65 files changed, 12 insertions, 1 deletions
diff --git a/shell-completion/bash/.gitignore b/shell-completion/bash/.gitignore
deleted file mode 100644
index 016e09d1e7..0000000000
--- a/shell-completion/bash/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/systemctl
diff --git a/shell-completion/zsh/.gitignore b/src/grp-system/systemctl/.gitignore
index 75f13ad6d1..ebd59d3c9e 100644
--- a/shell-completion/zsh/.gitignore
+++ b/src/grp-system/systemctl/.gitignore
@@ -1 +1,2 @@
+/systemctl
 /_systemctl
diff --git a/shell-completion/bash/systemctl.in b/src/grp-system/systemctl/systemctl.completion.bash.in
index 6f2b3f122c..6f2b3f122c 100644
--- a/shell-completion/bash/systemctl.in
+++ b/src/grp-system/systemctl/systemctl.completion.bash.in
diff --git a/shell-completion/zsh/_systemctl.in b/src/grp-system/systemctl/systemctl.completion.zsh.in
index 44c31b7833..44c31b7833 100644
--- a/shell-completion/zsh/_systemctl.in
+++ b/src/grp-system/systemctl/systemctl.completion.zsh.in
diff --git a/man/udev_device_get_syspath.xml b/src/libudev/udev_device_get_syspath.xml
index b54749ed56..b54749ed56 100644
--- a/man/udev_device_get_syspath.xml
+++ b/src/libudev/udev_device_get_syspath.xml
diff --git a/man/udev_device_has_tag.xml b/src/libudev/udev_device_has_tag.xml
index 480257343c..480257343c 100644
--- a/man/udev_device_has_tag.xml
+++ b/src/libudev/udev_device_has_tag.xml
diff --git a/man/udev_device_new_from_syspath.xml b/src/libudev/udev_device_new_from_syspath.xml
index 0bb71c8e91..0bb71c8e91 100644
--- a/man/udev_device_new_from_syspath.xml
+++ b/src/libudev/udev_device_new_from_syspath.xml
diff --git a/man/udev_enumerate_add_match_subsystem.xml b/src/libudev/udev_enumerate_add_match_subsystem.xml
index 5acce00bb0..5acce00bb0 100644
--- a/man/udev_enumerate_add_match_subsystem.xml
+++ b/src/libudev/udev_enumerate_add_match_subsystem.xml
diff --git a/man/udev_enumerate_new.xml b/src/libudev/udev_enumerate_new.xml
index b5856c5577..b5856c5577 100644
--- a/man/udev_enumerate_new.xml
+++ b/src/libudev/udev_enumerate_new.xml
diff --git a/man/udev_enumerate_scan_devices.xml b/src/libudev/udev_enumerate_scan_devices.xml
index e0b6bfba32..e0b6bfba32 100644
--- a/man/udev_enumerate_scan_devices.xml
+++ b/src/libudev/udev_enumerate_scan_devices.xml
diff --git a/man/udev_list_entry.xml b/src/libudev/udev_list_entry.xml
index a1b531d52a..a1b531d52a 100644
--- a/man/udev_list_entry.xml
+++ b/src/libudev/udev_list_entry.xml
diff --git a/man/udev_monitor_filter_update.xml b/src/libudev/udev_monitor_filter_update.xml
index f129595618..f129595618 100644
--- a/man/udev_monitor_filter_update.xml
+++ b/src/libudev/udev_monitor_filter_update.xml
diff --git a/man/udev_monitor_new_from_netlink.xml b/src/libudev/udev_monitor_new_from_netlink.xml
index d73a4acaec..d73a4acaec 100644
--- a/man/udev_monitor_new_from_netlink.xml
+++ b/src/libudev/udev_monitor_new_from_netlink.xml
diff --git a/man/udev_monitor_receive_device.xml b/src/libudev/udev_monitor_receive_device.xml
index 7e842f88df..7e842f88df 100644
--- a/man/udev_monitor_receive_device.xml
+++ b/src/libudev/udev_monitor_receive_device.xml
diff --git a/man/udev_new.xml b/src/libudev/udev_new.xml
index 587835a3ca..587835a3ca 100644
--- a/man/udev_new.xml
+++ b/src/libudev/udev_new.xml
diff --git a/man/.gitignore b/src/manpages/.gitignore
index d928e5a83f..d928e5a83f 100644
--- a/man/.gitignore
+++ b/src/manpages/.gitignore
diff --git a/man/binfmt.d.xml b/src/manpages/binfmt.d.xml
index 5b63cfb4c3..5b63cfb4c3 100644
--- a/man/binfmt.d.xml
+++ b/src/manpages/binfmt.d.xml
diff --git a/man/bootup.xml b/src/manpages/bootup.xml
index 986996398c..986996398c 100644
--- a/man/bootup.xml
+++ b/src/manpages/bootup.xml
diff --git a/man/coredump.conf.xml b/src/manpages/coredump.conf.xml
index 4f95680a3a..4f95680a3a 100644
--- a/man/coredump.conf.xml
+++ b/src/manpages/coredump.conf.xml
diff --git a/man/crypttab.xml b/src/manpages/crypttab.xml
index 1de834a045..1de834a045 100644
--- a/man/crypttab.xml
+++ b/src/manpages/crypttab.xml
diff --git a/man/custom-html.xsl b/src/manpages/custom-html.xsl
index e89d73e7f1..e89d73e7f1 100644
--- a/man/custom-html.xsl
+++ b/src/manpages/custom-html.xsl
diff --git a/man/custom-man.xsl b/src/manpages/custom-man.xsl
index e1b8d3618a..e1b8d3618a 100644
--- a/man/custom-man.xsl
+++ b/src/manpages/custom-man.xsl
diff --git a/man/daemon.xml b/src/manpages/daemon.xml
index a649749683..a649749683 100644
--- a/man/daemon.xml
+++ b/src/manpages/daemon.xml
diff --git a/man/dnssec-trust-anchors.d.xml b/src/manpages/dnssec-trust-anchors.d.xml
index 4bdc167f79..4bdc167f79 100644
--- a/man/dnssec-trust-anchors.d.xml
+++ b/src/manpages/dnssec-trust-anchors.d.xml
diff --git a/man/file-hierarchy.xml b/src/manpages/file-hierarchy.xml
index 538a592f8d..538a592f8d 100644
--- a/man/file-hierarchy.xml
+++ b/src/manpages/file-hierarchy.xml
diff --git a/man/glib-event-glue.c b/src/manpages/glib-event-glue.c
index 8f3168d0ea..8f3168d0ea 100644
--- a/man/glib-event-glue.c
+++ b/src/manpages/glib-event-glue.c
diff --git a/man/halt.xml b/src/manpages/halt.xml
index e3fa60a915..e3fa60a915 100644
--- a/man/halt.xml
+++ b/src/manpages/halt.xml
diff --git a/man/hostname.xml b/src/manpages/hostname.xml
index 8a4c0d5ac0..8a4c0d5ac0 100644
--- a/man/hostname.xml
+++ b/src/manpages/hostname.xml
diff --git a/man/hwdb.xml b/src/manpages/hwdb.xml
index 2b1e60fb22..2b1e60fb22 100644
--- a/man/hwdb.xml
+++ b/src/manpages/hwdb.xml
diff --git a/man/journal-remote.conf.xml b/src/manpages/journal-remote.conf.xml
index 2d345963d9..2d345963d9 100644
--- a/man/journal-remote.conf.xml
+++ b/src/manpages/journal-remote.conf.xml
diff --git a/man/journald.conf.xml b/src/manpages/journald.conf.xml
index 3964cd6bc5..3964cd6bc5 100644
--- a/man/journald.conf.xml
+++ b/src/manpages/journald.conf.xml
diff --git a/man/kernel-command-line.xml b/src/manpages/kernel-command-line.xml
index 9c04849f66..9c04849f66 100644
--- a/man/kernel-command-line.xml
+++ b/src/manpages/kernel-command-line.xml
diff --git a/man/less-variables.xml b/src/manpages/less-variables.xml
index 0fb4d7fbcf..0fb4d7fbcf 100644
--- a/man/less-variables.xml
+++ b/src/manpages/less-variables.xml
diff --git a/man/libsystemd-pkgconfig.xml b/src/manpages/libsystemd-pkgconfig.xml
index 272da64cd7..272da64cd7 100644
--- a/man/libsystemd-pkgconfig.xml
+++ b/src/manpages/libsystemd-pkgconfig.xml
diff --git a/man/locale.conf.xml b/src/manpages/locale.conf.xml
index 2fe731113a..2fe731113a 100644
--- a/man/locale.conf.xml
+++ b/src/manpages/locale.conf.xml
diff --git a/man/localtime.xml b/src/manpages/localtime.xml
index 2827da6e93..2827da6e93 100644
--- a/man/localtime.xml
+++ b/src/manpages/localtime.xml
diff --git a/man/logind.conf.xml b/src/manpages/logind.conf.xml
index fe92277a1f..fe92277a1f 100644
--- a/man/logind.conf.xml
+++ b/src/manpages/logind.conf.xml
diff --git a/man/machine-id.xml b/src/manpages/machine-id.xml
index d318ec54ec..d318ec54ec 100644
--- a/man/machine-id.xml
+++ b/src/manpages/machine-id.xml
diff --git a/man/machine-info.xml b/src/manpages/machine-info.xml
index 351133670b..351133670b 100644
--- a/man/machine-info.xml
+++ b/src/manpages/machine-info.xml
diff --git a/man/modules-load.d.xml b/src/manpages/modules-load.d.xml
index 4b722aa128..4b722aa128 100644
--- a/man/modules-load.d.xml
+++ b/src/manpages/modules-load.d.xml
diff --git a/man/networkd.conf.xml b/src/manpages/networkd.conf.xml
index 4bfc4f773a..4bfc4f773a 100644
--- a/man/networkd.conf.xml
+++ b/src/manpages/networkd.conf.xml
diff --git a/man/os-release.xml b/src/manpages/os-release.xml
index a70ba1aa31..a70ba1aa31 100644
--- a/man/os-release.xml
+++ b/src/manpages/os-release.xml
diff --git a/man/resolved.conf.xml b/src/manpages/resolved.conf.xml
index 920ce9e89b..920ce9e89b 100644
--- a/man/resolved.conf.xml
+++ b/src/manpages/resolved.conf.xml
diff --git a/man/runlevel.xml b/src/manpages/runlevel.xml
index ca29c7c22c..ca29c7c22c 100644
--- a/man/runlevel.xml
+++ b/src/manpages/runlevel.xml
diff --git a/man/shutdown.xml b/src/manpages/shutdown.xml
index a8af387c67..a8af387c67 100644
--- a/man/shutdown.xml
+++ b/src/manpages/shutdown.xml
diff --git a/man/standard-conf.xml b/src/manpages/standard-conf.xml
index 6edbb7ff83..6edbb7ff83 100644
--- a/man/standard-conf.xml
+++ b/src/manpages/standard-conf.xml
diff --git a/man/standard-options.xml b/src/manpages/standard-options.xml
index f214463392..f214463392 100644
--- a/man/standard-options.xml
+++ b/src/manpages/standard-options.xml
diff --git a/man/sysctl.d.xml b/src/manpages/sysctl.d.xml
index ccf6c8e39f..ccf6c8e39f 100644
--- a/man/sysctl.d.xml
+++ b/src/manpages/sysctl.d.xml
diff --git a/man/systemd-ask-password-console.service.xml b/src/manpages/systemd-ask-password-console.service.xml
index 479e5f2e5b..479e5f2e5b 100644
--- a/man/systemd-ask-password-console.service.xml
+++ b/src/manpages/systemd-ask-password-console.service.xml
diff --git a/man/systemd-cryptsetup-generator.xml b/src/manpages/systemd-cryptsetup-generator.xml
index f036ab9744..f036ab9744 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/src/manpages/systemd-cryptsetup-generator.xml
diff --git a/man/systemd-halt.service.xml b/src/manpages/systemd-halt.service.xml
index c94e2a1820..c94e2a1820 100644
--- a/man/systemd-halt.service.xml
+++ b/src/manpages/systemd-halt.service.xml
diff --git a/man/systemd-machine-id-commit.service.xml b/src/manpages/systemd-machine-id-commit.service.xml
index 39da1922cc..39da1922cc 100644
--- a/man/systemd-machine-id-commit.service.xml
+++ b/src/manpages/systemd-machine-id-commit.service.xml
diff --git a/man/systemd-suspend.service.xml b/src/manpages/systemd-suspend.service.xml
index a8beb86f4d..a8beb86f4d 100644
--- a/man/systemd-suspend.service.xml
+++ b/src/manpages/systemd-suspend.service.xml
diff --git a/man/systemd-system.conf.xml b/src/manpages/systemd-system.conf.xml
index 8833e73c72..8833e73c72 100644
--- a/man/systemd-system.conf.xml
+++ b/src/manpages/systemd-system.conf.xml
diff --git a/man/sysusers.d.xml b/src/manpages/sysusers.d.xml
index 18ee3800d6..18ee3800d6 100644
--- a/man/sysusers.d.xml
+++ b/src/manpages/sysusers.d.xml
diff --git a/man/telinit.xml b/src/manpages/telinit.xml
index 02d31fbd46..02d31fbd46 100644
--- a/man/telinit.xml
+++ b/src/manpages/telinit.xml
diff --git a/man/timesyncd.conf.xml b/src/manpages/timesyncd.conf.xml
index 8c86fd0074..8c86fd0074 100644
--- a/man/timesyncd.conf.xml
+++ b/src/manpages/timesyncd.conf.xml
diff --git a/man/tmpfiles.d.xml b/src/manpages/tmpfiles.d.xml
index 957475d2bd..957475d2bd 100644
--- a/man/tmpfiles.d.xml
+++ b/src/manpages/tmpfiles.d.xml
diff --git a/man/user-system-options.xml b/src/manpages/user-system-options.xml
index 8616c54249..8616c54249 100644
--- a/man/user-system-options.xml
+++ b/src/manpages/user-system-options.xml
diff --git a/man/vconsole.conf.xml b/src/manpages/vconsole.conf.xml
index 27196d44e9..27196d44e9 100644
--- a/man/vconsole.conf.xml
+++ b/src/manpages/vconsole.conf.xml
diff --git a/shell-completion/zsh/_sd_hosts_or_user_at_host b/src/zsh-completion/_sd_hosts_or_user_at_host
index 282f7328e4..282f7328e4 100644
--- a/shell-completion/zsh/_sd_hosts_or_user_at_host
+++ b/src/zsh-completion/_sd_hosts_or_user_at_host
diff --git a/shell-completion/zsh/_sd_machines b/src/zsh-completion/_sd_machines
index a0039ee0f8..a0039ee0f8 100644
--- a/shell-completion/zsh/_sd_machines
+++ b/src/zsh-completion/_sd_machines
diff --git a/shell-completion/zsh/_sd_outputmodes b/src/zsh-completion/_sd_outputmodes
index 3836f79b73..3836f79b73 100644
--- a/shell-completion/zsh/_sd_outputmodes
+++ b/src/zsh-completion/_sd_outputmodes
diff --git a/shell-completion/zsh/_sd_unit_files b/src/zsh-completion/_sd_unit_files
index 3e7a4ee803..3e7a4ee803 100644
--- a/shell-completion/zsh/_sd_unit_files
+++ b/src/zsh-completion/_sd_unit_files
diff --git a/tools/move.sh b/tools/move.sh
index 57dd6ddb3e..8a86ede3ee 100755
--- a/tools/move.sh
+++ b/tools/move.sh
@@ -340,6 +340,7 @@ move_files() (
 	# auto-distribute the stuff
 	(
 		mv -t src/libsystemd man/sd*
+		mv -t src/libudev man/udev_*
 		cd man
 		for file in *; do
 			if [[ -d ../src/"${file%%.*}" ]]; then
@@ -349,6 +350,7 @@ move_files() (
 			fi
 		done
 	)
+	mv -T man src/manpages
 	(
 		cd units
 		for file in *; do
@@ -361,20 +363,29 @@ move_files() (
 	)
 	(
 		cd shell-completion/bash
+		mv -T  systemctl.in ../../src/systemctl/systemctl.completion.bash.in
+		cat .gitignore   >> ../../src/systemctl/.gitignore
+		rm .gitignore
 		for file in *; do
 			if [[ -d ../../src/"$file" ]]; then
 				mv -T "$file" "../../src/$file/$file.completion.bash"
 			fi
 		done
 	)
+	rmdir shell-completion/bash
 	(
 		cd shell-completion/zsh
+		mv -T _systemctl.in ../../src/systemctl/systemctl.completion.zsh.in
+		cat .gitignore   >> ../../src/systemctl/.gitignore
+		rm .gitignore
 		for file in _*; do
 			if [[ -d ../../src/"${file#_}" ]]; then
 				mv -T "$file" "../../src/${file#_}/${file#_}.completion.zsh"
 			fi
 		done
 	)
+	mv -T shell-completion/zsh src/zsh-completion
+	rmdir shell-completion
 	
 	# categorize
 	grp src/grp-boot \