diff --git a/systemd/haveged.service b/systemd/system/haveged.service
similarity index 100%
rename from systemd/haveged.service
rename to systemd/system/haveged.service
diff --git a/systemd/pcscd.service b/systemd/system/multipathd.service
similarity index 100%
rename from systemd/pcscd.service
rename to systemd/system/multipathd.service
diff --git a/systemd/system/pcscd.service b/systemd/system/pcscd.service
new file mode 100644
index 00000000..544fb7da
--- /dev/null
+++ b/systemd/system/pcscd.service
@@ -0,0 +1,2 @@
+[Unit]
+After=apparmor.service
diff --git a/systemd/systemd-journald.service b/systemd/system/systemd-journald.service
similarity index 100%
rename from systemd/systemd-journald.service
rename to systemd/system/systemd-journald.service
diff --git a/systemd/systemd-networkd.service b/systemd/system/systemd-networkd.service
similarity index 100%
rename from systemd/systemd-networkd.service
rename to systemd/system/systemd-networkd.service
diff --git a/systemd/systemd-timesyncd.service b/systemd/system/systemd-timesyncd.service
similarity index 100%
rename from systemd/systemd-timesyncd.service
rename to systemd/system/systemd-timesyncd.service