961 files changed, 1658 insertions, 1606 deletions

diff --git a/.gitignore b/.gitignore
index e9c4ba3590..45d9e3503f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -219,57 +219,57 @@ test-*.trs
 /po/quot.sed
 /po/remove-potcdate.sin
 
-/src/NetworkManager
-/src/NetworkManager-all-sym
-/src/NetworkManager.ver
-/src/devices/bluetooth/tests/nm-bt-test
-/src/devices/tests/test-acd
-/src/devices/tests/test-lldp
-/src/devices/wifi/tests/test-devices-wifi
-/src/devices/wwan/tests/test-service-providers
-/src/dhcp/nm-dhcp-helper
-/src/dhcp/tests/test-dhcp-dhclient
-/src/dhcp/tests/test-dhcp-options
-/src/dhcp/tests/test-dhcp-utils
-/src/dnsmasq/tests/test-dnsmasq-utils
-/src/initrd/nm-initrd-generator
-/src/initrd/tests/test-cmdline-reader
-/src/initrd/tests/test-dt-reader
-/src/initrd/tests/test-ibft-reader
-/src/nm-iface-helper
-/src/ndisc/tests/test-ndisc-fake
-/src/ndisc/tests/test-ndisc-linux
-/src/platform/tests/monitor
-/src/platform/tests/test-address-fake
-/src/platform/tests/test-address-linux
-/src/platform/tests/test-cleanup-fake
-/src/platform/tests/test-cleanup-linux
-/src/platform/tests/test-link-fake
-/src/platform/tests/test-link-linux
-/src/platform/tests/test-nmp-object
-/src/platform/tests/test-platform-general
-/src/platform/tests/test-route-fake
-/src/platform/tests/test-route-linux
-/src/platform/tests/test-tc-fake
-/src/platform/tests/test-tc-linux
-/src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.[ch]
-/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
-/src/settings/plugins/ifupdown/tests/test-ifupdown
-/src/settings/plugins/keyfile/tests/test-keyfile-settings
-/src/settings/plugins/ifcfg-rh/tests/network-scripts/tmp/
-/src/supplicant/tests/test-supplicant-config
-/src/tests/config/test-config
-/src/tests/test-core
-/src/tests/test-core-with-expect
-/src/tests/test-dcb
-/src/tests/test-ip4-config
-/src/tests/test-ip6-config
-/src/tests/test-l3cfg
-/src/tests/test-route-manager-fake
-/src/tests/test-route-manager-linux
-/src/tests/test-systemd
-/src/tests/test-utils
-/src/tests/test-wired-defname
+/src/core/NetworkManager
+/src/core/NetworkManager-all-sym
+/src/core/NetworkManager.ver
+/src/core/devices/bluetooth/tests/nm-bt-test
+/src/core/devices/tests/test-acd
+/src/core/devices/tests/test-lldp
+/src/core/devices/wifi/tests/test-devices-wifi
+/src/core/devices/wwan/tests/test-service-providers
+/src/core/dhcp/nm-dhcp-helper
+/src/core/dhcp/tests/test-dhcp-dhclient
+/src/core/dhcp/tests/test-dhcp-options
+/src/core/dhcp/tests/test-dhcp-utils
+/src/core/dnsmasq/tests/test-dnsmasq-utils
+/src/core/initrd/nm-initrd-generator
+/src/core/initrd/tests/test-cmdline-reader
+/src/core/initrd/tests/test-dt-reader
+/src/core/initrd/tests/test-ibft-reader
+/src/core/nm-iface-helper
+/src/core/ndisc/tests/test-ndisc-fake
+/src/core/ndisc/tests/test-ndisc-linux
+/src/core/platform/tests/monitor
+/src/core/platform/tests/test-address-fake
+/src/core/platform/tests/test-address-linux
+/src/core/platform/tests/test-cleanup-fake
+/src/core/platform/tests/test-cleanup-linux
+/src/core/platform/tests/test-link-fake
+/src/core/platform/tests/test-link-linux
+/src/core/platform/tests/test-nmp-object
+/src/core/platform/tests/test-platform-general
+/src/core/platform/tests/test-route-fake
+/src/core/platform/tests/test-route-linux
+/src/core/platform/tests/test-tc-fake
+/src/core/platform/tests/test-tc-linux
+/src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.[ch]
+/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
+/src/core/settings/plugins/ifupdown/tests/test-ifupdown
+/src/core/settings/plugins/keyfile/tests/test-keyfile-settings
+/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/tmp/
+/src/core/supplicant/tests/test-supplicant-config
+/src/core/tests/config/test-config
+/src/core/tests/test-core
+/src/core/tests/test-core-with-expect
+/src/core/tests/test-dcb
+/src/core/tests/test-ip4-config
+/src/core/tests/test-ip6-config
+/src/core/tests/test-l3cfg
+/src/core/tests/test-route-manager-fake
+/src/core/tests/test-route-manager-linux
+/src/core/tests/test-systemd
+/src/core/tests/test-utils
+/src/core/tests/test-wired-defname
 
 /vapi/*.vapi
 
@@ -369,3 +369,54 @@ test-*.trs
 /src/tests/test-general
 /src/tests/test-general-with-expect
 /src/tests/test-resolvconf-capture
+/src/NetworkManager
+/src/NetworkManager-all-sym
+/src/NetworkManager.ver
+/src/devices/bluetooth/tests/nm-bt-test
+/src/devices/tests/test-acd
+/src/devices/tests/test-lldp
+/src/devices/wifi/tests/test-devices-wifi
+/src/devices/wwan/tests/test-service-providers
+/src/dhcp/nm-dhcp-helper
+/src/dhcp/tests/test-dhcp-dhclient
+/src/dhcp/tests/test-dhcp-options
+/src/dhcp/tests/test-dhcp-utils
+/src/dnsmasq/tests/test-dnsmasq-utils
+/src/initrd/nm-initrd-generator
+/src/initrd/tests/test-cmdline-reader
+/src/initrd/tests/test-dt-reader
+/src/initrd/tests/test-ibft-reader
+/src/nm-iface-helper
+/src/ndisc/tests/test-ndisc-fake
+/src/ndisc/tests/test-ndisc-linux
+/src/platform/tests/monitor
+/src/platform/tests/test-address-fake
+/src/platform/tests/test-address-linux
+/src/platform/tests/test-cleanup-fake
+/src/platform/tests/test-cleanup-linux
+/src/platform/tests/test-link-fake
+/src/platform/tests/test-link-linux
+/src/platform/tests/test-nmp-object
+/src/platform/tests/test-platform-general
+/src/platform/tests/test-route-fake
+/src/platform/tests/test-route-linux
+/src/platform/tests/test-tc-fake
+/src/platform/tests/test-tc-linux
+/src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.[ch]
+/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
+/src/settings/plugins/ifupdown/tests/test-ifupdown
+/src/settings/plugins/keyfile/tests/test-keyfile-settings
+/src/settings/plugins/ifcfg-rh/tests/network-scripts/tmp/
+/src/supplicant/tests/test-supplicant-config
+/src/tests/config/test-config
+/src/tests/test-core
+/src/tests/test-core-with-expect
+/src/tests/test-dcb
+/src/tests/test-ip4-config
+/src/tests/test-ip6-config
+/src/tests/test-l3cfg
+/src/tests/test-route-manager-fake
+/src/tests/test-route-manager-linux
+/src/tests/test-systemd
+/src/tests/test-utils
+/src/tests/test-wired-defname
diff --git a/Makefile.am b/Makefile.am
index 385e3385bf..48cf7cfb61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -123,7 +123,7 @@ shared/nm-udev-aux/.dirstamp:        config-extra.h
 shared/systemd/.dirstamp:            config-extra.h
 shared/systemd/src/basic/.dirstamp:  config-extra.h
 shared/systemd/src/shared/.dirstamp: config-extra.h
-src/dhcp/.dirstamp:                  config-extra.h
+src/core/dhcp/.dirstamp:             config-extra.h
 
 ###############################################################################
 
@@ -135,8 +135,8 @@ set_sanitizer_env = \
 	fi
 
 check_so_symbols = \
-	$(call set_sanitizer_env,$(1),$(builddir)/src/NetworkManager); \
-	LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/NetworkManager --version >/dev/null
+	$(call set_sanitizer_env,$(1),$(builddir)/src/core/NetworkManager); \
+	LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/core/NetworkManager --version >/dev/null
 
 ###############################################################################
 
@@ -1232,13 +1232,13 @@ $(dispatcher_nm_dispatcher_OBJECTS):                                        $(li
 $(libnm_core_libnm_core_la_OBJECTS):                                        $(libnm_core_lib_h_pub_mkenums)
 $(libnm_libnm_la_OBJECTS):                                                  $(libnm_core_lib_h_pub_mkenums)
 $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS):                      $(libnm_core_lib_h_pub_mkenums)
-$(src_NetworkManager_OBJECTS):                                              $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS):                    $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS):          $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_team_libnm_device_plugin_team_la_OBJECTS):                    $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS):                    $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS):                    $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS):                      $(libnm_core_lib_h_pub_mkenums)
+$(src_core_NetworkManager_OBJECTS):                                         $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS):               $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS):     $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_team_libnm_device_plugin_team_la_OBJECTS):               $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS):               $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS):               $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS):                 $(libnm_core_lib_h_pub_mkenums)
 
 libnm_core_libnm_core_la_CPPFLAGS = \
 	$(dflt_cppflags_libnm_core) \
@@ -1892,26 +1892,26 @@ EXTRA_DIST += \
 	libnm/tests/meson.build
 
 ###############################################################################
-# src/
+# src/core/
 ###############################################################################
 
-src_cppflags_base = \
-	-I$(srcdir)/src \
+src_core_cppflags_base = \
+	-I$(srcdir)/src/core \
 	$(dflt_cppflags_libnm_core) \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
-src_cppflags_base_test = \
-	$(src_cppflags_base) \
+src_core_cppflags_base_test = \
+	$(src_core_cppflags_base) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	$(NULL)
 
-src_cppflags_device_plugin = \
-	$(src_cppflags_base)
+src_core_cppflags_device_plugin = \
+	$(src_core_cppflags_base)
 
-src_cppflags = \
-	$(src_cppflags_base) \
+src_core_cppflags = \
+	$(src_core_cppflags_base) \
 	\
 	$(LIBNDP_CFLAGS) \
 	$(LIBPSL_CFLAGS) \
@@ -1923,27 +1923,27 @@ src_cppflags = \
 	\
 	$(NULL)
 
-src_cppflags_test = \
-	$(src_cppflags) \
+src_core_cppflags_test = \
+	$(src_core_cppflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	$(NULL)
 
 if REQUIRE_ROOT_TESTS
-src_cppflags_test += -DREQUIRE_ROOT_TESTS=1
+src_core_cppflags_test += -DREQUIRE_ROOT_TESTS=1
 endif
 
-src_ldflags = $(CODE_COVERAGE_LDFLAGS)
+src_core_ldflags = $(CODE_COVERAGE_LDFLAGS)
 
 sbin_PROGRAMS += \
-	src/NetworkManager
+	src/core/NetworkManager
 
 libexec_PROGRAMS += \
-	src/nm-iface-helper
+	src/core/nm-iface-helper
 
 noinst_LTLIBRARIES += \
-	src/libNetworkManagerBase.la \
-	src/libNetworkManager.la \
-	src/libnm-systemd-core.la \
+	src/core/libNetworkManagerBase.la \
+	src/core/libNetworkManager.la \
+	src/core/libnm-systemd-core.la \
 	$(NULL)
 
 check-config-options:
@@ -2128,373 +2128,373 @@ shared_systemd_libnm_systemd_shared_la_LIBADD = \
 
 ###############################################################################
 
-src_libnm_systemd_core_la_cppflags = \
+src_core_libnm_systemd_core_la_cppflags = \
 	$(libsystemd_cppflags) \
 	-I$(srcdir)/libnm-core \
 	-I$(builddir)/libnm-core \
-	-I$(srcdir)/src \
-	-I$(srcdir)/src/systemd/sd-adapt-core \
-	-I$(srcdir)/src/systemd/src/systemd \
-	-I$(srcdir)/src/systemd/src/libsystemd-network \
-	-I$(srcdir)/src/systemd/src/libsystemd/sd-event \
+	-I$(srcdir)/src/core \
+	-I$(srcdir)/src/core/systemd/sd-adapt-core \
+	-I$(srcdir)/src/core/systemd/src/systemd \
+	-I$(srcdir)/src/core/systemd/src/libsystemd-network \
+	-I$(srcdir)/src/core/systemd/src/libsystemd/sd-event \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
 	$(NULL)
 
-src_libnm_systemd_core_la_libadd = \
+src_core_libnm_systemd_core_la_libadd = \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
-src_libnm_systemd_core_la_SOURCES = \
-	src/systemd/nm-sd-utils-core.c \
-	src/systemd/nm-sd-utils-core.h \
-	src/systemd/nm-sd.c \
-	src/systemd/nm-sd.h \
-	src/systemd/nm-sd-utils-dhcp.h \
-	src/systemd/nm-sd-utils-dhcp.c \
-	src/systemd/sd-adapt-core/condition.h \
-	src/systemd/sd-adapt-core/conf-parser.h \
-	src/systemd/sd-adapt-core/device-util.h \
-	src/systemd/sd-adapt-core/khash.h \
-	src/systemd/sd-adapt-core/network-util.h \
-	src/systemd/sd-adapt-core/nm-sd-adapt-core.c \
-	src/systemd/sd-adapt-core/nm-sd-adapt-core.h \
-	src/systemd/sd-adapt-core/sd-daemon.h \
-	src/systemd/sd-adapt-core/sd-device.h \
-	src/systemd/sd-adapt-core/udev-util.h \
-	src/systemd/src/libsystemd-network/arp-util.c \
-	src/systemd/src/libsystemd-network/arp-util.h \
-	src/systemd/src/libsystemd-network/dhcp-identifier.c \
-	src/systemd/src/libsystemd-network/dhcp-identifier.h \
-	src/systemd/src/libsystemd-network/dhcp-internal.h \
-	src/systemd/src/libsystemd-network/dhcp-lease-internal.h \
-	src/systemd/src/libsystemd-network/dhcp-network.c \
-	src/systemd/src/libsystemd-network/dhcp-option.c \
-	src/systemd/src/libsystemd-network/dhcp-packet.c \
-	src/systemd/src/libsystemd-network/dhcp-protocol.h \
-	src/systemd/src/libsystemd-network/dhcp6-internal.h \
-	src/systemd/src/libsystemd-network/dhcp6-lease-internal.h \
-	src/systemd/src/libsystemd-network/dhcp6-network.c \
-	src/systemd/src/libsystemd-network/dhcp6-option.c \
-	src/systemd/src/libsystemd-network/dhcp6-protocol.h \
-	src/systemd/src/libsystemd-network/lldp-internal.h \
-	src/systemd/src/libsystemd-network/lldp-neighbor.c \
-	src/systemd/src/libsystemd-network/lldp-neighbor.h \
-	src/systemd/src/libsystemd-network/lldp-network.c \
-	src/systemd/src/libsystemd-network/lldp-network.h \
-	src/systemd/src/libsystemd-network/network-internal.c \
-	src/systemd/src/libsystemd-network/network-internal.h \
-	src/systemd/src/libsystemd-network/sd-dhcp-client.c \
-	src/systemd/src/libsystemd-network/sd-dhcp-lease.c \
-	src/systemd/src/libsystemd-network/sd-dhcp6-client.c \
-	src/systemd/src/libsystemd-network/sd-dhcp6-lease.c \
-	src/systemd/src/libsystemd-network/sd-ipv4acd.c \
-	src/systemd/src/libsystemd-network/sd-ipv4ll.c \
-	src/systemd/src/libsystemd-network/sd-lldp.c \
-	src/systemd/src/libsystemd/sd-event/event-source.h \
-	src/systemd/src/libsystemd/sd-event/event-util.c \
-	src/systemd/src/libsystemd/sd-event/event-util.h \
-	src/systemd/src/libsystemd/sd-event/sd-event.c \
-	src/systemd/src/libsystemd/sd-id128/id128-util.c \
-	src/systemd/src/libsystemd/sd-id128/id128-util.h \
-	src/systemd/src/libsystemd/sd-id128/sd-id128.c \
-	src/systemd/src/systemd/_sd-common.h \
-	src/systemd/src/systemd/sd-dhcp-client.h \
-	src/systemd/src/systemd/sd-dhcp-lease.h \
-	src/systemd/src/systemd/sd-dhcp-option.h \
-	src/systemd/src/systemd/sd-dhcp6-client.h \
-	src/systemd/src/systemd/sd-dhcp6-lease.h \
-	src/systemd/src/systemd/sd-dhcp6-option.h \
-	src/systemd/src/systemd/sd-event.h \
-	src/systemd/src/systemd/sd-id128.h \
-	src/systemd/src/systemd/sd-ipv4acd.h \
-	src/systemd/src/systemd/sd-ipv4ll.h \
-	src/systemd/src/systemd/sd-lldp.h \
-	src/systemd/src/systemd/sd-ndisc.h \
-	$(NULL)
-
-src_libnm_systemd_core_la_CPPFLAGS = $(src_libnm_systemd_core_la_cppflags)
-src_libnm_systemd_core_la_LIBADD = \
+src_core_libnm_systemd_core_la_SOURCES = \
+	src/core/systemd/nm-sd-utils-core.c \
+	src/core/systemd/nm-sd-utils-core.h \
+	src/core/systemd/nm-sd.c \
+	src/core/systemd/nm-sd.h \
+	src/core/systemd/nm-sd-utils-dhcp.h \
+	src/core/systemd/nm-sd-utils-dhcp.c \
+	src/core/systemd/sd-adapt-core/condition.h \
+	src/core/systemd/sd-adapt-core/conf-parser.h \
+	src/core/systemd/sd-adapt-core/device-util.h \
+	src/core/systemd/sd-adapt-core/khash.h \
+	src/core/systemd/sd-adapt-core/network-util.h \
+	src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c \
+	src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h \
+	src/core/systemd/sd-adapt-core/sd-daemon.h \
+	src/core/systemd/sd-adapt-core/sd-device.h \
+	src/core/systemd/sd-adapt-core/udev-util.h \
+	src/core/systemd/src/libsystemd-network/arp-util.c \
+	src/core/systemd/src/libsystemd-network/arp-util.h \
+	src/core/systemd/src/libsystemd-network/dhcp-identifier.c \
+	src/core/systemd/src/libsystemd-network/dhcp-identifier.h \
+	src/core/systemd/src/libsystemd-network/dhcp-internal.h \
+	src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h \
+	src/core/systemd/src/libsystemd-network/dhcp-network.c \
+	src/core/systemd/src/libsystemd-network/dhcp-option.c \
+	src/core/systemd/src/libsystemd-network/dhcp-packet.c \
+	src/core/systemd/src/libsystemd-network/dhcp-protocol.h \
+	src/core/systemd/src/libsystemd-network/dhcp6-internal.h \
+	src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h \
+	src/core/systemd/src/libsystemd-network/dhcp6-network.c \
+	src/core/systemd/src/libsystemd-network/dhcp6-option.c \
+	src/core/systemd/src/libsystemd-network/dhcp6-protocol.h \
+	src/core/systemd/src/libsystemd-network/lldp-internal.h \
+	src/core/systemd/src/libsystemd-network/lldp-neighbor.c \
+	src/core/systemd/src/libsystemd-network/lldp-neighbor.h \
+	src/core/systemd/src/libsystemd-network/lldp-network.c \
+	src/core/systemd/src/libsystemd-network/lldp-network.h \
+	src/core/systemd/src/libsystemd-network/network-internal.c \
+	src/core/systemd/src/libsystemd-network/network-internal.h \
+	src/core/systemd/src/libsystemd-network/sd-dhcp-client.c \
+	src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c \
+	src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c \
+	src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c \
+	src/core/systemd/src/libsystemd-network/sd-ipv4acd.c \
+	src/core/systemd/src/libsystemd-network/sd-ipv4ll.c \
+	src/core/systemd/src/libsystemd-network/sd-lldp.c \
+	src/core/systemd/src/libsystemd/sd-event/event-source.h \
+	src/core/systemd/src/libsystemd/sd-event/event-util.c \
+	src/core/systemd/src/libsystemd/sd-event/event-util.h \
+	src/core/systemd/src/libsystemd/sd-event/sd-event.c \
+	src/core/systemd/src/libsystemd/sd-id128/id128-util.c \
+	src/core/systemd/src/libsystemd/sd-id128/id128-util.h \
+	src/core/systemd/src/libsystemd/sd-id128/sd-id128.c \
+	src/core/systemd/src/systemd/_sd-common.h \
+	src/core/systemd/src/systemd/sd-dhcp-client.h \
+	src/core/systemd/src/systemd/sd-dhcp-lease.h \
+	src/core/systemd/src/systemd/sd-dhcp-option.h \
+	src/core/systemd/src/systemd/sd-dhcp6-client.h \
+	src/core/systemd/src/systemd/sd-dhcp6-lease.h \
+	src/core/systemd/src/systemd/sd-dhcp6-option.h \
+	src/core/systemd/src/systemd/sd-event.h \
+	src/core/systemd/src/systemd/sd-id128.h \
+	src/core/systemd/src/systemd/sd-ipv4acd.h \
+	src/core/systemd/src/systemd/sd-ipv4ll.h \
+	src/core/systemd/src/systemd/sd-lldp.h \
+	src/core/systemd/src/systemd/sd-ndisc.h \
+	$(NULL)
+
+src_core_libnm_systemd_core_la_CPPFLAGS = $(src_core_libnm_systemd_core_la_cppflags)
+src_core_libnm_systemd_core_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
-$(src_libnm_systemd_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_libnm_systemd_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
-	src/systemd/meson.build
+	src/core/systemd/meson.build
 
 ###############################################################################
 
-src_libNetworkManagerBase_la_CPPFLAGS = \
+src_core_libNetworkManagerBase_la_CPPFLAGS = \
 	$(libsystemd_cppflags) \
-	$(src_cppflags)
+	$(src_core_cppflags)
 
-src_libNetworkManagerBase_la_SOURCES = \
+src_core_libNetworkManagerBase_la_SOURCES = \
 	\
-	src/nm-core-utils.c \
-	src/nm-core-utils.h \
+	src/core/nm-core-utils.c \
+	src/core/nm-core-utils.h \
 	\
-	src/NetworkManagerUtils.c \
-	src/NetworkManagerUtils.h \
+	src/core/NetworkManagerUtils.c \
+	src/core/NetworkManagerUtils.h \
 	\
-	src/platform/nmp-object.c \
-	src/platform/nmp-object.h \
-	src/platform/nm-platform.c \
-	src/platform/nm-platform.h \
-	src/platform/nm-platform-private.h \
-	src/platform/nm-linux-platform.c \
-	src/platform/nm-linux-platform.h \
-	src/platform/nmp-rules-manager.c \
-	src/platform/nmp-rules-manager.h \
-	src/platform/wifi/nm-wifi-utils-nl80211.c \
-	src/platform/wifi/nm-wifi-utils-nl80211.h \
-	src/platform/wifi/nm-wifi-utils-private.h \
-	src/platform/wifi/nm-wifi-utils.c \
-	src/platform/wifi/nm-wifi-utils.h \
-	src/platform/wpan/nm-wpan-utils.c \
-	src/platform/wpan/nm-wpan-utils.h \
+	src/core/platform/nmp-object.c \
+	src/core/platform/nmp-object.h \
+	src/core/platform/nm-platform.c \
+	src/core/platform/nm-platform.h \
+	src/core/platform/nm-platform-private.h \
+	src/core/platform/nm-linux-platform.c \
+	src/core/platform/nm-linux-platform.h \
+	src/core/platform/nmp-rules-manager.c \
+	src/core/platform/nmp-rules-manager.h \
+	src/core/platform/wifi/nm-wifi-utils-nl80211.c \
+	src/core/platform/wifi/nm-wifi-utils-nl80211.h \
+	src/core/platform/wifi/nm-wifi-utils-private.h \
+	src/core/platform/wifi/nm-wifi-utils.c \
+	src/core/platform/wifi/nm-wifi-utils.h \
+	src/core/platform/wpan/nm-wpan-utils.c \
+	src/core/platform/wpan/nm-wpan-utils.h \
 	\
-	src/ndisc/nm-lndp-ndisc.c \
-	src/ndisc/nm-lndp-ndisc.h \
-	src/ndisc/nm-ndisc.c \
-	src/ndisc/nm-ndisc.h \
-	src/ndisc/nm-ndisc-private.h \
+	src/core/ndisc/nm-lndp-ndisc.c \
+	src/core/ndisc/nm-lndp-ndisc.h \
+	src/core/ndisc/nm-ndisc.c \
+	src/core/ndisc/nm-ndisc.h \
+	src/core/ndisc/nm-ndisc-private.h \
 	\
-	src/nm-dbus-utils.c \
-	src/nm-dbus-utils.h \
-	src/nm-dbus-object.c \
-	src/nm-dbus-object.h \
-	src/nm-netns.c \
-	src/nm-netns.h \
-	src/nm-l3-config-data.c \
-	src/nm-l3-config-data.h \
-	src/nm-l3-ipv4ll.c \
-	src/nm-l3-ipv4ll.h \
-	src/nm-l3cfg.c \
-	src/nm-l3cfg.h \
-	src/nm-ip-config.c \
-	src/nm-ip-config.h \
-	src/nm-ip4-config.c \
-	src/nm-ip4-config.h \
-	src/nm-ip6-config.c \
-	src/nm-ip6-config.h \
+	src/core/nm-dbus-utils.c \
+	src/core/nm-dbus-utils.h \
+	src/core/nm-dbus-object.c \
+	src/core/nm-dbus-object.h \
+	src/core/nm-netns.c \
+	src/core/nm-netns.h \
+	src/core/nm-l3-config-data.c \
+	src/core/nm-l3-config-data.h \
+	src/core/nm-l3-ipv4ll.c \
+	src/core/nm-l3-ipv4ll.h \
+	src/core/nm-l3cfg.c \
+	src/core/nm-l3cfg.h \
+	src/core/nm-ip-config.c \
+	src/core/nm-ip-config.h \
+	src/core/nm-ip4-config.c \
+	src/core/nm-ip4-config.h \
+	src/core/nm-ip6-config.c \
+	src/core/nm-ip6-config.h \
 	\
-	src/dhcp/nm-dhcp-client.c \
-	src/dhcp/nm-dhcp-client.h \
-	src/dhcp/nm-dhcp-client-logging.h \
-	src/dhcp/nm-dhcp-nettools.c \
-	src/dhcp/nm-dhcp-utils.c \
-	src/dhcp/nm-dhcp-utils.h \
-	src/dhcp/nm-dhcp-options.c \
-	src/dhcp/nm-dhcp-options.h \
-	src/dhcp/nm-dhcp-systemd.c \
-	src/dhcp/nm-dhcp-manager.c \
-	src/dhcp/nm-dhcp-manager.h \
+	src/core/dhcp/nm-dhcp-client.c \
+	src/core/dhcp/nm-dhcp-client.h \
+	src/core/dhcp/nm-dhcp-client-logging.h \
+	src/core/dhcp/nm-dhcp-nettools.c \
+	src/core/dhcp/nm-dhcp-utils.c \
+	src/core/dhcp/nm-dhcp-utils.h \
+	src/core/dhcp/nm-dhcp-options.c \
+	src/core/dhcp/nm-dhcp-options.h \
+	src/core/dhcp/nm-dhcp-systemd.c \
+	src/core/dhcp/nm-dhcp-manager.c \
+	src/core/dhcp/nm-dhcp-manager.h \
 	\
-	src/main-utils.c \
-	src/main-utils.h \
+	src/core/main-utils.c \
+	src/core/main-utils.h \
 	\
 	$(NULL)
 
 if WITH_WEXT
-src_libNetworkManagerBase_la_SOURCES += \
-	src/platform/wifi/nm-wifi-utils-wext.c \
-	src/platform/wifi/nm-wifi-utils-wext.h
+src_core_libNetworkManagerBase_la_SOURCES += \
+	src/core/platform/wifi/nm-wifi-utils-wext.c \
+	src/core/platform/wifi/nm-wifi-utils-wext.h
 endif
 
-src_libNetworkManagerBase_la_LIBADD = \
+src_core_libNetworkManagerBase_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
 	$(NULL)
 
-$(src_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
-	src/platform/linux/nl802154.h
+	src/core/platform/linux/nl802154.h
 
 ###############################################################################
 
-src_libNetworkManager_la_CPPFLAGS = $(src_cppflags)
+src_core_libNetworkManager_la_CPPFLAGS = $(src_core_cppflags)
 
-src_libNetworkManager_la_SOURCES = \
+src_core_libNetworkManager_la_SOURCES = \
 	\
-	src/nm-checkpoint.c \
-	src/nm-checkpoint.h \
-	src/nm-checkpoint-manager.c \
-	src/nm-checkpoint-manager.h \
+	src/core/nm-checkpoint.c \
+	src/core/nm-checkpoint.h \
+	src/core/nm-checkpoint-manager.c \
+	src/core/nm-checkpoint-manager.h \
 	\
-	src/devices/nm-acd-manager.c \
-	src/devices/nm-acd-manager.h \
-	src/devices/nm-lldp-listener.c \
-	src/devices/nm-lldp-listener.h \
-	src/devices/nm-device.c \
-	src/devices/nm-device.h \
-	src/devices/nm-device-ethernet-utils.c \
-	src/devices/nm-device-ethernet-utils.h \
-	src/devices/nm-device-factory.c \
-	src/devices/nm-device-factory.h \
-	src/devices/nm-device-generic.c \
-	src/devices/nm-device-generic.h \
-	src/devices/nm-device-logging.h \
-	src/devices/nm-device-private.h \
+	src/core/devices/nm-acd-manager.c \
+	src/core/devices/nm-acd-manager.h \
+	src/core/devices/nm-lldp-listener.c \
+	src/core/devices/nm-lldp-listener.h \
+	src/core/devices/nm-device.c \
+	src/core/devices/nm-device.h \
+	src/core/devices/nm-device-ethernet-utils.c \
+	src/core/devices/nm-device-ethernet-utils.h \
+	src/core/devices/nm-device-factory.c \
+	src/core/devices/nm-device-factory.h \
+	src/core/devices/nm-device-generic.c \
+	src/core/devices/nm-device-generic.h \
+	src/core/devices/nm-device-logging.h \
+	src/core/devices/nm-device-private.h \
 	\
-	src/devices/nm-device-6lowpan.c \
-	src/devices/nm-device-6lowpan.h \
-	src/devices/nm-device-bond.c \
-	src/devices/nm-device-bond.h \
-	src/devices/nm-device-bridge.c \
-	src/devices/nm-device-bridge.h \
-	src/devices/nm-device-dummy.c \
-	src/devices/nm-device-dummy.h \
-	src/devices/nm-device-ethernet.c \
-	src/devices/nm-device-ethernet.h \
-	src/devices/nm-device-infiniband.c \
-	src/devices/nm-device-infiniband.h \
-	src/devices/nm-device-ip-tunnel.c \
-	src/devices/nm-device-ip-tunnel.h \
-	src/devices/nm-device-macsec.c \
-	src/devices/nm-device-macsec.h \
-	src/devices/nm-device-macvlan.c \
-	src/devices/nm-device-macvlan.h \
-	src/devices/nm-device-ppp.c \
-	src/devices/nm-device-ppp.h \
-	src/devices/nm-device-tun.c \
-	src/devices/nm-device-tun.h \
-	src/devices/nm-device-veth.c \
-	src/devices/nm-device-veth.h \
-	src/devices/nm-device-vlan.c \
-	src/devices/nm-device-vlan.h \
-	src/devices/nm-device-vrf.c \
-	src/devices/nm-device-vrf.h \
-	src/devices/nm-device-vxlan.c \
-	src/devices/nm-device-vxlan.h \
-	src/devices/nm-device-wireguard.c \
-	src/devices/nm-device-wireguard.h \
-	src/devices/nm-device-wpan.c \
-	src/devices/nm-device-wpan.h \
+	src/core/devices/nm-device-6lowpan.c \
+	src/core/devices/nm-device-6lowpan.h \
+	src/core/devices/nm-device-bond.c \
+	src/core/devices/nm-device-bond.h \
+	src/core/devices/nm-device-bridge.c \
+	src/core/devices/nm-device-bridge.h \
+	src/core/devices/nm-device-dummy.c \
+	src/core/devices/nm-device-dummy.h \
+	src/core/devices/nm-device-ethernet.c \
+	src/core/devices/nm-device-ethernet.h \
+	src/core/devices/nm-device-infiniband.c \
+	src/core/devices/nm-device-infiniband.h \
+	src/core/devices/nm-device-ip-tunnel.c \
+	src/core/devices/nm-device-ip-tunnel.h \
+	src/core/devices/nm-device-macsec.c \
+	src/core/devices/nm-device-macsec.h \
+	src/core/devices/nm-device-macvlan.c \
+	src/core/devices/nm-device-macvlan.h \
+	src/core/devices/nm-device-ppp.c \
+	src/core/devices/nm-device-ppp.h \
+	src/core/devices/nm-device-tun.c \
+	src/core/devices/nm-device-tun.h \
+	src/core/devices/nm-device-veth.c \
+	src/core/devices/nm-device-veth.h \
+	src/core/devices/nm-device-vlan.c \
+	src/core/devices/nm-device-vlan.h \
+	src/core/devices/nm-device-vrf.c \
+	src/core/devices/nm-device-vrf.h \
+	src/core/devices/nm-device-vxlan.c \
+	src/core/devices/nm-device-vxlan.h \
+	src/core/devices/nm-device-wireguard.c \
+	src/core/devices/nm-device-wireguard.h \
+	src/core/devices/nm-device-wpan.c \
+	src/core/devices/nm-device-wpan.h \
 	\
-	src/dhcp/nm-dhcp-dhcpcanon.c \
-	src/dhcp/nm-dhcp-dhclient.c \
-	src/dhcp/nm-dhcp-dhcpcd.c \
-	src/dhcp/nm-dhcp-helper-api.h \
-	src/dhcp/nm-dhcp-listener.c \
-	src/dhcp/nm-dhcp-listener.h \
-	src/dhcp/nm-dhcp-dhclient-utils.c \
-	src/dhcp/nm-dhcp-dhclient-utils.h \
+	src/core/dhcp/nm-dhcp-dhcpcanon.c \
+	src/core/dhcp/nm-dhcp-dhclient.c \
+	src/core/dhcp/nm-dhcp-dhcpcd.c \
+	src/core/dhcp/nm-dhcp-helper-api.h \
+	src/core/dhcp/nm-dhcp-listener.c \
+	src/core/dhcp/nm-dhcp-listener.h \
+	src/core/dhcp/nm-dhcp-dhclient-utils.c \
+	src/core/dhcp/nm-dhcp-dhclient-utils.h \
 	\
-	src/dns/nm-dns-manager.c \
-	src/dns/nm-dns-manager.h \
-	src/dns/nm-dns-plugin.c \
-	src/dns/nm-dns-plugin.h \
-	src/dns/nm-dns-dnsmasq.c \
-	src/dns/nm-dns-dnsmasq.h \
-	src/dns/nm-dns-systemd-resolved.c \
-	src/dns/nm-dns-systemd-resolved.h \
-	src/dns/nm-dns-unbound.c \
-	src/dns/nm-dns-unbound.h \
+	src/core/dns/nm-dns-manager.c \
+	src/core/dns/nm-dns-manager.h \
+	src/core/dns/nm-dns-plugin.c \
+	src/core/dns/nm-dns-plugin.h \
+	src/core/dns/nm-dns-dnsmasq.c \
+	src/core/dns/nm-dns-dnsmasq.h \
+	src/core/dns/nm-dns-systemd-resolved.c \
+	src/core/dns/nm-dns-systemd-resolved.h \
+	src/core/dns/nm-dns-unbound.c \
+	src/core/dns/nm-dns-unbound.h \
 	\
-	src/dnsmasq/nm-dnsmasq-manager.c \
-	src/dnsmasq/nm-dnsmasq-manager.h \
-	src/dnsmasq/nm-dnsmasq-utils.c \
-	src/dnsmasq/nm-dnsmasq-utils.h \
+	src/core/dnsmasq/nm-dnsmasq-manager.c \
+	src/core/dnsmasq/nm-dnsmasq-manager.h \
+	src/core/dnsmasq/nm-dnsmasq-utils.c \
+	src/core/dnsmasq/nm-dnsmasq-utils.h \
 	\
-	src/ppp/nm-ppp-manager-call.c \
-	src/ppp/nm-ppp-manager-call.h \
-	src/ppp/nm-ppp-manager.h \
-	src/ppp/nm-ppp-status.h \
+	src/core/ppp/nm-ppp-manager-call.c \
+	src/core/ppp/nm-ppp-manager-call.h \
+	src/core/ppp/nm-ppp-manager.h \
+	src/core/ppp/nm-ppp-status.h \
 	\
-	src/nm-hostname-manager.c \
-	src/nm-hostname-manager.h \
+	src/core/nm-hostname-manager.c \
+	src/core/nm-hostname-manager.h \
 	\
-	src/settings/nm-agent-manager.c \
-	src/settings/nm-agent-manager.h \
-	src/settings/nm-secret-agent.c \
-	src/settings/nm-secret-agent.h \
-	src/settings/nm-settings-connection.c \
-	src/settings/nm-settings-connection.h \
-	src/settings/nm-settings-storage.c \
-	src/settings/nm-settings-storage.h \
-	src/settings/nm-settings-plugin.c \
-	src/settings/nm-settings-plugin.h \
-	src/settings/nm-settings.c \
-	src/settings/nm-settings.h \
-	src/settings/nm-settings-utils.c \
-	src/settings/nm-settings-utils.h \
+	src/core/settings/nm-agent-manager.c \
+	src/core/settings/nm-agent-manager.h \
+	src/core/settings/nm-secret-agent.c \
+	src/core/settings/nm-secret-agent.h \
+	src/core/settings/nm-settings-connection.c \
+	src/core/settings/nm-settings-connection.h \
+	src/core/settings/nm-settings-storage.c \
+	src/core/settings/nm-settings-storage.h \
+	src/core/settings/nm-settings-plugin.c \
+	src/core/settings/nm-settings-plugin.h \
+	src/core/settings/nm-settings.c \
+	src/core/settings/nm-settings.h \
+	src/core/settings/nm-settings-utils.c \
+	src/core/settings/nm-settings-utils.h \
 	\
-	src/settings/plugins/keyfile/nms-keyfile-storage.c \
-	src/settings/plugins/keyfile/nms-keyfile-storage.h \
-	src/settings/plugins/keyfile/nms-keyfile-plugin.c \
-	src/settings/plugins/keyfile/nms-keyfile-plugin.h \
-	src/settings/plugins/keyfile/nms-keyfile-reader.c \
-	src/settings/plugins/keyfile/nms-keyfile-reader.h \
-	src/settings/plugins/keyfile/nms-keyfile-utils.c \
-	src/settings/plugins/keyfile/nms-keyfile-utils.h \
-	src/settings/plugins/keyfile/nms-keyfile-writer.c \
-	src/settings/plugins/keyfile/nms-keyfile-writer.h \
+	src/core/settings/plugins/keyfile/nms-keyfile-storage.c \
+	src/core/settings/plugins/keyfile/nms-keyfile-storage.h \
+	src/core/settings/plugins/keyfile/nms-keyfile-plugin.c \
+	src/core/settings/plugins/keyfile/nms-keyfile-plugin.h \
+	src/core/settings/plugins/keyfile/nms-keyfile-reader.c \
+	src/core/settings/plugins/keyfile/nms-keyfile-reader.h \
+	src/core/settings/plugins/keyfile/nms-keyfile-utils.c \
+	src/core/settings/plugins/keyfile/nms-keyfile-utils.h \
+	src/core/settings/plugins/keyfile/nms-keyfile-writer.c \
+	src/core/settings/plugins/keyfile/nms-keyfile-writer.h \
 	\
-	src/supplicant/nm-supplicant-config.c \
-	src/supplicant/nm-supplicant-config.h \
-	src/supplicant/nm-supplicant-interface.c \
-	src/supplicant/nm-supplicant-interface.h \
-	src/supplicant/nm-supplicant-manager.c \
-	src/supplicant/nm-supplicant-manager.h \
-	src/supplicant/nm-supplicant-settings-verify.c \
-	src/supplicant/nm-supplicant-settings-verify.h \
-	src/supplicant/nm-supplicant-types.h \
+	src/core/supplicant/nm-supplicant-config.c \
+	src/core/supplicant/nm-supplicant-config.h \
+	src/core/supplicant/nm-supplicant-interface.c \
+	src/core/supplicant/nm-supplicant-interface.h \
+	src/core/supplicant/nm-supplicant-manager.c \
+	src/core/supplicant/nm-supplicant-manager.h \
+	src/core/supplicant/nm-supplicant-settings-verify.c \
+	src/core/supplicant/nm-supplicant-settings-verify.h \
+	src/core/supplicant/nm-supplicant-types.h \
 	\
-	src/vpn/nm-vpn-connection.c \
-	src/vpn/nm-vpn-connection.h \
-	src/vpn/nm-vpn-manager.c \
-	src/vpn/nm-vpn-manager.h \
+	src/core/vpn/nm-vpn-connection.c \
+	src/core/vpn/nm-vpn-connection.h \
+	src/core/vpn/nm-vpn-manager.c \
+	src/core/vpn/nm-vpn-manager.h \
 	\
-	src/nm-act-request.c \
-	src/nm-act-request.h \
-	src/nm-active-connection.c \
-	src/nm-active-connection.h \
-	src/nm-audit-manager.c \
-	src/nm-audit-manager.h \
-	src/nm-dbus-manager.c \
-	src/nm-dbus-manager.h \
-	src/nm-config.c \
-	src/nm-config.h \
-	src/nm-config-data.c \
-	src/nm-config-data.h \
-	src/nm-connectivity.c \
-	src/nm-connectivity.h \
-	src/nm-dcb.c \
-	src/nm-dcb.h \
-	src/nm-dhcp-config.c \
-	src/nm-dhcp-config.h \
-	src/nm-dispatcher.c \
-	src/nm-dispatcher.h \
-	src/nm-firewall-manager.c \
-	src/nm-firewall-manager.h \
-	src/nm-proxy-config.c \
-	src/nm-proxy-config.h \
-	src/nm-auth-manager.c \
-	src/nm-auth-manager.h \
-	src/nm-auth-utils.c \
-	src/nm-auth-utils.h \
-	src/nm-manager.c \
-	src/nm-manager.h \
-	src/nm-pacrunner-manager.c \
-	src/nm-pacrunner-manager.h \
-	src/nm-policy.c \
-	src/nm-policy.h \
-	src/nm-rfkill-manager.c \
-	src/nm-rfkill-manager.h \
-	src/nm-session-monitor.h \
-	src/nm-session-monitor.c \
-	src/nm-keep-alive.c \
-	src/nm-keep-alive.h \
-	src/nm-sleep-monitor.c \
-	src/nm-sleep-monitor.h \
-	src/nm-types.h \
+	src/core/nm-act-request.c \
+	src/core/nm-act-request.h \
+	src/core/nm-active-connection.c \
+	src/core/nm-active-connection.h \
+	src/core/nm-audit-manager.c \
+	src/core/nm-audit-manager.h \
+	src/core/nm-dbus-manager.c \
+	src/core/nm-dbus-manager.h \
+	src/core/nm-config.c \
+	src/core/nm-config.h \
+	src/core/nm-config-data.c \
+	src/core/nm-config-data.h \
+	src/core/nm-connectivity.c \
+	src/core/nm-connectivity.h \
+	src/core/nm-dcb.c \
+	src/core/nm-dcb.h \
+	src/core/nm-dhcp-config.c \
+	src/core/nm-dhcp-config.h \
+	src/core/nm-dispatcher.c \
+	src/core/nm-dispatcher.h \
+	src/core/nm-firewall-manager.c \
+	src/core/nm-firewall-manager.h \
+	src/core/nm-proxy-config.c \
+	src/core/nm-proxy-config.h \
+	src/core/nm-auth-manager.c \
+	src/core/nm-auth-manager.h \
+	src/core/nm-auth-utils.c \
+	src/core/nm-auth-utils.h \
+	src/core/nm-manager.c \
+	src/core/nm-manager.h \
+	src/core/nm-pacrunner-manager.c \
+	src/core/nm-pacrunner-manager.h \
+	src/core/nm-policy.c \
+	src/core/nm-policy.h \
+	src/core/nm-rfkill-manager.c \
+	src/core/nm-rfkill-manager.h \
+	src/core/nm-session-monitor.h \
+	src/core/nm-session-monitor.c \
+	src/core/nm-keep-alive.c \
+	src/core/nm-keep-alive.h \
+	src/core/nm-sleep-monitor.c \
+	src/core/nm-sleep-monitor.h \
+	src/core/nm-types.h \
 	\
 	$(NULL)
 
-src_libNetworkManager_la_LIBADD = \
-	src/libNetworkManagerBase.la \
+src_core_libNetworkManager_la_LIBADD = \
+	src/core/libNetworkManagerBase.la \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la \
@@ -2506,7 +2506,7 @@ src_libNetworkManager_la_LIBADD = \
 	shared/nm-udev-aux/libnm-udev-aux.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
-	src/libnm-systemd-core.la \
+	src/core/libnm-systemd-core.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/libnacd.la \
 	shared/libndhcp4.la \
@@ -2524,91 +2524,91 @@ src_libNetworkManager_la_LIBADD = \
 	$(LIBCURL_LIBS) \
 	$(NULL)
 
-$(src_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 ###############################################################################
 
-check_ltlibraries += src/libNetworkManagerTest.la
+check_ltlibraries += src/core/libNetworkManagerTest.la
 
-src_tests_cppflags_fake = $(src_cppflags_test) -DSETUP=nm_fake_platform_setup
-src_tests_cppflags_linux = $(src_cppflags_test) -DSETUP=nm_linux_platform_setup
+src_core_tests_cppflags_fake = $(src_core_cppflags_test) -DSETUP=nm_fake_platform_setup
+src_core_tests_cppflags_linux = $(src_core_cppflags_test) -DSETUP=nm_linux_platform_setup
 
-src_libNetworkManagerTest_la_CPPFLAGS = $(src_cppflags_test)
+src_core_libNetworkManagerTest_la_CPPFLAGS = $(src_core_cppflags_test)
 
-src_libNetworkManagerTest_la_SOURCES = \
-	src/ndisc/nm-fake-ndisc.c \
-	src/ndisc/nm-fake-ndisc.h \
-	src/platform/nm-fake-platform.c \
-	src/platform/nm-fake-platform.h \
-	src/platform/tests/test-common.c \
-	src/platform/tests/test-common.h \
+src_core_libNetworkManagerTest_la_SOURCES = \
+	src/core/ndisc/nm-fake-ndisc.c \
+	src/core/ndisc/nm-fake-ndisc.h \
+	src/core/platform/nm-fake-platform.c \
+	src/core/platform/nm-fake-platform.h \
+	src/core/platform/tests/test-common.c \
+	src/core/platform/tests/test-common.h \
 	$(NULL)
 
-src_libNetworkManagerTest_la_LIBADD = \
-	src/libNetworkManager.la \
+src_core_libNetworkManagerTest_la_LIBADD = \
+	src/core/libNetworkManager.la \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
 	$(NULL)
 
-$(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 ###############################################################################
 
-noinst_PROGRAMS += src/NetworkManager-all-sym
+noinst_PROGRAMS += src/core/NetworkManager-all-sym
 
-src_NetworkManager_all_sym_CPPFLAGS = $(src_cppflags)
+src_core_NetworkManager_all_sym_CPPFLAGS = $(src_core_cppflags)
 
-src_NetworkManager_all_sym_SOURCES = \
-	src/main.c
+src_core_NetworkManager_all_sym_SOURCES = \
+	src/core/main.c
 
-src_NetworkManager_all_sym_LDADD = \
-	src/libNetworkManager.la \
+src_core_NetworkManager_all_sym_LDADD = \
+	src/core/libNetworkManager.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-src_NetworkManager_all_sym_LDFLAGS = \
+src_core_NetworkManager_all_sym_LDFLAGS = \
 	-rdynamic \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-$(src_NetworkManager_all_sym_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_NetworkManager_all_sym_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-src/NetworkManager.ver: src/NetworkManager-all-sym $(core_plugins)
+src/core/NetworkManager.ver: src/core/NetworkManager-all-sym $(core_plugins)
 	$(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-build "$(srcdir)"
 
-CLEANFILES += src/NetworkManager.ver
+CLEANFILES += src/core/NetworkManager.ver
 
-EXTRA_src_NetworkManager_DEPENDENCIES = \
-	src/NetworkManager.ver
+EXTRA_src_core_NetworkManager_DEPENDENCIES = \
+	src/core/NetworkManager.ver
 
-src_NetworkManager_CPPFLAGS = $(src_cppflags)
+src_core_NetworkManager_CPPFLAGS = $(src_core_cppflags)
 
-src_NetworkManager_SOURCES = \
-	src/main.c
+src_core_NetworkManager_SOURCES = \
+	src/core/main.c
 
-src_NetworkManager_LDADD = \
-	src/libNetworkManager.la \
+src_core_NetworkManager_LDADD = \
+	src/core/libNetworkManager.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-src_NetworkManager_LDFLAGS = \
+src_core_NetworkManager_LDFLAGS = \
 	-rdynamic \
-	-Wl,--version-script="src/NetworkManager.ver" \
+	-Wl,--version-script="src/core/NetworkManager.ver" \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-$(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 ###############################################################################
 
-src_nm_iface_helper_CPPFLAGS = $(src_cppflags)
+src_core_nm_iface_helper_CPPFLAGS = $(src_core_cppflags)
 
-src_nm_iface_helper_SOURCES = \
-	src/nm-iface-helper.c
+src_core_nm_iface_helper_SOURCES = \
+	src/core/nm-iface-helper.c
 
-src_nm_iface_helper_LDADD = \
-	src/libNetworkManagerBase.la \
+src_core_nm_iface_helper_LDADD = \
+	src/core/libNetworkManagerBase.la \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la \
@@ -2620,7 +2620,7 @@ src_nm_iface_helper_LDADD = \
 	shared/nm-udev-aux/libnm-udev-aux.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
-	src/libnm-systemd-core.la \
+	src/core/libnm-systemd-core.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/libnacd.la \
 	shared/libndhcp4.la \
@@ -2633,37 +2633,37 @@ src_nm_iface_helper_LDADD = \
 	$(DL_LIBS) \
 	$(NULL)
 
-src_nm_iface_helper_LDFLAGS = \
+src_core_nm_iface_helper_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-$(src_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 ###############################################################################
 
-noinst_LTLIBRARIES += src/initrd/libnmi-core.la
+noinst_LTLIBRARIES += src/core/initrd/libnmi-core.la
 
-src_initrd_libnmi_core_la_CPPFLAGS = \
-	$(src_cppflags)
+src_core_initrd_libnmi_core_la_CPPFLAGS = \
+	$(src_core_cppflags)
 
-src_initrd_libnmi_core_la_SOURCES = \
-	src/initrd/nm-initrd-generator.h \
-	src/initrd/nmi-cmdline-reader.c \
-	src/initrd/nmi-dt-reader.c \
-	src/initrd/nmi-ibft-reader.c \
+src_core_initrd_libnmi_core_la_SOURCES = \
+	src/core/initrd/nm-initrd-generator.h \
+	src/core/initrd/nmi-cmdline-reader.c \
+	src/core/initrd/nmi-dt-reader.c \
+	src/core/initrd/nmi-ibft-reader.c \
 	$(NULL)
 
-libexec_PROGRAMS += src/initrd/nm-initrd-generator
+libexec_PROGRAMS += src/core/initrd/nm-initrd-generator
 
-src_initrd_nm_initrd_generator_CPPFLAGS = \
-	$(src_cppflags)
+src_core_initrd_nm_initrd_generator_CPPFLAGS = \
+	$(src_core_cppflags)
 
-src_initrd_nm_initrd_generator_SOURCES = \
-	src/initrd/nm-initrd-generator.c
+src_core_initrd_nm_initrd_generator_SOURCES = \
+	src/core/initrd/nm-initrd-generator.c
 
-src_initrd_nm_initrd_generator_LDADD = \
-	src/initrd/libnmi-core.la \
-	src/libNetworkManagerBase.la \
+src_core_initrd_nm_initrd_generator_LDADD = \
+	src/core/initrd/libnmi-core.la \
+	src/core/libNetworkManagerBase.la \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la \
@@ -2684,44 +2684,44 @@ src_initrd_nm_initrd_generator_LDADD = \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-src_initrd_nm_initrd_generator_LDFLAGS = \
+src_core_initrd_nm_initrd_generator_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-check_programs += src/initrd/tests/test-dt-reader
+check_programs += src/core/initrd/tests/test-dt-reader
 
-src_initrd_tests_test_dt_reader_CPPFLAGS = \
+src_core_initrd_tests_test_dt_reader_CPPFLAGS = \
 	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/initrd/tests\" \
-	$(src_cppflags)
+	-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/core/initrd/tests\" \
+	$(src_core_cppflags)
 
-src_initrd_tests_test_dt_reader_LDFLAGS = \
+src_core_initrd_tests_test_dt_reader_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_initrd_tests_test_dt_reader_LDADD = \
-	src/initrd/libnmi-core.la \
-	src/libNetworkManagerTest.la \
+src_core_initrd_tests_test_dt_reader_LDADD = \
+	src/core/initrd/libnmi-core.la \
+	src/core/libNetworkManagerTest.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-check_programs += src/initrd/tests/test-ibft-reader
+check_programs += src/core/initrd/tests/test-ibft-reader
 
-src_initrd_tests_test_ibft_reader_CPPFLAGS = \
+src_core_initrd_tests_test_ibft_reader_CPPFLAGS = \
 	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/initrd/tests\" \
-	$(src_cppflags)
+	-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/core/initrd/tests\" \
+	$(src_core_cppflags)
 
-src_initrd_tests_test_ibft_reader_LDFLAGS = \
+src_core_initrd_tests_test_ibft_reader_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_initrd_tests_test_ibft_reader_LDADD = \
-	src/initrd/libnmi-core.la \
-	src/libNetworkManagerTest.la \
+src_core_initrd_tests_test_ibft_reader_LDADD = \
+	src/core/initrd/libnmi-core.la \
+	src/core/libNetworkManagerTest.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
@@ -2729,261 +2729,261 @@ src_initrd_tests_test_ibft_reader_LDADD = \
 	$(NULL)
 
 EXTRA_DIST += \
-	src/initrd/meson.build \
-	src/initrd/tests/meson.build \
-	src/initrd/tests/sysfs/class/net/eth0/address \
-	src/initrd/tests/sysfs/class/net/eth2/address \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/flags \
-	src/initrd/tests/sysfs/firmware/ibft/initiator/isns-server \
-	src/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server \
-	src/initrd/tests/sysfs/firmware/ibft/initiator/slp-server \
-	src/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server \
-	src/initrd/tests/sysfs/firmware/ibft/initiator/index \
-	src/initrd/tests/sysfs/firmware/ibft/initiator/flags \
-	src/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc \
-	src/initrd/tests/sysfs/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs/firmware/ibft/target0/chap-type \
-	src/initrd/tests/sysfs/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs/firmware/ibft/target0/flags \
-	src/initrd/tests/sysfs/firmware/ibft/target0/port \
-	src/initrd/tests/sysfs/firmware/ibft/target2/target-name \
-	src/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc \
-	src/initrd/tests/sysfs/firmware/ibft/target2/ip-addr \
-	src/initrd/tests/sysfs/firmware/ibft/target2/chap-type \
-	src/initrd/tests/sysfs/firmware/ibft/target2/index \
-	src/initrd/tests/sysfs/firmware/ibft/target2/lun \
-	src/initrd/tests/sysfs/firmware/ibft/target2/flags \
-	src/initrd/tests/sysfs/firmware/ibft/target2/port \
-	src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id \
-	src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id \
-	src/initrd/tests/sysfs/firmware/ibft/acpi_header/signature \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/mac \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/origin \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/index \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/flags \
-	src/initrd/tests/sysfs-bad-dns1/class/net/eth0/address \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port \
-	src/initrd/tests/sysfs-bad-dns2/class/net/eth0/address \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port \
-	src/initrd/tests/sysfs-bad-gateway/class/net/eth0/address \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port \
-	src/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port \
-	src/initrd/tests/sysfs-dhcp/class/net/eth0/address \
-	src/initrd/tests/sysfs-dhcp/class/net/eth1/address \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name \
-	src/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath \
-	src/initrd/tests/sysfs-static/class/net/eth0/address \
-	src/initrd/tests/sysfs-static/class/net/eth1/address \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs-static/firmware/ibft/target0/target-name \
-	src/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs-static/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs-static/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs-static/firmware/ibft/target0/port \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index \
-	src/initrd/tests/sysfs-static/firmware/ibft/target1/target-name \
-	src/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr \
-	src/initrd/tests/sysfs-static/firmware/ibft/target1/index \
-	src/initrd/tests/sysfs-static/firmware/ibft/target1/lun \
-	src/initrd/tests/sysfs-static/firmware/ibft/target1/port \
-	src/initrd/tests/sysfs-vlan/class/net/eth0/address \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/target0/port \
-	$(NULL)
-
-check_programs += src/initrd/tests/test-cmdline-reader
-
-src_initrd_tests_test_cmdline_reader_CPPFLAGS = \
+	src/core/initrd/meson.build \
+	src/core/initrd/tests/meson.build \
+	src/core/initrd/tests/sysfs/class/net/eth0/address \
+	src/core/initrd/tests/sysfs/class/net/eth2/address \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/flags \
+	src/core/initrd/tests/sysfs/firmware/ibft/initiator/isns-server \
+	src/core/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server \
+	src/core/initrd/tests/sysfs/firmware/ibft/initiator/slp-server \
+	src/core/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server \
+	src/core/initrd/tests/sysfs/firmware/ibft/initiator/index \
+	src/core/initrd/tests/sysfs/firmware/ibft/initiator/flags \
+	src/core/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc \
+	src/core/initrd/tests/sysfs/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs/firmware/ibft/target0/chap-type \
+	src/core/initrd/tests/sysfs/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs/firmware/ibft/target0/flags \
+	src/core/initrd/tests/sysfs/firmware/ibft/target0/port \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/target-name \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/ip-addr \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/chap-type \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/index \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/lun \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/flags \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/port \
+	src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id \
+	src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id \
+	src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/signature \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/mac \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/origin \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/index \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/flags \
+	src/core/initrd/tests/sysfs-bad-dns1/class/net/eth0/address \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port \
+	src/core/initrd/tests/sysfs-bad-dns2/class/net/eth0/address \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port \
+	src/core/initrd/tests/sysfs-bad-gateway/class/net/eth0/address \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port \
+	src/core/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port \
+	src/core/initrd/tests/sysfs-dhcp/class/net/eth0/address \
+	src/core/initrd/tests/sysfs-dhcp/class/net/eth1/address \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name \
+	src/core/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath \
+	src/core/initrd/tests/sysfs-static/class/net/eth0/address \
+	src/core/initrd/tests/sysfs-static/class/net/eth1/address \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/target-name \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/port \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/target-name \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/index \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/lun \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/port \
+	src/core/initrd/tests/sysfs-vlan/class/net/eth0/address \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/port \
+	$(NULL)
+
+check_programs += src/core/initrd/tests/test-cmdline-reader
+
+src_core_initrd_tests_test_cmdline_reader_CPPFLAGS = \
 	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/initrd/tests\" \
-	$(src_cppflags)
+	-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/core/initrd/tests\" \
+	$(src_core_cppflags)
 
-src_initrd_tests_test_cmdline_reader_LDFLAGS = \
+src_core_initrd_tests_test_cmdline_reader_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_initrd_tests_test_cmdline_reader_LDADD = \
-	src/initrd/libnmi-core.la \
-	src/libNetworkManagerTest.la \
+src_core_initrd_tests_test_cmdline_reader_LDADD = \
+	src/core/initrd/libnmi-core.la \
+	src/core/libNetworkManagerTest.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-$(src_initrd_libnmi_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_initrd_nm_initrd_generator_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_initrd_tests_test_cmdline_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_initrd_tests_test_ibft_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_initrd_tests_test_dt_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_initrd_libnmi_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_initrd_nm_initrd_generator_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_initrd_tests_test_cmdline_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_initrd_tests_test_ibft_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_initrd_tests_test_dt_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 ###############################################################################
 
 EXTRA_DIST += \
-	src/org.freedesktop.NetworkManager.conf \
-	src/nm-test-utils-core.h \
-	src/meson.build
+	src/core/org.freedesktop.NetworkManager.conf \
+	src/core/nm-test-utils-core.h \
+	src/core/meson.build
 
 ###############################################################################
-# src/dhcp
+# src/core/dhcp
 ###############################################################################
 
-libexec_PROGRAMS += src/dhcp/nm-dhcp-helper
+libexec_PROGRAMS += src/core/dhcp/nm-dhcp-helper
 
-src_dhcp_nm_dhcp_helper_CPPFLAGS = \
+src_core_dhcp_nm_dhcp_helper_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
@@ -2992,60 +2992,60 @@ src_dhcp_nm_dhcp_helper_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(NULL)
 
-src_dhcp_nm_dhcp_helper_SOURCES = \
-	src/dhcp/nm-dhcp-helper.c \
-	src/dhcp/nm-dhcp-helper-api.h \
+src_core_dhcp_nm_dhcp_helper_SOURCES = \
+	src/core/dhcp/nm-dhcp-helper.c \
+	src/core/dhcp/nm-dhcp-helper-api.h \
 	$(NULL)
 
-src_dhcp_nm_dhcp_helper_LDFLAGS = \
+src_core_dhcp_nm_dhcp_helper_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
 
-src_dhcp_nm_dhcp_helper_LDADD = $(GLIB_LIBS)
+src_core_dhcp_nm_dhcp_helper_LDADD = $(GLIB_LIBS)
 
 EXTRA_DIST += \
-	src/dhcp/meson.build
+	src/core/dhcp/meson.build
 
 ###############################################################################
-# src/dhcp/tests
+# src/core/dhcp/tests
 ###############################################################################
 
-src_dhcp_tests_cppflags = $(src_cppflags_test)
+src_core_dhcp_tests_cppflags = $(src_core_cppflags_test)
 
-src_dhcp_tests_ldadd = \
-	src/libNetworkManagerTest.la
+src_core_dhcp_tests_ldadd = \
+	src/core/libNetworkManagerTest.la
 
 check_programs += \
-	src/dhcp/tests/test-dhcp-dhclient \
-	src/dhcp/tests/test-dhcp-utils
+	src/core/dhcp/tests/test-dhcp-dhclient \
+	src/core/dhcp/tests/test-dhcp-utils
 
-src_dhcp_tests_test_dhcp_dhclient_CPPFLAGS = $(src_dhcp_tests_cppflags)
-src_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_tests_cppflags)
+src_core_dhcp_tests_test_dhcp_dhclient_CPPFLAGS = $(src_core_dhcp_tests_cppflags)
+src_core_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_core_dhcp_tests_cppflags)
 
-src_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_tests_ldadd)
-src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd)
+src_core_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_core_dhcp_tests_ldadd)
+src_core_dhcp_tests_test_dhcp_utils_LDADD = $(src_core_dhcp_tests_ldadd)
 
-src_dhcp_tests_test_dhcp_dhclient_LDFLAGS = $(src_tests_ldflags)
-src_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_tests_ldflags)
+src_core_dhcp_tests_test_dhcp_dhclient_LDFLAGS = $(src_core_tests_ldflags)
+src_core_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_core_tests_ldflags)
 
-$(src_dhcp_tests_test_dhcp_dhclient_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_dhcp_tests_test_dhcp_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_dhcp_tests_test_dhcp_dhclient_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_dhcp_tests_test_dhcp_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
-	src/dhcp/tests/test-dhclient-duid.leases \
-	src/dhcp/tests/test-dhclient-commented-duid.leases \
-	src/dhcp/tests/meson.build
+	src/core/dhcp/tests/test-dhclient-duid.leases \
+	src/core/dhcp/tests/test-dhclient-commented-duid.leases \
+	src/core/dhcp/tests/meson.build
 
 ###############################################################################
-# src/ppp
+# src/core/ppp
 ###############################################################################
 
 if WITH_PPP
 
-core_plugins += src/ppp/libnm-ppp-plugin.la
+core_plugins += src/core/ppp/libnm-ppp-plugin.la
 
-pppd_plugin_LTLIBRARIES += src/ppp/nm-pppd-plugin.la
+pppd_plugin_LTLIBRARIES += src/core/ppp/nm-pppd-plugin.la
 
-src_ppp_nm_pppd_plugin_la_CPPFLAGS = \
+src_core_ppp_nm_pppd_plugin_la_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
@@ -3054,217 +3054,217 @@ src_ppp_nm_pppd_plugin_la_CPPFLAGS = \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \
 	$(GLIB_CFLAGS)
 
-src_ppp_nm_pppd_plugin_la_SOURCES = \
-	src/ppp/nm-pppd-plugin.c \
-	src/ppp/nm-pppd-plugin.h \
-	src/ppp/nm-ppp-status.h
+src_core_ppp_nm_pppd_plugin_la_SOURCES = \
+	src/core/ppp/nm-pppd-plugin.c \
+	src/core/ppp/nm-pppd-plugin.h \
+	src/core/ppp/nm-ppp-status.h
 
-src_ppp_nm_pppd_plugin_la_LDFLAGS = \
+src_core_ppp_nm_pppd_plugin_la_LDFLAGS = \
 	-module -avoid-version
 
-src_ppp_nm_pppd_plugin_la_LIBADD = \
+src_core_ppp_nm_pppd_plugin_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(DL_LIBS) \
 	$(NULL)
 
-$(src_ppp_nm_pppd_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_ppp_nm_pppd_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-src_ppp_libnm_ppp_plugin_la_SOURCES = \
-	src/ppp/nm-pppd-plugin.h \
-	src/ppp/nm-ppp-manager.c \
-	src/ppp/nm-ppp-manager.h \
-	src/ppp/nm-ppp-plugin-api.h \
-	src/ppp/nm-ppp-status.h \
+src_core_ppp_libnm_ppp_plugin_la_SOURCES = \
+	src/core/ppp/nm-pppd-plugin.h \
+	src/core/ppp/nm-ppp-manager.c \
+	src/core/ppp/nm-ppp-manager.h \
+	src/core/ppp/nm-ppp-plugin-api.h \
+	src/core/ppp/nm-ppp-status.h \
 	$(NULL)
 
-EXTRA_src_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \
-	src/ppp/nm-ppp-plugin.ver \
+EXTRA_src_core_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \
+	src/core/ppp/nm-ppp-plugin.ver \
 	$(NULL)
 
-src_ppp_libnm_ppp_plugin_la_CPPFLAGS = $(src_cppflags_base)
+src_core_ppp_libnm_ppp_plugin_la_CPPFLAGS = $(src_core_cppflags_base)
 
-src_ppp_libnm_ppp_plugin_la_LDFLAGS = \
+src_core_ppp_libnm_ppp_plugin_la_LDFLAGS = \
 	-module -avoid-version \
-	-Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver" \
+	-Wl,--version-script="$(srcdir)/src/core/ppp/nm-ppp-plugin.ver" \
 	$(NULL)
 
-src_ppp_libnm_ppp_plugin_la_LIBADD = \
+src_core_ppp_libnm_ppp_plugin_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-$(src_ppp_libnm_ppp_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_ppp_libnm_ppp_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 endif
 
 EXTRA_DIST += \
-	src/ppp/meson.build
+	src/core/ppp/meson.build
 
 ###############################################################################
-# src/settings/plugins/keyfile/tests
+# src/core/settings/plugins/keyfile/tests
 ###############################################################################
 
-check_programs += src/settings/plugins/keyfile/tests/test-keyfile-settings
+check_programs += src/core/settings/plugins/keyfile/tests/test-keyfile-settings
 
-src_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS = $(src_cppflags_test)
+src_core_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS = $(src_core_cppflags_test)
 
-src_settings_plugins_keyfile_tests_test_keyfile_settings_LDFLAGS = \
+src_core_settings_plugins_keyfile_tests_test_keyfile_settings_LDFLAGS = \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD = \
-	src/libNetworkManagerTest.la
+src_core_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD = \
+	src/core/libNetworkManagerTest.la
 
-$(src_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 \
-	src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT \
-	src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT \
+	src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \
 	\
-	src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \
-	src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \
+	src/core/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \
+	src/core/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \
 	\
-	src/settings/plugins/keyfile/tests/meson.build
+	src/core/settings/plugins/keyfile/tests/meson.build
 
 ###############################################################################
-# src/settings/plugins/ifcfg-rh
+# src/core/settings/plugins/ifcfg-rh
 ###############################################################################
 
 if CONFIG_PLUGIN_IFCFG_RH
 
-core_plugins += src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
+core_plugins += src/core/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
 
 noinst_LTLIBRARIES += \
-	src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \
-	src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
+	src/core/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \
+	src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
 
 ###############################################################################
 
-nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES = \
-	src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c \
-	src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
+nodist_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES = \
+	src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c \
+	src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
 
-src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = \
-	$(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_cppflags_base)) \
+src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = \
+	$(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_core_cppflags_base)) \
 	$(INTROSPECTION_EXTRA_CFLAGS) \
 	$(NULL)
 
-CLEANFILES += $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
+CLEANFILES += $(nodist_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
 
-src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h: src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
-	@$(MKDIR_P) src/settings/plugins/ifcfg-rh/
+src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h: src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
+	@$(MKDIR_P) src/core/settings/plugins/ifcfg-rh/
 	$(AM_V_GEN) gdbus-codegen \
 		--generate-c-code $(basename $@) \
 		--c-namespace NMDBus \
 		--interface-prefix com.redhat \
 		$<
 
-src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c: src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
+src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c: src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
 	@true
 
 ###############################################################################
 
-src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \
-	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \
-	src/settings/plugins/ifcfg-rh/shvar.c \
-	src/settings/plugins/ifcfg-rh/shvar.h \
-	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \
-	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \
-	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \
-	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h \
-	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \
-	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h \
+src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \
+	src/core/settings/plugins/ifcfg-rh/shvar.c \
+	src/core/settings/plugins/ifcfg-rh/shvar.h \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h \
 	$(NULL)
 
-src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_cppflags_base)
+src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_core_cppflags_base)
 
-$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 ###############################################################################
 
-src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
-	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c \
-	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h \
-	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c \
-	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h \
+src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h \
 	$(NULL)
 
-src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_cppflags_base)
+src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_core_cppflags_base)
 
-src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \
+src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \
 	-module -avoid-version \
 	-Wl,--version-script="$(srcdir)/linker-script-settings.ver" \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
-	src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
+src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
+	src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
 
-$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
-$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
+$(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-check-local-symbols-settings-ifcfg-rh: src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
-	$(call check_so_symbols,$(builddir)/src/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so)
+check-local-symbols-settings-ifcfg-rh: src/core/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
+	$(call check_so_symbols,$(builddir)/src/core/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so)
 
 check_local += check-local-symbols-settings-ifcfg-rh
 
 ###############################################################################
-# src/settings/plugins/ifcfg-rh/tests
+# src/core/settings/plugins/ifcfg-rh/tests
 ###############################################################################
 
-check_programs += src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
+check_programs += src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
 
-src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \
-	src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \
+	src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
 
-src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = $(src_cppflags_base_test)
+src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = $(src_core_cppflags_base_test)
 
-src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \
+src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \
-	src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
-	src/libNetworkManagerTest.la
+src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \
+	src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
+	src/core/libNetworkManagerTest.la
 
-$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 dist_libexec_SCRIPTS += \
-	src/settings/plugins/ifcfg-rh/nm-ifup \
-	src/settings/plugins/ifcfg-rh/nm-ifdown
+	src/core/settings/plugins/ifcfg-rh/nm-ifup \
+	src/core/settings/plugins/ifcfg-rh/nm-ifdown
 
 install-data-hook-ifcfg-rh:
 	$(mkinstalldirs) -m 0755 $(DESTDIR)$(sysconfdir)/sysconfig/network-scripts
@@ -3274,229 +3274,229 @@ install_data_hook += install-data-hook-ifcfg-rh
 endif
 
 EXTRA_DIST += \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 \
 	$(NULL)
 
 # make target dependencies can't have colons in their names, which ends up
 # meaning that we can't add the alias files to EXTRA_DIST. They are instead
 # dist'ed via dist-hook-settings-ifcfg-rh below.
-src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1
+src_core_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1
 
 dist-hook-settings-ifcfg-rh-alias-files:
-	@for f in $(src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files); do \
-		cp $(abs_srcdir)/$$f $(distdir)/src/settings/plugins/ifcfg-rh/tests/network-scripts/; \
+	@for f in $(src_core_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files); do \
+		cp $(abs_srcdir)/$$f $(distdir)/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/; \
 	done
 
 dist_hook += dist-hook-settings-ifcfg-rh-alias-files
@@ -3504,473 +3504,473 @@ dist_hook += dist-hook-settings-ifcfg-rh-alias-files
 ###############################################################################
 
 if CONFIG_PLUGIN_IFCFG_RH
-dbusservice_DATA += src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
+dbusservice_DATA += src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
 endif
 
 EXTRA_DIST += \
-	src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \
-	src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml \
-	src/settings/plugins/ifcfg-rh/meson.build \
-	src/settings/plugins/ifcfg-rh/tests/meson.build
+	src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \
+	src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml \
+	src/core/settings/plugins/ifcfg-rh/meson.build \
+	src/core/settings/plugins/ifcfg-rh/tests/meson.build
 
 ###############################################################################
-# src/settings/plugins/ifupdown
+# src/core/settings/plugins/ifupdown
 ###############################################################################
 
 if CONFIG_PLUGIN_IFUPDOWN
 
-core_plugins += src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
+core_plugins += src/core/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
 
-noinst_LTLIBRARIES += src/settings/plugins/ifupdown/libnms-ifupdown-core.la
+noinst_LTLIBRARIES += src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la
 
-src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES = \
-	src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \
-	src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \
-	src/settings/plugins/ifupdown/nms-ifupdown-parser.c \
-	src/settings/plugins/ifupdown/nms-ifupdown-parser.h \
+src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES = \
+	src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \
+	src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \
+	src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c \
+	src/core/settings/plugins/ifupdown/nms-ifupdown-parser.h \
 	$(NULL)
 
-src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_cppflags_base)
+src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_core_cppflags_base)
 
-src_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = \
+src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = \
 	$(LIBUDEV_LIBS) \
 	$(NULL)
 
-src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES = \
-	src/settings/plugins/ifupdown/nms-ifupdown-plugin.c \
-	src/settings/plugins/ifupdown/nms-ifupdown-plugin.h \
+src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES = \
+	src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c \
+	src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.h \
 	$(NULL)
 
-src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_cppflags_base)
+src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_core_cppflags_base)
 
-src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS = \
+src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS = \
 	-module -avoid-version \
 	-Wl,--version-script="$(srcdir)/linker-script-settings.ver" \
 	$(NULL)
 
-src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \
-	src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
+src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \
+	src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la \
 	$(LIBUDEV_LIBS) \
 	$(NULL)
 
-$(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-check-local-symbols-settings-ifupdown: src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
-	$(call check_so_symbols,$(builddir)/src/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so)
+check-local-symbols-settings-ifupdown: src/core/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
+	$(call check_so_symbols,$(builddir)/src/core/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so)
 
 check_local += check-local-symbols-settings-ifupdown
 
 ###############################################################################
 
-check_programs += src/settings/plugins/ifupdown/tests/test-ifupdown
+check_programs += src/core/settings/plugins/ifupdown/tests/test-ifupdown
 
-src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = $(src_cppflags_base_test)
+src_core_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = $(src_core_cppflags_base_test)
 
-src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \
+src_core_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \
-	src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
-	src/libNetworkManagerTest.la \
+src_core_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \
+	src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la \
+	src/core/libNetworkManagerTest.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-$(src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 endif
 
 EXTRA_DIST += \
-	src/settings/plugins/ifupdown/tests/test1 \
-	src/settings/plugins/ifupdown/tests/test2 \
-	src/settings/plugins/ifupdown/tests/test3 \
-	src/settings/plugins/ifupdown/tests/test4 \
-	src/settings/plugins/ifupdown/tests/test5 \
-	src/settings/plugins/ifupdown/tests/test6 \
-	src/settings/plugins/ifupdown/tests/test7 \
-	src/settings/plugins/ifupdown/tests/test8 \
-	src/settings/plugins/ifupdown/tests/test9 \
-	src/settings/plugins/ifupdown/tests/test11 \
-	src/settings/plugins/ifupdown/tests/test12 \
-	src/settings/plugins/ifupdown/tests/test13 \
-	src/settings/plugins/ifupdown/tests/test14 \
-	src/settings/plugins/ifupdown/tests/test15 \
-	src/settings/plugins/ifupdown/tests/test16 \
-	src/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 \
-	src/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 \
-	src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen \
-	src/settings/plugins/ifupdown/tests/test20-source-stanza \
-	src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 \
-	src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 \
-	src/settings/plugins/ifupdown/tests/test21-source-dir-stanza \
-	src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d \
-	src/settings/plugins/ifupdown/tests/test22-duplicate-stanzas \
-	src/settings/plugins/ifupdown/meson.build \
-	src/settings/plugins/ifupdown/tests/meson.build
-
-###############################################################################
-# src/devices
+	src/core/settings/plugins/ifupdown/tests/test1 \
+	src/core/settings/plugins/ifupdown/tests/test2 \
+	src/core/settings/plugins/ifupdown/tests/test3 \
+	src/core/settings/plugins/ifupdown/tests/test4 \
+	src/core/settings/plugins/ifupdown/tests/test5 \
+	src/core/settings/plugins/ifupdown/tests/test6 \
+	src/core/settings/plugins/ifupdown/tests/test7 \
+	src/core/settings/plugins/ifupdown/tests/test8 \
+	src/core/settings/plugins/ifupdown/tests/test9 \
+	src/core/settings/plugins/ifupdown/tests/test11 \
+	src/core/settings/plugins/ifupdown/tests/test12 \
+	src/core/settings/plugins/ifupdown/tests/test13 \
+	src/core/settings/plugins/ifupdown/tests/test14 \
+	src/core/settings/plugins/ifupdown/tests/test15 \
+	src/core/settings/plugins/ifupdown/tests/test16 \
+	src/core/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 \
+	src/core/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 \
+	src/core/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen \
+	src/core/settings/plugins/ifupdown/tests/test20-source-stanza \
+	src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 \
+	src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 \
+	src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza \
+	src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d \
+	src/core/settings/plugins/ifupdown/tests/test22-duplicate-stanzas \
+	src/core/settings/plugins/ifupdown/meson.build \
+	src/core/settings/plugins/ifupdown/tests/meson.build
+
+###############################################################################
+# src/core/devices
 ###############################################################################
 
 EXTRA_DIST += \
-	src/devices/meson.build
+	src/core/devices/meson.build
 
 ###############################################################################
-# src/devices/adsl
+# src/core/devices/adsl
 ###############################################################################
 
-core_plugins += src/devices/adsl/libnm-device-plugin-adsl.la
+core_plugins += src/core/devices/adsl/libnm-device-plugin-adsl.la
 
-src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
-	src/devices/adsl/nm-atm-manager.c \
-	src/devices/adsl/nm-device-adsl.c \
-	src/devices/adsl/nm-device-adsl.h
+src_core_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
+	src/core/devices/adsl/nm-atm-manager.c \
+	src/core/devices/adsl/nm-device-adsl.c \
+	src/core/devices/adsl/nm-device-adsl.h
 
-src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = $(src_cppflags_device_plugin)
+src_core_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = $(src_core_cppflags_device_plugin)
 
-src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \
+src_core_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \
 	-module -avoid-version \
 	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
 
-src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
+src_core_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 	$(LIBUDEV_LIBS)
 
-check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la
-	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(srcdir)/linker-script-devices.ver"
-	$(call check_so_symbols,$(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so)
+check-local-devices-adsl: src/core/devices/adsl/libnm-device-plugin-adsl.la
+	$(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(srcdir)/linker-script-devices.ver"
+	$(call check_so_symbols,$(builddir)/src/core/devices/adsl/.libs/libnm-device-plugin-adsl.so)
 
 check_local += check-local-devices-adsl
 
 EXTRA_DIST += \
-	src/devices/adsl/meson.build
+	src/core/devices/adsl/meson.build
 
 ###############################################################################
-# src/devices/wwan
+# src/core/devices/wwan
 ###############################################################################
 
 if WITH_MODEM_MANAGER_1
 
-src_devices_wwan_cppflags = \
-	$(src_cppflags_device_plugin) \
+src_core_devices_wwan_cppflags = \
+	$(src_core_cppflags_device_plugin) \
 	$(MM_GLIB_CFLAGS) \
 	$(NULL)
 
-core_plugins += src/devices/wwan/libnm-wwan.la
+core_plugins += src/core/devices/wwan/libnm-wwan.la
 
-src_devices_wwan_libnm_wwan_la_SOURCES = \
-	src/devices/wwan/nm-modem-broadband.c \
-	src/devices/wwan/nm-modem-broadband.h \
-	src/devices/wwan/nm-modem-manager.c \
-	src/devices/wwan/nm-modem-manager.h \
-	src/devices/wwan/nm-modem.c \
-	src/devices/wwan/nm-modem.h \
-	src/devices/wwan/nm-service-providers.c \
-	src/devices/wwan/nm-service-providers.h \
+src_core_devices_wwan_libnm_wwan_la_SOURCES = \
+	src/core/devices/wwan/nm-modem-broadband.c \
+	src/core/devices/wwan/nm-modem-broadband.h \
+	src/core/devices/wwan/nm-modem-manager.c \
+	src/core/devices/wwan/nm-modem-manager.h \
+	src/core/devices/wwan/nm-modem.c \
+	src/core/devices/wwan/nm-modem.h \
+	src/core/devices/wwan/nm-service-providers.c \
+	src/core/devices/wwan/nm-service-providers.h \
 	$(NULL)
 
 if WITH_OFONO
-src_devices_wwan_libnm_wwan_la_SOURCES += \
-	src/devices/wwan/nm-modem-ofono.c \
-	src/devices/wwan/nm-modem-ofono.h
+src_core_devices_wwan_libnm_wwan_la_SOURCES += \
+	src/core/devices/wwan/nm-modem-ofono.c \
+	src/core/devices/wwan/nm-modem-ofono.h
 endif
 
-src_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags)
+src_core_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_core_devices_wwan_cppflags)
 
-src_devices_wwan_libnm_wwan_la_LDFLAGS = \
+src_core_devices_wwan_libnm_wwan_la_LDFLAGS = \
 	-avoid-version \
-	-Wl,--version-script="$(srcdir)/src/devices/wwan/libnm-wwan.ver"
+	-Wl,--version-script="$(srcdir)/src/core/devices/wwan/libnm-wwan.ver"
 
-src_devices_wwan_libnm_wwan_la_LIBADD = \
+src_core_devices_wwan_libnm_wwan_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(LIBSYSTEMD_LIBS) \
 	$(MM_GLIB_LIBS)
 
-$(src_devices_wwan_libnm_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_wwan_libnm_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-EXTRA_src_devices_wwan_libnm_wwan_la_DEPENDENCIES = \
-	src/devices/wwan/libnm-wwan.ver
+EXTRA_src_core_devices_wwan_libnm_wwan_la_DEPENDENCIES = \
+	src/core/devices/wwan/libnm-wwan.ver
 
-core_plugins += src/devices/wwan/libnm-device-plugin-wwan.la
+core_plugins += src/core/devices/wwan/libnm-device-plugin-wwan.la
 
-src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES = \
-	src/devices/wwan/nm-wwan-factory.c \
-	src/devices/wwan/nm-device-modem.c \
-	src/devices/wwan/nm-device-modem.h
+src_core_devices_wwan_libnm_device_plugin_wwan_la_SOURCES = \
+	src/core/devices/wwan/nm-wwan-factory.c \
+	src/core/devices/wwan/nm-device-modem.c \
+	src/core/devices/wwan/nm-device-modem.h
 
-src_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags)
+src_core_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS = $(src_core_devices_wwan_cppflags)
 
-src_devices_wwan_libnm_device_plugin_wwan_la_LDFLAGS = \
+src_core_devices_wwan_libnm_device_plugin_wwan_la_LDFLAGS = \
 	-module -avoid-version \
 	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
 
-src_devices_wwan_libnm_device_plugin_wwan_la_LIBADD = \
-	src/devices/wwan/libnm-wwan.la \
+src_core_devices_wwan_libnm_device_plugin_wwan_la_LIBADD = \
+	src/core/devices/wwan/libnm-wwan.la \
 	$(GLIB_LIBS)
 
-check-local-devices-wwan: src/devices/wwan/libnm-device-plugin-wwan.la src/devices/wwan/libnm-wwan.la
-	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so "$(srcdir)/linker-script-devices.ver"
-	$(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so)
-	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-wwan.so "$(srcdir)/src/devices/wwan/libnm-wwan.ver"
-	$(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-wwan.so)
+check-local-devices-wwan: src/core/devices/wwan/libnm-device-plugin-wwan.la src/core/devices/wwan/libnm-wwan.la
+	$(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/wwan/.libs/libnm-device-plugin-wwan.so "$(srcdir)/linker-script-devices.ver"
+	$(call check_so_symbols,$(builddir)/src/core/devices/wwan/.libs/libnm-device-plugin-wwan.so)
+	$(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/wwan/.libs/libnm-wwan.so "$(srcdir)/src/core/devices/wwan/libnm-wwan.ver"
+	$(call check_so_symbols,$(builddir)/src/core/devices/wwan/.libs/libnm-wwan.so)
 
 check_local += check-local-devices-wwan
 
-src_devices_wwan_tests_test_service_providers_SOURCES = \
-	src/devices/wwan/tests/test-service-providers.c \
-	src/devices/wwan/nm-service-providers.c \
-	src/devices/wwan/nm-service-providers.h \
+src_core_devices_wwan_tests_test_service_providers_SOURCES = \
+	src/core/devices/wwan/tests/test-service-providers.c \
+	src/core/devices/wwan/nm-service-providers.c \
+	src/core/devices/wwan/nm-service-providers.h \
 	$(NULL)
 
-src_devices_wwan_tests_test_service_providers_CPPFLAGS = \
-	$(src_cppflags_base_test) \
-	-I$(srcdir)/src/devices/wwan \
+src_core_devices_wwan_tests_test_service_providers_CPPFLAGS = \
+	$(src_core_cppflags_base_test) \
+	-I$(srcdir)/src/core/devices/wwan \
 	$(NULL)
 
-src_devices_wwan_tests_test_service_providers_LDFLAGS = \
+src_core_devices_wwan_tests_test_service_providers_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-src_devices_wwan_tests_test_service_providers_LDADD = \
-	src/libNetworkManagerTest.la \
+src_core_devices_wwan_tests_test_service_providers_LDADD = \
+	src/core/libNetworkManagerTest.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-check_programs += src/devices/wwan/tests/test-service-providers
+check_programs += src/core/devices/wwan/tests/test-service-providers
 
-$(src_devices_wwan_tests_test_service_providers_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_wwan_tests_test_service_providers_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 endif
 
 EXTRA_DIST += \
-	src/devices/wwan/libnm-wwan.ver \
-	src/devices/wwan/meson.build \
-	src/devices/wwan/tests/test-service-providers.xml \
+	src/core/devices/wwan/libnm-wwan.ver \
+	src/core/devices/wwan/meson.build \
+	src/core/devices/wwan/tests/test-service-providers.xml \
 	$(NULL)
 
 ###############################################################################
-# src/devices/bluetooth
+# src/core/devices/bluetooth
 ###############################################################################
 
 if WITH_MODEM_MANAGER_1
 
-noinst_LTLIBRARIES += src/devices/bluetooth/libnm-bluetooth-utils.la
+noinst_LTLIBRARIES += src/core/devices/bluetooth/libnm-bluetooth-utils.la
 
-src_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES = \
-	src/devices/bluetooth/nm-bluez-common.h \
-	src/devices/bluetooth/nm-bt-error.c \
-	src/devices/bluetooth/nm-bt-error.h \
+src_core_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES = \
+	src/core/devices/bluetooth/nm-bluez-common.h \
+	src/core/devices/bluetooth/nm-bt-error.c \
+	src/core/devices/bluetooth/nm-bt-error.h \
 	$(NULL)
 
-src_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS = \
-	$(src_cppflags_base) \
+src_core_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS = \
+	$(src_core_cppflags_base) \
 	$(NULL)
 
-src_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD = \
+src_core_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(NULL)
 
 if WITH_BLUEZ5_DUN
-src_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES += \
-	src/devices/bluetooth/nm-bluez5-dun.c \
-	src/devices/bluetooth/nm-bluez5-dun.h \
+src_core_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES += \
+	src/core/devices/bluetooth/nm-bluez5-dun.c \
+	src/core/devices/bluetooth/nm-bluez5-dun.h \
 	$(NULL)
 
-src_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS += $(BLUEZ5_CFLAGS)
-src_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD += $(BLUEZ5_LIBS)
+src_core_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS += $(BLUEZ5_CFLAGS)
+src_core_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD += $(BLUEZ5_LIBS)
 endif
 
-$(src_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 ###############################################################################
 
-core_plugins += src/devices/bluetooth/libnm-device-plugin-bluetooth.la
+core_plugins += src/core/devices/bluetooth/libnm-device-plugin-bluetooth.la
 
-src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
-	src/devices/bluetooth/nm-bluez-manager.c \
-	src/devices/bluetooth/nm-bluez-manager.h \
-	src/devices/bluetooth/nm-device-bt.c \
-	src/devices/bluetooth/nm-device-bt.h \
+src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
+	src/core/devices/bluetooth/nm-bluez-manager.c \
+	src/core/devices/bluetooth/nm-bluez-manager.h \
+	src/core/devices/bluetooth/nm-device-bt.c \
+	src/core/devices/bluetooth/nm-device-bt.h \
 	$(NULL)
 
-src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = $(src_cppflags_device_plugin)
+src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = $(src_core_cppflags_device_plugin)
 
-src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \
+src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \
 	-module -avoid-version \
 	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
 
-src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \
-	src/devices/bluetooth/libnm-bluetooth-utils.la \
-	src/devices/wwan/libnm-wwan.la \
+src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \
+	src/core/devices/bluetooth/libnm-bluetooth-utils.la \
+	src/core/devices/wwan/libnm-wwan.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
 ###############################################################################
 
 check_programs_norun += \
-	src/devices/bluetooth/tests/nm-bt-test
+	src/core/devices/bluetooth/tests/nm-bt-test
 
-src_devices_bluetooth_tests_nm_bt_test_CPPFLAGS = \
-	$(src_cppflags_test) \
+src_core_devices_bluetooth_tests_nm_bt_test_CPPFLAGS = \
+	$(src_core_cppflags_test) \
 	$(NULL)
 
-src_devices_bluetooth_tests_nm_bt_test_LDFLAGS = \
+src_core_devices_bluetooth_tests_nm_bt_test_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-src_devices_bluetooth_tests_nm_bt_test_LDADD = \
-	src/devices/bluetooth/libnm-bluetooth-utils.la \
-	src/libNetworkManager.la \
+src_core_devices_bluetooth_tests_nm_bt_test_LDADD = \
+	src/core/devices/bluetooth/libnm-bluetooth-utils.la \
+	src/core/libNetworkManager.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-$(src_devices_bluetooth_tests_nm_bt_test_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_bluetooth_tests_nm_bt_test_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 ###############################################################################
 
-check-local-devices-bluetooth: src/devices/bluetooth/libnm-device-plugin-bluetooth.la
-	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so "$(srcdir)/linker-script-devices.ver"
-	$(call check_so_symbols,$(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so)
+check-local-devices-bluetooth: src/core/devices/bluetooth/libnm-device-plugin-bluetooth.la
+	$(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so "$(srcdir)/linker-script-devices.ver"
+	$(call check_so_symbols,$(builddir)/src/core/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so)
 
 check_local += check-local-devices-bluetooth
 
 endif
 
 EXTRA_DIST += \
-	src/devices/bluetooth/meson.build \
+	src/core/devices/bluetooth/meson.build \
 	$(NULL)
 
 ###############################################################################
-# src/devices/wifi
+# src/core/devices/wifi
 ###############################################################################
 
 if WITH_WIFI
 
-noinst_LTLIBRARIES += src/devices/wifi/libnm-wifi-base.la
-
-src_devices_wifi_libnm_wifi_base_la_SOURCES = \
-	src/devices/wifi/nm-device-olpc-mesh.c \
-	src/devices/wifi/nm-device-olpc-mesh.h \
-	src/devices/wifi/nm-device-wifi-p2p.c \
-	src/devices/wifi/nm-device-wifi-p2p.h \
-	src/devices/wifi/nm-device-wifi.c \
-	src/devices/wifi/nm-device-wifi.h \
-	src/devices/wifi/nm-wifi-ap.c \
-	src/devices/wifi/nm-wifi-ap.h \
-	src/devices/wifi/nm-wifi-common.c \
-	src/devices/wifi/nm-wifi-common.h \
-	src/devices/wifi/nm-wifi-p2p-peer.c \
-	src/devices/wifi/nm-wifi-p2p-peer.h \
-	src/devices/wifi/nm-wifi-utils.c \
-	src/devices/wifi/nm-wifi-utils.h \
+noinst_LTLIBRARIES += src/core/devices/wifi/libnm-wifi-base.la
+
+src_core_devices_wifi_libnm_wifi_base_la_SOURCES = \
+	src/core/devices/wifi/nm-device-olpc-mesh.c \
+	src/core/devices/wifi/nm-device-olpc-mesh.h \
+	src/core/devices/wifi/nm-device-wifi-p2p.c \
+	src/core/devices/wifi/nm-device-wifi-p2p.h \
+	src/core/devices/wifi/nm-device-wifi.c \
+	src/core/devices/wifi/nm-device-wifi.h \
+	src/core/devices/wifi/nm-wifi-ap.c \
+	src/core/devices/wifi/nm-wifi-ap.h \
+	src/core/devices/wifi/nm-wifi-common.c \
+	src/core/devices/wifi/nm-wifi-common.h \
+	src/core/devices/wifi/nm-wifi-p2p-peer.c \
+	src/core/devices/wifi/nm-wifi-p2p-peer.h \
+	src/core/devices/wifi/nm-wifi-utils.c \
+	src/core/devices/wifi/nm-wifi-utils.h \
 	$(NULL)
 
 if WITH_IWD
-src_devices_wifi_libnm_wifi_base_la_SOURCES += \
-	src/devices/wifi/nm-device-iwd.c \
-	src/devices/wifi/nm-device-iwd.h \
-	src/devices/wifi/nm-iwd-manager.c \
-	src/devices/wifi/nm-iwd-manager.h \
+src_core_devices_wifi_libnm_wifi_base_la_SOURCES += \
+	src/core/devices/wifi/nm-device-iwd.c \
+	src/core/devices/wifi/nm-device-iwd.h \
+	src/core/devices/wifi/nm-iwd-manager.c \
+	src/core/devices/wifi/nm-iwd-manager.h \
 	$(NULL)
 endif
 
-src_devices_wifi_libnm_wifi_base_la_CPPFLAGS = $(src_cppflags_device_plugin)
+src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS = $(src_core_cppflags_device_plugin)
 
-src_devices_wifi_libnm_wifi_base_la_LIBADD = \
+src_core_devices_wifi_libnm_wifi_base_la_LIBADD = \
 	$(GLIB_LIBS)
 
-$(src_devices_wifi_libnm_wifi_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_wifi_libnm_wifi_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-core_plugins += src/devices/wifi/libnm-device-plugin-wifi.la
+core_plugins += src/core/devices/wifi/libnm-device-plugin-wifi.la
 
-src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
-	src/devices/wifi/nm-wifi-factory.c \
+src_core_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
+	src/core/devices/wifi/nm-wifi-factory.c \
 	$(NULL)
 
-src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_cppflags_device_plugin)
+src_core_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_core_cppflags_device_plugin)
 
-src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \
+src_core_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \
 	-module -avoid-version \
 	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
 
-src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \
-	src/devices/wifi/libnm-wifi-base.la \
+src_core_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \
+	src/core/devices/wifi/libnm-wifi-base.la \
 	$(GLIB_LIBS)
 
-check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la
-	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so "$(srcdir)/linker-script-devices.ver"
-	$(call check_so_symbols,$(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so)
+check-local-devices-wifi: src/core/devices/wifi/libnm-device-plugin-wifi.la
+	$(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/wifi/.libs/libnm-device-plugin-wifi.so "$(srcdir)/linker-script-devices.ver"
+	$(call check_so_symbols,$(builddir)/src/core/devices/wifi/.libs/libnm-device-plugin-wifi.so)
 
 check_local += check-local-devices-wifi
 
-check_programs += src/devices/wifi/tests/test-devices-wifi
+check_programs += src/core/devices/wifi/tests/test-devices-wifi
 
-src_devices_wifi_tests_test_devices_wifi_SOURCES = \
-	src/devices/wifi/tests/test-devices-wifi.c \
+src_core_devices_wifi_tests_test_devices_wifi_SOURCES = \
+	src/core/devices/wifi/tests/test-devices-wifi.c \
 	$(NULL)
 
-src_devices_wifi_tests_test_devices_wifi_CPPFLAGS = $(src_cppflags_base_test)
+src_core_devices_wifi_tests_test_devices_wifi_CPPFLAGS = $(src_core_cppflags_base_test)
 
-src_devices_wifi_tests_test_devices_wifi_LDADD = \
-	src/devices/wifi/libnm-wifi-base.la \
-	src/libNetworkManagerTest.la \
-	src/libNetworkManagerBase.la \
+src_core_devices_wifi_tests_test_devices_wifi_LDADD = \
+	src/core/devices/wifi/libnm-wifi-base.la \
+	src/core/libNetworkManagerTest.la \
+	src/core/libNetworkManagerBase.la \
 	$(NULL)
 
-src_devices_wifi_tests_test_devices_wifi_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
+src_core_devices_wifi_tests_test_devices_wifi_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
 
-$(src_devices_wifi_tests_test_devices_wifi_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_wifi_tests_test_devices_wifi_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 endif
 
 EXTRA_DIST += \
-	src/devices/wifi/meson.build \
+	src/core/devices/wifi/meson.build \
 	$(NULL)
 
 ###############################################################################
-# src/devices/team
+# src/core/devices/team
 ###############################################################################
 
 if WITH_TEAMDCTL
 
-core_plugins += src/devices/team/libnm-device-plugin-team.la
+core_plugins += src/core/devices/team/libnm-device-plugin-team.la
 
-src_devices_team_libnm_device_plugin_team_la_SOURCES = \
-	src/devices/team/nm-team-factory.c \
-	src/devices/team/nm-device-team.c \
-	src/devices/team/nm-device-team.h \
+src_core_devices_team_libnm_device_plugin_team_la_SOURCES = \
+	src/core/devices/team/nm-team-factory.c \
+	src/core/devices/team/nm-device-team.c \
+	src/core/devices/team/nm-device-team.h \
 	$(NULL)
 
-src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \
-	$(src_cppflags_device_plugin) \
+src_core_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \
+	$(src_core_cppflags_device_plugin) \
 	$(LIBTEAMDCTL_CFLAGS) \
 	$(JANSSON_CFLAGS) \
 	$(NULL)
 
-src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \
+src_core_devices_team_libnm_device_plugin_team_la_LDFLAGS = \
 	-module -avoid-version \
 	-Wl,--version-script="$(srcdir)/linker-script-devices.ver" \
 	$(NULL)
 
-src_devices_team_libnm_device_plugin_team_la_LIBADD = \
+src_core_devices_team_libnm_device_plugin_team_la_LIBADD = \
 	$(LIBTEAMDCTL_LIBS) \
 	$(JANSSON_LIBS) \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-check-local-devices-team: src/devices/team/libnm-device-plugin-team.la
-	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so "$(srcdir)/linker-script-devices.ver"
-	$(call check_so_symbols,$(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so)
+check-local-devices-team: src/core/devices/team/libnm-device-plugin-team.la
+	$(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/team/.libs/libnm-device-plugin-team.so "$(srcdir)/linker-script-devices.ver"
+	$(call check_so_symbols,$(builddir)/src/core/devices/team/.libs/libnm-device-plugin-team.so)
 
 check_local += check-local-devices-team
 
 endif
 
 EXTRA_DIST += \
-	src/devices/team/meson.build
+	src/core/devices/team/meson.build
 
 ###############################################################################
-# src/devices/ovs
+# src/core/devices/ovs
 ###############################################################################
 
 if WITH_OPENVSWITCH
@@ -3983,373 +3983,373 @@ systemdnmunit_DATA = \
 
 endif
 
-core_plugins += src/devices/ovs/libnm-device-plugin-ovs.la
+core_plugins += src/core/devices/ovs/libnm-device-plugin-ovs.la
 
-src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES = \
-	src/devices/ovs/nm-ovsdb.c \
-	src/devices/ovs/nm-ovsdb.h \
-	src/devices/ovs/nm-ovs-factory.c \
-	src/devices/ovs/nm-device-ovs-interface.c \
-	src/devices/ovs/nm-device-ovs-interface.h \
-	src/devices/ovs/nm-device-ovs-port.c \
-	src/devices/ovs/nm-device-ovs-port.h \
-	src/devices/ovs/nm-device-ovs-bridge.c \
-	src/devices/ovs/nm-device-ovs-bridge.h \
+src_core_devices_ovs_libnm_device_plugin_ovs_la_SOURCES = \
+	src/core/devices/ovs/nm-ovsdb.c \
+	src/core/devices/ovs/nm-ovsdb.h \
+	src/core/devices/ovs/nm-ovs-factory.c \
+	src/core/devices/ovs/nm-device-ovs-interface.c \
+	src/core/devices/ovs/nm-device-ovs-interface.h \
+	src/core/devices/ovs/nm-device-ovs-port.c \
+	src/core/devices/ovs/nm-device-ovs-port.h \
+	src/core/devices/ovs/nm-device-ovs-bridge.c \
+	src/core/devices/ovs/nm-device-ovs-bridge.h \
 	$(NULL)
 
-src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \
-	$(src_cppflags_device_plugin) \
+src_core_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \
+	$(src_core_cppflags_device_plugin) \
 	$(JANSSON_CFLAGS) \
 	$(NULL)
 
-src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS = \
+src_core_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS = \
 	-module -avoid-version \
 	-Wl,--version-script="$(srcdir)/linker-script-devices.ver" \
 	$(NULL)
 
-src_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \
+src_core_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \
 	$(JANSSON_LIBS) \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-check-local-devices-ovs: src/devices/ovs/libnm-device-plugin-ovs.la
-	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/ovs/.libs/libnm-device-plugin-ovs.so "$(srcdir)/linker-script-devices.ver"
-	$(call check_so_symbols,$(builddir)/src/devices/ovs/.libs/libnm-device-plugin-ovs.so)
+check-local-devices-ovs: src/core/devices/ovs/libnm-device-plugin-ovs.la
+	$(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/ovs/.libs/libnm-device-plugin-ovs.so "$(srcdir)/linker-script-devices.ver"
+	$(call check_so_symbols,$(builddir)/src/core/devices/ovs/.libs/libnm-device-plugin-ovs.so)
 
 endif
 
 EXTRA_DIST += \
 	data/NetworkManager-ovs.conf \
-	src/devices/ovs/meson.build
+	src/core/devices/ovs/meson.build
 
 ###############################################################################
-# src/dnsmasq/tests
+# src/core/dnsmasq/tests
 ###############################################################################
 
-check_programs += src/dnsmasq/tests/test-dnsmasq-utils
+check_programs += src/core/dnsmasq/tests/test-dnsmasq-utils
 
-src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = $(src_cppflags_test)
+src_core_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = $(src_core_cppflags_test)
 
-src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \
-	src/libNetworkManagerTest.la
+src_core_dnsmasq_tests_test_dnsmasq_utils_LDADD = \
+	src/core/libNetworkManagerTest.la
 
-src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \
+src_core_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-$(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
-	src/dnsmasq/tests/meson.build
+	src/core/dnsmasq/tests/meson.build
 
 ###############################################################################
-# src/platform/tests
+# src/core/platform/tests
 ###############################################################################
 
-src_platform_tests_ldflags = \
+src_core_platform_tests_ldflags = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_platform_tests_libadd = \
-	src/libNetworkManagerTest.la \
+src_core_platform_tests_libadd = \
+	src/core/libNetworkManagerTest.la \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS)
 
 check_programs_norun += \
-	src/platform/tests/monitor
+	src/core/platform/tests/monitor
 
 check_programs += \
-	src/platform/tests/test-address-fake \
-	src/platform/tests/test-address-linux \
-	src/platform/tests/test-cleanup-fake \
-	src/platform/tests/test-cleanup-linux \
-	src/platform/tests/test-link-fake \
-	src/platform/tests/test-link-linux \
-	src/platform/tests/test-nmp-object \
-	src/platform/tests/test-platform-general \
-	src/platform/tests/test-route-fake \
-	src/platform/tests/test-route-linux \
-	src/platform/tests/test-tc-fake \
-	src/platform/tests/test-tc-linux \
-	$(NULL)
-
-src_platform_tests_monitor_CPPFLAGS = $(src_cppflags_test)
-src_platform_tests_monitor_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_monitor_LDADD = $(src_platform_tests_libadd)
-
-src_platform_tests_test_address_fake_SOURCES = src/platform/tests/test-address.c
-src_platform_tests_test_address_fake_CPPFLAGS = $(src_tests_cppflags_fake)
-src_platform_tests_test_address_fake_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_address_fake_LDADD = $(src_platform_tests_libadd)
-
-src_platform_tests_test_address_linux_SOURCES = src/platform/tests/test-address.c
-src_platform_tests_test_address_linux_CPPFLAGS = $(src_tests_cppflags_linux)
-src_platform_tests_test_address_linux_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_address_linux_LDADD = $(src_platform_tests_libadd)
-
-src_platform_tests_test_cleanup_fake_SOURCES = src/platform/tests/test-cleanup.c
-src_platform_tests_test_cleanup_fake_CPPFLAGS = $(src_tests_cppflags_fake)
-src_platform_tests_test_cleanup_fake_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_cleanup_fake_LDADD = $(src_platform_tests_libadd)
-
-src_platform_tests_test_cleanup_linux_SOURCES = src/platform/tests/test-cleanup.c
-src_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_tests_cppflags_linux)
-src_platform_tests_test_cleanup_linux_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_cleanup_linux_LDADD = $(src_platform_tests_libadd)
-
-src_platform_tests_test_link_fake_SOURCES = src/platform/tests/test-link.c
-src_platform_tests_test_link_fake_CPPFLAGS = $(src_tests_cppflags_fake)
-src_platform_tests_test_link_fake_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_link_fake_LDADD = $(src_platform_tests_libadd)
-
-src_platform_tests_test_link_linux_SOURCES = src/platform/tests/test-link.c
-src_platform_tests_test_link_linux_CPPFLAGS = $(src_tests_cppflags_linux)
-src_platform_tests_test_link_linux_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_link_linux_LDADD = $(src_platform_tests_libadd)
-
-src_platform_tests_test_nmp_object_CPPFLAGS = $(src_cppflags_test)
-src_platform_tests_test_nmp_object_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_nmp_object_LDADD = src/libNetworkManagerTest.la
-
-src_platform_tests_test_platform_general_CPPFLAGS = $(src_cppflags_test)
-src_platform_tests_test_platform_general_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_platform_general_LDADD = src/libNetworkManagerTest.la
-
-src_platform_tests_test_route_fake_SOURCES = src/platform/tests/test-route.c
-src_platform_tests_test_route_fake_CPPFLAGS = $(src_tests_cppflags_fake)
-src_platform_tests_test_route_fake_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_route_fake_LDADD = $(src_platform_tests_libadd)
-
-src_platform_tests_test_route_linux_SOURCES = src/platform/tests/test-route.c
-src_platform_tests_test_route_linux_CPPFLAGS = $(src_tests_cppflags_linux)
-src_platform_tests_test_route_linux_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_route_linux_LDADD = $(src_platform_tests_libadd)
-
-src_platform_tests_test_tc_fake_SOURCES = src/platform/tests/test-tc.c
-src_platform_tests_test_tc_fake_CPPFLAGS = $(src_tests_cppflags_fake)
-src_platform_tests_test_tc_fake_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_tc_fake_LDADD = $(src_platform_tests_libadd)
-
-src_platform_tests_test_tc_linux_SOURCES = src/platform/tests/test-tc.c
-src_platform_tests_test_tc_linux_CPPFLAGS = $(src_tests_cppflags_linux)
-src_platform_tests_test_tc_linux_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_tc_linux_LDADD = $(src_platform_tests_libadd)
-
-
-$(src_platform_tests_monitor_OBJECTS):               $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_address_fake_OBJECTS):     $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_address_linux_OBJECTS):    $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_cleanup_fake_OBJECTS):     $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_cleanup_linux_OBJECTS):    $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_link_fake_OBJECTS):        $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_link_linux_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_nmp_object_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_platform_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_route_fake_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_route_linux_OBJECTS):      $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_tc_fake_OBJECTS):          $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_tc_linux_OBJECTS):         $(libnm_core_lib_h_pub_mkenums)
+	src/core/platform/tests/test-address-fake \
+	src/core/platform/tests/test-address-linux \
+	src/core/platform/tests/test-cleanup-fake \
+	src/core/platform/tests/test-cleanup-linux \
+	src/core/platform/tests/test-link-fake \
+	src/core/platform/tests/test-link-linux \
+	src/core/platform/tests/test-nmp-object \
+	src/core/platform/tests/test-platform-general \
+	src/core/platform/tests/test-route-fake \
+	src/core/platform/tests/test-route-linux \
+	src/core/platform/tests/test-tc-fake \
+	src/core/platform/tests/test-tc-linux \
+	$(NULL)
+
+src_core_platform_tests_monitor_CPPFLAGS = $(src_core_cppflags_test)
+src_core_platform_tests_monitor_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_monitor_LDADD = $(src_core_platform_tests_libadd)
+
+src_core_platform_tests_test_address_fake_SOURCES = src/core/platform/tests/test-address.c
+src_core_platform_tests_test_address_fake_CPPFLAGS = $(src_core_tests_cppflags_fake)
+src_core_platform_tests_test_address_fake_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_address_fake_LDADD = $(src_core_platform_tests_libadd)
+
+src_core_platform_tests_test_address_linux_SOURCES = src/core/platform/tests/test-address.c
+src_core_platform_tests_test_address_linux_CPPFLAGS = $(src_core_tests_cppflags_linux)
+src_core_platform_tests_test_address_linux_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_address_linux_LDADD = $(src_core_platform_tests_libadd)
+
+src_core_platform_tests_test_cleanup_fake_SOURCES = src/core/platform/tests/test-cleanup.c
+src_core_platform_tests_test_cleanup_fake_CPPFLAGS = $(src_core_tests_cppflags_fake)
+src_core_platform_tests_test_cleanup_fake_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_cleanup_fake_LDADD = $(src_core_platform_tests_libadd)
+
+src_core_platform_tests_test_cleanup_linux_SOURCES = src/core/platform/tests/test-cleanup.c
+src_core_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_core_tests_cppflags_linux)
+src_core_platform_tests_test_cleanup_linux_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_cleanup_linux_LDADD = $(src_core_platform_tests_libadd)
+
+src_core_platform_tests_test_link_fake_SOURCES = src/core/platform/tests/test-link.c
+src_core_platform_tests_test_link_fake_CPPFLAGS = $(src_core_tests_cppflags_fake)
+src_core_platform_tests_test_link_fake_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_link_fake_LDADD = $(src_core_platform_tests_libadd)
+
+src_core_platform_tests_test_link_linux_SOURCES = src/core/platform/tests/test-link.c
+src_core_platform_tests_test_link_linux_CPPFLAGS = $(src_core_tests_cppflags_linux)
+src_core_platform_tests_test_link_linux_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_link_linux_LDADD = $(src_core_platform_tests_libadd)
+
+src_core_platform_tests_test_nmp_object_CPPFLAGS = $(src_core_cppflags_test)
+src_core_platform_tests_test_nmp_object_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_nmp_object_LDADD = src/core/libNetworkManagerTest.la
+
+src_core_platform_tests_test_platform_general_CPPFLAGS = $(src_core_cppflags_test)
+src_core_platform_tests_test_platform_general_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_platform_general_LDADD = src/core/libNetworkManagerTest.la
+
+src_core_platform_tests_test_route_fake_SOURCES = src/core/platform/tests/test-route.c
+src_core_platform_tests_test_route_fake_CPPFLAGS = $(src_core_tests_cppflags_fake)
+src_core_platform_tests_test_route_fake_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_route_fake_LDADD = $(src_core_platform_tests_libadd)
+
+src_core_platform_tests_test_route_linux_SOURCES = src/core/platform/tests/test-route.c
+src_core_platform_tests_test_route_linux_CPPFLAGS = $(src_core_tests_cppflags_linux)
+src_core_platform_tests_test_route_linux_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_route_linux_LDADD = $(src_core_platform_tests_libadd)
+
+src_core_platform_tests_test_tc_fake_SOURCES = src/core/platform/tests/test-tc.c
+src_core_platform_tests_test_tc_fake_CPPFLAGS = $(src_core_tests_cppflags_fake)
+src_core_platform_tests_test_tc_fake_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_tc_fake_LDADD = $(src_core_platform_tests_libadd)
+
+src_core_platform_tests_test_tc_linux_SOURCES = src/core/platform/tests/test-tc.c
+src_core_platform_tests_test_tc_linux_CPPFLAGS = $(src_core_tests_cppflags_linux)
+src_core_platform_tests_test_tc_linux_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_tc_linux_LDADD = $(src_core_platform_tests_libadd)
+
+
+$(src_core_platform_tests_monitor_OBJECTS):               $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_address_fake_OBJECTS):     $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_address_linux_OBJECTS):    $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_cleanup_fake_OBJECTS):     $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_cleanup_linux_OBJECTS):    $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_link_fake_OBJECTS):        $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_link_linux_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_nmp_object_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_platform_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_route_fake_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_route_linux_OBJECTS):      $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_tc_fake_OBJECTS):          $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_tc_linux_OBJECTS):         $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
-	src/platform/tests/meson.build \
+	src/core/platform/tests/meson.build \
 	$(NULL)
 
 ###############################################################################
-# src/devices/tests
+# src/core/devices/tests
 ###############################################################################
 
-src_devices_tests_ldflags = \
+src_core_devices_tests_ldflags = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
 check_programs += \
-	src/devices/tests/test-lldp \
-	src/devices/tests/test-acd
+	src/core/devices/tests/test-lldp \
+	src/core/devices/tests/test-acd
 
-src_devices_tests_test_lldp_CPPFLAGS = $(src_cppflags_test)
-src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags)
-src_devices_tests_test_lldp_LDADD = \
-	src/libNetworkManagerTest.la
+src_core_devices_tests_test_lldp_CPPFLAGS = $(src_core_cppflags_test)
+src_core_devices_tests_test_lldp_LDFLAGS = $(src_core_devices_tests_ldflags)
+src_core_devices_tests_test_lldp_LDADD = \
+	src/core/libNetworkManagerTest.la
 
-src_devices_tests_test_acd_CPPFLAGS = $(src_cppflags_test)
-src_devices_tests_test_acd_LDFLAGS = $(src_devices_tests_ldflags)
-src_devices_tests_test_acd_LDADD = \
-	src/libNetworkManagerTest.la
+src_core_devices_tests_test_acd_CPPFLAGS = $(src_core_cppflags_test)
+src_core_devices_tests_test_acd_LDFLAGS = $(src_core_devices_tests_ldflags)
+src_core_devices_tests_test_acd_LDADD = \
+	src/core/libNetworkManagerTest.la
 
-$(src_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_tests_test_acd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_tests_test_acd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
-	src/devices/tests/meson.build
+	src/core/devices/tests/meson.build
 
 ###############################################################################
-# src/ndisc/tests
+# src/core/ndisc/tests
 ###############################################################################
 
-src_ndisc_tests_ldflags = \
+src_core_ndisc_tests_ldflags = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_ndisc_tests_ldadd = \
-	src/libNetworkManagerTest.la \
+src_core_ndisc_tests_ldadd = \
+	src/core/libNetworkManagerTest.la \
 	$(GLIB_LIBS)
 
-check_programs += src/ndisc/tests/test-ndisc-fake
-check_programs_norun += src/ndisc/tests/test-ndisc-linux
+check_programs += src/core/ndisc/tests/test-ndisc-fake
+check_programs_norun += src/core/ndisc/tests/test-ndisc-linux
 
-src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_cppflags_test)
-src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_ldflags)
-src_ndisc_tests_test_ndisc_linux_LDADD = $(src_ndisc_tests_ldadd)
+src_core_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_core_cppflags_test)
+src_core_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_core_ndisc_tests_ldflags)
+src_core_ndisc_tests_test_ndisc_linux_LDADD = $(src_core_ndisc_tests_ldadd)
 
-src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_cppflags_test)
-src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_ldflags)
-src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd)
+src_core_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_core_cppflags_test)
+src_core_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_core_ndisc_tests_ldflags)
+src_core_ndisc_tests_test_ndisc_fake_LDADD = $(src_core_ndisc_tests_ldadd)
 
-$(src_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
-	src/ndisc/tests/meson.build
+	src/core/ndisc/tests/meson.build
 
 ###############################################################################
-# src/supplicant/tests
+# src/core/supplicant/tests
 ###############################################################################
 
-check_programs += src/supplicant/tests/test-supplicant-config
+check_programs += src/core/supplicant/tests/test-supplicant-config
 
-src_supplicant_tests_test_supplicant_config_CPPFLAGS = $(src_cppflags_test)
+src_core_supplicant_tests_test_supplicant_config_CPPFLAGS = $(src_core_cppflags_test)
 
-src_supplicant_tests_test_supplicant_config_LDADD = \
-	src/libNetworkManagerTest.la
+src_core_supplicant_tests_test_supplicant_config_LDADD = \
+	src/core/libNetworkManagerTest.la
 
-src_supplicant_tests_test_supplicant_config_LDFLAGS = \
+src_core_supplicant_tests_test_supplicant_config_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-$(src_supplicant_tests_test_supplicant_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_supplicant_tests_test_supplicant_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
-	src/supplicant/tests/certs/test-ca-cert.pem \
-	src/supplicant/tests/certs/test-cert.p12 \
-	src/supplicant/tests/meson.build
+	src/core/supplicant/tests/certs/test-ca-cert.pem \
+	src/core/supplicant/tests/certs/test-cert.p12 \
+	src/core/supplicant/tests/meson.build
 
 ###############################################################################
-# src/tests/config
+# src/core/tests/config
 ###############################################################################
 
-check_programs += src/tests/config/test-config
+check_programs += src/core/tests/config/test-config
 
-src_tests_config_test_config_SOURCES = \
-	src/tests/config/nm-test-device.c \
-	src/tests/config/nm-test-device.h \
-	src/tests/config/test-config.c
+src_core_tests_config_test_config_SOURCES = \
+	src/core/tests/config/nm-test-device.c \
+	src/core/tests/config/nm-test-device.h \
+	src/core/tests/config/test-config.c
 
-src_tests_config_test_config_CPPFLAGS = $(src_cppflags_test)
+src_core_tests_config_test_config_CPPFLAGS = $(src_core_cppflags_test)
 
-src_tests_config_test_config_LDADD = \
-	src/libNetworkManagerTest.la
+src_core_tests_config_test_config_LDADD = \
+	src/core/libNetworkManagerTest.la
 
-src_tests_config_test_config_LDFLAGS = \
+src_core_tests_config_test_config_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-$(src_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
-	src/tests/config/NetworkManager.conf \
-	src/tests/config/NetworkManager-warn.conf \
-	src/tests/config/NetworkManager.state \
-	src/tests/config/bad.conf \
-	src/tests/config/global-dns-invalid.conf \
-	src/tests/config/conf.d/00-overrides.conf \
-	src/tests/config/conf.d/10-more.conf \
-	src/tests/config/conf.d/20-config-enable-1.conf \
-	src/tests/config/conf.d/90-last.conf \
-	src/tests/config/meson.build
+	src/core/tests/config/NetworkManager.conf \
+	src/core/tests/config/NetworkManager-warn.conf \
+	src/core/tests/config/NetworkManager.state \
+	src/core/tests/config/bad.conf \
+	src/core/tests/config/global-dns-invalid.conf \
+	src/core/tests/config/conf.d/00-overrides.conf \
+	src/core/tests/config/conf.d/10-more.conf \
+	src/core/tests/config/conf.d/20-config-enable-1.conf \
+	src/core/tests/config/conf.d/90-last.conf \
+	src/core/tests/config/meson.build
 
 ###############################################################################
-# src/tests
+# src/core/tests
 ###############################################################################
 
-src_tests_ldflags = \
+src_core_tests_ldflags = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_tests_ldadd = \
-	src/libNetworkManagerTest.la
+src_core_tests_ldadd = \
+	src/core/libNetworkManagerTest.la
 
 check_programs += \
-	src/tests/test-core \
-	src/tests/test-core-with-expect \
-	src/tests/test-dcb \
-	src/tests/test-ip4-config \
-	src/tests/test-ip6-config \
-	src/tests/test-l3cfg \
-	src/tests/test-systemd \
-	src/tests/test-utils \
-	src/tests/test-wired-defname \
-	$(NULL)
-
-src_tests_test_ip4_config_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_ip4_config_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_ip4_config_LDADD = $(src_tests_ldadd)
-
-src_tests_test_ip6_config_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_ip6_config_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_ip6_config_LDADD = $(src_tests_ldadd)
-
-src_tests_test_dcb_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_dcb_LDADD = $(src_tests_ldadd)
-
-src_tests_test_core_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_core_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_core_LDADD = $(src_tests_ldadd)
-
-src_tests_test_core_with_expect_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_core_with_expect_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_core_with_expect_LDADD = $(src_tests_ldadd)
-
-src_tests_test_wired_defname_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_wired_defname_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_wired_defname_LDADD = $(src_tests_ldadd)
-
-src_tests_test_utils_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_utils_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_utils_LDADD = $(src_tests_ldadd)
-
-src_tests_test_l3cfg_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_l3cfg_LDFLAGS = $(src_devices_tests_ldflags)
-src_tests_test_l3cfg_LDADD = $(src_tests_ldadd)
-
-$(src_tests_test_core_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_core_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_l3cfg_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-
-src_tests_test_systemd_CPPFLAGS = \
-	$(src_libnm_systemd_core_la_cppflags) \
+	src/core/tests/test-core \
+	src/core/tests/test-core-with-expect \
+	src/core/tests/test-dcb \
+	src/core/tests/test-ip4-config \
+	src/core/tests/test-ip6-config \
+	src/core/tests/test-l3cfg \
+	src/core/tests/test-systemd \
+	src/core/tests/test-utils \
+	src/core/tests/test-wired-defname \
+	$(NULL)
+
+src_core_tests_test_ip4_config_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_ip4_config_LDFLAGS = $(src_core_tests_ldflags)
+src_core_tests_test_ip4_config_LDADD = $(src_core_tests_ldadd)
+
+src_core_tests_test_ip6_config_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_ip6_config_LDFLAGS = $(src_core_tests_ldflags)
+src_core_tests_test_ip6_config_LDADD = $(src_core_tests_ldadd)
+
+src_core_tests_test_dcb_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_dcb_LDFLAGS = $(src_core_tests_ldflags)
+src_core_tests_test_dcb_LDADD = $(src_core_tests_ldadd)
+
+src_core_tests_test_core_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_core_LDFLAGS = $(src_core_tests_ldflags)
+src_core_tests_test_core_LDADD = $(src_core_tests_ldadd)
+
+src_core_tests_test_core_with_expect_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_core_with_expect_LDFLAGS = $(src_core_tests_ldflags)
+src_core_tests_test_core_with_expect_LDADD = $(src_core_tests_ldadd)
+
+src_core_tests_test_wired_defname_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_wired_defname_LDFLAGS = $(src_core_tests_ldflags)
+src_core_tests_test_wired_defname_LDADD = $(src_core_tests_ldadd)
+
+src_core_tests_test_utils_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_utils_LDFLAGS = $(src_core_tests_ldflags)
+src_core_tests_test_utils_LDADD = $(src_core_tests_ldadd)
+
+src_core_tests_test_l3cfg_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_l3cfg_LDFLAGS = $(src_core_devices_tests_ldflags)
+src_core_tests_test_l3cfg_LDADD = $(src_core_tests_ldadd)
+
+$(src_core_tests_test_core_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_core_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_l3cfg_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+
+src_core_tests_test_systemd_CPPFLAGS = \
+	$(src_core_libnm_systemd_core_la_cppflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	$(NULL)
 
-src_tests_test_systemd_LDFLAGS = \
+src_core_tests_test_systemd_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-src_tests_test_systemd_LDADD = \
-	src/libnm-systemd-core.la \
+src_core_tests_test_systemd_LDADD = \
+	src/core/libnm-systemd-core.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
-$(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
-	src/tests/test-secret-agent.py \
-	src/tests/meson.build
+	src/core/tests/test-secret-agent.py \
+	src/core/tests/meson.build
 
 ###############################################################################
 # dispatcher
@@ -5394,7 +5394,7 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 BUILT_SOURCES += $(typelib_DATA)
 
 dbusservicedir = $(DBUS_SYS_DIR)
-dbusservice_DATA += src/org.freedesktop.NetworkManager.conf
+dbusservice_DATA += src/core/org.freedesktop.NetworkManager.conf
 
 ###############################################################################
 
@@ -5422,7 +5422,7 @@ EXTRA_DIST += \
 	linker-script-binary.ver \
 	linker-script-devices.ver \
 	linker-script-settings.ver \
-	src/ppp/nm-ppp-plugin.ver \
+	src/core/ppp/nm-ppp-plugin.ver \
 	Makefile.glib \
 	autogen.sh \
 	lsan.suppressions \
@@ -5462,7 +5462,7 @@ EXTRA_DIST += \
 	tools/test-sudo-wrapper.sh \
 	tools/enums-to-docbook.pl \
 	\
-	src/settings/plugins/meson.build \
+	src/core/settings/plugins/meson.build \
 	\
 	$(NULL)
 
diff --git a/autogen.sh b/autogen.sh
index ca9253f1b4..8809806178 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,7 @@ REQUIRED_AUTOMAKE_VERSION=1.9
 PKG_NAME=NetworkManager
 
 (test -f $srcdir/configure.ac \
-  && test -f $srcdir/src/main.c) || {
+  && test -f $srcdir/src/core/main.c) || {
     printf "**Error**: Directory "\`$srcdir\'" does not look like the" >&2
     echo " top-level $PKG_NAME directory" >&2
     exit 1
diff --git a/contrib/scripts/nm-code-format.sh b/contrib/scripts/nm-code-format.sh
index 70eb5a7f3a..2de32aafc6 100755
--- a/contrib/scripts/nm-code-format.sh
+++ b/contrib/scripts/nm-code-format.sh
@@ -18,7 +18,7 @@ EXCLUDE=(
     ":(exclude)shared/n-dhcp4"
     ":(exclude)shared/nm-std-aux/unaligned.h"
     ":(exclude)shared/systemd/src"
-    ":(exclude)src/systemd/src"
+    ":(exclude)src/core/systemd/src"
 )
 
 NM_ROOT="$(git rev-parse --show-toplevel)" || die "not inside a git repository"
diff --git a/meson.build b/meson.build
index 357fcf6348..560fa712d1 100644
--- a/meson.build
+++ b/meson.build
@@ -905,7 +905,7 @@ subdir('introspection')
 subdir('shared')
 subdir('libnm-core')
 subdir('libnm')
-subdir('src')
+subdir('src/core')
 subdir('dispatcher')
 subdir('clients')
 subdir('data')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b3d33487bd..e48d9a8e29 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -148,38 +148,38 @@ libnm/nm-vpn-service-plugin.c
 data/org.freedesktop.NetworkManager.policy.in.in
 shared/nm-glib-aux/nm-shared-utils.c
 shared/nm-log-core/nm-logging.c
-src/NetworkManagerUtils.c
-src/main.c
-src/main-utils.c
-src/dhcp/nm-dhcp-dhclient.c
-src/dhcp/nm-dhcp-dhclient-utils.c
-src/dhcp/nm-dhcp-manager.c
-src/dns/nm-dns-manager.c
-src/devices/adsl/nm-device-adsl.c
-src/devices/bluetooth/nm-bluez-manager.c
-src/devices/bluetooth/nm-device-bt.c
-src/devices/nm-device-6lowpan.c
-src/devices/nm-device-bond.c
-src/devices/nm-device-bridge.c
-src/devices/nm-device-dummy.c
-src/devices/nm-device-ethernet.c
-src/devices/nm-device-ethernet-utils.c
-src/devices/nm-device-infiniband.c
-src/devices/nm-device-ip-tunnel.c
-src/devices/nm-device-macvlan.c
-src/devices/nm-device-tun.c
-src/devices/nm-device-veth.c
-src/devices/nm-device-vlan.c
-src/devices/nm-device-vrf.c
-src/devices/nm-device-vxlan.c
-src/devices/nm-device-wpan.c
-src/devices/team/nm-device-team.c
-src/devices/wifi/nm-device-olpc-mesh.c
-src/devices/wifi/nm-device-wifi.c
-src/devices/wifi/nm-wifi-utils.c
-src/devices/wwan/nm-modem-broadband.c
-src/nm-config.c
-src/nm-iface-helper.c
-src/nm-manager.c
-src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
-src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+src/core/NetworkManagerUtils.c
+src/core/main.c
+src/core/main-utils.c
+src/core/dhcp/nm-dhcp-dhclient.c
+src/core/dhcp/nm-dhcp-dhclient-utils.c
+src/core/dhcp/nm-dhcp-manager.c
+src/core/dns/nm-dns-manager.c
+src/core/devices/adsl/nm-device-adsl.c
+src/core/devices/bluetooth/nm-bluez-manager.c
+src/core/devices/bluetooth/nm-device-bt.c
+src/core/devices/nm-device-6lowpan.c
+src/core/devices/nm-device-bond.c
+src/core/devices/nm-device-bridge.c
+src/core/devices/nm-device-dummy.c
+src/core/devices/nm-device-ethernet.c
+src/core/devices/nm-device-ethernet-utils.c
+src/core/devices/nm-device-infiniband.c
+src/core/devices/nm-device-ip-tunnel.c
+src/core/devices/nm-device-macvlan.c
+src/core/devices/nm-device-tun.c
+src/core/devices/nm-device-veth.c
+src/core/devices/nm-device-vlan.c
+src/core/devices/nm-device-vrf.c
+src/core/devices/nm-device-vxlan.c
+src/core/devices/nm-device-wpan.c
+src/core/devices/team/nm-device-team.c
+src/core/devices/wifi/nm-device-olpc-mesh.c
+src/core/devices/wifi/nm-device-wifi.c
+src/core/devices/wifi/nm-wifi-utils.c
+src/core/devices/wwan/nm-modem-broadband.c
+src/core/nm-config.c
+src/core/nm-iface-helper.c
+src/core/nm-manager.c
+src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
diff --git a/src/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c
index d55df95e13..d55df95e13 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/core/NetworkManagerUtils.c
diff --git a/src/NetworkManagerUtils.h b/src/core/NetworkManagerUtils.h
index 2afb5a3ecc..2afb5a3ecc 100644
--- a/src/NetworkManagerUtils.h
+++ b/src/core/NetworkManagerUtils.h
diff --git a/src/devices/adsl/meson.build b/src/core/devices/adsl/meson.build
index 95f61d958a..95f61d958a 100644
--- a/src/devices/adsl/meson.build
+++ b/src/core/devices/adsl/meson.build
diff --git a/src/devices/adsl/nm-atm-manager.c b/src/core/devices/adsl/nm-atm-manager.c
index eab723d5f1..eab723d5f1 100644
--- a/src/devices/adsl/nm-atm-manager.c
+++ b/src/core/devices/adsl/nm-atm-manager.c
diff --git a/src/devices/adsl/nm-device-adsl.c b/src/core/devices/adsl/nm-device-adsl.c
index 29a73ba14e..29a73ba14e 100644
--- a/src/devices/adsl/nm-device-adsl.c
+++ b/src/core/devices/adsl/nm-device-adsl.c
diff --git a/src/devices/adsl/nm-device-adsl.h b/src/core/devices/adsl/nm-device-adsl.h
index c5c18901c4..c5c18901c4 100644
--- a/src/devices/adsl/nm-device-adsl.h
+++ b/src/core/devices/adsl/nm-device-adsl.h
diff --git a/src/devices/bluetooth/meson.build b/src/core/devices/bluetooth/meson.build
index d5f260686f..d5f260686f 100644
--- a/src/devices/bluetooth/meson.build
+++ b/src/core/devices/bluetooth/meson.build
diff --git a/src/devices/bluetooth/nm-bluez-common.h b/src/core/devices/bluetooth/nm-bluez-common.h
index 868a985eeb..868a985eeb 100644
--- a/src/devices/bluetooth/nm-bluez-common.h
+++ b/src/core/devices/bluetooth/nm-bluez-common.h
diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/core/devices/bluetooth/nm-bluez-manager.c
index 3343b6ede9..3343b6ede9 100644
--- a/src/devices/bluetooth/nm-bluez-manager.c
+++ b/src/core/devices/bluetooth/nm-bluez-manager.c
diff --git a/src/devices/bluetooth/nm-bluez-manager.h b/src/core/devices/bluetooth/nm-bluez-manager.h
index 04bfea7daf..04bfea7daf 100644
--- a/src/devices/bluetooth/nm-bluez-manager.h
+++ b/src/core/devices/bluetooth/nm-bluez-manager.h
diff --git a/src/devices/bluetooth/nm-bluez5-dun.c b/src/core/devices/bluetooth/nm-bluez5-dun.c
index d803b748e0..d803b748e0 100644
--- a/src/devices/bluetooth/nm-bluez5-dun.c
+++ b/src/core/devices/bluetooth/nm-bluez5-dun.c
diff --git a/src/devices/bluetooth/nm-bluez5-dun.h b/src/core/devices/bluetooth/nm-bluez5-dun.h
index 020d41197d..020d41197d 100644
--- a/src/devices/bluetooth/nm-bluez5-dun.h
+++ b/src/core/devices/bluetooth/nm-bluez5-dun.h
diff --git a/src/devices/bluetooth/nm-bt-error.c b/src/core/devices/bluetooth/nm-bt-error.c
index ed091474aa..ed091474aa 100644
--- a/src/devices/bluetooth/nm-bt-error.c
+++ b/src/core/devices/bluetooth/nm-bt-error.c
diff --git a/src/devices/bluetooth/nm-bt-error.h b/src/core/devices/bluetooth/nm-bt-error.h
index 432ae5b4fa..432ae5b4fa 100644
--- a/src/devices/bluetooth/nm-bt-error.h
+++ b/src/core/devices/bluetooth/nm-bt-error.h
diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/core/devices/bluetooth/nm-device-bt.c
index 0515d29c11..0515d29c11 100644
--- a/src/devices/bluetooth/nm-device-bt.c
+++ b/src/core/devices/bluetooth/nm-device-bt.c
diff --git a/src/devices/bluetooth/nm-device-bt.h b/src/core/devices/bluetooth/nm-device-bt.h
index c2d3bc1823..c2d3bc1823 100644
--- a/src/devices/bluetooth/nm-device-bt.h
+++ b/src/core/devices/bluetooth/nm-device-bt.h
diff --git a/src/devices/bluetooth/tests/nm-bt-test.c b/src/core/devices/bluetooth/tests/nm-bt-test.c
index 546c06a77e..546c06a77e 100644
--- a/src/devices/bluetooth/tests/nm-bt-test.c
+++ b/src/core/devices/bluetooth/tests/nm-bt-test.c
diff --git a/src/devices/meson.build b/src/core/devices/meson.build
index 66f7aa928b..66f7aa928b 100644
--- a/src/devices/meson.build
+++ b/src/core/devices/meson.build
diff --git a/src/devices/nm-acd-manager.c b/src/core/devices/nm-acd-manager.c
index 82b7146d86..82b7146d86 100644
--- a/src/devices/nm-acd-manager.c
+++ b/src/core/devices/nm-acd-manager.c
diff --git a/src/devices/nm-acd-manager.h b/src/core/devices/nm-acd-manager.h
index e8ef6f2b99..e8ef6f2b99 100644
--- a/src/devices/nm-acd-manager.h
+++ b/src/core/devices/nm-acd-manager.h
diff --git a/src/devices/nm-device-6lowpan.c b/src/core/devices/nm-device-6lowpan.c
index 7c0be5978b..7c0be5978b 100644
--- a/src/devices/nm-device-6lowpan.c
+++ b/src/core/devices/nm-device-6lowpan.c
diff --git a/src/devices/nm-device-6lowpan.h b/src/core/devices/nm-device-6lowpan.h
index 34ea3c8d44..34ea3c8d44 100644
--- a/src/devices/nm-device-6lowpan.h
+++ b/src/core/devices/nm-device-6lowpan.h
diff --git a/src/devices/nm-device-bond.c b/src/core/devices/nm-device-bond.c
index 5671a42ef5..5671a42ef5 100644
--- a/src/devices/nm-device-bond.c
+++ b/src/core/devices/nm-device-bond.c
diff --git a/src/devices/nm-device-bond.h b/src/core/devices/nm-device-bond.h
index 1930179338..1930179338 100644
--- a/src/devices/nm-device-bond.h
+++ b/src/core/devices/nm-device-bond.h
diff --git a/src/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c
index 6557558d4c..6557558d4c 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/core/devices/nm-device-bridge.c
diff --git a/src/devices/nm-device-bridge.h b/src/core/devices/nm-device-bridge.h
index 32437947e0..32437947e0 100644
--- a/src/devices/nm-device-bridge.h
+++ b/src/core/devices/nm-device-bridge.h
diff --git a/src/devices/nm-device-dummy.c b/src/core/devices/nm-device-dummy.c
index 5ec0b7fe7f..5ec0b7fe7f 100644
--- a/src/devices/nm-device-dummy.c
+++ b/src/core/devices/nm-device-dummy.c
diff --git a/src/devices/nm-device-dummy.h b/src/core/devices/nm-device-dummy.h
index 2845b4ebcc..2845b4ebcc 100644
--- a/src/devices/nm-device-dummy.h
+++ b/src/core/devices/nm-device-dummy.h
diff --git a/src/devices/nm-device-ethernet-utils.c b/src/core/devices/nm-device-ethernet-utils.c
index 50da2678e3..50da2678e3 100644
--- a/src/devices/nm-device-ethernet-utils.c
+++ b/src/core/devices/nm-device-ethernet-utils.c
diff --git a/src/devices/nm-device-ethernet-utils.h b/src/core/devices/nm-device-ethernet-utils.h
index 133340fcce..133340fcce 100644
--- a/src/devices/nm-device-ethernet-utils.h
+++ b/src/core/devices/nm-device-ethernet-utils.h
diff --git a/src/devices/nm-device-ethernet.c b/src/core/devices/nm-device-ethernet.c
index 1c6c300e15..1c6c300e15 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/core/devices/nm-device-ethernet.c
diff --git a/src/devices/nm-device-ethernet.h b/src/core/devices/nm-device-ethernet.h
index 6e134d7196..6e134d7196 100644
--- a/src/devices/nm-device-ethernet.h
+++ b/src/core/devices/nm-device-ethernet.h
diff --git a/src/devices/nm-device-factory.c b/src/core/devices/nm-device-factory.c
index 7034202823..7034202823 100644
--- a/src/devices/nm-device-factory.c
+++ b/src/core/devices/nm-device-factory.c
diff --git a/src/devices/nm-device-factory.h b/src/core/devices/nm-device-factory.h
index d9b505638b..d9b505638b 100644
--- a/src/devices/nm-device-factory.h
+++ b/src/core/devices/nm-device-factory.h
diff --git a/src/devices/nm-device-generic.c b/src/core/devices/nm-device-generic.c
index 17ff407099..17ff407099 100644
--- a/src/devices/nm-device-generic.c
+++ b/src/core/devices/nm-device-generic.c
diff --git a/src/devices/nm-device-generic.h b/src/core/devices/nm-device-generic.h
index 48c4352389..48c4352389 100644
--- a/src/devices/nm-device-generic.h
+++ b/src/core/devices/nm-device-generic.h
diff --git a/src/devices/nm-device-infiniband.c b/src/core/devices/nm-device-infiniband.c
index af1a49b2a4..af1a49b2a4 100644
--- a/src/devices/nm-device-infiniband.c
+++ b/src/core/devices/nm-device-infiniband.c
diff --git a/src/devices/nm-device-infiniband.h b/src/core/devices/nm-device-infiniband.h
index 69994a2d53..69994a2d53 100644
--- a/src/devices/nm-device-infiniband.h
+++ b/src/core/devices/nm-device-infiniband.h
diff --git a/src/devices/nm-device-ip-tunnel.c b/src/core/devices/nm-device-ip-tunnel.c
index 9124c44643..9124c44643 100644
--- a/src/devices/nm-device-ip-tunnel.c
+++ b/src/core/devices/nm-device-ip-tunnel.c
diff --git a/src/devices/nm-device-ip-tunnel.h b/src/core/devices/nm-device-ip-tunnel.h
index 0a941cc24d..0a941cc24d 100644
--- a/src/devices/nm-device-ip-tunnel.h
+++ b/src/core/devices/nm-device-ip-tunnel.h
diff --git a/src/devices/nm-device-logging.h b/src/core/devices/nm-device-logging.h
index 844e994940..844e994940 100644
--- a/src/devices/nm-device-logging.h
+++ b/src/core/devices/nm-device-logging.h
diff --git a/src/devices/nm-device-macsec.c b/src/core/devices/nm-device-macsec.c
index 390cc6dccd..390cc6dccd 100644
--- a/src/devices/nm-device-macsec.c
+++ b/src/core/devices/nm-device-macsec.c
diff --git a/src/devices/nm-device-macsec.h b/src/core/devices/nm-device-macsec.h
index e91fe51cb2..e91fe51cb2 100644
--- a/src/devices/nm-device-macsec.h
+++ b/src/core/devices/nm-device-macsec.h
diff --git a/src/devices/nm-device-macvlan.c b/src/core/devices/nm-device-macvlan.c
index 051f9d6784..051f9d6784 100644
--- a/src/devices/nm-device-macvlan.c
+++ b/src/core/devices/nm-device-macvlan.c
diff --git a/src/devices/nm-device-macvlan.h b/src/core/devices/nm-device-macvlan.h
index 109a2bcde5..109a2bcde5 100644
--- a/src/devices/nm-device-macvlan.h
+++ b/src/core/devices/nm-device-macvlan.h
diff --git a/src/devices/nm-device-ppp.c b/src/core/devices/nm-device-ppp.c
index e8a2cb8a09..e8a2cb8a09 100644
--- a/src/devices/nm-device-ppp.c
+++ b/src/core/devices/nm-device-ppp.c
diff --git a/src/devices/nm-device-ppp.h b/src/core/devices/nm-device-ppp.h
index 24c119ab4e..24c119ab4e 100644
--- a/src/devices/nm-device-ppp.h
+++ b/src/core/devices/nm-device-ppp.h
diff --git a/src/devices/nm-device-private.h b/src/core/devices/nm-device-private.h
index 8675a699a3..8675a699a3 100644
--- a/src/devices/nm-device-private.h
+++ b/src/core/devices/nm-device-private.h
diff --git a/src/devices/nm-device-tun.c b/src/core/devices/nm-device-tun.c
index c4dd4b47bb..c4dd4b47bb 100644
--- a/src/devices/nm-device-tun.c
+++ b/src/core/devices/nm-device-tun.c
diff --git a/src/devices/nm-device-tun.h b/src/core/devices/nm-device-tun.h
index 84497ea066..84497ea066 100644
--- a/src/devices/nm-device-tun.h
+++ b/src/core/devices/nm-device-tun.h
diff --git a/src/devices/nm-device-veth.c b/src/core/devices/nm-device-veth.c
index 0fc76b1b86..0fc76b1b86 100644
--- a/src/devices/nm-device-veth.c
+++ b/src/core/devices/nm-device-veth.c
diff --git a/src/devices/nm-device-veth.h b/src/core/devices/nm-device-veth.h
index d43a0a4bf2..d43a0a4bf2 100644
--- a/src/devices/nm-device-veth.h
+++ b/src/core/devices/nm-device-veth.h
diff --git a/src/devices/nm-device-vlan.c b/src/core/devices/nm-device-vlan.c
index edb16ed1ed..edb16ed1ed 100644
--- a/src/devices/nm-device-vlan.c
+++ b/src/core/devices/nm-device-vlan.c
diff --git a/src/devices/nm-device-vlan.h b/src/core/devices/nm-device-vlan.h
index 5270706fe3..5270706fe3 100644
--- a/src/devices/nm-device-vlan.h
+++ b/src/core/devices/nm-device-vlan.h
diff --git a/src/devices/nm-device-vrf.c b/src/core/devices/nm-device-vrf.c
index 6e672b665f..6e672b665f 100644
--- a/src/devices/nm-device-vrf.c
+++ b/src/core/devices/nm-device-vrf.c
diff --git a/src/devices/nm-device-vrf.h b/src/core/devices/nm-device-vrf.h
index 5169041c55..5169041c55 100644
--- a/src/devices/nm-device-vrf.h
+++ b/src/core/devices/nm-device-vrf.h
diff --git a/src/devices/nm-device-vxlan.c b/src/core/devices/nm-device-vxlan.c
index 763aee95e5..763aee95e5 100644
--- a/src/devices/nm-device-vxlan.c
+++ b/src/core/devices/nm-device-vxlan.c
diff --git a/src/devices/nm-device-vxlan.h b/src/core/devices/nm-device-vxlan.h
index 4c4165e5ce..4c4165e5ce 100644
--- a/src/devices/nm-device-vxlan.h
+++ b/src/core/devices/nm-device-vxlan.h
diff --git a/src/devices/nm-device-wireguard.c b/src/core/devices/nm-device-wireguard.c
index 1b109969ee..1b109969ee 100644
--- a/src/devices/nm-device-wireguard.c
+++ b/src/core/devices/nm-device-wireguard.c
diff --git a/src/devices/nm-device-wireguard.h b/src/core/devices/nm-device-wireguard.h
index 7e18bdba61..7e18bdba61 100644
--- a/src/devices/nm-device-wireguard.h
+++ b/src/core/devices/nm-device-wireguard.h
diff --git a/src/devices/nm-device-wpan.c b/src/core/devices/nm-device-wpan.c
index 05b48a70d3..05b48a70d3 100644
--- a/src/devices/nm-device-wpan.c
+++ b/src/core/devices/nm-device-wpan.c
diff --git a/src/devices/nm-device-wpan.h b/src/core/devices/nm-device-wpan.h
index 969929ae89..969929ae89 100644
--- a/src/devices/nm-device-wpan.h
+++ b/src/core/devices/nm-device-wpan.h
diff --git a/src/devices/nm-device.c b/src/core/devices/nm-device.c
index c7c459f499..c7c459f499 100644
--- a/src/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
diff --git a/src/devices/nm-device.h b/src/core/devices/nm-device.h
index 72777d0aaf..72777d0aaf 100644
--- a/src/devices/nm-device.h
+++ b/src/core/devices/nm-device.h
diff --git a/src/devices/nm-lldp-listener.c b/src/core/devices/nm-lldp-listener.c
index e645b9d620..e645b9d620 100644
--- a/src/devices/nm-lldp-listener.c
+++ b/src/core/devices/nm-lldp-listener.c
diff --git a/src/devices/nm-lldp-listener.h b/src/core/devices/nm-lldp-listener.h
index 9d3e243685..9d3e243685 100644
--- a/src/devices/nm-lldp-listener.h
+++ b/src/core/devices/nm-lldp-listener.h
diff --git a/src/devices/ovs/meson.build b/src/core/devices/ovs/meson.build
index 81c29bd6d4..81c29bd6d4 100644
--- a/src/devices/ovs/meson.build
+++ b/src/core/devices/ovs/meson.build
diff --git a/src/devices/ovs/nm-device-ovs-bridge.c b/src/core/devices/ovs/nm-device-ovs-bridge.c
index 1b7035bd9d..1b7035bd9d 100644
--- a/src/devices/ovs/nm-device-ovs-bridge.c
+++ b/src/core/devices/ovs/nm-device-ovs-bridge.c
diff --git a/src/devices/ovs/nm-device-ovs-bridge.h b/src/core/devices/ovs/nm-device-ovs-bridge.h
index 2b89334311..2b89334311 100644
--- a/src/devices/ovs/nm-device-ovs-bridge.h
+++ b/src/core/devices/ovs/nm-device-ovs-bridge.h
diff --git a/src/devices/ovs/nm-device-ovs-interface.c b/src/core/devices/ovs/nm-device-ovs-interface.c
index b9d3d509e9..b9d3d509e9 100644
--- a/src/devices/ovs/nm-device-ovs-interface.c
+++ b/src/core/devices/ovs/nm-device-ovs-interface.c
diff --git a/src/devices/ovs/nm-device-ovs-interface.h b/src/core/devices/ovs/nm-device-ovs-interface.h
index 03b0e9a40d..03b0e9a40d 100644
--- a/src/devices/ovs/nm-device-ovs-interface.h
+++ b/src/core/devices/ovs/nm-device-ovs-interface.h
diff --git a/src/devices/ovs/nm-device-ovs-port.c b/src/core/devices/ovs/nm-device-ovs-port.c
index 5f7a697d8f..5f7a697d8f 100644
--- a/src/devices/ovs/nm-device-ovs-port.c
+++ b/src/core/devices/ovs/nm-device-ovs-port.c
diff --git a/src/devices/ovs/nm-device-ovs-port.h b/src/core/devices/ovs/nm-device-ovs-port.h
index f4516c014f..f4516c014f 100644
--- a/src/devices/ovs/nm-device-ovs-port.h
+++ b/src/core/devices/ovs/nm-device-ovs-port.h
diff --git a/src/devices/ovs/nm-ovs-factory.c b/src/core/devices/ovs/nm-ovs-factory.c
index 10b6d7f419..10b6d7f419 100644
--- a/src/devices/ovs/nm-ovs-factory.c
+++ b/src/core/devices/ovs/nm-ovs-factory.c
diff --git a/src/devices/ovs/nm-ovsdb.c b/src/core/devices/ovs/nm-ovsdb.c
index de54a2e6c9..de54a2e6c9 100644
--- a/src/devices/ovs/nm-ovsdb.c
+++ b/src/core/devices/ovs/nm-ovsdb.c
diff --git a/src/devices/ovs/nm-ovsdb.h b/src/core/devices/ovs/nm-ovsdb.h
index d0b4d19d45..d0b4d19d45 100644
--- a/src/devices/ovs/nm-ovsdb.h
+++ b/src/core/devices/ovs/nm-ovsdb.h
diff --git a/src/devices/team/meson.build b/src/core/devices/team/meson.build
index d0ff4caa93..d0ff4caa93 100644
--- a/src/devices/team/meson.build
+++ b/src/core/devices/team/meson.build
diff --git a/src/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c
index 7b7a679617..7b7a679617 100644
--- a/src/devices/team/nm-device-team.c
+++ b/src/core/devices/team/nm-device-team.c
diff --git a/src/devices/team/nm-device-team.h b/src/core/devices/team/nm-device-team.h
index 6f5cff9326..6f5cff9326 100644
--- a/src/devices/team/nm-device-team.h
+++ b/src/core/devices/team/nm-device-team.h
diff --git a/src/devices/team/nm-team-factory.c b/src/core/devices/team/nm-team-factory.c
index ce623e29e2..ce623e29e2 100644
--- a/src/devices/team/nm-team-factory.c
+++ b/src/core/devices/team/nm-team-factory.c
diff --git a/src/devices/tests/meson.build b/src/core/devices/tests/meson.build
index 1bc883706e..1bc883706e 100644
--- a/src/devices/tests/meson.build
+++ b/src/core/devices/tests/meson.build
diff --git a/src/devices/tests/test-acd.c b/src/core/devices/tests/test-acd.c
index 875dfff9e1..875dfff9e1 100644
--- a/src/devices/tests/test-acd.c
+++ b/src/core/devices/tests/test-acd.c
diff --git a/src/devices/tests/test-lldp.c b/src/core/devices/tests/test-lldp.c
index 04c3b5b6fe..04c3b5b6fe 100644
--- a/src/devices/tests/test-lldp.c
+++ b/src/core/devices/tests/test-lldp.c
diff --git a/src/devices/wifi/meson.build b/src/core/devices/wifi/meson.build
index 743937dbda..743937dbda 100644
--- a/src/devices/wifi/meson.build
+++ b/src/core/devices/wifi/meson.build
diff --git a/src/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c
index 8bfdcaa309..8bfdcaa309 100644
--- a/src/devices/wifi/nm-device-iwd.c
+++ b/src/core/devices/wifi/nm-device-iwd.c
diff --git a/src/devices/wifi/nm-device-iwd.h b/src/core/devices/wifi/nm-device-iwd.h
index ce94c9ea75..ce94c9ea75 100644
--- a/src/devices/wifi/nm-device-iwd.h
+++ b/src/core/devices/wifi/nm-device-iwd.h
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/core/devices/wifi/nm-device-olpc-mesh.c
index 1554411617..1554411617 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/core/devices/wifi/nm-device-olpc-mesh.c
diff --git a/src/devices/wifi/nm-device-olpc-mesh.h b/src/core/devices/wifi/nm-device-olpc-mesh.h
index 79b7fd5d70..79b7fd5d70 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.h
+++ b/src/core/devices/wifi/nm-device-olpc-mesh.h
diff --git a/src/devices/wifi/nm-device-wifi-p2p.c b/src/core/devices/wifi/nm-device-wifi-p2p.c
index b2f071fb55..b2f071fb55 100644
--- a/src/devices/wifi/nm-device-wifi-p2p.c
+++ b/src/core/devices/wifi/nm-device-wifi-p2p.c
diff --git a/src/devices/wifi/nm-device-wifi-p2p.h b/src/core/devices/wifi/nm-device-wifi-p2p.h
index d1aadd8ebd..d1aadd8ebd 100644
--- a/src/devices/wifi/nm-device-wifi-p2p.h
+++ b/src/core/devices/wifi/nm-device-wifi-p2p.h
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/core/devices/wifi/nm-device-wifi.c
index 6375412ce8..6375412ce8 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/core/devices/wifi/nm-device-wifi.c
diff --git a/src/devices/wifi/nm-device-wifi.h b/src/core/devices/wifi/nm-device-wifi.h
index d9e9038cc0..d9e9038cc0 100644
--- a/src/devices/wifi/nm-device-wifi.h
+++ b/src/core/devices/wifi/nm-device-wifi.h
diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/core/devices/wifi/nm-iwd-manager.c
index 5ded8e15a6..5ded8e15a6 100644
--- a/src/devices/wifi/nm-iwd-manager.c
+++ b/src/core/devices/wifi/nm-iwd-manager.c
diff --git a/src/devices/wifi/nm-iwd-manager.h b/src/core/devices/wifi/nm-iwd-manager.h
index 466f67c766..466f67c766 100644
--- a/src/devices/wifi/nm-iwd-manager.h
+++ b/src/core/devices/wifi/nm-iwd-manager.h
diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/core/devices/wifi/nm-wifi-ap.c
index 4df2f35c00..4df2f35c00 100644
--- a/src/devices/wifi/nm-wifi-ap.c
+++ b/src/core/devices/wifi/nm-wifi-ap.c
diff --git a/src/devices/wifi/nm-wifi-ap.h b/src/core/devices/wifi/nm-wifi-ap.h
index bdd72415f1..bdd72415f1 100644
--- a/src/devices/wifi/nm-wifi-ap.h
+++ b/src/core/devices/wifi/nm-wifi-ap.h
diff --git a/src/devices/wifi/nm-wifi-common.c b/src/core/devices/wifi/nm-wifi-common.c
index 053537af7f..053537af7f 100644
--- a/src/devices/wifi/nm-wifi-common.c
+++ b/src/core/devices/wifi/nm-wifi-common.c
diff --git a/src/devices/wifi/nm-wifi-common.h b/src/core/devices/wifi/nm-wifi-common.h
index fd6f47ed43..fd6f47ed43 100644
--- a/src/devices/wifi/nm-wifi-common.h
+++ b/src/core/devices/wifi/nm-wifi-common.h
diff --git a/src/devices/wifi/nm-wifi-factory.c b/src/core/devices/wifi/nm-wifi-factory.c
index c4afd3fe24..c4afd3fe24 100644
--- a/src/devices/wifi/nm-wifi-factory.c
+++ b/src/core/devices/wifi/nm-wifi-factory.c
diff --git a/src/devices/wifi/nm-wifi-p2p-peer.c b/src/core/devices/wifi/nm-wifi-p2p-peer.c
index 01f4f9bba5..01f4f9bba5 100644
--- a/src/devices/wifi/nm-wifi-p2p-peer.c
+++ b/src/core/devices/wifi/nm-wifi-p2p-peer.c
diff --git a/src/devices/wifi/nm-wifi-p2p-peer.h b/src/core/devices/wifi/nm-wifi-p2p-peer.h
index ee4bfb53fe..ee4bfb53fe 100644
--- a/src/devices/wifi/nm-wifi-p2p-peer.h
+++ b/src/core/devices/wifi/nm-wifi-p2p-peer.h
diff --git a/src/devices/wifi/nm-wifi-utils.c b/src/core/devices/wifi/nm-wifi-utils.c
index f0b772c647..f0b772c647 100644
--- a/src/devices/wifi/nm-wifi-utils.c
+++ b/src/core/devices/wifi/nm-wifi-utils.c
diff --git a/src/devices/wifi/nm-wifi-utils.h b/src/core/devices/wifi/nm-wifi-utils.h
index 6646bca3ba..6646bca3ba 100644
--- a/src/devices/wifi/nm-wifi-utils.h
+++ b/src/core/devices/wifi/nm-wifi-utils.h
diff --git a/src/devices/wifi/tests/test-devices-wifi.c b/src/core/devices/wifi/tests/test-devices-wifi.c
index 3ff09639d8..3ff09639d8 100644
--- a/src/devices/wifi/tests/test-devices-wifi.c
+++ b/src/core/devices/wifi/tests/test-devices-wifi.c
diff --git a/src/devices/wwan/libnm-wwan.ver b/src/core/devices/wwan/libnm-wwan.ver
index c368a5907d..c368a5907d 100644
--- a/src/devices/wwan/libnm-wwan.ver
+++ b/src/core/devices/wwan/libnm-wwan.ver
diff --git a/src/devices/wwan/meson.build b/src/core/devices/wwan/meson.build
index 87af042949..87af042949 100644
--- a/src/devices/wwan/meson.build
+++ b/src/core/devices/wwan/meson.build
diff --git a/src/devices/wwan/nm-device-modem.c b/src/core/devices/wwan/nm-device-modem.c
index a715cebb61..a715cebb61 100644
--- a/src/devices/wwan/nm-device-modem.c
+++ b/src/core/devices/wwan/nm-device-modem.c
diff --git a/src/devices/wwan/nm-device-modem.h b/src/core/devices/wwan/nm-device-modem.h
index f171d76f6e..f171d76f6e 100644
--- a/src/devices/wwan/nm-device-modem.h
+++ b/src/core/devices/wwan/nm-device-modem.h
diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/core/devices/wwan/nm-modem-broadband.c
index d2debac5bf..d2debac5bf 100644
--- a/src/devices/wwan/nm-modem-broadband.c
+++ b/src/core/devices/wwan/nm-modem-broadband.c
diff --git a/src/devices/wwan/nm-modem-broadband.h b/src/core/devices/wwan/nm-modem-broadband.h
index 627fe25a02..627fe25a02 100644
--- a/src/devices/wwan/nm-modem-broadband.h
+++ b/src/core/devices/wwan/nm-modem-broadband.h
diff --git a/src/devices/wwan/nm-modem-manager.c b/src/core/devices/wwan/nm-modem-manager.c
index d05c77a148..d05c77a148 100644
--- a/src/devices/wwan/nm-modem-manager.c
+++ b/src/core/devices/wwan/nm-modem-manager.c
diff --git a/src/devices/wwan/nm-modem-manager.h b/src/core/devices/wwan/nm-modem-manager.h
index e89a032b45..e89a032b45 100644
--- a/src/devices/wwan/nm-modem-manager.h
+++ b/src/core/devices/wwan/nm-modem-manager.h
diff --git a/src/devices/wwan/nm-modem-ofono.c b/src/core/devices/wwan/nm-modem-ofono.c
index ec43cd82d0..ec43cd82d0 100644
--- a/src/devices/wwan/nm-modem-ofono.c
+++ b/src/core/devices/wwan/nm-modem-ofono.c
diff --git a/src/devices/wwan/nm-modem-ofono.h b/src/core/devices/wwan/nm-modem-ofono.h
index 260e395474..260e395474 100644
--- a/src/devices/wwan/nm-modem-ofono.h
+++ b/src/core/devices/wwan/nm-modem-ofono.h
diff --git a/src/devices/wwan/nm-modem.c b/src/core/devices/wwan/nm-modem.c
index 4e4412279e..4e4412279e 100644
--- a/src/devices/wwan/nm-modem.c
+++ b/src/core/devices/wwan/nm-modem.c
diff --git a/src/devices/wwan/nm-modem.h b/src/core/devices/wwan/nm-modem.h
index 87162cfca7..87162cfca7 100644
--- a/src/devices/wwan/nm-modem.h
+++ b/src/core/devices/wwan/nm-modem.h
diff --git a/src/devices/wwan/nm-service-providers.c b/src/core/devices/wwan/nm-service-providers.c
index b9187036a2..b9187036a2 100644
--- a/src/devices/wwan/nm-service-providers.c
+++ b/src/core/devices/wwan/nm-service-providers.c
diff --git a/src/devices/wwan/nm-service-providers.h b/src/core/devices/wwan/nm-service-providers.h
index 959f660ae4..959f660ae4 100644
--- a/src/devices/wwan/nm-service-providers.h
+++ b/src/core/devices/wwan/nm-service-providers.h
diff --git a/src/devices/wwan/nm-wwan-factory.c b/src/core/devices/wwan/nm-wwan-factory.c
index 7418d7aaca..7418d7aaca 100644
--- a/src/devices/wwan/nm-wwan-factory.c
+++ b/src/core/devices/wwan/nm-wwan-factory.c
diff --git a/src/devices/wwan/tests/test-service-providers.c b/src/core/devices/wwan/tests/test-service-providers.c
index 3ac3fed506..2c54a76401 100644
--- a/src/devices/wwan/tests/test-service-providers.c
+++ b/src/core/devices/wwan/tests/test-service-providers.c
@@ -43,7 +43,7 @@ test_positive(void)
     GMainLoop *loop = g_main_loop_new(NULL, FALSE);
 
     nm_service_providers_find_gsm_apn(NM_BUILD_SRCDIR
-                                      "/src/devices/wwan/tests/test-service-providers.xml",
+                                      "/src/core/devices/wwan/tests/test-service-providers.xml",
                                       "13337",
                                       NULL,
                                       test_positive_cb,
@@ -76,7 +76,7 @@ test_negative(void)
     GMainLoop *loop = g_main_loop_new(NULL, FALSE);
 
     nm_service_providers_find_gsm_apn(NM_BUILD_SRCDIR
-                                      "/src/devices/wwan/tests/test-service-providers.xml",
+                                      "/src/core/devices/wwan/tests/test-service-providers.xml",
                                       "78130",
                                       NULL,
                                       test_negative_cb,
diff --git a/src/devices/wwan/tests/test-service-providers.xml b/src/core/devices/wwan/tests/test-service-providers.xml
index f0ca2debce..f0ca2debce 100644
--- a/src/devices/wwan/tests/test-service-providers.xml
+++ b/src/core/devices/wwan/tests/test-service-providers.xml
diff --git a/src/dhcp/meson.build b/src/core/dhcp/meson.build
index ea0d056265..ea0d056265 100644
--- a/src/dhcp/meson.build
+++ b/src/core/dhcp/meson.build
diff --git a/src/dhcp/nm-dhcp-client-logging.h b/src/core/dhcp/nm-dhcp-client-logging.h
index d69b3ebd72..d69b3ebd72 100644
--- a/src/dhcp/nm-dhcp-client-logging.h
+++ b/src/core/dhcp/nm-dhcp-client-logging.h
diff --git a/src/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c
index 3ee8510b58..3ee8510b58 100644
--- a/src/dhcp/nm-dhcp-client.c
+++ b/src/core/dhcp/nm-dhcp-client.c
diff --git a/src/dhcp/nm-dhcp-client.h b/src/core/dhcp/nm-dhcp-client.h
index 72ab477dfb..72ab477dfb 100644
--- a/src/dhcp/nm-dhcp-client.h
+++ b/src/core/dhcp/nm-dhcp-client.h
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/core/dhcp/nm-dhcp-dhclient-utils.c
index 14a2b96e64..14a2b96e64 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.c
+++ b/src/core/dhcp/nm-dhcp-dhclient-utils.c
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.h b/src/core/dhcp/nm-dhcp-dhclient-utils.h
index ed7c1c7c96..ed7c1c7c96 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.h
+++ b/src/core/dhcp/nm-dhcp-dhclient-utils.h
diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/core/dhcp/nm-dhcp-dhclient.c
index 53d1ba760d..53d1ba760d 100644
--- a/src/dhcp/nm-dhcp-dhclient.c
+++ b/src/core/dhcp/nm-dhcp-dhclient.c
diff --git a/src/dhcp/nm-dhcp-dhcpcanon.c b/src/core/dhcp/nm-dhcp-dhcpcanon.c
index db75958f1e..db75958f1e 100644
--- a/src/dhcp/nm-dhcp-dhcpcanon.c
+++ b/src/core/dhcp/nm-dhcp-dhcpcanon.c
diff --git a/src/dhcp/nm-dhcp-dhcpcd.c b/src/core/dhcp/nm-dhcp-dhcpcd.c
index 4f45c3a7e5..4f45c3a7e5 100644
--- a/src/dhcp/nm-dhcp-dhcpcd.c
+++ b/src/core/dhcp/nm-dhcp-dhcpcd.c
diff --git a/src/dhcp/nm-dhcp-helper-api.h b/src/core/dhcp/nm-dhcp-helper-api.h
index ffbf3f7296..ffbf3f7296 100644
--- a/src/dhcp/nm-dhcp-helper-api.h
+++ b/src/core/dhcp/nm-dhcp-helper-api.h
diff --git a/src/dhcp/nm-dhcp-helper.c b/src/core/dhcp/nm-dhcp-helper.c
index 94ee181e6a..94ee181e6a 100644
--- a/src/dhcp/nm-dhcp-helper.c
+++ b/src/core/dhcp/nm-dhcp-helper.c
diff --git a/src/dhcp/nm-dhcp-listener.c b/src/core/dhcp/nm-dhcp-listener.c
index 279ce4984c..279ce4984c 100644
--- a/src/dhcp/nm-dhcp-listener.c
+++ b/src/core/dhcp/nm-dhcp-listener.c
diff --git a/src/dhcp/nm-dhcp-listener.h b/src/core/dhcp/nm-dhcp-listener.h
index 5f3c952cf9..5f3c952cf9 100644
--- a/src/dhcp/nm-dhcp-listener.h
+++ b/src/core/dhcp/nm-dhcp-listener.h
diff --git a/src/dhcp/nm-dhcp-manager.c b/src/core/dhcp/nm-dhcp-manager.c
index ca99122ae5..ca99122ae5 100644
--- a/src/dhcp/nm-dhcp-manager.c
+++ b/src/core/dhcp/nm-dhcp-manager.c
diff --git a/src/dhcp/nm-dhcp-manager.h b/src/core/dhcp/nm-dhcp-manager.h
index f7aba8a023..f7aba8a023 100644
--- a/src/dhcp/nm-dhcp-manager.h
+++ b/src/core/dhcp/nm-dhcp-manager.h
diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c
index 87e17f5cca..87e17f5cca 100644
--- a/src/dhcp/nm-dhcp-nettools.c
+++ b/src/core/dhcp/nm-dhcp-nettools.c
diff --git a/src/dhcp/nm-dhcp-options.c b/src/core/dhcp/nm-dhcp-options.c
index 13d85015d3..13d85015d3 100644
--- a/src/dhcp/nm-dhcp-options.c
+++ b/src/core/dhcp/nm-dhcp-options.c
diff --git a/src/dhcp/nm-dhcp-options.h b/src/core/dhcp/nm-dhcp-options.h
index c2a403a4b5..c2a403a4b5 100644
--- a/src/dhcp/nm-dhcp-options.h
+++ b/src/core/dhcp/nm-dhcp-options.h
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/core/dhcp/nm-dhcp-systemd.c
index ea505110ac..ea505110ac 100644
--- a/src/dhcp/nm-dhcp-systemd.c
+++ b/src/core/dhcp/nm-dhcp-systemd.c
diff --git a/src/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c
index ed11a6ea30..ed11a6ea30 100644
--- a/src/dhcp/nm-dhcp-utils.c
+++ b/src/core/dhcp/nm-dhcp-utils.c
diff --git a/src/dhcp/nm-dhcp-utils.h b/src/core/dhcp/nm-dhcp-utils.h
index f5bc53a215..f5bc53a215 100644
--- a/src/dhcp/nm-dhcp-utils.h
+++ b/src/core/dhcp/nm-dhcp-utils.h
diff --git a/src/dhcp/tests/meson.build b/src/core/dhcp/tests/meson.build
index e43c8cab36..e43c8cab36 100644
--- a/src/dhcp/tests/meson.build
+++ b/src/core/dhcp/tests/meson.build
diff --git a/src/dhcp/tests/test-dhclient-commented-duid.leases b/src/core/dhcp/tests/test-dhclient-commented-duid.leases
index 3e46ae7d0b..3e46ae7d0b 100644
--- a/src/dhcp/tests/test-dhclient-commented-duid.leases
+++ b/src/core/dhcp/tests/test-dhclient-commented-duid.leases
diff --git a/src/dhcp/tests/test-dhclient-duid.leases b/src/core/dhcp/tests/test-dhclient-duid.leases
index 229331d47f..229331d47f 100644
--- a/src/dhcp/tests/test-dhclient-duid.leases
+++ b/src/core/dhcp/tests/test-dhclient-duid.leases
diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/core/dhcp/tests/test-dhcp-dhclient.c
index 4821aa8088..6b3ec7a127 100644
--- a/src/dhcp/tests/test-dhcp-dhclient.c
+++ b/src/core/dhcp/tests/test-dhcp-dhclient.c
@@ -20,7 +20,7 @@
 
 #include "nm-test-utils-core.h"
 
-#define TEST_DIR    NM_BUILD_SRCDIR "/src/dhcp/tests"
+#define TEST_DIR    NM_BUILD_SRCDIR "/src/core/dhcp/tests"
 #define TEST_MUDURL "https://example.com/mud.json"
 
 static void
diff --git a/src/dhcp/tests/test-dhcp-utils.c b/src/core/dhcp/tests/test-dhcp-utils.c
index dc58688f97..dc58688f97 100644
--- a/src/dhcp/tests/test-dhcp-utils.c
+++ b/src/core/dhcp/tests/test-dhcp-utils.c
diff --git a/src/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c
index 82470e02f7..82470e02f7 100644
--- a/src/dns/nm-dns-dnsmasq.c
+++ b/src/core/dns/nm-dns-dnsmasq.c
diff --git a/src/dns/nm-dns-dnsmasq.h b/src/core/dns/nm-dns-dnsmasq.h
index bd6d4c60b7..bd6d4c60b7 100644
--- a/src/dns/nm-dns-dnsmasq.h
+++ b/src/core/dns/nm-dns-dnsmasq.h
diff --git a/src/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c
index 92f0ef3947..92f0ef3947 100644
--- a/src/dns/nm-dns-manager.c
+++ b/src/core/dns/nm-dns-manager.c
diff --git a/src/dns/nm-dns-manager.h b/src/core/dns/nm-dns-manager.h
index 937ba62a05..937ba62a05 100644
--- a/src/dns/nm-dns-manager.h
+++ b/src/core/dns/nm-dns-manager.h
diff --git a/src/dns/nm-dns-plugin.c b/src/core/dns/nm-dns-plugin.c
index 3233b6f0d7..3233b6f0d7 100644
--- a/src/dns/nm-dns-plugin.c
+++ b/src/core/dns/nm-dns-plugin.c
diff --git a/src/dns/nm-dns-plugin.h b/src/core/dns/nm-dns-plugin.h
index 644d01e51b..644d01e51b 100644
--- a/src/dns/nm-dns-plugin.h
+++ b/src/core/dns/nm-dns-plugin.h
diff --git a/src/dns/nm-dns-systemd-resolved.c b/src/core/dns/nm-dns-systemd-resolved.c
index 3535d3dcad..3535d3dcad 100644
--- a/src/dns/nm-dns-systemd-resolved.c
+++ b/src/core/dns/nm-dns-systemd-resolved.c
diff --git a/src/dns/nm-dns-systemd-resolved.h b/src/core/dns/nm-dns-systemd-resolved.h
index 4ab04ab49c..4ab04ab49c 100644
--- a/src/dns/nm-dns-systemd-resolved.h
+++ b/src/core/dns/nm-dns-systemd-resolved.h
diff --git a/src/dns/nm-dns-unbound.c b/src/core/dns/nm-dns-unbound.c
index ee162c333b..ee162c333b 100644
--- a/src/dns/nm-dns-unbound.c
+++ b/src/core/dns/nm-dns-unbound.c
diff --git a/src/dns/nm-dns-unbound.h b/src/core/dns/nm-dns-unbound.h
index feb3309913..feb3309913 100644
--- a/src/dns/nm-dns-unbound.h
+++ b/src/core/dns/nm-dns-unbound.h
diff --git a/src/dnsmasq/nm-dnsmasq-manager.c b/src/core/dnsmasq/nm-dnsmasq-manager.c
index 00b02a05aa..00b02a05aa 100644
--- a/src/dnsmasq/nm-dnsmasq-manager.c
+++ b/src/core/dnsmasq/nm-dnsmasq-manager.c
diff --git a/src/dnsmasq/nm-dnsmasq-manager.h b/src/core/dnsmasq/nm-dnsmasq-manager.h
index 272d1cead1..272d1cead1 100644
--- a/src/dnsmasq/nm-dnsmasq-manager.h
+++ b/src/core/dnsmasq/nm-dnsmasq-manager.h
diff --git a/src/dnsmasq/nm-dnsmasq-utils.c b/src/core/dnsmasq/nm-dnsmasq-utils.c
index 3bd7c93ff9..3bd7c93ff9 100644
--- a/src/dnsmasq/nm-dnsmasq-utils.c
+++ b/src/core/dnsmasq/nm-dnsmasq-utils.c
diff --git a/src/dnsmasq/nm-dnsmasq-utils.h b/src/core/dnsmasq/nm-dnsmasq-utils.h
index 57bbc4c40c..57bbc4c40c 100644
--- a/src/dnsmasq/nm-dnsmasq-utils.h
+++ b/src/core/dnsmasq/nm-dnsmasq-utils.h
diff --git a/src/dnsmasq/tests/meson.build b/src/core/dnsmasq/tests/meson.build
index 565c18ad2a..565c18ad2a 100644
--- a/src/dnsmasq/tests/meson.build
+++ b/src/core/dnsmasq/tests/meson.build
diff --git a/src/dnsmasq/tests/test-dnsmasq-utils.c b/src/core/dnsmasq/tests/test-dnsmasq-utils.c
index 6eadf294ef..6eadf294ef 100644
--- a/src/dnsmasq/tests/test-dnsmasq-utils.c
+++ b/src/core/dnsmasq/tests/test-dnsmasq-utils.c
diff --git a/src/initrd/meson.build b/src/core/initrd/meson.build
index bd590e8ca5..bd590e8ca5 100644
--- a/src/initrd/meson.build
+++ b/src/core/initrd/meson.build
diff --git a/src/initrd/nm-initrd-generator.c b/src/core/initrd/nm-initrd-generator.c
index 654adf9497..654adf9497 100644
--- a/src/initrd/nm-initrd-generator.c
+++ b/src/core/initrd/nm-initrd-generator.c
diff --git a/src/initrd/nm-initrd-generator.h b/src/core/initrd/nm-initrd-generator.h
index 56dcfd68f3..56dcfd68f3 100644
--- a/src/initrd/nm-initrd-generator.h
+++ b/src/core/initrd/nm-initrd-generator.h
diff --git a/src/initrd/nmi-cmdline-reader.c b/src/core/initrd/nmi-cmdline-reader.c
index 662b98055d..662b98055d 100644
--- a/src/initrd/nmi-cmdline-reader.c
+++ b/src/core/initrd/nmi-cmdline-reader.c
diff --git a/src/initrd/nmi-dt-reader.c b/src/core/initrd/nmi-dt-reader.c
index 5c406a4963..5c406a4963 100644
--- a/src/initrd/nmi-dt-reader.c
+++ b/src/core/initrd/nmi-dt-reader.c
diff --git a/src/initrd/nmi-ibft-reader.c b/src/core/initrd/nmi-ibft-reader.c
index 4080ede5ff..4080ede5ff 100644
--- a/src/initrd/nmi-ibft-reader.c
+++ b/src/core/initrd/nmi-ibft-reader.c
diff --git a/src/initrd/tests/meson.build b/src/core/initrd/tests/meson.build
index 51650d0f15..51650d0f15 100644
--- a/src/initrd/tests/meson.build
+++ b/src/core/initrd/tests/meson.build
diff --git a/src/initrd/tests/sysfs-bad-dns1/class/net/eth0/address b/src/core/initrd/tests/sysfs-bad-dns1/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-dns1/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs-bad-dns1/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway
index bf6cf4543f..bf6cf4543f 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr
index 944c8d4565..944c8d4565 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns
index 2303dbdcbc..2303dbdcbc 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name
+++ b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name
diff --git a/src/initrd/tests/sysfs-bad-dns2/class/net/eth0/address b/src/core/initrd/tests/sysfs-bad-dns2/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-dns2/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs-bad-dns2/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway
index bf6cf4543f..bf6cf4543f 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr
index 944c8d4565..944c8d4565 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns
index 5ed7b71958..5ed7b71958 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name
+++ b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name
diff --git a/src/initrd/tests/sysfs-bad-gateway/class/net/eth0/address b/src/core/initrd/tests/sysfs-bad-gateway/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-gateway/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs-bad-gateway/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway
index 1970856e09..1970856e09 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr
index 944c8d4565..944c8d4565 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name
+++ b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address b/src/core/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway
index bf6cf4543f..bf6cf4543f 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr
index d526f3244f..d526f3244f 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name
+++ b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name
diff --git a/src/initrd/tests/sysfs-dhcp/class/net/eth0/address b/src/core/initrd/tests/sysfs-dhcp/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-dhcp/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs-dhcp/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs-dhcp/class/net/eth1/address b/src/core/initrd/tests/sysfs-dhcp/class/net/eth1/address
index befa7850fd..befa7850fd 100644
--- a/src/initrd/tests/sysfs-dhcp/class/net/eth1/address
+++ b/src/core/initrd/tests/sysfs-dhcp/class/net/eth1/address
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway
index 59ea5b826b..59ea5b826b 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin
index e440e5c842..e440e5c842 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway
index 59ea5b826b..59ea5b826b 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac
index befa7850fd..befa7850fd 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin
index e440e5c842..e440e5c842 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port
diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name
index ac3a6a2ab3..ac3a6a2ab3 100644
--- a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name
+++ b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name
diff --git a/src/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath b/src/core/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath
index 6f069ae0fc..6f069ae0fc 100644
--- a/src/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath
+++ b/src/core/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request
index 034d423ee3..034d423ee3 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response
index 25982d6f42..25982d6f42 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath
index db88070270..db88070270 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip
index 7bde8641b9..7bde8641b9 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip
index f108ba9b39..f108ba9b39 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name
index fe0f76b8ed..fe0f76b8ed 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name
index b34f9f968e..b34f9f968e 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip
index f036183536..f036183536 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name
index f3e5805251..f3e5805251 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip
index d441cd83fc..d441cd83fc 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path
index f76dd238ad..f76dd238ad 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip
index a2a4b2e8de..a2a4b2e8de 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file
index c0e0e3303e..c0e0e3303e 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options
index f76dd238ad..f76dd238ad 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type
index df3c9d9f4c..df3c9d9f4c 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address
index c983e75212..c983e75212 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address
index c983e75212..c983e75212 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address
diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name
index 88eaddfe14..88eaddfe14 100644
--- a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name
+++ b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name
diff --git a/src/initrd/tests/sysfs-static/class/net/eth0/address b/src/core/initrd/tests/sysfs-static/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-static/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs-static/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs-static/class/net/eth1/address b/src/core/initrd/tests/sysfs-static/class/net/eth1/address
index befa7850fd..befa7850fd 100644
--- a/src/initrd/tests/sysfs-static/class/net/eth1/address
+++ b/src/core/initrd/tests/sysfs-static/class/net/eth1/address
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway
index bf6cf4543f..bf6cf4543f 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr
index 944c8d4565..944c8d4565 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len
index 8fdd954df9..8fdd954df9 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask
index 7cb9d0a9bb..7cb9d0a9bb 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway
index 59ea5b826b..59ea5b826b 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac
index befa7850fd..befa7850fd 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin
index e440e5c842..e440e5c842 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns
index 2e152cb083..2e152cb083 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns
index 2eb9e1d0ad..2eb9e1d0ad 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name
index 509a7ab8be..509a7ab8be 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/target-name
index 32c9450a2f..32c9450a2f 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target0/target-name
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/target-name
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/index b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/index
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target1/index
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/index
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr
index 7450fdf90a..7450fdf90a 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/lun b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/lun
index c43d0930ca..c43d0930ca 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target1/lun
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/lun
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/port b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target1/port
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/port
diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/target-name b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/target-name
index ac3a6a2ab3..ac3a6a2ab3 100644
--- a/src/initrd/tests/sysfs-static/firmware/ibft/target1/target-name
+++ b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/target-name
diff --git a/src/initrd/tests/sysfs-vlan/class/net/eth0/address b/src/core/initrd/tests/sysfs-vlan/class/net/eth0/address
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-vlan/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs-vlan/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr
index 4923230c8c..4923230c8c 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac
index 20659db7e8..20659db7e8 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin
index 56a6051ca2..56a6051ca2 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len
index cabf43b5dd..cabf43b5dd 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask
index 5a279b41f0..5a279b41f0 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan
index d800886d9c..d800886d9c 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name
index 8e9cd2c42c..8e9cd2c42c 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/index
index c227083464..c227083464 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr
index a32ce01ba1..a32ce01ba1 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun
index f309ca6a0a..f309ca6a0a 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/port
index 58f0d919f4..58f0d919f4 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name
index f0e6115796..f0e6115796 100644
--- a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name
+++ b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name
diff --git a/src/initrd/tests/sysfs/class/net/eth0/address b/src/core/initrd/tests/sysfs/class/net/eth0/address
index 1f2f610ecc..1f2f610ecc 100644
--- a/src/initrd/tests/sysfs/class/net/eth0/address
+++ b/src/core/initrd/tests/sysfs/class/net/eth0/address
diff --git a/src/initrd/tests/sysfs/class/net/eth2/address b/src/core/initrd/tests/sysfs/class/net/eth2/address
index 6ec1078ab8..6ec1078ab8 100644
--- a/src/initrd/tests/sysfs/class/net/eth2/address
+++ b/src/core/initrd/tests/sysfs/class/net/eth2/address
diff --git a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id
index 590d9cd211..590d9cd211 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id
diff --git a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id
index 35d4d09ce2..35d4d09ce2 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id
diff --git a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/signature b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/signature
index e3a5d7ef22..e3a5d7ef22 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/signature
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/signature
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp
index 98a0d79742..98a0d79742 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/flags b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/flags
index 00750edc07..00750edc07 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/flags
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/flags
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway
index 7f378f8f97..7f378f8f97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname
index 3ed5163c84..3ed5163c84 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/index
index 573541ac97..573541ac97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/index
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/index
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr
index 98a0d79742..98a0d79742 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/mac
index f24413198a..f24413198a 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/mac
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/mac
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/origin
index b8626c4cff..b8626c4cff 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/origin
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/origin
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len
index 900731ffd5..900731ffd5 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns
index e7511d5af4..e7511d5af4 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns
index 1f6c5c9547..1f6c5c9547 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask
index 5df934545e..5df934545e 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan
index 7cc86ad136..7cc86ad136 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp
index 61ef5585ef..61ef5585ef 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/flags b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/flags
index 00750edc07..00750edc07 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/flags
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/flags
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway
index 2096f194ff..2096f194ff 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname
index 5dc539d584..5dc539d584 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/index b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/index
index 0cfbf08886..0cfbf08886 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/index
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/index
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr
index 61ef5585ef..61ef5585ef 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/mac b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/mac
index 2fc3d5253b..2fc3d5253b 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/mac
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/mac
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/origin b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/origin
index 00750edc07..00750edc07 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/origin
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/origin
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len
index a45fd52cc5..a45fd52cc5 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns
index 6fa8c74292..6fa8c74292 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns
index a7269ff5e9..a7269ff5e9 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask
index d30f9e9fdb..d30f9e9fdb 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask
diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan
index 573541ac97..573541ac97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan
diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/flags b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/flags
index 00750edc07..00750edc07 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/initiator/flags
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/flags
diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/index b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/index
index 573541ac97..573541ac97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/initiator/index
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/index
diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name
index 337b5a0f3a..337b5a0f3a 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name
diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/isns-server b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/isns-server
index 4aff93986c..4aff93986c 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/initiator/isns-server
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/isns-server
diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server
index a26fb64927..a26fb64927 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server
diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server
index 908be27f4b..908be27f4b 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server
diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/slp-server b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/slp-server
index fca9e24bd5..fca9e24bd5 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/initiator/slp-server
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/slp-server
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/chap-type b/src/core/initrd/tests/sysfs/firmware/ibft/target0/chap-type
index 573541ac97..573541ac97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target0/chap-type
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target0/chap-type
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/flags b/src/core/initrd/tests/sysfs/firmware/ibft/target0/flags
index 00750edc07..00750edc07 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target0/flags
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target0/flags
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs/firmware/ibft/target0/index
index 573541ac97..573541ac97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target0/index
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target0/index
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs/firmware/ibft/target0/ip-addr
index 994b6e9c69..994b6e9c69 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target0/ip-addr
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target0/ip-addr
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs/firmware/ibft/target0/lun
index 7c295bd444..7c295bd444 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target0/lun
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target0/lun
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc b/src/core/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc
index 573541ac97..573541ac97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs/firmware/ibft/target0/port
index 53f0295f3f..53f0295f3f 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target0/port
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target0/port
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/chap-type b/src/core/initrd/tests/sysfs/firmware/ibft/target2/chap-type
index 573541ac97..573541ac97 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/chap-type
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/chap-type
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/flags b/src/core/initrd/tests/sysfs/firmware/ibft/target2/flags
index 00750edc07..00750edc07 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/flags
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/flags
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/index b/src/core/initrd/tests/sysfs/firmware/ibft/target2/index
index 0cfbf08886..0cfbf08886 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/index
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/index
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/ip-addr b/src/core/initrd/tests/sysfs/firmware/ibft/target2/ip-addr
index a210477e6d..a210477e6d 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/ip-addr
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/ip-addr
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/lun b/src/core/initrd/tests/sysfs/firmware/ibft/target2/lun
index 7c295bd444..7c295bd444 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/lun
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/lun
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc b/src/core/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc
index 0cfbf08886..0cfbf08886 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/port b/src/core/initrd/tests/sysfs/firmware/ibft/target2/port
index 53f0295f3f..53f0295f3f 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/port
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/port
diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/target-name b/src/core/initrd/tests/sysfs/firmware/ibft/target2/target-name
index f409432041..f409432041 100644
--- a/src/initrd/tests/sysfs/firmware/ibft/target2/target-name
+++ b/src/core/initrd/tests/sysfs/firmware/ibft/target2/target-name
diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/core/initrd/tests/test-cmdline-reader.c
index 1dc0988e38..1dc0988e38 100644
--- a/src/initrd/tests/test-cmdline-reader.c
+++ b/src/core/initrd/tests/test-cmdline-reader.c
diff --git a/src/initrd/tests/test-dt-reader.c b/src/core/initrd/tests/test-dt-reader.c
index 982ccc3ac2..982ccc3ac2 100644
--- a/src/initrd/tests/test-dt-reader.c
+++ b/src/core/initrd/tests/test-dt-reader.c
diff --git a/src/initrd/tests/test-ibft-reader.c b/src/core/initrd/tests/test-ibft-reader.c
index 320153f81c..320153f81c 100644
--- a/src/initrd/tests/test-ibft-reader.c
+++ b/src/core/initrd/tests/test-ibft-reader.c
diff --git a/src/main-utils.c b/src/core/main-utils.c
index 357f20f6c0..357f20f6c0 100644
--- a/src/main-utils.c
+++ b/src/core/main-utils.c
diff --git a/src/main-utils.h b/src/core/main-utils.h
index 2eb731a1a6..2eb731a1a6 100644
--- a/src/main-utils.h
+++ b/src/core/main-utils.h
diff --git a/src/main.c b/src/core/main.c
index 18a6333e6e..18a6333e6e 100644
--- a/src/main.c
+++ b/src/core/main.c
diff --git a/src/meson.build b/src/core/meson.build
index ada4d7ab01..ada4d7ab01 100644
--- a/src/meson.build
+++ b/src/core/meson.build
diff --git a/src/ndisc/nm-fake-ndisc.c b/src/core/ndisc/nm-fake-ndisc.c
index 5bcdb0de7a..5bcdb0de7a 100644
--- a/src/ndisc/nm-fake-ndisc.c
+++ b/src/core/ndisc/nm-fake-ndisc.c
diff --git a/src/ndisc/nm-fake-ndisc.h b/src/core/ndisc/nm-fake-ndisc.h
index 677f15fcac..677f15fcac 100644
--- a/src/ndisc/nm-fake-ndisc.h
+++ b/src/core/ndisc/nm-fake-ndisc.h
diff --git a/src/ndisc/nm-lndp-ndisc.c b/src/core/ndisc/nm-lndp-ndisc.c
index 7abd197c99..7abd197c99 100644
--- a/src/ndisc/nm-lndp-ndisc.c
+++ b/src/core/ndisc/nm-lndp-ndisc.c
diff --git a/src/ndisc/nm-lndp-ndisc.h b/src/core/ndisc/nm-lndp-ndisc.h
index 96fc97373a..96fc97373a 100644
--- a/src/ndisc/nm-lndp-ndisc.h
+++ b/src/core/ndisc/nm-lndp-ndisc.h
diff --git a/src/ndisc/nm-ndisc-private.h b/src/core/ndisc/nm-ndisc-private.h
index 047391243b..047391243b 100644
--- a/src/ndisc/nm-ndisc-private.h
+++ b/src/core/ndisc/nm-ndisc-private.h
diff --git a/src/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c
index 05da8eb7d1..05da8eb7d1 100644
--- a/src/ndisc/nm-ndisc.c
+++ b/src/core/ndisc/nm-ndisc.c
diff --git a/src/ndisc/nm-ndisc.h b/src/core/ndisc/nm-ndisc.h
index 93aee4db38..93aee4db38 100644
--- a/src/ndisc/nm-ndisc.h
+++ b/src/core/ndisc/nm-ndisc.h
diff --git a/src/ndisc/tests/meson.build b/src/core/ndisc/tests/meson.build
index 6a2e70f08c..6a2e70f08c 100644
--- a/src/ndisc/tests/meson.build
+++ b/src/core/ndisc/tests/meson.build
diff --git a/src/ndisc/tests/test-ndisc-fake.c b/src/core/ndisc/tests/test-ndisc-fake.c
index 3c4bc1f2f7..3c4bc1f2f7 100644
--- a/src/ndisc/tests/test-ndisc-fake.c
+++ b/src/core/ndisc/tests/test-ndisc-fake.c
diff --git a/src/ndisc/tests/test-ndisc-linux.c b/src/core/ndisc/tests/test-ndisc-linux.c
index 2517e2b7b4..2517e2b7b4 100644
--- a/src/ndisc/tests/test-ndisc-linux.c
+++ b/src/core/ndisc/tests/test-ndisc-linux.c
diff --git a/src/nm-act-request.c b/src/core/nm-act-request.c
index 248b57b861..248b57b861 100644
--- a/src/nm-act-request.c
+++ b/src/core/nm-act-request.c
diff --git a/src/nm-act-request.h b/src/core/nm-act-request.h
index 2a568430ac..2a568430ac 100644
--- a/src/nm-act-request.h
+++ b/src/core/nm-act-request.h
diff --git a/src/nm-active-connection.c b/src/core/nm-active-connection.c
index 9049eea92f..9049eea92f 100644
--- a/src/nm-active-connection.c
+++ b/src/core/nm-active-connection.c
diff --git a/src/nm-active-connection.h b/src/core/nm-active-connection.h
index 15c68e6e7e..15c68e6e7e 100644
--- a/src/nm-active-connection.h
+++ b/src/core/nm-active-connection.h
diff --git a/src/nm-audit-manager.c b/src/core/nm-audit-manager.c
index 4a67f2eebd..4a67f2eebd 100644
--- a/src/nm-audit-manager.c
+++ b/src/core/nm-audit-manager.c
diff --git a/src/nm-audit-manager.h b/src/core/nm-audit-manager.h
index fdabbf2814..fdabbf2814 100644
--- a/src/nm-audit-manager.h
+++ b/src/core/nm-audit-manager.h
diff --git a/src/nm-auth-manager.c b/src/core/nm-auth-manager.c
index 046282c230..046282c230 100644
--- a/src/nm-auth-manager.c
+++ b/src/core/nm-auth-manager.c
diff --git a/src/nm-auth-manager.h b/src/core/nm-auth-manager.h
index 991083c1b8..991083c1b8 100644
--- a/src/nm-auth-manager.h
+++ b/src/core/nm-auth-manager.h
diff --git a/src/nm-auth-utils.c b/src/core/nm-auth-utils.c
index 41ddd3a4b8..41ddd3a4b8 100644
--- a/src/nm-auth-utils.c
+++ b/src/core/nm-auth-utils.c
diff --git a/src/nm-auth-utils.h b/src/core/nm-auth-utils.h
index 999dacf579..999dacf579 100644
--- a/src/nm-auth-utils.h
+++ b/src/core/nm-auth-utils.h
diff --git a/src/nm-checkpoint-manager.c b/src/core/nm-checkpoint-manager.c
index b4c00f9d8b..b4c00f9d8b 100644
--- a/src/nm-checkpoint-manager.c
+++ b/src/core/nm-checkpoint-manager.c
diff --git a/src/nm-checkpoint-manager.h b/src/core/nm-checkpoint-manager.h
index 7fe86d6040..7fe86d6040 100644
--- a/src/nm-checkpoint-manager.h
+++ b/src/core/nm-checkpoint-manager.h
diff --git a/src/nm-checkpoint.c b/src/core/nm-checkpoint.c
index 0bee16ece5..0bee16ece5 100644
--- a/src/nm-checkpoint.c
+++ b/src/core/nm-checkpoint.c
diff --git a/src/nm-checkpoint.h b/src/core/nm-checkpoint.h
index 28c936fae5..28c936fae5 100644
--- a/src/nm-checkpoint.h
+++ b/src/core/nm-checkpoint.h
diff --git a/src/nm-config-data.c b/src/core/nm-config-data.c
index b3cd5e986f..b3cd5e986f 100644
--- a/src/nm-config-data.c
+++ b/src/core/nm-config-data.c
diff --git a/src/nm-config-data.h b/src/core/nm-config-data.h
index 07cffb436d..07cffb436d 100644
--- a/src/nm-config-data.h
+++ b/src/core/nm-config-data.h
diff --git a/src/nm-config.c b/src/core/nm-config.c
index 3c0c78eb8b..3c0c78eb8b 100644
--- a/src/nm-config.c
+++ b/src/core/nm-config.c
diff --git a/src/nm-config.h b/src/core/nm-config.h
index 6f3f514c2b..6f3f514c2b 100644
--- a/src/nm-config.h
+++ b/src/core/nm-config.h
diff --git a/src/nm-connectivity.c b/src/core/nm-connectivity.c
index 4e38e77e82..4e38e77e82 100644
--- a/src/nm-connectivity.c
+++ b/src/core/nm-connectivity.c
diff --git a/src/nm-connectivity.h b/src/core/nm-connectivity.h
index c67668ce4a..c67668ce4a 100644
--- a/src/nm-connectivity.h
+++ b/src/core/nm-connectivity.h
diff --git a/src/nm-core-utils.c b/src/core/nm-core-utils.c
index 660f6f4317..660f6f4317 100644
--- a/src/nm-core-utils.c
+++ b/src/core/nm-core-utils.c
diff --git a/src/nm-core-utils.h b/src/core/nm-core-utils.h
index a3f47874fd..a3f47874fd 100644
--- a/src/nm-core-utils.h
+++ b/src/core/nm-core-utils.h
diff --git a/src/nm-dbus-manager.c b/src/core/nm-dbus-manager.c
index e05ae39288..e05ae39288 100644
--- a/src/nm-dbus-manager.c
+++ b/src/core/nm-dbus-manager.c
diff --git a/src/nm-dbus-manager.h b/src/core/nm-dbus-manager.h
index 06876af010..06876af010 100644
--- a/src/nm-dbus-manager.h
+++ b/src/core/nm-dbus-manager.h
diff --git a/src/nm-dbus-object.c b/src/core/nm-dbus-object.c
index 4f6d2af343..4f6d2af343 100644
--- a/src/nm-dbus-object.c
+++ b/src/core/nm-dbus-object.c
diff --git a/src/nm-dbus-object.h b/src/core/nm-dbus-object.h
index d94bd5df45..d94bd5df45 100644
--- a/src/nm-dbus-object.h
+++ b/src/core/nm-dbus-object.h
diff --git a/src/nm-dbus-utils.c b/src/core/nm-dbus-utils.c
index 40e10e2811..40e10e2811 100644
--- a/src/nm-dbus-utils.c
+++ b/src/core/nm-dbus-utils.c
diff --git a/src/nm-dbus-utils.h b/src/core/nm-dbus-utils.h
index 501e199618..501e199618 100644
--- a/src/nm-dbus-utils.h
+++ b/src/core/nm-dbus-utils.h
diff --git a/src/nm-dcb.c b/src/core/nm-dcb.c
index df345434e6..df345434e6 100644
--- a/src/nm-dcb.c
+++ b/src/core/nm-dcb.c
diff --git a/src/nm-dcb.h b/src/core/nm-dcb.h
index 7cb5e7ef0c..7cb5e7ef0c 100644
--- a/src/nm-dcb.h
+++ b/src/core/nm-dcb.h
diff --git a/src/nm-dhcp-config.c b/src/core/nm-dhcp-config.c
index 390a73f428..390a73f428 100644
--- a/src/nm-dhcp-config.c
+++ b/src/core/nm-dhcp-config.c
diff --git a/src/nm-dhcp-config.h b/src/core/nm-dhcp-config.h
index 9e68f2fb3a..9e68f2fb3a 100644
--- a/src/nm-dhcp-config.h
+++ b/src/core/nm-dhcp-config.h
diff --git a/src/nm-dispatcher.c b/src/core/nm-dispatcher.c
index a848d41d8d..a848d41d8d 100644
--- a/src/nm-dispatcher.c
+++ b/src/core/nm-dispatcher.c
diff --git a/src/nm-dispatcher.h b/src/core/nm-dispatcher.h
index d588de4e8f..d588de4e8f 100644
--- a/src/nm-dispatcher.h
+++ b/src/core/nm-dispatcher.h
diff --git a/src/nm-firewall-manager.c b/src/core/nm-firewall-manager.c
index ff0c1a0d2b..ff0c1a0d2b 100644
--- a/src/nm-firewall-manager.c
+++ b/src/core/nm-firewall-manager.c
diff --git a/src/nm-firewall-manager.h b/src/core/nm-firewall-manager.h
index 1ce802b2cd..1ce802b2cd 100644
--- a/src/nm-firewall-manager.h
+++ b/src/core/nm-firewall-manager.h
diff --git a/src/nm-hostname-manager.c b/src/core/nm-hostname-manager.c
index ca23b97ce1..ca23b97ce1 100644
--- a/src/nm-hostname-manager.c
+++ b/src/core/nm-hostname-manager.c
diff --git a/src/nm-hostname-manager.h b/src/core/nm-hostname-manager.h
index 0fa137713a..0fa137713a 100644
--- a/src/nm-hostname-manager.h
+++ b/src/core/nm-hostname-manager.h
diff --git a/src/nm-iface-helper.c b/src/core/nm-iface-helper.c
index 42483cf756..42483cf756 100644
--- a/src/nm-iface-helper.c
+++ b/src/core/nm-iface-helper.c
diff --git a/src/nm-ip-config.c b/src/core/nm-ip-config.c
index 040483ed53..040483ed53 100644
--- a/src/nm-ip-config.c
+++ b/src/core/nm-ip-config.c
diff --git a/src/nm-ip-config.h b/src/core/nm-ip-config.h
index 8e1a593412..8e1a593412 100644
--- a/src/nm-ip-config.h
+++ b/src/core/nm-ip-config.h
diff --git a/src/nm-ip4-config.c b/src/core/nm-ip4-config.c
index 8014549f4d..8014549f4d 100644
--- a/src/nm-ip4-config.c
+++ b/src/core/nm-ip4-config.c
diff --git a/src/nm-ip4-config.h b/src/core/nm-ip4-config.h
index a795e152ca..a795e152ca 100644
--- a/src/nm-ip4-config.h
+++ b/src/core/nm-ip4-config.h
diff --git a/src/nm-ip6-config.c b/src/core/nm-ip6-config.c
index d48c6e30c8..d48c6e30c8 100644
--- a/src/nm-ip6-config.c
+++ b/src/core/nm-ip6-config.c
diff --git a/src/nm-ip6-config.h b/src/core/nm-ip6-config.h
index 398186da79..398186da79 100644
--- a/src/nm-ip6-config.h
+++ b/src/core/nm-ip6-config.h
diff --git a/src/nm-keep-alive.c b/src/core/nm-keep-alive.c
index d0cce40714..d0cce40714 100644
--- a/src/nm-keep-alive.c
+++ b/src/core/nm-keep-alive.c
diff --git a/src/nm-keep-alive.h b/src/core/nm-keep-alive.h
index 2c2b4faae7..2c2b4faae7 100644
--- a/src/nm-keep-alive.h
+++ b/src/core/nm-keep-alive.h
diff --git a/src/nm-l3-config-data.c b/src/core/nm-l3-config-data.c
index 0f689d409b..0f689d409b 100644
--- a/src/nm-l3-config-data.c
+++ b/src/core/nm-l3-config-data.c
diff --git a/src/nm-l3-config-data.h b/src/core/nm-l3-config-data.h
index b3d9cd32ec..b3d9cd32ec 100644
--- a/src/nm-l3-config-data.h
+++ b/src/core/nm-l3-config-data.h
diff --git a/src/nm-l3-ipv4ll.c b/src/core/nm-l3-ipv4ll.c
index edd6671a9f..edd6671a9f 100644
--- a/src/nm-l3-ipv4ll.c
+++ b/src/core/nm-l3-ipv4ll.c
diff --git a/src/nm-l3-ipv4ll.h b/src/core/nm-l3-ipv4ll.h
index b39762a81e..b39762a81e 100644
--- a/src/nm-l3-ipv4ll.h
+++ b/src/core/nm-l3-ipv4ll.h
diff --git a/src/nm-l3cfg.c b/src/core/nm-l3cfg.c
index 44023aad57..44023aad57 100644
--- a/src/nm-l3cfg.c
+++ b/src/core/nm-l3cfg.c
diff --git a/src/nm-l3cfg.h b/src/core/nm-l3cfg.h
index 5cfc93f643..5cfc93f643 100644
--- a/src/nm-l3cfg.h
+++ b/src/core/nm-l3cfg.h
diff --git a/src/nm-manager.c b/src/core/nm-manager.c
index 5e5f4e7ff2..5e5f4e7ff2 100644
--- a/src/nm-manager.c
+++ b/src/core/nm-manager.c
diff --git a/src/nm-manager.h b/src/core/nm-manager.h
index 7a8b3a1e03..7a8b3a1e03 100644
--- a/src/nm-manager.h
+++ b/src/core/nm-manager.h
diff --git a/src/nm-netns.c b/src/core/nm-netns.c
index 9f62643686..9f62643686 100644
--- a/src/nm-netns.c
+++ b/src/core/nm-netns.c
diff --git a/src/nm-netns.h b/src/core/nm-netns.h
index aab3b52019..aab3b52019 100644
--- a/src/nm-netns.h
+++ b/src/core/nm-netns.h
diff --git a/src/nm-pacrunner-manager.c b/src/core/nm-pacrunner-manager.c
index 50551116f3..50551116f3 100644
--- a/src/nm-pacrunner-manager.c
+++ b/src/core/nm-pacrunner-manager.c
diff --git a/src/nm-pacrunner-manager.h b/src/core/nm-pacrunner-manager.h
index fd40f1204d..fd40f1204d 100644
--- a/src/nm-pacrunner-manager.h
+++ b/src/core/nm-pacrunner-manager.h
diff --git a/src/nm-policy.c b/src/core/nm-policy.c
index 98ff704102..98ff704102 100644
--- a/src/nm-policy.c
+++ b/src/core/nm-policy.c
diff --git a/src/nm-policy.h b/src/core/nm-policy.h
index fa216db3a8..fa216db3a8 100644
--- a/src/nm-policy.h
+++ b/src/core/nm-policy.h
diff --git a/src/nm-proxy-config.c b/src/core/nm-proxy-config.c
index 85bd047598..85bd047598 100644
--- a/src/nm-proxy-config.c
+++ b/src/core/nm-proxy-config.c
diff --git a/src/nm-proxy-config.h b/src/core/nm-proxy-config.h
index 7aa587d045..7aa587d045 100644
--- a/src/nm-proxy-config.h
+++ b/src/core/nm-proxy-config.h
diff --git a/src/nm-rfkill-manager.c b/src/core/nm-rfkill-manager.c
index 8fd9dbf181..8fd9dbf181 100644
--- a/src/nm-rfkill-manager.c
+++ b/src/core/nm-rfkill-manager.c
diff --git a/src/nm-rfkill-manager.h b/src/core/nm-rfkill-manager.h
index d3f6634935..d3f6634935 100644
--- a/src/nm-rfkill-manager.h
+++ b/src/core/nm-rfkill-manager.h
diff --git a/src/nm-session-monitor.c b/src/core/nm-session-monitor.c
index 8e66dbe7c9..8e66dbe7c9 100644
--- a/src/nm-session-monitor.c
+++ b/src/core/nm-session-monitor.c
diff --git a/src/nm-session-monitor.h b/src/core/nm-session-monitor.h
index 63a3136b7d..63a3136b7d 100644
--- a/src/nm-session-monitor.h
+++ b/src/core/nm-session-monitor.h
diff --git a/src/nm-sleep-monitor.c b/src/core/nm-sleep-monitor.c
index cc3d72ee67..cc3d72ee67 100644
--- a/src/nm-sleep-monitor.c
+++ b/src/core/nm-sleep-monitor.c
diff --git a/src/nm-sleep-monitor.h b/src/core/nm-sleep-monitor.h
index 7d45065b76..7d45065b76 100644
--- a/src/nm-sleep-monitor.h
+++ b/src/core/nm-sleep-monitor.h
diff --git a/src/nm-test-utils-core.h b/src/core/nm-test-utils-core.h
index 71d19cc152..71d19cc152 100644
--- a/src/nm-test-utils-core.h
+++ b/src/core/nm-test-utils-core.h
diff --git a/src/nm-types.h b/src/core/nm-types.h
index ab2314594d..ab2314594d 100644
--- a/src/nm-types.h
+++ b/src/core/nm-types.h
diff --git a/src/org.freedesktop.NetworkManager.conf b/src/core/org.freedesktop.NetworkManager.conf
index 5c2af2e0e5..5c2af2e0e5 100644
--- a/src/org.freedesktop.NetworkManager.conf
+++ b/src/core/org.freedesktop.NetworkManager.conf
diff --git a/src/platform/linux/nl802154.h b/src/core/platform/linux/nl802154.h
index c21bd0791c..c21bd0791c 100644
--- a/src/platform/linux/nl802154.h
+++ b/src/core/platform/linux/nl802154.h
diff --git a/src/platform/nm-fake-platform.c b/src/core/platform/nm-fake-platform.c
index fbd3e3fbc7..fbd3e3fbc7 100644
--- a/src/platform/nm-fake-platform.c
+++ b/src/core/platform/nm-fake-platform.c
diff --git a/src/platform/nm-fake-platform.h b/src/core/platform/nm-fake-platform.h
index a1d44f8ff9..a1d44f8ff9 100644
--- a/src/platform/nm-fake-platform.h
+++ b/src/core/platform/nm-fake-platform.h
diff --git a/src/platform/nm-linux-platform.c b/src/core/platform/nm-linux-platform.c
index ae6c4f44c2..ae6c4f44c2 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/core/platform/nm-linux-platform.c
diff --git a/src/platform/nm-linux-platform.h b/src/core/platform/nm-linux-platform.h
index 6837e64a70..6837e64a70 100644
--- a/src/platform/nm-linux-platform.h
+++ b/src/core/platform/nm-linux-platform.h
diff --git a/src/platform/nm-platform-private.h b/src/core/platform/nm-platform-private.h
index cf80568912..cf80568912 100644
--- a/src/platform/nm-platform-private.h
+++ b/src/core/platform/nm-platform-private.h
diff --git a/src/platform/nm-platform.c b/src/core/platform/nm-platform.c
index 6411abbacc..6411abbacc 100644
--- a/src/platform/nm-platform.c
+++ b/src/core/platform/nm-platform.c
diff --git a/src/platform/nm-platform.h b/src/core/platform/nm-platform.h
index d400c5680a..d400c5680a 100644
--- a/src/platform/nm-platform.h
+++ b/src/core/platform/nm-platform.h
diff --git a/src/platform/nmp-object.c b/src/core/platform/nmp-object.c
index 9520013ad7..9520013ad7 100644
--- a/src/platform/nmp-object.c
+++ b/src/core/platform/nmp-object.c
diff --git a/src/platform/nmp-object.h b/src/core/platform/nmp-object.h
index dc2cc86b65..dc2cc86b65 100644
--- a/src/platform/nmp-object.h
+++ b/src/core/platform/nmp-object.h
diff --git a/src/platform/nmp-rules-manager.c b/src/core/platform/nmp-rules-manager.c
index ab329c9578..ab329c9578 100644
--- a/src/platform/nmp-rules-manager.c
+++ b/src/core/platform/nmp-rules-manager.c
diff --git a/src/platform/nmp-rules-manager.h b/src/core/platform/nmp-rules-manager.h
index 69cf907555..69cf907555 100644
--- a/src/platform/nmp-rules-manager.h
+++ b/src/core/platform/nmp-rules-manager.h
diff --git a/src/platform/tests/meson.build b/src/core/platform/tests/meson.build
index 5d55707a08..5d55707a08 100644
--- a/src/platform/tests/meson.build
+++ b/src/core/platform/tests/meson.build
diff --git a/src/platform/tests/monitor.c b/src/core/platform/tests/monitor.c
index b67d50b44b..b67d50b44b 100644
--- a/src/platform/tests/monitor.c
+++ b/src/core/platform/tests/monitor.c
diff --git a/src/platform/tests/test-address.c b/src/core/platform/tests/test-address.c
index b9eabbd1db..b9eabbd1db 100644
--- a/src/platform/tests/test-address.c
+++ b/src/core/platform/tests/test-address.c
diff --git a/src/platform/tests/test-cleanup.c b/src/core/platform/tests/test-cleanup.c
index 2fd6a4e57c..2fd6a4e57c 100644
--- a/src/platform/tests/test-cleanup.c
+++ b/src/core/platform/tests/test-cleanup.c
diff --git a/src/platform/tests/test-common.c b/src/core/platform/tests/test-common.c
index 529100b9f2..529100b9f2 100644
--- a/src/platform/tests/test-common.c
+++ b/src/core/platform/tests/test-common.c
diff --git a/src/platform/tests/test-common.h b/src/core/platform/tests/test-common.h
index 618645fea9..618645fea9 100644
--- a/src/platform/tests/test-common.h
+++ b/src/core/platform/tests/test-common.h
diff --git a/src/platform/tests/test-link.c b/src/core/platform/tests/test-link.c
index 895b89a09b..895b89a09b 100644
--- a/src/platform/tests/test-link.c
+++ b/src/core/platform/tests/test-link.c
diff --git a/src/platform/tests/test-nmp-object.c b/src/core/platform/tests/test-nmp-object.c
index 590f41c6d7..590f41c6d7 100644
--- a/src/platform/tests/test-nmp-object.c
+++ b/src/core/platform/tests/test-nmp-object.c
diff --git a/src/platform/tests/test-platform-general.c b/src/core/platform/tests/test-platform-general.c
index 00671cfba0..00671cfba0 100644
--- a/src/platform/tests/test-platform-general.c
+++ b/src/core/platform/tests/test-platform-general.c
diff --git a/src/platform/tests/test-route.c b/src/core/platform/tests/test-route.c
index 0aa94ecd2d..0aa94ecd2d 100644
--- a/src/platform/tests/test-route.c
+++ b/src/core/platform/tests/test-route.c
diff --git a/src/platform/tests/test-tc.c b/src/core/platform/tests/test-tc.c
index c005b069f0..c005b069f0 100644
--- a/src/platform/tests/test-tc.c
+++ b/src/core/platform/tests/test-tc.c
diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.c b/src/core/platform/wifi/nm-wifi-utils-nl80211.c
index aae6af1ec8..aae6af1ec8 100644
--- a/src/platform/wifi/nm-wifi-utils-nl80211.c
+++ b/src/core/platform/wifi/nm-wifi-utils-nl80211.c
diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.h b/src/core/platform/wifi/nm-wifi-utils-nl80211.h
index 37c32ed78e..37c32ed78e 100644
--- a/src/platform/wifi/nm-wifi-utils-nl80211.h
+++ b/src/core/platform/wifi/nm-wifi-utils-nl80211.h
diff --git a/src/platform/wifi/nm-wifi-utils-private.h b/src/core/platform/wifi/nm-wifi-utils-private.h
index 9ed5745383..9ed5745383 100644
--- a/src/platform/wifi/nm-wifi-utils-private.h
+++ b/src/core/platform/wifi/nm-wifi-utils-private.h
diff --git a/src/platform/wifi/nm-wifi-utils-wext.c b/src/core/platform/wifi/nm-wifi-utils-wext.c
index 2b070b5abe..2b070b5abe 100644
--- a/src/platform/wifi/nm-wifi-utils-wext.c
+++ b/src/core/platform/wifi/nm-wifi-utils-wext.c
diff --git a/src/platform/wifi/nm-wifi-utils-wext.h b/src/core/platform/wifi/nm-wifi-utils-wext.h
index d6f3453c2e..d6f3453c2e 100644
--- a/src/platform/wifi/nm-wifi-utils-wext.h
+++ b/src/core/platform/wifi/nm-wifi-utils-wext.h
diff --git a/src/platform/wifi/nm-wifi-utils.c b/src/core/platform/wifi/nm-wifi-utils.c
index 66d6a05a75..66d6a05a75 100644
--- a/src/platform/wifi/nm-wifi-utils.c
+++ b/src/core/platform/wifi/nm-wifi-utils.c
diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/core/platform/wifi/nm-wifi-utils.h
index a252e43e54..a252e43e54 100644
--- a/src/platform/wifi/nm-wifi-utils.h
+++ b/src/core/platform/wifi/nm-wifi-utils.h
diff --git a/src/platform/wpan/nm-wpan-utils.c b/src/core/platform/wpan/nm-wpan-utils.c
index 96897ae04d..96897ae04d 100644
--- a/src/platform/wpan/nm-wpan-utils.c
+++ b/src/core/platform/wpan/nm-wpan-utils.c
diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/core/platform/wpan/nm-wpan-utils.h
index 940c2c9daa..940c2c9daa 100644
--- a/src/platform/wpan/nm-wpan-utils.h
+++ b/src/core/platform/wpan/nm-wpan-utils.h
diff --git a/src/ppp/meson.build b/src/core/ppp/meson.build
index 991f0b3dc1..991f0b3dc1 100644
--- a/src/ppp/meson.build
+++ b/src/core/ppp/meson.build
diff --git a/src/ppp/nm-ppp-manager-call.c b/src/core/ppp/nm-ppp-manager-call.c
index b07c3df714..b07c3df714 100644
--- a/src/ppp/nm-ppp-manager-call.c
+++ b/src/core/ppp/nm-ppp-manager-call.c
diff --git a/src/ppp/nm-ppp-manager-call.h b/src/core/ppp/nm-ppp-manager-call.h
index c831cf0d61..c831cf0d61 100644
--- a/src/ppp/nm-ppp-manager-call.h
+++ b/src/core/ppp/nm-ppp-manager-call.h
diff --git a/src/ppp/nm-ppp-manager.c b/src/core/ppp/nm-ppp-manager.c
index 939eca31d4..939eca31d4 100644
--- a/src/ppp/nm-ppp-manager.c
+++ b/src/core/ppp/nm-ppp-manager.c
diff --git a/src/ppp/nm-ppp-manager.h b/src/core/ppp/nm-ppp-manager.h
index c41dda2074..c41dda2074 100644
--- a/src/ppp/nm-ppp-manager.h
+++ b/src/core/ppp/nm-ppp-manager.h
diff --git a/src/ppp/nm-ppp-plugin-api.h b/src/core/ppp/nm-ppp-plugin-api.h
index 647e1c240e..647e1c240e 100644
--- a/src/ppp/nm-ppp-plugin-api.h
+++ b/src/core/ppp/nm-ppp-plugin-api.h
diff --git a/src/ppp/nm-ppp-plugin.ver b/src/core/ppp/nm-ppp-plugin.ver
index fee5578753..fee5578753 100644
--- a/src/ppp/nm-ppp-plugin.ver
+++ b/src/core/ppp/nm-ppp-plugin.ver
diff --git a/src/ppp/nm-ppp-status.h b/src/core/ppp/nm-ppp-status.h
index c346b119a2..c346b119a2 100644
--- a/src/ppp/nm-ppp-status.h
+++ b/src/core/ppp/nm-ppp-status.h
diff --git a/src/ppp/nm-pppd-plugin.c b/src/core/ppp/nm-pppd-plugin.c
index 519e637e20..519e637e20 100644
--- a/src/ppp/nm-pppd-plugin.c
+++ b/src/core/ppp/nm-pppd-plugin.c
diff --git a/src/ppp/nm-pppd-plugin.h b/src/core/ppp/nm-pppd-plugin.h
index b56afbebd7..b56afbebd7 100644
--- a/src/ppp/nm-pppd-plugin.h
+++ b/src/core/ppp/nm-pppd-plugin.h
diff --git a/src/settings/nm-agent-manager.c b/src/core/settings/nm-agent-manager.c
index cd96808e7b..cd96808e7b 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/core/settings/nm-agent-manager.c
diff --git a/src/settings/nm-agent-manager.h b/src/core/settings/nm-agent-manager.h
index b26af4ef7a..b26af4ef7a 100644
--- a/src/settings/nm-agent-manager.h
+++ b/src/core/settings/nm-agent-manager.h
diff --git a/src/settings/nm-secret-agent.c b/src/core/settings/nm-secret-agent.c
index 7d31272199..7d31272199 100644
--- a/src/settings/nm-secret-agent.c
+++ b/src/core/settings/nm-secret-agent.c
diff --git a/src/settings/nm-secret-agent.h b/src/core/settings/nm-secret-agent.h
index ce591425b7..ce591425b7 100644
--- a/src/settings/nm-secret-agent.h
+++ b/src/core/settings/nm-secret-agent.h
diff --git a/src/settings/nm-settings-connection.c b/src/core/settings/nm-settings-connection.c
index a5761bf635..a5761bf635 100644
--- a/src/settings/nm-settings-connection.c
+++ b/src/core/settings/nm-settings-connection.c
diff --git a/src/settings/nm-settings-connection.h b/src/core/settings/nm-settings-connection.h
index 3954fd8b29..3954fd8b29 100644
--- a/src/settings/nm-settings-connection.h
+++ b/src/core/settings/nm-settings-connection.h
diff --git a/src/settings/nm-settings-plugin.c b/src/core/settings/nm-settings-plugin.c
index 74ae314df6..74ae314df6 100644
--- a/src/settings/nm-settings-plugin.c
+++ b/src/core/settings/nm-settings-plugin.c
diff --git a/src/settings/nm-settings-plugin.h b/src/core/settings/nm-settings-plugin.h
index a9b9b2aea2..a9b9b2aea2 100644
--- a/src/settings/nm-settings-plugin.h
+++ b/src/core/settings/nm-settings-plugin.h
diff --git a/src/settings/nm-settings-storage.c b/src/core/settings/nm-settings-storage.c
index bea440cb5a..bea440cb5a 100644
--- a/src/settings/nm-settings-storage.c
+++ b/src/core/settings/nm-settings-storage.c
diff --git a/src/settings/nm-settings-storage.h b/src/core/settings/nm-settings-storage.h
index 970cfd771c..970cfd771c 100644
--- a/src/settings/nm-settings-storage.h
+++ b/src/core/settings/nm-settings-storage.h
diff --git a/src/settings/nm-settings-utils.c b/src/core/settings/nm-settings-utils.c
index f6c2f60810..f6c2f60810 100644
--- a/src/settings/nm-settings-utils.c
+++ b/src/core/settings/nm-settings-utils.c
diff --git a/src/settings/nm-settings-utils.h b/src/core/settings/nm-settings-utils.h
index d3f50ddf79..d3f50ddf79 100644
--- a/src/settings/nm-settings-utils.h
+++ b/src/core/settings/nm-settings-utils.h
diff --git a/src/settings/nm-settings.c b/src/core/settings/nm-settings.c
index eda3789f40..eda3789f40 100644
--- a/src/settings/nm-settings.c
+++ b/src/core/settings/nm-settings.c
diff --git a/src/settings/nm-settings.h b/src/core/settings/nm-settings.h
index 09a0af57f6..09a0af57f6 100644
--- a/src/settings/nm-settings.h
+++ b/src/core/settings/nm-settings.h
diff --git a/src/settings/plugins/ifcfg-rh/meson.build b/src/core/settings/plugins/ifcfg-rh/meson.build
index a2f11a927e..a2f11a927e 100644
--- a/src/settings/plugins/ifcfg-rh/meson.build
+++ b/src/core/settings/plugins/ifcfg-rh/meson.build
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf b/src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
index c7a1730a5e..c7a1730a5e 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
+++ b/src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml b/src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
index 033fbfaa30..033fbfaa30 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
+++ b/src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifdown b/src/core/settings/plugins/ifcfg-rh/nm-ifdown
index e7bd73aec3..e7bd73aec3 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifdown
+++ b/src/core/settings/plugins/ifcfg-rh/nm-ifdown
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifup b/src/core/settings/plugins/ifcfg-rh/nm-ifup
index 96637a92fb..96637a92fb 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifup
+++ b/src/core/settings/plugins/ifcfg-rh/nm-ifup
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h
index 79c67e4859..79c67e4859 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
index b5c205c2fd..b5c205c2fd 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
index dc1a01c8cf..dc1a01c8cf 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index bce47efc8e..bce47efc8e 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h
index c7dc2240af..c7dc2240af 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
index 3c2682830f..3c2682830f 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h
index 6fb9838f92..6fb9838f92 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
index 58d3e698ae..58d3e698ae 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
index 36ec922514..36ec922514 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index a268c58c58..a268c58c58 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
index d0d8a4cd8f..d0d8a4cd8f 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/core/settings/plugins/ifcfg-rh/shvar.c
index 6c1cd41837..6c1cd41837 100644
--- a/src/settings/plugins/ifcfg-rh/shvar.c
+++ b/src/core/settings/plugins/ifcfg-rh/shvar.c
diff --git a/src/settings/plugins/ifcfg-rh/shvar.h b/src/core/settings/plugins/ifcfg-rh/shvar.h
index 6965d87314..6965d87314 100644
--- a/src/settings/plugins/ifcfg-rh/shvar.h
+++ b/src/core/settings/plugins/ifcfg-rh/shvar.h
diff --git a/src/settings/plugins/ifcfg-rh/tests/meson.build b/src/core/settings/plugins/ifcfg-rh/tests/meson.build
index 077e4782f0..077e4782f0 100644
--- a/src/settings/plugins/ifcfg-rh/tests/meson.build
+++ b/src/core/settings/plugins/ifcfg-rh/tests/meson.build
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected
index d81d918747..d81d918747 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected
index 2e69c5e7fe..2e69c5e7fe 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected
index 59a6f79b42..59a6f79b42 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected
index a48be78a23..a48be78a23 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected
index b288c04a47..b288c04a47 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected
index a8ff8df3e9..a8ff8df3e9 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected
index 80e969212b..80e969212b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected
index 716eedc270..716eedc270 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected
index 0c2fa035cf..0c2fa035cf 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected
index 2df1fbb38b..2df1fbb38b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected
index ff55cefe7f..ff55cefe7f 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected
index 9c2a1ff066..9c2a1ff066 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected
index ccec2b81ae..ccec2b81ae 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected
index ddbd986fb9..ddbd986fb9 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected
index 495a24d392..495a24d392 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected
index aec6918a1f..aec6918a1f 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected
index 9d47163f65..9d47163f65 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected
index 43c07ddb73..43c07ddb73 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected
index 21f2e2de71..21f2e2de71 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected
index d3db19b229..d3db19b229 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected
index 32db726256..32db726256 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected
index 214f5da55b..214f5da55b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected
index cd8fc96f5a..cd8fc96f5a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected
index de66dcddb8..de66dcddb8 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected
index 9499278e3e..9499278e3e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected
index 44eb777ce4..44eb777ce4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0
index 4f9d645c8a..4f9d645c8a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1
index 37c0df1185..37c0df1185 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2
index 0c3b6a7e91..0c3b6a7e91 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99
index 5df3f154b1..5df3f154b1 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1
index f6fefc0d0c..f6fefc0d0c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1
index 21971611ef..21971611ef 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2
index 92ed461e4d..92ed461e4d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1
index ce0f23ba31..ce0f23ba31 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3
index b7bdd78180..b7bdd78180 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1
index 5e151875d3..5e151875d3 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected
index 56e233cc60..56e233cc60 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1
index ecb36c3792..ecb36c3792 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
index 87493ac2b3..87493ac2b3 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected
index ead3a04747..ead3a04747 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected
index 7bc1ae6cdd..7bc1ae6cdd 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected
index b01372af29..b01372af29 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type
index 8d295c76d6..8d295c76d6 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main
index 4c4834d54e..4c4834d54e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric
index 9989f58b97..9989f58b97 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave
index c0de645df4..c0de645df4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib
index 5bd9a3a85d..5bd9a3a85d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component
index 24b5122188..24b5122188 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main
index 1788efe263..1788efe263 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp
index 7135cd4259..7135cd4259 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb
index 6e6589d39e..6e6589d39e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans
index 2f46a0823c..2f46a0823c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent
index 0c5d7b8872..0c5d7b8872 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints
index 8334999b12..8334999b12 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities
index 5bdcb63ce6..5bdcb63ce6 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100
index 95eb7c5b55..95eb7c5b55 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans
index fbe1cbbc53..fbe1cbbc53 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent
index 07ba6b6412..07ba6b6412 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints
index 05ae39cb6e..05ae39cb6e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options
index cea2471a9a..cea2471a9a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric
index cde1c28d67..cde1c28d67 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn
index 20c08451e2..20c08451e2 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft
index d3e4edca1a..d3e4edca1a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp
index abfcd6e4ce..abfcd6e4ce 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static
index 99b02e42b1..99b02e42b1 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband
index 6c36f1defb..6c36f1defb 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected
index cae51b8995..cae51b8995 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal
index 63bcc840de..63bcc840de 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables
index 1b10cddbe5..1b10cddbe5 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled
index a38f1f5f18..a38f1f5f18 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized
index 58263ece4e..58263ece4e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip
index b5028daac5..b5028daac5 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no
index b949171104..b949171104 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions
index 5b413aa977..5b413aa977 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic
index e2cf6c212c..e2cf6c212c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore
index a2581db67c..a2581db67c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov
index 142f56e434..142f56e434 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected
index c882c4796e..c882c4796e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy
index 2173729d17..2173729d17 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected
index a28c5c1ca4..a28c5c1ca4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc
index d0a3c25412..d0a3c25412 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected
index a67ca598b7..a67ca598b7 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1
index 209447b844..209447b844 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2
index 26e448cc7e..26e448cc7e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid
index 41c0f25c64..41c0f25c64 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1
index 80355c2643..80355c2643 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2
index 4284737a1c..4284737a1c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config
index 04df693877..04df693877 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized
index 18da66c1d7..18da66c1d7 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1
index af62dcfc18..af62dcfc18 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1
index 5ff8789129..5ff8789129 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2
index 2c01be71fc..2c01be71fc 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface
index d8d9193fe4..d8d9193fe4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device
index 4ba06f28e2..4ba06f28e2 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid
index 622d41ec77..622d41ec77 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev
index 446c2a627f..446c2a627f 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1
index 0dc539712b..0dc539712b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2
index d98a9d364d..d98a9d364d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces
index 4a31e475ae..4a31e475ae 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a
index 4328611100..4328611100 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch
index 8905ba0b32..8905ba0b32 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch
index e02e21ad26..e02e21ad26 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap
index d9c95cc24a..d9c95cc24a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden
index 08b9a730a6..08b9a730a6 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap
index 50f4fd31e6..50f4fd31e6 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent
index 991ba67aa9..991ba67aa9 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask
index 5bb02b5cea..5bb02b5cea 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always
index 9dcb5bf851..9dcb5bf851 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default
index 3709c493c4..3709c493c4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing
index f896eb0f99..f896eb0f99 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never
index aa12d74938..aa12d74938 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open
index b089103dae..b089103dae 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto
index 42ee200afc..42ee200afc 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex
index 32d633428c..32d633428c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex
index dcb46da7fa..dcb46da7fa 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex
index 37bb085b50..37bb085b50 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted
index 0b46acd666..0b46acd666 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted
index 08496bb56d..08496bb56d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe
index 354046ad08..354046ad08 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae
index 68afbe970d..68afbe970d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep
index e1ce20d6de..e1ce20d6de 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii
index 250efa134c..250efa134c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii
index 250efa134c..250efa134c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc
index 9d0bacfc76..9d0bacfc76 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys
index 2bc16b6e5a..2bc16b6e5a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap
index bdea6aa3b0..bdea6aa3b0 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys
index cb4da43f77..cb4da43f77 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase
index 250efa134c..250efa134c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls
index 9a74bb4d9b..9a74bb4d9b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls
index 92aaeeab9c..92aaeeab9c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls
index 42ed1d68a5..42ed1d68a5 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk
index 4ab45ae39b..4ab45ae39b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2
index 038b656d2d..038b656d2d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc
index c3cadbb857..c3cadbb857 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex
index 2119ba8e6b..2119ba8e6b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted
index 2119ba8e6b..2119ba8e6b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2
index 2119ba8e6b..2119ba8e6b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches
index 70d69bf52a..70d69bf52a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw
index a5434434ba..a5434434ba 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc
index fad927726c..fad927726c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2
index 27bcbbf9ae..27bcbbf9ae 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent
index 052ab425af..052ab425af 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always
index 5deee06631..5deee06631 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert
index 2439747352..2439747352 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on
index d0b50775a1..d0b50775a1 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip
index e683db3c7b..e683db3c7b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static
index 61f8f423d4..61f8f423d4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no
index fe8b15b29a..fe8b15b29a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes
index 3cf4323dd2..3cf4323dd2 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp
index 5d36675a41..5d36675a41 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip
index af254f9c22..af254f9c22 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname
index cba380db3c..cba380db3c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only
index de03e04480..de03e04480 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback
index d38e762e20..d38e762e20 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway
index 98d910531e..98d910531e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore
index bb81399e52..bb81399e52 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1
index db09afdb9f..db09afdb9f 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2
index 6972e279d4..6972e279d4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3
index d906599411..d906599411 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4
index 935267f72a..935267f72a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual
index 45db0e4c4b..45db0e4c4b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only
index 94189064f1..94189064f1 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1
index 95f8a8ed8d..95f8a8ed8d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default
index 12d5b5e635..12d5b5e635 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n
index 2190a9959f..2190a9959f 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static
index 4719de2175..4719de2175 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip
index 5098aef79c..5098aef79c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static
index 34acf9fe17..34acf9fe17 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto
index a01f655833..a01f655833 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16
index 0799903887..0799903887 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24
index 688143cd2e..688143cd2e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8
index 0433c62a86..0433c62a86 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes
index 7faf49bdae..7faf49bdae 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy
index 7faf49bdae..7faf49bdae 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt
index 861dd41f24..861dd41f24 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan
index 1dfc9a4331..1dfc9a4331 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1
index 2af1daf3a6..2af1daf3a6 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected
index 7f154073d4..7f154073d4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2
index 850149b21e..850149b21e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected
index 6ec53c17e9..6ec53c17e9 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3
index 3d198e005b..3d198e005b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected
index d2b27eb338..d2b27eb338 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4
index f834464eb9..f834464eb9 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected
index 040ddc9d7d..040ddc9d7d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected
index 426085765c..426085765c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap
index 6936f2e063..6936f2e063 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap
index fe78177e74..fe78177e74 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae
index 5a9569ed60..5a9569ed60 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep
index 0bd766c276..0bd766c276 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii
index f5d532b283..f5d532b283 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii
index b0d1470827..b0d1470827 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc
index 0bd766c276..0bd766c276 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap
index 6936f2e063..6936f2e063 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase
index d45c0ea8e8..d45c0ea8e8 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls
index 0c3bc1e1d5..0c3bc1e1d5 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls
index b6256b9517..b6256b9517 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk
index d7813b2f58..d7813b2f58 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2
index 995721ddb8..995721ddb8 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc
index d7813b2f58..d7813b2f58 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex
index d0576a8ded..d0576a8ded 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted
index 9a47196a22..9a47196a22 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2
index 347bb85e50..347bb85e50 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw
index d29a428976..d29a428976 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2
index 6936f2e063..6936f2e063 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes
index 0d6a302f12..0d6a302f12 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway
index 7987d1058e..7987d1058e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore
index 7987d1058e..7987d1058e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default
index 4347405e3d..4347405e3d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy
index c9e422e76a..c9e422e76a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes
index 9c05417ec2..9c05417ec2 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy
index 1fef7e9792..1fef7e9792 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual
index 8bdf0acf5c..8bdf0acf5c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem
index dec9aa1b8f..dec9aa1b8f 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem
index ef1be20d2b..ef1be20d2b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12
index edc2af75ca..edc2af75ca 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index 71f2d3e8c9..10d498edac 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -49,8 +49,9 @@
 
 #include "nm-test-utils-core.h"
 
-#define TEST_IFCFG_DIR       NM_BUILD_SRCDIR "/src/settings/plugins/ifcfg-rh/tests/network-scripts"
-#define TEST_SCRATCH_DIR     NM_BUILD_BUILDDIR "/src/settings/plugins/ifcfg-rh/tests/network-scripts"
+#define TEST_IFCFG_DIR NM_BUILD_SRCDIR "/src/core/settings/plugins/ifcfg-rh/tests/network-scripts"
+#define TEST_SCRATCH_DIR \
+    NM_BUILD_BUILDDIR "/src/core/settings/plugins/ifcfg-rh/tests/network-scripts"
 #define TEST_SCRATCH_DIR_TMP TEST_SCRATCH_DIR "/tmp"
 
 #define TEST_SCRATCH_ALIAS_BASE TEST_SCRATCH_DIR "/ifcfg-alias0"
diff --git a/src/settings/plugins/ifupdown/meson.build b/src/core/settings/plugins/ifupdown/meson.build
index dd2527836c..dd2527836c 100644
--- a/src/settings/plugins/ifupdown/meson.build
+++ b/src/core/settings/plugins/ifupdown/meson.build
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
index c766a358e0..c766a358e0 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h b/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h
index dd0e15fbde..dd0e15fbde 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c
index 767e0daa09..767e0daa09 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.h b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.h
index ced98dba01..ced98dba01 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-parser.h
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.h
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c
index 8c22e3b6d7..8c22e3b6d7 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.h b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.h
index edf1b31740..edf1b31740 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.h
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.h
diff --git a/src/settings/plugins/ifupdown/tests/meson.build b/src/core/settings/plugins/ifupdown/tests/meson.build
index 882287cb2f..882287cb2f 100644
--- a/src/settings/plugins/ifupdown/tests/meson.build
+++ b/src/core/settings/plugins/ifupdown/tests/meson.build
diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c
index e921cd5b0e..c3c5bb5432 100644
--- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c
+++ b/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c
@@ -12,7 +12,7 @@
 
 #include "nm-test-utils-core.h"
 
-#define TEST_DIR NM_BUILD_SRCDIR "/src/settings/plugins/ifupdown/tests"
+#define TEST_DIR NM_BUILD_SRCDIR "/src/core/settings/plugins/ifupdown/tests"
 
 /*****************************************************************************/
 
diff --git a/src/settings/plugins/ifupdown/tests/test1 b/src/core/settings/plugins/ifupdown/tests/test1
index 74c23b457d..74c23b457d 100644
--- a/src/settings/plugins/ifupdown/tests/test1
+++ b/src/core/settings/plugins/ifupdown/tests/test1
diff --git a/src/settings/plugins/ifupdown/tests/test11 b/src/core/settings/plugins/ifupdown/tests/test11
index 89561dd7df..89561dd7df 100644
--- a/src/settings/plugins/ifupdown/tests/test11
+++ b/src/core/settings/plugins/ifupdown/tests/test11
diff --git a/src/settings/plugins/ifupdown/tests/test12 b/src/core/settings/plugins/ifupdown/tests/test12
index 6096842e1e..6096842e1e 100644
--- a/src/settings/plugins/ifupdown/tests/test12
+++ b/src/core/settings/plugins/ifupdown/tests/test12
diff --git a/src/settings/plugins/ifupdown/tests/test13 b/src/core/settings/plugins/ifupdown/tests/test13
index c001f7ef1b..c001f7ef1b 100644
--- a/src/settings/plugins/ifupdown/tests/test13
+++ b/src/core/settings/plugins/ifupdown/tests/test13
diff --git a/src/settings/plugins/ifupdown/tests/test14 b/src/core/settings/plugins/ifupdown/tests/test14
index 4a153ab3b5..4a153ab3b5 100644
--- a/src/settings/plugins/ifupdown/tests/test14
+++ b/src/core/settings/plugins/ifupdown/tests/test14
diff --git a/src/settings/plugins/ifupdown/tests/test15 b/src/core/settings/plugins/ifupdown/tests/test15
index c3ceca2409..c3ceca2409 100644
--- a/src/settings/plugins/ifupdown/tests/test15
+++ b/src/core/settings/plugins/ifupdown/tests/test15
diff --git a/src/settings/plugins/ifupdown/tests/test16 b/src/core/settings/plugins/ifupdown/tests/test16
index f4f74fb5a1..f4f74fb5a1 100644
--- a/src/settings/plugins/ifupdown/tests/test16
+++ b/src/core/settings/plugins/ifupdown/tests/test16
diff --git a/src/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 b/src/core/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4
index 9e5243a7ed..9e5243a7ed 100644
--- a/src/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4
+++ b/src/core/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4
diff --git a/src/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 b/src/core/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6
index 29546a6111..29546a6111 100644
--- a/src/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6
+++ b/src/core/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6
diff --git a/src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen b/src/core/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen
index 441106da45..441106da45 100644
--- a/src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen
+++ b/src/core/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen
diff --git a/src/settings/plugins/ifupdown/tests/test2 b/src/core/settings/plugins/ifupdown/tests/test2
index 7462b35268..7462b35268 100644
--- a/src/settings/plugins/ifupdown/tests/test2
+++ b/src/core/settings/plugins/ifupdown/tests/test2
diff --git a/src/settings/plugins/ifupdown/tests/test20-source-stanza b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza
index 5cfe1730c9..5cfe1730c9 100644
--- a/src/settings/plugins/ifupdown/tests/test20-source-stanza
+++ b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza
diff --git a/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth0
index 81922cea65..81922cea65 100644
--- a/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0
+++ b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth0
diff --git a/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth1
index b8a783f58b..b8a783f58b 100644
--- a/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1
+++ b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth1
diff --git a/src/settings/plugins/ifupdown/tests/test21-source-dir-stanza b/src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza
index d0604ddc27..d0604ddc27 100644
--- a/src/settings/plugins/ifupdown/tests/test21-source-dir-stanza
+++ b/src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza
diff --git a/src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d/test21-source-dir-stanza.eth0 b/src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d/test21-source-dir-stanza.eth0
index 81922cea65..81922cea65 100644
--- a/src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d/test21-source-dir-stanza.eth0
+++ b/src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d/test21-source-dir-stanza.eth0
diff --git a/src/settings/plugins/ifupdown/tests/test22-duplicate-stanzas b/src/core/settings/plugins/ifupdown/tests/test22-duplicate-stanzas
index c13c2e7ebc..c13c2e7ebc 100644
--- a/src/settings/plugins/ifupdown/tests/test22-duplicate-stanzas
+++ b/src/core/settings/plugins/ifupdown/tests/test22-duplicate-stanzas
diff --git a/src/settings/plugins/ifupdown/tests/test3 b/src/core/settings/plugins/ifupdown/tests/test3
index f6293bbdc6..f6293bbdc6 100644
--- a/src/settings/plugins/ifupdown/tests/test3
+++ b/src/core/settings/plugins/ifupdown/tests/test3
diff --git a/src/settings/plugins/ifupdown/tests/test4 b/src/core/settings/plugins/ifupdown/tests/test4
index 46a40bc9c2..46a40bc9c2 100644
--- a/src/settings/plugins/ifupdown/tests/test4
+++ b/src/core/settings/plugins/ifupdown/tests/test4
diff --git a/src/settings/plugins/ifupdown/tests/test5 b/src/core/settings/plugins/ifupdown/tests/test5
index b69fc42bd0..b69fc42bd0 100644
--- a/src/settings/plugins/ifupdown/tests/test5
+++ b/src/core/settings/plugins/ifupdown/tests/test5
diff --git a/src/settings/plugins/ifupdown/tests/test6 b/src/core/settings/plugins/ifupdown/tests/test6
index 50ac69bd98..50ac69bd98 100644
--- a/src/settings/plugins/ifupdown/tests/test6
+++ b/src/core/settings/plugins/ifupdown/tests/test6
diff --git a/src/settings/plugins/ifupdown/tests/test7 b/src/core/settings/plugins/ifupdown/tests/test7
index 03cb131a98..03cb131a98 100644
--- a/src/settings/plugins/ifupdown/tests/test7
+++ b/src/core/settings/plugins/ifupdown/tests/test7
diff --git a/src/settings/plugins/ifupdown/tests/test8 b/src/core/settings/plugins/ifupdown/tests/test8
index 311f7e15a4..311f7e15a4 100644
--- a/src/settings/plugins/ifupdown/tests/test8
+++ b/src/core/settings/plugins/ifupdown/tests/test8
diff --git a/src/settings/plugins/ifupdown/tests/test9 b/src/core/settings/plugins/ifupdown/tests/test9
index 7d94563af9..7d94563af9 100644
--- a/src/settings/plugins/ifupdown/tests/test9
+++ b/src/core/settings/plugins/ifupdown/tests/test9
diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
index 400c175191..400c175191 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-plugin.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.h b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.h
index 5d9f2da313..5d9f2da313 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-plugin.h
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.h
diff --git a/src/settings/plugins/keyfile/nms-keyfile-reader.c b/src/core/settings/plugins/keyfile/nms-keyfile-reader.c
index 6978c10596..6978c10596 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-reader.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-reader.c
diff --git a/src/settings/plugins/keyfile/nms-keyfile-reader.h b/src/core/settings/plugins/keyfile/nms-keyfile-reader.h
index 247457d816..247457d816 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-reader.h
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-reader.h
diff --git a/src/settings/plugins/keyfile/nms-keyfile-storage.c b/src/core/settings/plugins/keyfile/nms-keyfile-storage.c
index 8fb9861cd2..8fb9861cd2 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-storage.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-storage.c
diff --git a/src/settings/plugins/keyfile/nms-keyfile-storage.h b/src/core/settings/plugins/keyfile/nms-keyfile-storage.h
index 008070df4f..008070df4f 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-storage.h
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-storage.h
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.c b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
index a62e0ae018..a62e0ae018 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.h b/src/core/settings/plugins/keyfile/nms-keyfile-utils.h
index 419a17ed7a..419a17ed7a 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.h
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-utils.h
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
index be1bf158b3..be1bf158b3 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.h b/src/core/settings/plugins/keyfile/nms-keyfile-writer.h
index dffd3b043d..dffd3b043d 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.h
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-writer.h
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT b/src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT
index 162bf72e58..162bf72e58 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain b/src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain
index 11e1ec6f63..11e1ec6f63 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component
index f5463ed004..f5463ed004 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main
index fc9fd8f81f..fc9fd8f81f 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property
index 52b395b3ab..52b395b3ab 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property
index 3a46611d4d..3a46611d4d 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection
index 3d58fee041..3d58fee041 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection
index 3a984b774a..3a984b774a 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID
index 2bacb72526..2bacb72526 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2
index 20240251e1..20240251e1 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID
index 6d2bc0fad1..6d2bc0fad1 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format
index b2bf91550e..b2bf91550e 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format
index 9427b16c52..9427b16c52 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID
index 138380d080..138380d080 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags
index 330adda0f5..330adda0f5 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting
index 95d7b9a9d1..95d7b9a9d1 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name
index f27cd4a342..f27cd4a342 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names
index d9ac586496..d9ac586496 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID
index 4a3b56d24f..4a3b56d24f 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config
index 14280eef6f..14280eef6f 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection
index f9ccc003df..f9ccc003df 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6
index a42dd5d2a5..a42dd5d2a5 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case
index 29aef49494..29aef49494 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob
index 62e6ae31fd..62e6ae31fd 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New
index 4cd8668626..4cd8668626 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old
index d3da598c81..d3da598c81 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing
index 2b39538ea2..2b39538ea2 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection
index b1949d0dd6..b1949d0dd6 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection
index 16d4b45e15..16d4b45e15 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1
index cac135ad1d..cac135ad1d 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2
index bbf2d8d631..bbf2d8d631 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1
index d3122d5395..d3122d5395 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2
index eb1cdacebd..eb1cdacebd 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3
index 7419e97dd2..7419e97dd2 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4
index 626b6f6840..626b6f6840 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem b/src/core/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem
index ef1be20d2b..ef1be20d2b 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem b/src/core/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem
index dec9aa1b8f..dec9aa1b8f 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem
diff --git a/src/settings/plugins/keyfile/tests/meson.build b/src/core/settings/plugins/keyfile/tests/meson.build
index 3c89bcf99a..3c89bcf99a 100644
--- a/src/settings/plugins/keyfile/tests/meson.build
+++ b/src/core/settings/plugins/keyfile/tests/meson.build
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile-settings.c b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
index 9dbfba1c5f..4d9c86c3d1 100644
--- a/src/settings/plugins/keyfile/tests/test-keyfile-settings.c
+++ b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
@@ -23,8 +23,8 @@
 
 #include "nm-test-utils-core.h"
 
-#define TEST_KEYFILES_DIR NM_BUILD_SRCDIR "/src/settings/plugins/keyfile/tests/keyfiles"
-#define TEST_SCRATCH_DIR  NM_BUILD_BUILDDIR "/src/settings/plugins/keyfile/tests/keyfiles"
+#define TEST_KEYFILES_DIR NM_BUILD_SRCDIR "/src/core/settings/plugins/keyfile/tests/keyfiles"
+#define TEST_SCRATCH_DIR  NM_BUILD_BUILDDIR "/src/core/settings/plugins/keyfile/tests/keyfiles"
 
 /*****************************************************************************/
 
diff --git a/src/settings/plugins/meson.build b/src/core/settings/plugins/meson.build
index d4338a30a5..d4338a30a5 100644
--- a/src/settings/plugins/meson.build
+++ b/src/core/settings/plugins/meson.build
diff --git a/src/supplicant/nm-supplicant-config.c b/src/core/supplicant/nm-supplicant-config.c
index 1754bfff59..1754bfff59 100644
--- a/src/supplicant/nm-supplicant-config.c
+++ b/src/core/supplicant/nm-supplicant-config.c
diff --git a/src/supplicant/nm-supplicant-config.h b/src/core/supplicant/nm-supplicant-config.h
index b561936239..b561936239 100644
--- a/src/supplicant/nm-supplicant-config.h
+++ b/src/core/supplicant/nm-supplicant-config.h
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/core/supplicant/nm-supplicant-interface.c
index ec278c31fc..ec278c31fc 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/core/supplicant/nm-supplicant-interface.c
diff --git a/src/supplicant/nm-supplicant-interface.h b/src/core/supplicant/nm-supplicant-interface.h
index a62eeb6297..a62eeb6297 100644
--- a/src/supplicant/nm-supplicant-interface.h
+++ b/src/core/supplicant/nm-supplicant-interface.h
diff --git a/src/supplicant/nm-supplicant-manager.c b/src/core/supplicant/nm-supplicant-manager.c
index 30b15cc010..30b15cc010 100644
--- a/src/supplicant/nm-supplicant-manager.c
+++ b/src/core/supplicant/nm-supplicant-manager.c
diff --git a/src/supplicant/nm-supplicant-manager.h b/src/core/supplicant/nm-supplicant-manager.h
index 3000d064bb..3000d064bb 100644
--- a/src/supplicant/nm-supplicant-manager.h
+++ b/src/core/supplicant/nm-supplicant-manager.h
diff --git a/src/supplicant/nm-supplicant-settings-verify.c b/src/core/supplicant/nm-supplicant-settings-verify.c
index fe4cb1c1b0..fe4cb1c1b0 100644
--- a/src/supplicant/nm-supplicant-settings-verify.c
+++ b/src/core/supplicant/nm-supplicant-settings-verify.c
diff --git a/src/supplicant/nm-supplicant-settings-verify.h b/src/core/supplicant/nm-supplicant-settings-verify.h
index 8ba50b6713..8ba50b6713 100644
--- a/src/supplicant/nm-supplicant-settings-verify.h
+++ b/src/core/supplicant/nm-supplicant-settings-verify.h
diff --git a/src/supplicant/nm-supplicant-types.h b/src/core/supplicant/nm-supplicant-types.h
index adcf02db8b..adcf02db8b 100644
--- a/src/supplicant/nm-supplicant-types.h
+++ b/src/core/supplicant/nm-supplicant-types.h
diff --git a/src/supplicant/tests/certs/test-ca-cert.pem b/src/core/supplicant/tests/certs/test-ca-cert.pem
index ef1be20d2b..ef1be20d2b 100644
--- a/src/supplicant/tests/certs/test-ca-cert.pem
+++ b/src/core/supplicant/tests/certs/test-ca-cert.pem
diff --git a/src/supplicant/tests/certs/test-cert.p12 b/src/core/supplicant/tests/certs/test-cert.p12
index ae4a683049..ae4a683049 100644
--- a/src/supplicant/tests/certs/test-cert.p12
+++ b/src/core/supplicant/tests/certs/test-cert.p12
diff --git a/src/supplicant/tests/meson.build b/src/core/supplicant/tests/meson.build
index 88832a9b6f..88832a9b6f 100644
--- a/src/supplicant/tests/meson.build
+++ b/src/core/supplicant/tests/meson.build
diff --git a/src/supplicant/tests/test-supplicant-config.c b/src/core/supplicant/tests/test-supplicant-config.c
index 4918ae03cf..1dde90bd18 100644
--- a/src/supplicant/tests/test-supplicant-config.c
+++ b/src/core/supplicant/tests/test-supplicant-config.c
@@ -21,7 +21,7 @@
 
 #include "nm-test-utils-core.h"
 
-#define TEST_CERT_DIR NM_BUILD_SRCDIR "/src/supplicant/tests/certs"
+#define TEST_CERT_DIR NM_BUILD_SRCDIR "/src/core/supplicant/tests/certs"
 
 /*****************************************************************************/
 
diff --git a/src/systemd/meson.build b/src/core/systemd/meson.build
index 4f3a63eda4..4f3a63eda4 100644
--- a/src/systemd/meson.build
+++ b/src/core/systemd/meson.build
diff --git a/src/systemd/nm-sd-utils-core.c b/src/core/systemd/nm-sd-utils-core.c
index c7d4aadafa..c7d4aadafa 100644
--- a/src/systemd/nm-sd-utils-core.c
+++ b/src/core/systemd/nm-sd-utils-core.c
diff --git a/src/systemd/nm-sd-utils-core.h b/src/core/systemd/nm-sd-utils-core.h
index ccad002989..ccad002989 100644
--- a/src/systemd/nm-sd-utils-core.h
+++ b/src/core/systemd/nm-sd-utils-core.h
diff --git a/src/systemd/nm-sd-utils-dhcp.c b/src/core/systemd/nm-sd-utils-dhcp.c
index bafc8fcc68..bafc8fcc68 100644
--- a/src/systemd/nm-sd-utils-dhcp.c
+++ b/src/core/systemd/nm-sd-utils-dhcp.c
diff --git a/src/systemd/nm-sd-utils-dhcp.h b/src/core/systemd/nm-sd-utils-dhcp.h
index 5d126d5bd9..5d126d5bd9 100644
--- a/src/systemd/nm-sd-utils-dhcp.h
+++ b/src/core/systemd/nm-sd-utils-dhcp.h
diff --git a/src/systemd/nm-sd.c b/src/core/systemd/nm-sd.c
index 6543321312..6543321312 100644
--- a/src/systemd/nm-sd.c
+++ b/src/core/systemd/nm-sd.c
diff --git a/src/systemd/nm-sd.h b/src/core/systemd/nm-sd.h
index 0ea4be2229..0ea4be2229 100644
--- a/src/systemd/nm-sd.h
+++ b/src/core/systemd/nm-sd.h
diff --git a/src/systemd/sd-adapt-core/condition.h b/src/core/systemd/sd-adapt-core/condition.h
index d3a6812af0..d3a6812af0 100644
--- a/src/systemd/sd-adapt-core/condition.h
+++ b/src/core/systemd/sd-adapt-core/condition.h
diff --git a/src/systemd/sd-adapt-core/conf-parser.h b/src/core/systemd/sd-adapt-core/conf-parser.h
index 637892c2d6..637892c2d6 100644
--- a/src/systemd/sd-adapt-core/conf-parser.h
+++ b/src/core/systemd/sd-adapt-core/conf-parser.h
diff --git a/src/systemd/sd-adapt-core/device-util.h b/src/core/systemd/sd-adapt-core/device-util.h
index 637892c2d6..637892c2d6 100644
--- a/src/systemd/sd-adapt-core/device-util.h
+++ b/src/core/systemd/sd-adapt-core/device-util.h
diff --git a/src/systemd/sd-adapt-core/khash.h b/src/core/systemd/sd-adapt-core/khash.h
index 637892c2d6..637892c2d6 100644
--- a/src/systemd/sd-adapt-core/khash.h
+++ b/src/core/systemd/sd-adapt-core/khash.h
diff --git a/src/systemd/sd-adapt-core/network-util.h b/src/core/systemd/sd-adapt-core/network-util.h
index 637892c2d6..637892c2d6 100644
--- a/src/systemd/sd-adapt-core/network-util.h
+++ b/src/core/systemd/sd-adapt-core/network-util.h
diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.c b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c
index c03d4d97bd..c03d4d97bd 100644
--- a/src/systemd/sd-adapt-core/nm-sd-adapt-core.c
+++ b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c
diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h
index a7332914f0..a7332914f0 100644
--- a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h
+++ b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h
diff --git a/src/systemd/sd-adapt-core/sd-daemon.h b/src/core/systemd/sd-adapt-core/sd-daemon.h
index 637892c2d6..637892c2d6 100644
--- a/src/systemd/sd-adapt-core/sd-daemon.h
+++ b/src/core/systemd/sd-adapt-core/sd-daemon.h
diff --git a/src/systemd/sd-adapt-core/sd-device.h b/src/core/systemd/sd-adapt-core/sd-device.h
index 637892c2d6..637892c2d6 100644
--- a/src/systemd/sd-adapt-core/sd-device.h
+++ b/src/core/systemd/sd-adapt-core/sd-device.h
diff --git a/src/systemd/sd-adapt-core/udev-util.h b/src/core/systemd/sd-adapt-core/udev-util.h
index 637892c2d6..637892c2d6 100644
--- a/src/systemd/sd-adapt-core/udev-util.h
+++ b/src/core/systemd/sd-adapt-core/udev-util.h
diff --git a/src/systemd/src/libsystemd-network/arp-util.c b/src/core/systemd/src/libsystemd-network/arp-util.c
index 1c777d8a7a..1c777d8a7a 100644
--- a/src/systemd/src/libsystemd-network/arp-util.c
+++ b/src/core/systemd/src/libsystemd-network/arp-util.c
diff --git a/src/systemd/src/libsystemd-network/arp-util.h b/src/core/systemd/src/libsystemd-network/arp-util.h
index 2dac8cfbaa..2dac8cfbaa 100644
--- a/src/systemd/src/libsystemd-network/arp-util.h
+++ b/src/core/systemd/src/libsystemd-network/arp-util.h
diff --git a/src/systemd/src/libsystemd-network/dhcp-identifier.c b/src/core/systemd/src/libsystemd-network/dhcp-identifier.c
index 0720e38185..0720e38185 100644
--- a/src/systemd/src/libsystemd-network/dhcp-identifier.c
+++ b/src/core/systemd/src/libsystemd-network/dhcp-identifier.c
diff --git a/src/systemd/src/libsystemd-network/dhcp-identifier.h b/src/core/systemd/src/libsystemd-network/dhcp-identifier.h
index e9f2ea7e95..e9f2ea7e95 100644
--- a/src/systemd/src/libsystemd-network/dhcp-identifier.h
+++ b/src/core/systemd/src/libsystemd-network/dhcp-identifier.h
diff --git a/src/systemd/src/libsystemd-network/dhcp-internal.h b/src/core/systemd/src/libsystemd-network/dhcp-internal.h
index 40e6b1f26f..40e6b1f26f 100644
--- a/src/systemd/src/libsystemd-network/dhcp-internal.h
+++ b/src/core/systemd/src/libsystemd-network/dhcp-internal.h
diff --git a/src/systemd/src/libsystemd-network/dhcp-lease-internal.h b/src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h
index 49392d1bea..49392d1bea 100644
--- a/src/systemd/src/libsystemd-network/dhcp-lease-internal.h
+++ b/src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h
diff --git a/src/systemd/src/libsystemd-network/dhcp-network.c b/src/core/systemd/src/libsystemd-network/dhcp-network.c
index 4477f46f2c..4477f46f2c 100644
--- a/src/systemd/src/libsystemd-network/dhcp-network.c
+++ b/src/core/systemd/src/libsystemd-network/dhcp-network.c
diff --git a/src/systemd/src/libsystemd-network/dhcp-option.c b/src/core/systemd/src/libsystemd-network/dhcp-option.c
index 2c15d85a97..2c15d85a97 100644
--- a/src/systemd/src/libsystemd-network/dhcp-option.c
+++ b/src/core/systemd/src/libsystemd-network/dhcp-option.c
diff --git a/src/systemd/src/libsystemd-network/dhcp-packet.c b/src/core/systemd/src/libsystemd-network/dhcp-packet.c
index eeadd5628b..eeadd5628b 100644
--- a/src/systemd/src/libsystemd-network/dhcp-packet.c
+++ b/src/core/systemd/src/libsystemd-network/dhcp-packet.c
diff --git a/src/systemd/src/libsystemd-network/dhcp-protocol.h b/src/core/systemd/src/libsystemd-network/dhcp-protocol.h
index 11f4201ab2..11f4201ab2 100644
--- a/src/systemd/src/libsystemd-network/dhcp-protocol.h
+++ b/src/core/systemd/src/libsystemd-network/dhcp-protocol.h
diff --git a/src/systemd/src/libsystemd-network/dhcp6-internal.h b/src/core/systemd/src/libsystemd-network/dhcp6-internal.h
index 24d8a314a4..24d8a314a4 100644
--- a/src/systemd/src/libsystemd-network/dhcp6-internal.h
+++ b/src/core/systemd/src/libsystemd-network/dhcp6-internal.h
diff --git a/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h b/src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h
index e9e2362d6f..e9e2362d6f 100644
--- a/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h
+++ b/src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h
diff --git a/src/systemd/src/libsystemd-network/dhcp6-network.c b/src/core/systemd/src/libsystemd-network/dhcp6-network.c
index b6816de404..b6816de404 100644
--- a/src/systemd/src/libsystemd-network/dhcp6-network.c
+++ b/src/core/systemd/src/libsystemd-network/dhcp6-network.c
diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/core/systemd/src/libsystemd-network/dhcp6-option.c
index 21e2d3f02f..21e2d3f02f 100644
--- a/src/systemd/src/libsystemd-network/dhcp6-option.c
+++ b/src/core/systemd/src/libsystemd-network/dhcp6-option.c
diff --git a/src/systemd/src/libsystemd-network/dhcp6-protocol.h b/src/core/systemd/src/libsystemd-network/dhcp6-protocol.h
index c700363803..c700363803 100644
--- a/src/systemd/src/libsystemd-network/dhcp6-protocol.h
+++ b/src/core/systemd/src/libsystemd-network/dhcp6-protocol.h
diff --git a/src/systemd/src/libsystemd-network/lldp-internal.h b/src/core/systemd/src/libsystemd-network/lldp-internal.h
index f23695f974..f23695f974 100644
--- a/src/systemd/src/libsystemd-network/lldp-internal.h
+++ b/src/core/systemd/src/libsystemd-network/lldp-internal.h
diff --git a/src/systemd/src/libsystemd-network/lldp-neighbor.c b/src/core/systemd/src/libsystemd-network/lldp-neighbor.c
index 58ff0e0fbc..58ff0e0fbc 100644
--- a/src/systemd/src/libsystemd-network/lldp-neighbor.c
+++ b/src/core/systemd/src/libsystemd-network/lldp-neighbor.c
diff --git a/src/systemd/src/libsystemd-network/lldp-neighbor.h b/src/core/systemd/src/libsystemd-network/lldp-neighbor.h
index a5718c8c31..a5718c8c31 100644
--- a/src/systemd/src/libsystemd-network/lldp-neighbor.h
+++ b/src/core/systemd/src/libsystemd-network/lldp-neighbor.h
diff --git a/src/systemd/src/libsystemd-network/lldp-network.c b/src/core/systemd/src/libsystemd-network/lldp-network.c
index 75dce58c30..75dce58c30 100644
--- a/src/systemd/src/libsystemd-network/lldp-network.c
+++ b/src/core/systemd/src/libsystemd-network/lldp-network.c
diff --git a/src/systemd/src/libsystemd-network/lldp-network.h b/src/core/systemd/src/libsystemd-network/lldp-network.h
index bc69b324c2..bc69b324c2 100644
--- a/src/systemd/src/libsystemd-network/lldp-network.h
+++ b/src/core/systemd/src/libsystemd-network/lldp-network.h
diff --git a/src/systemd/src/libsystemd-network/network-internal.c b/src/core/systemd/src/libsystemd-network/network-internal.c
index efa3dcfa4d..efa3dcfa4d 100644
--- a/src/systemd/src/libsystemd-network/network-internal.c
+++ b/src/core/systemd/src/libsystemd-network/network-internal.c
diff --git a/src/systemd/src/libsystemd-network/network-internal.h b/src/core/systemd/src/libsystemd-network/network-internal.h
index e5b853c0cd..e5b853c0cd 100644
--- a/src/systemd/src/libsystemd-network/network-internal.h
+++ b/src/core/systemd/src/libsystemd-network/network-internal.h
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-client.c b/src/core/systemd/src/libsystemd-network/sd-dhcp-client.c
index 27a3476fcf..27a3476fcf 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/core/systemd/src/libsystemd-network/sd-dhcp-client.c
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-lease.c b/src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c
index 94b0d35c09..94b0d35c09 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
index 3fafd3c0e2..3fafd3c0e2 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c b/src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c
index 5792f6882d..5792f6882d 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
+++ b/src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c
diff --git a/src/systemd/src/libsystemd-network/sd-ipv4acd.c b/src/core/systemd/src/libsystemd-network/sd-ipv4acd.c
index 096afbd8ef..096afbd8ef 100644
--- a/src/systemd/src/libsystemd-network/sd-ipv4acd.c
+++ b/src/core/systemd/src/libsystemd-network/sd-ipv4acd.c
diff --git a/src/systemd/src/libsystemd-network/sd-ipv4ll.c b/src/core/systemd/src/libsystemd-network/sd-ipv4ll.c
index c5e7a91fe8..c5e7a91fe8 100644
--- a/src/systemd/src/libsystemd-network/sd-ipv4ll.c
+++ b/src/core/systemd/src/libsystemd-network/sd-ipv4ll.c
diff --git a/src/systemd/src/libsystemd-network/sd-lldp.c b/src/core/systemd/src/libsystemd-network/sd-lldp.c
index b12d8e27f2..b12d8e27f2 100644
--- a/src/systemd/src/libsystemd-network/sd-lldp.c
+++ b/src/core/systemd/src/libsystemd-network/sd-lldp.c
diff --git a/src/systemd/src/libsystemd/sd-event/event-source.h b/src/core/systemd/src/libsystemd/sd-event/event-source.h
index f0d2a1b9e6..f0d2a1b9e6 100644
--- a/src/systemd/src/libsystemd/sd-event/event-source.h
+++ b/src/core/systemd/src/libsystemd/sd-event/event-source.h
diff --git a/src/systemd/src/libsystemd/sd-event/event-util.c b/src/core/systemd/src/libsystemd/sd-event/event-util.c
index 7cc55be101..7cc55be101 100644
--- a/src/systemd/src/libsystemd/sd-event/event-util.c
+++ b/src/core/systemd/src/libsystemd/sd-event/event-util.c
diff --git a/src/systemd/src/libsystemd/sd-event/event-util.h b/src/core/systemd/src/libsystemd/sd-event/event-util.h
index c8f97bc8d6..c8f97bc8d6 100644
--- a/src/systemd/src/libsystemd/sd-event/event-util.h
+++ b/src/core/systemd/src/libsystemd/sd-event/event-util.h
diff --git a/src/systemd/src/libsystemd/sd-event/sd-event.c b/src/core/systemd/src/libsystemd/sd-event/sd-event.c
index dda4be00bf..dda4be00bf 100644
--- a/src/systemd/src/libsystemd/sd-event/sd-event.c
+++ b/src/core/systemd/src/libsystemd/sd-event/sd-event.c
diff --git a/src/systemd/src/libsystemd/sd-id128/id128-util.c b/src/core/systemd/src/libsystemd/sd-id128/id128-util.c
index b61cfdb02c..b61cfdb02c 100644
--- a/src/systemd/src/libsystemd/sd-id128/id128-util.c
+++ b/src/core/systemd/src/libsystemd/sd-id128/id128-util.c
diff --git a/src/systemd/src/libsystemd/sd-id128/id128-util.h b/src/core/systemd/src/libsystemd/sd-id128/id128-util.h
index 6b09bcd96a..6b09bcd96a 100644
--- a/src/systemd/src/libsystemd/sd-id128/id128-util.h
+++ b/src/core/systemd/src/libsystemd/sd-id128/id128-util.h
diff --git a/src/systemd/src/libsystemd/sd-id128/sd-id128.c b/src/core/systemd/src/libsystemd/sd-id128/sd-id128.c
index 64b8c78728..64b8c78728 100644
--- a/src/systemd/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/core/systemd/src/libsystemd/sd-id128/sd-id128.c
diff --git a/src/systemd/src/systemd/_sd-common.h b/src/core/systemd/src/systemd/_sd-common.h
index e3de2ae562..e3de2ae562 100644
--- a/src/systemd/src/systemd/_sd-common.h
+++ b/src/core/systemd/src/systemd/_sd-common.h
diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/core/systemd/src/systemd/sd-dhcp-client.h
index c35328a9a6..c35328a9a6 100644
--- a/src/systemd/src/systemd/sd-dhcp-client.h
+++ b/src/core/systemd/src/systemd/sd-dhcp-client.h
diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/core/systemd/src/systemd/sd-dhcp-lease.h
index c255a1f912..c255a1f912 100644
--- a/src/systemd/src/systemd/sd-dhcp-lease.h
+++ b/src/core/systemd/src/systemd/sd-dhcp-lease.h
diff --git a/src/systemd/src/systemd/sd-dhcp-option.h b/src/core/systemd/src/systemd/sd-dhcp-option.h
index 71aa479b5e..71aa479b5e 100644
--- a/src/systemd/src/systemd/sd-dhcp-option.h
+++ b/src/core/systemd/src/systemd/sd-dhcp-option.h
diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/core/systemd/src/systemd/sd-dhcp6-client.h
index 75ee27d68b..75ee27d68b 100644
--- a/src/systemd/src/systemd/sd-dhcp6-client.h
+++ b/src/core/systemd/src/systemd/sd-dhcp6-client.h
diff --git a/src/systemd/src/systemd/sd-dhcp6-lease.h b/src/core/systemd/src/systemd/sd-dhcp6-lease.h
index f77b31acf9..f77b31acf9 100644
--- a/src/systemd/src/systemd/sd-dhcp6-lease.h
+++ b/src/core/systemd/src/systemd/sd-dhcp6-lease.h
diff --git a/src/systemd/src/systemd/sd-dhcp6-option.h b/src/core/systemd/src/systemd/sd-dhcp6-option.h
index ddb2c7cecd..ddb2c7cecd 100644
--- a/src/systemd/src/systemd/sd-dhcp6-option.h
+++ b/src/core/systemd/src/systemd/sd-dhcp6-option.h
diff --git a/src/systemd/src/systemd/sd-event.h b/src/core/systemd/src/systemd/sd-event.h
index 2ae2a0da48..2ae2a0da48 100644
--- a/src/systemd/src/systemd/sd-event.h
+++ b/src/core/systemd/src/systemd/sd-event.h
diff --git a/src/systemd/src/systemd/sd-id128.h b/src/core/systemd/src/systemd/sd-id128.h
index 02aa318a06..02aa318a06 100644
--- a/src/systemd/src/systemd/sd-id128.h
+++ b/src/core/systemd/src/systemd/sd-id128.h
diff --git a/src/systemd/src/systemd/sd-ipv4acd.h b/src/core/systemd/src/systemd/sd-ipv4acd.h
index 2809d8748b..2809d8748b 100644
--- a/src/systemd/src/systemd/sd-ipv4acd.h
+++ b/src/core/systemd/src/systemd/sd-ipv4acd.h
diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/core/systemd/src/systemd/sd-ipv4ll.h
index aa4d174e4b..aa4d174e4b 100644
--- a/src/systemd/src/systemd/sd-ipv4ll.h
+++ b/src/core/systemd/src/systemd/sd-ipv4ll.h
diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/core/systemd/src/systemd/sd-lldp.h
index f551f6b4fa..f551f6b4fa 100644
--- a/src/systemd/src/systemd/sd-lldp.h
+++ b/src/core/systemd/src/systemd/sd-lldp.h
diff --git a/src/systemd/src/systemd/sd-ndisc.h b/src/core/systemd/src/systemd/sd-ndisc.h
index c0e37899a7..c0e37899a7 100644
--- a/src/systemd/src/systemd/sd-ndisc.h
+++ b/src/core/systemd/src/systemd/sd-ndisc.h
diff --git a/src/tests/config/NetworkManager-warn.conf b/src/core/tests/config/NetworkManager-warn.conf
index 80df7c5232..80df7c5232 100644
--- a/src/tests/config/NetworkManager-warn.conf
+++ b/src/core/tests/config/NetworkManager-warn.conf
diff --git a/src/tests/config/NetworkManager.conf b/src/core/tests/config/NetworkManager.conf
index a447b6d68d..a447b6d68d 100644
--- a/src/tests/config/NetworkManager.conf
+++ b/src/core/tests/config/NetworkManager.conf
diff --git a/src/tests/config/NetworkManager.state b/src/core/tests/config/NetworkManager.state
index 1b9d604ac5..1b9d604ac5 100644
--- a/src/tests/config/NetworkManager.state
+++ b/src/core/tests/config/NetworkManager.state
diff --git a/src/tests/config/bad.conf b/src/core/tests/config/bad.conf
index 20d6a67a1b..20d6a67a1b 100644
--- a/src/tests/config/bad.conf
+++ b/src/core/tests/config/bad.conf
diff --git a/src/tests/config/conf.d/00-overrides.conf b/src/core/tests/config/conf.d/00-overrides.conf
index f26ed93b9a..f26ed93b9a 100644
--- a/src/tests/config/conf.d/00-overrides.conf
+++ b/src/core/tests/config/conf.d/00-overrides.conf
diff --git a/src/tests/config/conf.d/10-more.conf b/src/core/tests/config/conf.d/10-more.conf
index eadb7f96f6..eadb7f96f6 100644
--- a/src/tests/config/conf.d/10-more.conf
+++ b/src/core/tests/config/conf.d/10-more.conf
diff --git a/src/tests/config/conf.d/20-config-enable-1.conf b/src/core/tests/config/conf.d/20-config-enable-1.conf
index e6800f5236..e6800f5236 100644
--- a/src/tests/config/conf.d/20-config-enable-1.conf
+++ b/src/core/tests/config/conf.d/20-config-enable-1.conf
diff --git a/src/tests/config/conf.d/90-last.conf b/src/core/tests/config/conf.d/90-last.conf
index 7d078788de..7d078788de 100644
--- a/src/tests/config/conf.d/90-last.conf
+++ b/src/core/tests/config/conf.d/90-last.conf
diff --git a/src/tests/config/global-dns-invalid.conf b/src/core/tests/config/global-dns-invalid.conf
index e490f609cc..e490f609cc 100644
--- a/src/tests/config/global-dns-invalid.conf
+++ b/src/core/tests/config/global-dns-invalid.conf
diff --git a/src/tests/config/meson.build b/src/core/tests/config/meson.build
index d0d8b1cf79..d0d8b1cf79 100644
--- a/src/tests/config/meson.build
+++ b/src/core/tests/config/meson.build
diff --git a/src/tests/config/nm-test-device.c b/src/core/tests/config/nm-test-device.c
index c6b894d429..c6b894d429 100644
--- a/src/tests/config/nm-test-device.c
+++ b/src/core/tests/config/nm-test-device.c
diff --git a/src/tests/config/nm-test-device.h b/src/core/tests/config/nm-test-device.h
index 638177a09c..638177a09c 100644
--- a/src/tests/config/nm-test-device.h
+++ b/src/core/tests/config/nm-test-device.h
diff --git a/src/tests/config/test-config.c b/src/core/tests/config/test-config.c
index 15a4340b7d..526c713852 100644
--- a/src/tests/config/test-config.c
+++ b/src/core/tests/config/test-config.c
@@ -16,8 +16,8 @@
 
 #include "nm-test-utils-core.h"
 
-#define TEST_DIR  NM_BUILD_SRCDIR "/src/tests/config"
-#define BUILD_DIR NM_BUILD_BUILDDIR "/src/tests/config"
+#define TEST_DIR  NM_BUILD_SRCDIR "/src/core/tests/config"
+#define BUILD_DIR NM_BUILD_BUILDDIR "/src/core/tests/config"
 
 /*****************************************************************************/
 
diff --git a/src/tests/meson.build b/src/core/tests/meson.build
index f4125396c2..f4125396c2 100644
--- a/src/tests/meson.build
+++ b/src/core/tests/meson.build
diff --git a/src/tests/test-core-with-expect.c b/src/core/tests/test-core-with-expect.c
index d9750cd676..d9750cd676 100644
--- a/src/tests/test-core-with-expect.c
+++ b/src/core/tests/test-core-with-expect.c
diff --git a/src/tests/test-core.c b/src/core/tests/test-core.c
index 87136dc3f1..87136dc3f1 100644
--- a/src/tests/test-core.c
+++ b/src/core/tests/test-core.c
diff --git a/src/tests/test-dcb.c b/src/core/tests/test-dcb.c
index 9ee1fda6fb..9ee1fda6fb 100644
--- a/src/tests/test-dcb.c
+++ b/src/core/tests/test-dcb.c
diff --git a/src/tests/test-ip4-config.c b/src/core/tests/test-ip4-config.c
index 008201a2bf..008201a2bf 100644
--- a/src/tests/test-ip4-config.c
+++ b/src/core/tests/test-ip4-config.c
diff --git a/src/tests/test-ip6-config.c b/src/core/tests/test-ip6-config.c
index 7ba79731c4..7ba79731c4 100644
--- a/src/tests/test-ip6-config.c
+++ b/src/core/tests/test-ip6-config.c
diff --git a/src/tests/test-l3cfg.c b/src/core/tests/test-l3cfg.c
index 92e596a09e..92e596a09e 100644
--- a/src/tests/test-l3cfg.c
+++ b/src/core/tests/test-l3cfg.c
diff --git a/src/tests/test-secret-agent.py b/src/core/tests/test-secret-agent.py
index 46f82b3485..46f82b3485 100755
--- a/src/tests/test-secret-agent.py
+++ b/src/core/tests/test-secret-agent.py
diff --git a/src/tests/test-systemd.c b/src/core/tests/test-systemd.c
index aa87660c98..aa87660c98 100644
--- a/src/tests/test-systemd.c
+++ b/src/core/tests/test-systemd.c
diff --git a/src/tests/test-utils.c b/src/core/tests/test-utils.c
index 7750109279..7750109279 100644
--- a/src/tests/test-utils.c
+++ b/src/core/tests/test-utils.c
diff --git a/src/tests/test-wired-defname.c b/src/core/tests/test-wired-defname.c
index 7fb8cbab99..7fb8cbab99 100644
--- a/src/tests/test-wired-defname.c
+++ b/src/core/tests/test-wired-defname.c
diff --git a/src/vpn/nm-vpn-connection.c b/src/core/vpn/nm-vpn-connection.c
index b6513497a0..b6513497a0 100644
--- a/src/vpn/nm-vpn-connection.c
+++ b/src/core/vpn/nm-vpn-connection.c
diff --git a/src/vpn/nm-vpn-connection.h b/src/core/vpn/nm-vpn-connection.h
index 66ec7eec3a..66ec7eec3a 100644
--- a/src/vpn/nm-vpn-connection.h
+++ b/src/core/vpn/nm-vpn-connection.h
diff --git a/src/vpn/nm-vpn-manager.c b/src/core/vpn/nm-vpn-manager.c
index 65f9e56918..65f9e56918 100644
--- a/src/vpn/nm-vpn-manager.c
+++ b/src/core/vpn/nm-vpn-manager.c
diff --git a/src/vpn/nm-vpn-manager.h b/src/core/vpn/nm-vpn-manager.h
index 41ecb8d2dd..41ecb8d2dd 100644
--- a/src/vpn/nm-vpn-manager.h
+++ b/src/core/vpn/nm-vpn-manager.h
diff --git a/tools/check-config-options.sh b/tools/check-config-options.sh
index d9d4431ee8..4cbd485599 100755
--- a/tools/check-config-options.sh
+++ b/tools/check-config-options.sh
@@ -5,20 +5,20 @@ ret=0
 
 get_supported_options()
 {
-    awk '/START OPTION LIST/{flag=1;next}/END OPTION LIST/{flag=0}flag' "$srcdir/src/nm-config.c" |
+    awk '/START OPTION LIST/{flag=1;next}/END OPTION LIST/{flag=0}flag' "$srcdir/src/core/nm-config.c" |
     grep -o 'NM_CONFIG_KEYFILE_KEY_\w*'
 }
 
 get_missing_options()
 {
-    grep -v '/\* check-config-options skip \*/' "$srcdir/src/nm-config.h" |
+    grep -v '/\* check-config-options skip \*/' "$srcdir/src/core/nm-config.h" |
     grep -o 'NM_CONFIG_KEYFILE_KEY_\w*' |
     grep -v -Fx -f <(get_supported_options)
 }
 
 get_src_con_defaults()
 {
-    sed -n 's/\<NM_CON_DEFAULT/\n\0/gp' $(find "$srcdir/src/" -name \*.c ! -name test\*.c) |
+    sed -n 's/\<NM_CON_DEFAULT/\n\0/gp' $(find "$srcdir/src/core/" -name \*.c ! -name test\*.c) |
     sed -n 's/.*\<NM_CON_DEFAULT\(_NOP\)\?\s*("\([^"]*\)").*/\2/p'
 }
 
diff --git a/tools/create-exports-NetworkManager.sh b/tools/create-exports-NetworkManager.sh
index 406e14cf16..f7fd3bab95 100755
--- a/tools/create-exports-NetworkManager.sh
+++ b/tools/create-exports-NetworkManager.sh
@@ -8,7 +8,7 @@ die() {
     exit 1
 }
 
-# generates the linker version script src/NetworkManager.ver
+# generates the linker version script src/core/NetworkManager.ver
 # by looking at the symbols needed by the device and settings
 # plugins. Note that this depends on how NetworkManager and
 # the plugins are build. For example, compiling without
@@ -40,9 +40,9 @@ call_nm() {
 }
 
 get_symbols_nm () {
-    base=./src/.libs/NetworkManager-all-sym
+    base=./src/core/.libs/NetworkManager-all-sym
     if ! test -f "$base"; then
-        base=./src/NetworkManager-all-sym
+        base=./src/core/NetworkManager-all-sym
     fi
     call_nm "$base" |
         sed -n 's/^[tTDGRBS] //p' |
@@ -56,9 +56,9 @@ EOF
 }
 
 get_symbols_missing() {
-    (for f in $(find ./src/settings/plugins/*/${libs} \
-                     ./src/devices/*/${libs} \
-                     ./src/ppp/${libs} -name '*.so' 2>/dev/null); do
+    (for f in $(find ./src/core/settings/plugins/*/${libs} \
+                     ./src/core/devices/*/${libs} \
+                     ./src/core/ppp/${libs} -name '*.so' 2>/dev/null); do
         call_nm "$f" |
             sed -n 's/^\([U]\) \(\(nm_\|nmp_\|_nm\|NM\|_NM\|nmtst_\|c_siphash_\|c_list_\).*\)$/\2/p'
     done) |
@@ -82,7 +82,7 @@ do_rebuild() {
 }
 
 do_update() {
-    do_generate > ./src/NetworkManager.ver
+    do_generate > ./src/core/NetworkManager.ver
 }
 
 SYMBOLS_MISSING="$(get_symbols_missing | pretty)"
@@ -110,7 +110,7 @@ else
     libs=.libs/
 fi
 
-test -f ./src/${libs}libNetworkManager.a || die "must be called from NetworkManager top build dir after building the tree"
+test -f ./src/core/${libs}libNetworkManager.a || die "must be called from NetworkManager top build dir after building the tree"
 
 case "$1" in
     rebuild)
@@ -125,8 +125,8 @@ case "$1" in
         if test -z "${NM_BUILD_NO_CREATE_EXPORTS+x}"; then
             do_update
         else
-            if test -f "./src/NetworkManager.ver"; then
-                touch ./src/NetworkManager.ver
+            if test -f "./src/core/NetworkManager.ver"; then
+                touch ./src/core/NetworkManager.ver
             fi
         fi
         ;;
diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh
index ef9d4a61c7..6d835a8fb8 100755
--- a/tools/run-nm-test.sh
+++ b/tools/run-nm-test.sh
@@ -45,9 +45,9 @@ usage() {
     echo " With \"--test\" and \"--\" you can select the test and which arguments are"
     echo " passed to the test. You can omit these, in which case the first unknown parameter"
     echo " is the test and all other unknown parameters are passed to the test. For example"
-    echo "   $0 -m --test src/tests/test-core -- -p /general/match-spec/device"
+    echo "   $0 -m --test src/core/tests/test-core -- -p /general/match-spec/device"
     echo " can also be called as"
-    echo "   $0 src/tests/test-core -p /general/match-spec/device -m"
+    echo "   $0 src/core/tests/test-core -p /general/match-spec/device -m"
     echo ""
     echo "  The following environment variables are honored:"
     echo "    NMTST_USE_VALGRIND=0|1: enable/disable valgrind"
diff --git a/tools/test-build.sh b/tools/test-build.sh
index 17bcba7d1d..0ae9a58620 100755
--- a/tools/test-build.sh
+++ b/tools/test-build.sh
@@ -31,15 +31,15 @@ build_out_of_tree() {
 TARGETS=("$@")
 if [ "${#TARGETS}" -lt 1 ]; then
     TARGETS=(
-        src/NetworkManager
-        src/nm-iface-helper
-        src/dhcp/nm-dhcp-helper
+        src/core/NetworkManager
+        src/core/nm-iface-helper
+        src/core/dhcp/nm-dhcp-helper
         dispatcher/nm-dispatcher
         clients/nm-online
         clients/cli/nmcli
         clients/tui/nmtui
-        src/platform/tests/monitor
-        src/ndisc/tests/test-ndisc-linux
+        src/core/platform/tests/monitor
+        src/core/ndisc/tests/test-ndisc-linux
         $(git grep -h '\.l\?a\>' Makefile.am | sed 's/[a-zA-Z.0-9_-/]\+/\n\0\n/g' | sort -u | grep '\.l\?a$')
     )
 fi