diff --git a/src/core/systemd/meson.build b/src/libnm-systemd-core/meson.build
similarity index 100%
rename from src/core/systemd/meson.build
rename to src/libnm-systemd-core/meson.build
diff --git a/src/core/systemd/nm-sd-utils-core.c b/src/libnm-systemd-core/nm-sd-utils-core.c
similarity index 100%
rename from src/core/systemd/nm-sd-utils-core.c
rename to src/libnm-systemd-core/nm-sd-utils-core.c
diff --git a/src/core/systemd/nm-sd-utils-core.h b/src/libnm-systemd-core/nm-sd-utils-core.h
similarity index 100%
rename from src/core/systemd/nm-sd-utils-core.h
rename to src/libnm-systemd-core/nm-sd-utils-core.h
diff --git a/src/core/systemd/nm-sd-utils-dhcp.c b/src/libnm-systemd-core/nm-sd-utils-dhcp.c
similarity index 100%
rename from src/core/systemd/nm-sd-utils-dhcp.c
rename to src/libnm-systemd-core/nm-sd-utils-dhcp.c
diff --git a/src/core/systemd/nm-sd-utils-dhcp.h b/src/libnm-systemd-core/nm-sd-utils-dhcp.h
similarity index 100%
rename from src/core/systemd/nm-sd-utils-dhcp.h
rename to src/libnm-systemd-core/nm-sd-utils-dhcp.h
diff --git a/src/core/systemd/nm-sd.c b/src/libnm-systemd-core/nm-sd.c
similarity index 100%
rename from src/core/systemd/nm-sd.c
rename to src/libnm-systemd-core/nm-sd.c
diff --git a/src/core/systemd/nm-sd.h b/src/libnm-systemd-core/nm-sd.h
similarity index 100%
rename from src/core/systemd/nm-sd.h
rename to src/libnm-systemd-core/nm-sd.h
diff --git a/src/core/systemd/sd-adapt-core/condition.h b/src/libnm-systemd-core/sd-adapt-core/condition.h
similarity index 100%
rename from src/core/systemd/sd-adapt-core/condition.h
rename to src/libnm-systemd-core/sd-adapt-core/condition.h
diff --git a/src/core/systemd/sd-adapt-core/conf-parser.h b/src/libnm-systemd-core/sd-adapt-core/conf-parser.h
similarity index 100%
rename from src/core/systemd/sd-adapt-core/conf-parser.h
rename to src/libnm-systemd-core/sd-adapt-core/conf-parser.h
diff --git a/src/core/systemd/sd-adapt-core/device-util.h b/src/libnm-systemd-core/sd-adapt-core/device-util.h
similarity index 100%
rename from src/core/systemd/sd-adapt-core/device-util.h
rename to src/libnm-systemd-core/sd-adapt-core/device-util.h
diff --git a/src/core/systemd/sd-adapt-core/khash.h b/src/libnm-systemd-core/sd-adapt-core/khash.h
similarity index 100%
rename from src/core/systemd/sd-adapt-core/khash.h
rename to src/libnm-systemd-core/sd-adapt-core/khash.h
diff --git a/src/core/systemd/sd-adapt-core/network-util.h b/src/libnm-systemd-core/sd-adapt-core/network-util.h
similarity index 100%
rename from src/core/systemd/sd-adapt-core/network-util.h
rename to src/libnm-systemd-core/sd-adapt-core/network-util.h
diff --git a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c
similarity index 100%
rename from src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c
rename to src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c
diff --git a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h
similarity index 100%
rename from src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h
rename to src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h
diff --git a/src/core/systemd/sd-adapt-core/sd-daemon.h b/src/libnm-systemd-core/sd-adapt-core/sd-daemon.h
similarity index 100%
rename from src/core/systemd/sd-adapt-core/sd-daemon.h
rename to src/libnm-systemd-core/sd-adapt-core/sd-daemon.h
diff --git a/src/core/systemd/sd-adapt-core/sd-device.h b/src/libnm-systemd-core/sd-adapt-core/sd-device.h
similarity index 100%
rename from src/core/systemd/sd-adapt-core/sd-device.h
rename to src/libnm-systemd-core/sd-adapt-core/sd-device.h
diff --git a/src/core/systemd/sd-adapt-core/udev-util.h b/src/libnm-systemd-core/sd-adapt-core/udev-util.h
similarity index 100%
rename from src/core/systemd/sd-adapt-core/udev-util.h
rename to src/libnm-systemd-core/sd-adapt-core/udev-util.h
diff --git a/src/core/systemd/src/libsystemd-network/arp-util.c b/src/libnm-systemd-core/src/libsystemd-network/arp-util.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/arp-util.c
rename to src/libnm-systemd-core/src/libsystemd-network/arp-util.c
diff --git a/src/core/systemd/src/libsystemd-network/arp-util.h b/src/libnm-systemd-core/src/libsystemd-network/arp-util.h
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/arp-util.h
rename to src/libnm-systemd-core/src/libsystemd-network/arp-util.h
diff --git a/src/core/systemd/src/libsystemd-network/dhcp-identifier.c b/src/libnm-systemd-core/src/libsystemd-network/dhcp-identifier.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/dhcp-identifier.c
rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-identifier.c
diff --git a/src/core/systemd/src/libsystemd-network/dhcp-identifier.h b/src/libnm-systemd-core/src/libsystemd-network/dhcp-identifier.h
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/dhcp-identifier.h
rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-identifier.h
diff --git a/src/core/systemd/src/libsystemd-network/dhcp-internal.h b/src/libnm-systemd-core/src/libsystemd-network/dhcp-internal.h
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/dhcp-internal.h
rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-internal.h
diff --git a/src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h b/src/libnm-systemd-core/src/libsystemd-network/dhcp-lease-internal.h
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h
rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-lease-internal.h
diff --git a/src/core/systemd/src/libsystemd-network/dhcp-network.c b/src/libnm-systemd-core/src/libsystemd-network/dhcp-network.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/dhcp-network.c
rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-network.c
diff --git a/src/core/systemd/src/libsystemd-network/dhcp-option.c b/src/libnm-systemd-core/src/libsystemd-network/dhcp-option.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/dhcp-option.c
rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-option.c
diff --git a/src/core/systemd/src/libsystemd-network/dhcp-packet.c b/src/libnm-systemd-core/src/libsystemd-network/dhcp-packet.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/dhcp-packet.c
rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-packet.c
diff --git a/src/core/systemd/src/libsystemd-network/dhcp-protocol.h b/src/libnm-systemd-core/src/libsystemd-network/dhcp-protocol.h
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/dhcp-protocol.h
rename to src/libnm-systemd-core/src/libsystemd-network/dhcp-protocol.h
diff --git a/src/core/systemd/src/libsystemd-network/dhcp6-internal.h b/src/libnm-systemd-core/src/libsystemd-network/dhcp6-internal.h
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/dhcp6-internal.h
rename to src/libnm-systemd-core/src/libsystemd-network/dhcp6-internal.h
diff --git a/src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h b/src/libnm-systemd-core/src/libsystemd-network/dhcp6-lease-internal.h
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h
rename to src/libnm-systemd-core/src/libsystemd-network/dhcp6-lease-internal.h
diff --git a/src/core/systemd/src/libsystemd-network/dhcp6-network.c b/src/libnm-systemd-core/src/libsystemd-network/dhcp6-network.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/dhcp6-network.c
rename to src/libnm-systemd-core/src/libsystemd-network/dhcp6-network.c
diff --git a/src/core/systemd/src/libsystemd-network/dhcp6-option.c b/src/libnm-systemd-core/src/libsystemd-network/dhcp6-option.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/dhcp6-option.c
rename to src/libnm-systemd-core/src/libsystemd-network/dhcp6-option.c
diff --git a/src/core/systemd/src/libsystemd-network/dhcp6-protocol.h b/src/libnm-systemd-core/src/libsystemd-network/dhcp6-protocol.h
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/dhcp6-protocol.h
rename to src/libnm-systemd-core/src/libsystemd-network/dhcp6-protocol.h
diff --git a/src/core/systemd/src/libsystemd-network/lldp-internal.h b/src/libnm-systemd-core/src/libsystemd-network/lldp-internal.h
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/lldp-internal.h
rename to src/libnm-systemd-core/src/libsystemd-network/lldp-internal.h
diff --git a/src/core/systemd/src/libsystemd-network/lldp-neighbor.c b/src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/lldp-neighbor.c
rename to src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.c
diff --git a/src/core/systemd/src/libsystemd-network/lldp-neighbor.h b/src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.h
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/lldp-neighbor.h
rename to src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.h
diff --git a/src/core/systemd/src/libsystemd-network/lldp-network.c b/src/libnm-systemd-core/src/libsystemd-network/lldp-network.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/lldp-network.c
rename to src/libnm-systemd-core/src/libsystemd-network/lldp-network.c
diff --git a/src/core/systemd/src/libsystemd-network/lldp-network.h b/src/libnm-systemd-core/src/libsystemd-network/lldp-network.h
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/lldp-network.h
rename to src/libnm-systemd-core/src/libsystemd-network/lldp-network.h
diff --git a/src/core/systemd/src/libsystemd-network/network-common.c b/src/libnm-systemd-core/src/libsystemd-network/network-common.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/network-common.c
rename to src/libnm-systemd-core/src/libsystemd-network/network-common.c
diff --git a/src/core/systemd/src/libsystemd-network/network-common.h b/src/libnm-systemd-core/src/libsystemd-network/network-common.h
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/network-common.h
rename to src/libnm-systemd-core/src/libsystemd-network/network-common.h
diff --git a/src/core/systemd/src/libsystemd-network/network-internal.c b/src/libnm-systemd-core/src/libsystemd-network/network-internal.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/network-internal.c
rename to src/libnm-systemd-core/src/libsystemd-network/network-internal.c
diff --git a/src/core/systemd/src/libsystemd-network/network-internal.h b/src/libnm-systemd-core/src/libsystemd-network/network-internal.h
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/network-internal.h
rename to src/libnm-systemd-core/src/libsystemd-network/network-internal.h
diff --git a/src/core/systemd/src/libsystemd-network/sd-dhcp-client.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-client.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/sd-dhcp-client.c
rename to src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-client.c
diff --git a/src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-lease.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c
rename to src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-lease.c
diff --git a/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
rename to src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
diff --git a/src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-lease.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c
rename to src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-lease.c
diff --git a/src/core/systemd/src/libsystemd-network/sd-ipv4acd.c b/src/libnm-systemd-core/src/libsystemd-network/sd-ipv4acd.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/sd-ipv4acd.c
rename to src/libnm-systemd-core/src/libsystemd-network/sd-ipv4acd.c
diff --git a/src/core/systemd/src/libsystemd-network/sd-ipv4ll.c b/src/libnm-systemd-core/src/libsystemd-network/sd-ipv4ll.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/sd-ipv4ll.c
rename to src/libnm-systemd-core/src/libsystemd-network/sd-ipv4ll.c
diff --git a/src/core/systemd/src/libsystemd-network/sd-lldp.c b/src/libnm-systemd-core/src/libsystemd-network/sd-lldp.c
similarity index 100%
rename from src/core/systemd/src/libsystemd-network/sd-lldp.c
rename to src/libnm-systemd-core/src/libsystemd-network/sd-lldp.c
diff --git a/src/core/systemd/src/libsystemd/sd-event/event-source.h b/src/libnm-systemd-core/src/libsystemd/sd-event/event-source.h
similarity index 100%
rename from src/core/systemd/src/libsystemd/sd-event/event-source.h
rename to src/libnm-systemd-core/src/libsystemd/sd-event/event-source.h
diff --git a/src/core/systemd/src/libsystemd/sd-event/event-util.c b/src/libnm-systemd-core/src/libsystemd/sd-event/event-util.c
similarity index 100%
rename from src/core/systemd/src/libsystemd/sd-event/event-util.c
rename to src/libnm-systemd-core/src/libsystemd/sd-event/event-util.c
diff --git a/src/core/systemd/src/libsystemd/sd-event/event-util.h b/src/libnm-systemd-core/src/libsystemd/sd-event/event-util.h
similarity index 100%
rename from src/core/systemd/src/libsystemd/sd-event/event-util.h
rename to src/libnm-systemd-core/src/libsystemd/sd-event/event-util.h
diff --git a/src/core/systemd/src/libsystemd/sd-event/sd-event.c b/src/libnm-systemd-core/src/libsystemd/sd-event/sd-event.c
similarity index 100%
rename from src/core/systemd/src/libsystemd/sd-event/sd-event.c
rename to src/libnm-systemd-core/src/libsystemd/sd-event/sd-event.c
diff --git a/src/core/systemd/src/libsystemd/sd-id128/id128-util.c b/src/libnm-systemd-core/src/libsystemd/sd-id128/id128-util.c
similarity index 100%
rename from src/core/systemd/src/libsystemd/sd-id128/id128-util.c
rename to src/libnm-systemd-core/src/libsystemd/sd-id128/id128-util.c
diff --git a/src/core/systemd/src/libsystemd/sd-id128/id128-util.h b/src/libnm-systemd-core/src/libsystemd/sd-id128/id128-util.h
similarity index 100%
rename from src/core/systemd/src/libsystemd/sd-id128/id128-util.h
rename to src/libnm-systemd-core/src/libsystemd/sd-id128/id128-util.h
diff --git a/src/core/systemd/src/libsystemd/sd-id128/sd-id128.c b/src/libnm-systemd-core/src/libsystemd/sd-id128/sd-id128.c
similarity index 100%
rename from src/core/systemd/src/libsystemd/sd-id128/sd-id128.c
rename to src/libnm-systemd-core/src/libsystemd/sd-id128/sd-id128.c
diff --git a/src/core/systemd/src/systemd/_sd-common.h b/src/libnm-systemd-core/src/systemd/_sd-common.h
similarity index 100%
rename from src/core/systemd/src/systemd/_sd-common.h
rename to src/libnm-systemd-core/src/systemd/_sd-common.h
diff --git a/src/core/systemd/src/systemd/sd-dhcp-client.h b/src/libnm-systemd-core/src/systemd/sd-dhcp-client.h
similarity index 100%
rename from src/core/systemd/src/systemd/sd-dhcp-client.h
rename to src/libnm-systemd-core/src/systemd/sd-dhcp-client.h
diff --git a/src/core/systemd/src/systemd/sd-dhcp-lease.h b/src/libnm-systemd-core/src/systemd/sd-dhcp-lease.h
similarity index 100%
rename from src/core/systemd/src/systemd/sd-dhcp-lease.h
rename to src/libnm-systemd-core/src/systemd/sd-dhcp-lease.h
diff --git a/src/core/systemd/src/systemd/sd-dhcp-option.h b/src/libnm-systemd-core/src/systemd/sd-dhcp-option.h
similarity index 100%
rename from src/core/systemd/src/systemd/sd-dhcp-option.h
rename to src/libnm-systemd-core/src/systemd/sd-dhcp-option.h
diff --git a/src/core/systemd/src/systemd/sd-dhcp6-client.h b/src/libnm-systemd-core/src/systemd/sd-dhcp6-client.h
similarity index 100%
rename from src/core/systemd/src/systemd/sd-dhcp6-client.h
rename to src/libnm-systemd-core/src/systemd/sd-dhcp6-client.h
diff --git a/src/core/systemd/src/systemd/sd-dhcp6-lease.h b/src/libnm-systemd-core/src/systemd/sd-dhcp6-lease.h
similarity index 100%
rename from src/core/systemd/src/systemd/sd-dhcp6-lease.h
rename to src/libnm-systemd-core/src/systemd/sd-dhcp6-lease.h
diff --git a/src/core/systemd/src/systemd/sd-dhcp6-option.h b/src/libnm-systemd-core/src/systemd/sd-dhcp6-option.h
similarity index 100%
rename from src/core/systemd/src/systemd/sd-dhcp6-option.h
rename to src/libnm-systemd-core/src/systemd/sd-dhcp6-option.h
diff --git a/src/core/systemd/src/systemd/sd-event.h b/src/libnm-systemd-core/src/systemd/sd-event.h
similarity index 100%
rename from src/core/systemd/src/systemd/sd-event.h
rename to src/libnm-systemd-core/src/systemd/sd-event.h
diff --git a/src/core/systemd/src/systemd/sd-id128.h b/src/libnm-systemd-core/src/systemd/sd-id128.h
similarity index 100%
rename from src/core/systemd/src/systemd/sd-id128.h
rename to src/libnm-systemd-core/src/systemd/sd-id128.h
diff --git a/src/core/systemd/src/systemd/sd-ipv4acd.h b/src/libnm-systemd-core/src/systemd/sd-ipv4acd.h
similarity index 100%
rename from src/core/systemd/src/systemd/sd-ipv4acd.h
rename to src/libnm-systemd-core/src/systemd/sd-ipv4acd.h
diff --git a/src/core/systemd/src/systemd/sd-ipv4ll.h b/src/libnm-systemd-core/src/systemd/sd-ipv4ll.h
similarity index 100%
rename from src/core/systemd/src/systemd/sd-ipv4ll.h
rename to src/libnm-systemd-core/src/systemd/sd-ipv4ll.h
diff --git a/src/core/systemd/src/systemd/sd-lldp.h b/src/libnm-systemd-core/src/systemd/sd-lldp.h
similarity index 100%
rename from src/core/systemd/src/systemd/sd-lldp.h
rename to src/libnm-systemd-core/src/systemd/sd-lldp.h
diff --git a/src/core/systemd/src/systemd/sd-ndisc.h b/src/libnm-systemd-core/src/systemd/sd-ndisc.h
similarity index 100%
rename from src/core/systemd/src/systemd/sd-ndisc.h
rename to src/libnm-systemd-core/src/systemd/sd-ndisc.h