diff --git a/shared/systemd/nm-logging-stub.c b/src/libnm-systemd-shared/nm-logging-stub.c
similarity index 100%
rename from shared/systemd/nm-logging-stub.c
rename to src/libnm-systemd-shared/nm-logging-stub.c
diff --git a/shared/systemd/nm-sd-utils-shared.c b/src/libnm-systemd-shared/nm-sd-utils-shared.c
similarity index 100%
rename from shared/systemd/nm-sd-utils-shared.c
rename to src/libnm-systemd-shared/nm-sd-utils-shared.c
diff --git a/shared/systemd/nm-sd-utils-shared.h b/src/libnm-systemd-shared/nm-sd-utils-shared.h
similarity index 100%
rename from shared/systemd/nm-sd-utils-shared.h
rename to src/libnm-systemd-shared/nm-sd-utils-shared.h
diff --git a/shared/systemd/sd-adapt-shared/architecture.h b/src/libnm-systemd-shared/sd-adapt-shared/architecture.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/architecture.h
rename to src/libnm-systemd-shared/sd-adapt-shared/architecture.h
diff --git a/shared/systemd/sd-adapt-shared/arphrd-list.h b/src/libnm-systemd-shared/sd-adapt-shared/arphrd-list.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/arphrd-list.h
rename to src/libnm-systemd-shared/sd-adapt-shared/arphrd-list.h
diff --git a/shared/systemd/sd-adapt-shared/blockdev-util.h b/src/libnm-systemd-shared/sd-adapt-shared/blockdev-util.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/blockdev-util.h
rename to src/libnm-systemd-shared/sd-adapt-shared/blockdev-util.h
diff --git a/shared/systemd/sd-adapt-shared/build.h b/src/libnm-systemd-shared/sd-adapt-shared/build.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/build.h
rename to src/libnm-systemd-shared/sd-adapt-shared/build.h
diff --git a/shared/systemd/sd-adapt-shared/copy.h b/src/libnm-systemd-shared/sd-adapt-shared/copy.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/copy.h
rename to src/libnm-systemd-shared/sd-adapt-shared/copy.h
diff --git a/shared/systemd/sd-adapt-shared/def.h b/src/libnm-systemd-shared/sd-adapt-shared/def.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/def.h
rename to src/libnm-systemd-shared/sd-adapt-shared/def.h
diff --git a/shared/systemd/sd-adapt-shared/dhcp-server-internal.h b/src/libnm-systemd-shared/sd-adapt-shared/dhcp-server-internal.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/dhcp-server-internal.h
rename to src/libnm-systemd-shared/sd-adapt-shared/dhcp-server-internal.h
diff --git a/shared/systemd/sd-adapt-shared/dirent-util.h b/src/libnm-systemd-shared/sd-adapt-shared/dirent-util.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/dirent-util.h
rename to src/libnm-systemd-shared/sd-adapt-shared/dirent-util.h
diff --git a/shared/systemd/sd-adapt-shared/errno-list.h b/src/libnm-systemd-shared/sd-adapt-shared/errno-list.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/errno-list.h
rename to src/libnm-systemd-shared/sd-adapt-shared/errno-list.h
diff --git a/shared/systemd/sd-adapt-shared/glob-util.h b/src/libnm-systemd-shared/sd-adapt-shared/glob-util.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/glob-util.h
rename to src/libnm-systemd-shared/sd-adapt-shared/glob-util.h
diff --git a/shared/systemd/sd-adapt-shared/gunicode.h b/src/libnm-systemd-shared/sd-adapt-shared/gunicode.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/gunicode.h
rename to src/libnm-systemd-shared/sd-adapt-shared/gunicode.h
diff --git a/shared/systemd/sd-adapt-shared/idn-util.h b/src/libnm-systemd-shared/sd-adapt-shared/idn-util.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/idn-util.h
rename to src/libnm-systemd-shared/sd-adapt-shared/idn-util.h
diff --git a/shared/systemd/sd-adapt-shared/ioprio.h b/src/libnm-systemd-shared/sd-adapt-shared/ioprio.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/ioprio.h
rename to src/libnm-systemd-shared/sd-adapt-shared/ioprio.h
diff --git a/shared/systemd/sd-adapt-shared/locale-util.h b/src/libnm-systemd-shared/sd-adapt-shared/locale-util.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/locale-util.h
rename to src/libnm-systemd-shared/sd-adapt-shared/locale-util.h
diff --git a/shared/systemd/sd-adapt-shared/memfd-util.h b/src/libnm-systemd-shared/sd-adapt-shared/memfd-util.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/memfd-util.h
rename to src/libnm-systemd-shared/sd-adapt-shared/memfd-util.h
diff --git a/shared/systemd/sd-adapt-shared/missing_fs.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_fs.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/missing_fs.h
rename to src/libnm-systemd-shared/sd-adapt-shared/missing_fs.h
diff --git a/shared/systemd/sd-adapt-shared/missing_keyctl.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_keyctl.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/missing_keyctl.h
rename to src/libnm-systemd-shared/sd-adapt-shared/missing_keyctl.h
diff --git a/shared/systemd/sd-adapt-shared/missing_magic.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_magic.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/missing_magic.h
rename to src/libnm-systemd-shared/sd-adapt-shared/missing_magic.h
diff --git a/shared/systemd/sd-adapt-shared/missing_network.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_network.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/missing_network.h
rename to src/libnm-systemd-shared/sd-adapt-shared/missing_network.h
diff --git a/shared/systemd/sd-adapt-shared/missing_sched.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_sched.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/missing_sched.h
rename to src/libnm-systemd-shared/sd-adapt-shared/missing_sched.h
diff --git a/shared/systemd/sd-adapt-shared/missing_timerfd.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_timerfd.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/missing_timerfd.h
rename to src/libnm-systemd-shared/sd-adapt-shared/missing_timerfd.h
diff --git a/shared/systemd/sd-adapt-shared/mkdir.h b/src/libnm-systemd-shared/sd-adapt-shared/mkdir.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/mkdir.h
rename to src/libnm-systemd-shared/sd-adapt-shared/mkdir.h
diff --git a/shared/systemd/sd-adapt-shared/namespace-util.h b/src/libnm-systemd-shared/sd-adapt-shared/namespace-util.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/namespace-util.h
rename to src/libnm-systemd-shared/sd-adapt-shared/namespace-util.h
diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
rename to src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h
diff --git a/shared/systemd/sd-adapt-shared/nulstr-util.h b/src/libnm-systemd-shared/sd-adapt-shared/nulstr-util.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/nulstr-util.h
rename to src/libnm-systemd-shared/sd-adapt-shared/nulstr-util.h
diff --git a/shared/systemd/sd-adapt-shared/raw-clone.h b/src/libnm-systemd-shared/sd-adapt-shared/raw-clone.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/raw-clone.h
rename to src/libnm-systemd-shared/sd-adapt-shared/raw-clone.h
diff --git a/shared/systemd/sd-adapt-shared/rlimit-util.h b/src/libnm-systemd-shared/sd-adapt-shared/rlimit-util.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/rlimit-util.h
rename to src/libnm-systemd-shared/sd-adapt-shared/rlimit-util.h
diff --git a/shared/systemd/sd-adapt-shared/terminal-util.h b/src/libnm-systemd-shared/sd-adapt-shared/terminal-util.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/terminal-util.h
rename to src/libnm-systemd-shared/sd-adapt-shared/terminal-util.h
diff --git a/shared/systemd/sd-adapt-shared/unaligned.h b/src/libnm-systemd-shared/sd-adapt-shared/unaligned.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/unaligned.h
rename to src/libnm-systemd-shared/sd-adapt-shared/unaligned.h
diff --git a/shared/systemd/sd-adapt-shared/user-util.h b/src/libnm-systemd-shared/sd-adapt-shared/user-util.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/user-util.h
rename to src/libnm-systemd-shared/sd-adapt-shared/user-util.h
diff --git a/shared/systemd/sd-adapt-shared/virt.h b/src/libnm-systemd-shared/sd-adapt-shared/virt.h
similarity index 100%
rename from shared/systemd/sd-adapt-shared/virt.h
rename to src/libnm-systemd-shared/sd-adapt-shared/virt.h
diff --git a/shared/systemd/src/basic/alloc-util.c b/src/libnm-systemd-shared/src/basic/alloc-util.c
similarity index 100%
rename from shared/systemd/src/basic/alloc-util.c
rename to src/libnm-systemd-shared/src/basic/alloc-util.c
diff --git a/shared/systemd/src/basic/alloc-util.h b/src/libnm-systemd-shared/src/basic/alloc-util.h
similarity index 100%
rename from shared/systemd/src/basic/alloc-util.h
rename to src/libnm-systemd-shared/src/basic/alloc-util.h
diff --git a/shared/systemd/src/basic/async.h b/src/libnm-systemd-shared/src/basic/async.h
similarity index 100%
rename from shared/systemd/src/basic/async.h
rename to src/libnm-systemd-shared/src/basic/async.h
diff --git a/shared/systemd/src/basic/cgroup-util.h b/src/libnm-systemd-shared/src/basic/cgroup-util.h
similarity index 100%
rename from shared/systemd/src/basic/cgroup-util.h
rename to src/libnm-systemd-shared/src/basic/cgroup-util.h
diff --git a/shared/systemd/src/basic/env-file.c b/src/libnm-systemd-shared/src/basic/env-file.c
similarity index 100%
rename from shared/systemd/src/basic/env-file.c
rename to src/libnm-systemd-shared/src/basic/env-file.c
diff --git a/shared/systemd/src/basic/env-file.h b/src/libnm-systemd-shared/src/basic/env-file.h
similarity index 100%
rename from shared/systemd/src/basic/env-file.h
rename to src/libnm-systemd-shared/src/basic/env-file.h
diff --git a/shared/systemd/src/basic/env-util.c b/src/libnm-systemd-shared/src/basic/env-util.c
similarity index 100%
rename from shared/systemd/src/basic/env-util.c
rename to src/libnm-systemd-shared/src/basic/env-util.c
diff --git a/shared/systemd/src/basic/env-util.h b/src/libnm-systemd-shared/src/basic/env-util.h
similarity index 100%
rename from shared/systemd/src/basic/env-util.h
rename to src/libnm-systemd-shared/src/basic/env-util.h
diff --git a/shared/systemd/src/basic/errno-util.h b/src/libnm-systemd-shared/src/basic/errno-util.h
similarity index 100%
rename from shared/systemd/src/basic/errno-util.h
rename to src/libnm-systemd-shared/src/basic/errno-util.h
diff --git a/shared/systemd/src/basic/escape.c b/src/libnm-systemd-shared/src/basic/escape.c
similarity index 100%
rename from shared/systemd/src/basic/escape.c
rename to src/libnm-systemd-shared/src/basic/escape.c
diff --git a/shared/systemd/src/basic/escape.h b/src/libnm-systemd-shared/src/basic/escape.h
similarity index 100%
rename from shared/systemd/src/basic/escape.h
rename to src/libnm-systemd-shared/src/basic/escape.h
diff --git a/shared/systemd/src/basic/ether-addr-util.c b/src/libnm-systemd-shared/src/basic/ether-addr-util.c
similarity index 100%
rename from shared/systemd/src/basic/ether-addr-util.c
rename to src/libnm-systemd-shared/src/basic/ether-addr-util.c
diff --git a/shared/systemd/src/basic/ether-addr-util.h b/src/libnm-systemd-shared/src/basic/ether-addr-util.h
similarity index 100%
rename from shared/systemd/src/basic/ether-addr-util.h
rename to src/libnm-systemd-shared/src/basic/ether-addr-util.h
diff --git a/shared/systemd/src/basic/extract-word.c b/src/libnm-systemd-shared/src/basic/extract-word.c
similarity index 100%
rename from shared/systemd/src/basic/extract-word.c
rename to src/libnm-systemd-shared/src/basic/extract-word.c
diff --git a/shared/systemd/src/basic/extract-word.h b/src/libnm-systemd-shared/src/basic/extract-word.h
similarity index 100%
rename from shared/systemd/src/basic/extract-word.h
rename to src/libnm-systemd-shared/src/basic/extract-word.h
diff --git a/shared/systemd/src/basic/fd-util.c b/src/libnm-systemd-shared/src/basic/fd-util.c
similarity index 100%
rename from shared/systemd/src/basic/fd-util.c
rename to src/libnm-systemd-shared/src/basic/fd-util.c
diff --git a/shared/systemd/src/basic/fd-util.h b/src/libnm-systemd-shared/src/basic/fd-util.h
similarity index 100%
rename from shared/systemd/src/basic/fd-util.h
rename to src/libnm-systemd-shared/src/basic/fd-util.h
diff --git a/shared/systemd/src/basic/fileio.c b/src/libnm-systemd-shared/src/basic/fileio.c
similarity index 100%
rename from shared/systemd/src/basic/fileio.c
rename to src/libnm-systemd-shared/src/basic/fileio.c
diff --git a/shared/systemd/src/basic/fileio.h b/src/libnm-systemd-shared/src/basic/fileio.h
similarity index 100%
rename from shared/systemd/src/basic/fileio.h
rename to src/libnm-systemd-shared/src/basic/fileio.h
diff --git a/shared/systemd/src/basic/format-util.c b/src/libnm-systemd-shared/src/basic/format-util.c
similarity index 100%
rename from shared/systemd/src/basic/format-util.c
rename to src/libnm-systemd-shared/src/basic/format-util.c
diff --git a/shared/systemd/src/basic/format-util.h b/src/libnm-systemd-shared/src/basic/format-util.h
similarity index 100%
rename from shared/systemd/src/basic/format-util.h
rename to src/libnm-systemd-shared/src/basic/format-util.h
diff --git a/shared/systemd/src/basic/fs-util.c b/src/libnm-systemd-shared/src/basic/fs-util.c
similarity index 100%
rename from shared/systemd/src/basic/fs-util.c
rename to src/libnm-systemd-shared/src/basic/fs-util.c
diff --git a/shared/systemd/src/basic/fs-util.h b/src/libnm-systemd-shared/src/basic/fs-util.h
similarity index 100%
rename from shared/systemd/src/basic/fs-util.h
rename to src/libnm-systemd-shared/src/basic/fs-util.h
diff --git a/shared/systemd/src/basic/hash-funcs.c b/src/libnm-systemd-shared/src/basic/hash-funcs.c
similarity index 100%
rename from shared/systemd/src/basic/hash-funcs.c
rename to src/libnm-systemd-shared/src/basic/hash-funcs.c
diff --git a/shared/systemd/src/basic/hash-funcs.h b/src/libnm-systemd-shared/src/basic/hash-funcs.h
similarity index 100%
rename from shared/systemd/src/basic/hash-funcs.h
rename to src/libnm-systemd-shared/src/basic/hash-funcs.h
diff --git a/shared/systemd/src/basic/hashmap.c b/src/libnm-systemd-shared/src/basic/hashmap.c
similarity index 100%
rename from shared/systemd/src/basic/hashmap.c
rename to src/libnm-systemd-shared/src/basic/hashmap.c
diff --git a/shared/systemd/src/basic/hashmap.h b/src/libnm-systemd-shared/src/basic/hashmap.h
similarity index 100%
rename from shared/systemd/src/basic/hashmap.h
rename to src/libnm-systemd-shared/src/basic/hashmap.h
diff --git a/shared/systemd/src/basic/hexdecoct.c b/src/libnm-systemd-shared/src/basic/hexdecoct.c
similarity index 100%
rename from shared/systemd/src/basic/hexdecoct.c
rename to src/libnm-systemd-shared/src/basic/hexdecoct.c
diff --git a/shared/systemd/src/basic/hexdecoct.h b/src/libnm-systemd-shared/src/basic/hexdecoct.h
similarity index 100%
rename from shared/systemd/src/basic/hexdecoct.h
rename to src/libnm-systemd-shared/src/basic/hexdecoct.h
diff --git a/shared/systemd/src/basic/hostname-util.c b/src/libnm-systemd-shared/src/basic/hostname-util.c
similarity index 100%
rename from shared/systemd/src/basic/hostname-util.c
rename to src/libnm-systemd-shared/src/basic/hostname-util.c
diff --git a/shared/systemd/src/basic/hostname-util.h b/src/libnm-systemd-shared/src/basic/hostname-util.h
similarity index 100%
rename from shared/systemd/src/basic/hostname-util.h
rename to src/libnm-systemd-shared/src/basic/hostname-util.h
diff --git a/shared/systemd/src/basic/in-addr-util.c b/src/libnm-systemd-shared/src/basic/in-addr-util.c
similarity index 100%
rename from shared/systemd/src/basic/in-addr-util.c
rename to src/libnm-systemd-shared/src/basic/in-addr-util.c
diff --git a/shared/systemd/src/basic/in-addr-util.h b/src/libnm-systemd-shared/src/basic/in-addr-util.h
similarity index 100%
rename from shared/systemd/src/basic/in-addr-util.h
rename to src/libnm-systemd-shared/src/basic/in-addr-util.h
diff --git a/shared/systemd/src/basic/io-util.c b/src/libnm-systemd-shared/src/basic/io-util.c
similarity index 100%
rename from shared/systemd/src/basic/io-util.c
rename to src/libnm-systemd-shared/src/basic/io-util.c
diff --git a/shared/systemd/src/basic/io-util.h b/src/libnm-systemd-shared/src/basic/io-util.h
similarity index 100%
rename from shared/systemd/src/basic/io-util.h
rename to src/libnm-systemd-shared/src/basic/io-util.h
diff --git a/shared/systemd/src/basic/list.h b/src/libnm-systemd-shared/src/basic/list.h
similarity index 100%
rename from shared/systemd/src/basic/list.h
rename to src/libnm-systemd-shared/src/basic/list.h
diff --git a/shared/systemd/src/basic/log.h b/src/libnm-systemd-shared/src/basic/log.h
similarity index 100%
rename from shared/systemd/src/basic/log.h
rename to src/libnm-systemd-shared/src/basic/log.h
diff --git a/shared/systemd/src/basic/macro.h b/src/libnm-systemd-shared/src/basic/macro.h
similarity index 100%
rename from shared/systemd/src/basic/macro.h
rename to src/libnm-systemd-shared/src/basic/macro.h
diff --git a/shared/systemd/src/basic/memory-util.c b/src/libnm-systemd-shared/src/basic/memory-util.c
similarity index 100%
rename from shared/systemd/src/basic/memory-util.c
rename to src/libnm-systemd-shared/src/basic/memory-util.c
diff --git a/shared/systemd/src/basic/memory-util.h b/src/libnm-systemd-shared/src/basic/memory-util.h
similarity index 100%
rename from shared/systemd/src/basic/memory-util.h
rename to src/libnm-systemd-shared/src/basic/memory-util.h
diff --git a/shared/systemd/src/basic/mempool.c b/src/libnm-systemd-shared/src/basic/mempool.c
similarity index 100%
rename from shared/systemd/src/basic/mempool.c
rename to src/libnm-systemd-shared/src/basic/mempool.c
diff --git a/shared/systemd/src/basic/mempool.h b/src/libnm-systemd-shared/src/basic/mempool.h
similarity index 100%
rename from shared/systemd/src/basic/mempool.h
rename to src/libnm-systemd-shared/src/basic/mempool.h
diff --git a/shared/systemd/src/basic/missing_fcntl.h b/src/libnm-systemd-shared/src/basic/missing_fcntl.h
similarity index 100%
rename from shared/systemd/src/basic/missing_fcntl.h
rename to src/libnm-systemd-shared/src/basic/missing_fcntl.h
diff --git a/shared/systemd/src/basic/missing_random.h b/src/libnm-systemd-shared/src/basic/missing_random.h
similarity index 100%
rename from shared/systemd/src/basic/missing_random.h
rename to src/libnm-systemd-shared/src/basic/missing_random.h
diff --git a/shared/systemd/src/basic/missing_socket.h b/src/libnm-systemd-shared/src/basic/missing_socket.h
similarity index 100%
rename from shared/systemd/src/basic/missing_socket.h
rename to src/libnm-systemd-shared/src/basic/missing_socket.h
diff --git a/shared/systemd/src/basic/missing_stat.h b/src/libnm-systemd-shared/src/basic/missing_stat.h
similarity index 100%
rename from shared/systemd/src/basic/missing_stat.h
rename to src/libnm-systemd-shared/src/basic/missing_stat.h
diff --git a/shared/systemd/src/basic/missing_syscall.h b/src/libnm-systemd-shared/src/basic/missing_syscall.h
similarity index 100%
rename from shared/systemd/src/basic/missing_syscall.h
rename to src/libnm-systemd-shared/src/basic/missing_syscall.h
diff --git a/shared/systemd/src/basic/missing_type.h b/src/libnm-systemd-shared/src/basic/missing_type.h
similarity index 100%
rename from shared/systemd/src/basic/missing_type.h
rename to src/libnm-systemd-shared/src/basic/missing_type.h
diff --git a/shared/systemd/src/basic/parse-util.c b/src/libnm-systemd-shared/src/basic/parse-util.c
similarity index 100%
rename from shared/systemd/src/basic/parse-util.c
rename to src/libnm-systemd-shared/src/basic/parse-util.c
diff --git a/shared/systemd/src/basic/parse-util.h b/src/libnm-systemd-shared/src/basic/parse-util.h
similarity index 100%
rename from shared/systemd/src/basic/parse-util.h
rename to src/libnm-systemd-shared/src/basic/parse-util.h
diff --git a/shared/systemd/src/basic/path-util.c b/src/libnm-systemd-shared/src/basic/path-util.c
similarity index 100%
rename from shared/systemd/src/basic/path-util.c
rename to src/libnm-systemd-shared/src/basic/path-util.c
diff --git a/shared/systemd/src/basic/path-util.h b/src/libnm-systemd-shared/src/basic/path-util.h
similarity index 100%
rename from shared/systemd/src/basic/path-util.h
rename to src/libnm-systemd-shared/src/basic/path-util.h
diff --git a/shared/systemd/src/basic/prioq.c b/src/libnm-systemd-shared/src/basic/prioq.c
similarity index 100%
rename from shared/systemd/src/basic/prioq.c
rename to src/libnm-systemd-shared/src/basic/prioq.c
diff --git a/shared/systemd/src/basic/prioq.h b/src/libnm-systemd-shared/src/basic/prioq.h
similarity index 100%
rename from shared/systemd/src/basic/prioq.h
rename to src/libnm-systemd-shared/src/basic/prioq.h
diff --git a/shared/systemd/src/basic/process-util.c b/src/libnm-systemd-shared/src/basic/process-util.c
similarity index 100%
rename from shared/systemd/src/basic/process-util.c
rename to src/libnm-systemd-shared/src/basic/process-util.c
diff --git a/shared/systemd/src/basic/process-util.h b/src/libnm-systemd-shared/src/basic/process-util.h
similarity index 100%
rename from shared/systemd/src/basic/process-util.h
rename to src/libnm-systemd-shared/src/basic/process-util.h
diff --git a/shared/systemd/src/basic/random-util.c b/src/libnm-systemd-shared/src/basic/random-util.c
similarity index 100%
rename from shared/systemd/src/basic/random-util.c
rename to src/libnm-systemd-shared/src/basic/random-util.c
diff --git a/shared/systemd/src/basic/random-util.h b/src/libnm-systemd-shared/src/basic/random-util.h
similarity index 100%
rename from shared/systemd/src/basic/random-util.h
rename to src/libnm-systemd-shared/src/basic/random-util.h
diff --git a/shared/systemd/src/basic/ratelimit.c b/src/libnm-systemd-shared/src/basic/ratelimit.c
similarity index 100%
rename from shared/systemd/src/basic/ratelimit.c
rename to src/libnm-systemd-shared/src/basic/ratelimit.c
diff --git a/shared/systemd/src/basic/ratelimit.h b/src/libnm-systemd-shared/src/basic/ratelimit.h
similarity index 100%
rename from shared/systemd/src/basic/ratelimit.h
rename to src/libnm-systemd-shared/src/basic/ratelimit.h
diff --git a/shared/systemd/src/basic/set.h b/src/libnm-systemd-shared/src/basic/set.h
similarity index 100%
rename from shared/systemd/src/basic/set.h
rename to src/libnm-systemd-shared/src/basic/set.h
diff --git a/shared/systemd/src/basic/signal-util.c b/src/libnm-systemd-shared/src/basic/signal-util.c
similarity index 100%
rename from shared/systemd/src/basic/signal-util.c
rename to src/libnm-systemd-shared/src/basic/signal-util.c
diff --git a/shared/systemd/src/basic/signal-util.h b/src/libnm-systemd-shared/src/basic/signal-util.h
similarity index 100%
rename from shared/systemd/src/basic/signal-util.h
rename to src/libnm-systemd-shared/src/basic/signal-util.h
diff --git a/shared/systemd/src/basic/siphash24.h b/src/libnm-systemd-shared/src/basic/siphash24.h
similarity index 100%
rename from shared/systemd/src/basic/siphash24.h
rename to src/libnm-systemd-shared/src/basic/siphash24.h
diff --git a/shared/systemd/src/basic/socket-util.c b/src/libnm-systemd-shared/src/basic/socket-util.c
similarity index 100%
rename from shared/systemd/src/basic/socket-util.c
rename to src/libnm-systemd-shared/src/basic/socket-util.c
diff --git a/shared/systemd/src/basic/socket-util.h b/src/libnm-systemd-shared/src/basic/socket-util.h
similarity index 100%
rename from shared/systemd/src/basic/socket-util.h
rename to src/libnm-systemd-shared/src/basic/socket-util.h
diff --git a/shared/systemd/src/basic/sort-util.h b/src/libnm-systemd-shared/src/basic/sort-util.h
similarity index 100%
rename from shared/systemd/src/basic/sort-util.h
rename to src/libnm-systemd-shared/src/basic/sort-util.h
diff --git a/shared/systemd/src/basic/sparse-endian.h b/src/libnm-systemd-shared/src/basic/sparse-endian.h
similarity index 100%
rename from shared/systemd/src/basic/sparse-endian.h
rename to src/libnm-systemd-shared/src/basic/sparse-endian.h
diff --git a/shared/systemd/src/basic/stat-util.c b/src/libnm-systemd-shared/src/basic/stat-util.c
similarity index 100%
rename from shared/systemd/src/basic/stat-util.c
rename to src/libnm-systemd-shared/src/basic/stat-util.c
diff --git a/shared/systemd/src/basic/stat-util.h b/src/libnm-systemd-shared/src/basic/stat-util.h
similarity index 100%
rename from shared/systemd/src/basic/stat-util.h
rename to src/libnm-systemd-shared/src/basic/stat-util.h
diff --git a/shared/systemd/src/basic/stdio-util.h b/src/libnm-systemd-shared/src/basic/stdio-util.h
similarity index 100%
rename from shared/systemd/src/basic/stdio-util.h
rename to src/libnm-systemd-shared/src/basic/stdio-util.h
diff --git a/shared/systemd/src/basic/string-table.c b/src/libnm-systemd-shared/src/basic/string-table.c
similarity index 100%
rename from shared/systemd/src/basic/string-table.c
rename to src/libnm-systemd-shared/src/basic/string-table.c
diff --git a/shared/systemd/src/basic/string-table.h b/src/libnm-systemd-shared/src/basic/string-table.h
similarity index 100%
rename from shared/systemd/src/basic/string-table.h
rename to src/libnm-systemd-shared/src/basic/string-table.h
diff --git a/shared/systemd/src/basic/string-util.c b/src/libnm-systemd-shared/src/basic/string-util.c
similarity index 100%
rename from shared/systemd/src/basic/string-util.c
rename to src/libnm-systemd-shared/src/basic/string-util.c
diff --git a/shared/systemd/src/basic/string-util.h b/src/libnm-systemd-shared/src/basic/string-util.h
similarity index 100%
rename from shared/systemd/src/basic/string-util.h
rename to src/libnm-systemd-shared/src/basic/string-util.h
diff --git a/shared/systemd/src/basic/strv.c b/src/libnm-systemd-shared/src/basic/strv.c
similarity index 100%
rename from shared/systemd/src/basic/strv.c
rename to src/libnm-systemd-shared/src/basic/strv.c
diff --git a/shared/systemd/src/basic/strv.h b/src/libnm-systemd-shared/src/basic/strv.h
similarity index 100%
rename from shared/systemd/src/basic/strv.h
rename to src/libnm-systemd-shared/src/basic/strv.h
diff --git a/shared/systemd/src/basic/strxcpyx.c b/src/libnm-systemd-shared/src/basic/strxcpyx.c
similarity index 100%
rename from shared/systemd/src/basic/strxcpyx.c
rename to src/libnm-systemd-shared/src/basic/strxcpyx.c
diff --git a/shared/systemd/src/basic/strxcpyx.h b/src/libnm-systemd-shared/src/basic/strxcpyx.h
similarity index 100%
rename from shared/systemd/src/basic/strxcpyx.h
rename to src/libnm-systemd-shared/src/basic/strxcpyx.h
diff --git a/shared/systemd/src/basic/time-util.c b/src/libnm-systemd-shared/src/basic/time-util.c
similarity index 100%
rename from shared/systemd/src/basic/time-util.c
rename to src/libnm-systemd-shared/src/basic/time-util.c
diff --git a/shared/systemd/src/basic/time-util.h b/src/libnm-systemd-shared/src/basic/time-util.h
similarity index 100%
rename from shared/systemd/src/basic/time-util.h
rename to src/libnm-systemd-shared/src/basic/time-util.h
diff --git a/shared/systemd/src/basic/tmpfile-util.c b/src/libnm-systemd-shared/src/basic/tmpfile-util.c
similarity index 100%
rename from shared/systemd/src/basic/tmpfile-util.c
rename to src/libnm-systemd-shared/src/basic/tmpfile-util.c
diff --git a/shared/systemd/src/basic/tmpfile-util.h b/src/libnm-systemd-shared/src/basic/tmpfile-util.h
similarity index 100%
rename from shared/systemd/src/basic/tmpfile-util.h
rename to src/libnm-systemd-shared/src/basic/tmpfile-util.h
diff --git a/shared/systemd/src/basic/umask-util.h b/src/libnm-systemd-shared/src/basic/umask-util.h
similarity index 100%
rename from shared/systemd/src/basic/umask-util.h
rename to src/libnm-systemd-shared/src/basic/umask-util.h
diff --git a/shared/systemd/src/basic/user-util.h b/src/libnm-systemd-shared/src/basic/user-util.h
similarity index 100%
rename from shared/systemd/src/basic/user-util.h
rename to src/libnm-systemd-shared/src/basic/user-util.h
diff --git a/shared/systemd/src/basic/utf8.c b/src/libnm-systemd-shared/src/basic/utf8.c
similarity index 100%
rename from shared/systemd/src/basic/utf8.c
rename to src/libnm-systemd-shared/src/basic/utf8.c
diff --git a/shared/systemd/src/basic/utf8.h b/src/libnm-systemd-shared/src/basic/utf8.h
similarity index 100%
rename from shared/systemd/src/basic/utf8.h
rename to src/libnm-systemd-shared/src/basic/utf8.h
diff --git a/shared/systemd/src/basic/util.c b/src/libnm-systemd-shared/src/basic/util.c
similarity index 100%
rename from shared/systemd/src/basic/util.c
rename to src/libnm-systemd-shared/src/basic/util.c
diff --git a/shared/systemd/src/basic/util.h b/src/libnm-systemd-shared/src/basic/util.h
similarity index 100%
rename from shared/systemd/src/basic/util.h
rename to src/libnm-systemd-shared/src/basic/util.h
diff --git a/shared/systemd/src/shared/dns-domain.c b/src/libnm-systemd-shared/src/shared/dns-domain.c
similarity index 100%
rename from shared/systemd/src/shared/dns-domain.c
rename to src/libnm-systemd-shared/src/shared/dns-domain.c
diff --git a/shared/systemd/src/shared/dns-domain.h b/src/libnm-systemd-shared/src/shared/dns-domain.h
similarity index 100%
rename from shared/systemd/src/shared/dns-domain.h
rename to src/libnm-systemd-shared/src/shared/dns-domain.h
diff --git a/shared/systemd/src/shared/log-link.h b/src/libnm-systemd-shared/src/shared/log-link.h
similarity index 100%
rename from shared/systemd/src/shared/log-link.h
rename to src/libnm-systemd-shared/src/shared/log-link.h
diff --git a/shared/systemd/src/shared/web-util.c b/src/libnm-systemd-shared/src/shared/web-util.c
similarity index 100%
rename from shared/systemd/src/shared/web-util.c
rename to src/libnm-systemd-shared/src/shared/web-util.c
diff --git a/shared/systemd/src/shared/web-util.h b/src/libnm-systemd-shared/src/shared/web-util.h
similarity index 100%
rename from shared/systemd/src/shared/web-util.h
rename to src/libnm-systemd-shared/src/shared/web-util.h