diff --git a/deploy-initial b/deploy-initial
index d57d699..7f00fef 100755
--- a/deploy-initial
+++ b/deploy-initial
@@ -21,42 +21,42 @@ ssh $remote '[[ $(grep IMAGE_VERSION /etc/os-release) = "IMAGE_VERSION=2025.03.0
 
 ssh $remote "sfdisk /dev/$drive -w always <<< ';'"
 ssh $remote "mkfs.xfs -d agcount=$agcount -f /dev/${drive}1"
-rsync -cv pacman.d/mirrorlist $remote:/etc/pacman.d/mirrorlist
+rsync -cv etc/pacman.d/mirrorlist $remote:/etc/pacman.d/mirrorlist
 ssh $remote "mount /dev/${drive}1 /mnt"
 ssh $remote "pacstrap -K /mnt $(tr '\n' ' ' < packages/$host)"
 
-rsync -cv grub $remote:/mnt/etc/default/grub
+rsync -cv etc/default/grub $remote:/mnt/etc/default/grub
 ssh $remote "arch-chroot /mnt grub-install /dev/$drive"
 ssh $remote "arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg"
 
 ssh $remote "echo $hostname >/mnt/etc/hostname"
 
-rsync -cpv --chmod=644 systemd/network/$host.link $remote:/mnt/etc/systemd/network/10-public.link
-rsync -cpv --chmod=644 systemd/network/$host.network $remote:/mnt/etc/systemd/network/10-public.network
+rsync -cpv --chmod=644 etc/systemd/network/$host.link $remote:/mnt/etc/systemd/network/10-public.link
+rsync -cpv --chmod=644 etc/systemd/network/$host.network $remote:/mnt/etc/systemd/network/10-public.network
 
-rsync -cpv --chmod=644 fstab.virtual $remote:/mnt/etc/fstab
-rsync -cpv --chmod=644 crypttab locale.conf mkinitcpio.conf pacman.conf pacreport.conf resolv.conf $remote:/mnt/etc/
+rsync -cpv --chmod=644 etc/fstab.virtual $remote:/mnt/etc/fstab
+rsync -cpv --chmod=644 etc/{crypttab,locale.conf,mkinitcpio.conf,pacman.conf,pacreport.conf,resolv.conf} $remote:/mnt/etc/
 
-rsync -cv unbound.conf $remote:/mnt/etc/unbound/unbound.conf
+rsync -cv etc/unbound/unbound.conf $remote:/mnt/etc/unbound/unbound.conf
 
 if [[ $host = @(0.grapheneos.network|1.grapheneos.network|2.grapheneos.network|3.grapheneos.network) ]]; then
-    cp chrony.conf chrony.conf.tmp
-    echo -e '\nallow' >> chrony.conf.tmp
-    rsync -cv chrony.conf.tmp $remote:/mnt/etc/chrony.conf
-    rm chrony.conf.tmp
+    cp etc/chrony.conf etc/chrony.conf.tmp
+    echo -e '\nallow' >> etc/chrony.conf.tmp
+    rsync -cv etc/chrony.conf.tmp $remote:/mnt/etc/chrony.conf
+    rm etc/chrony.conf.tmp
 else
-    rsync -cv chrony.conf $remote:/mnt/etc/chrony.conf
+    rsync -cv etc/chrony.conf $remote:/mnt/etc/chrony.conf
 fi
 ssh $remote mkdir -vp /mnt/etc/sysconfig
-rsync -cpv --chmod 644 sysconfig/chronyd $remote:/mnt/etc/sysconfig/chronyd
+rsync -cpv --chmod 644 etc/sysconfig/chronyd $remote:/mnt/etc/sysconfig/chronyd
 
 rsync -cv authorized_keys $remote:/mnt/root/.ssh/authorized_keys
-cp ssh/sshd_config ssh/sshd_config.tmp
-sed -i "s/{{ssh_users}}/${hosts_ssh_users[$host]:-root}/g" ssh/sshd_config.tmp
-rsync -cv ssh/sshd_config.tmp $remote:/mnt/etc/ssh/sshd_config
-rm ssh/sshd_config.tmp
+cp etc/ssh/sshd_config etc/ssh/sshd_config.tmp
+sed -i "s/{{ssh_users}}/${hosts_ssh_users[$host]:-root}/g" etc/ssh/sshd_config.tmp
+rsync -cv etc/ssh/sshd_config.tmp $remote:/mnt/etc/ssh/sshd_config
+rm etc/ssh/sshd_config.tmp
 
-rsync -cv nftables/nftables-${hosts_firewall[$host]:-web}.conf $remote:/mnt/etc/nftables.conf
+rsync -cv etc/nftables/nftables-${hosts_firewall[$host]:-web}.conf $remote:/mnt/etc/nftables.conf
 
 ssh $remote "arch-chroot /mnt systemctl enable chronyd.service fstrim.timer logrotate.timer nftables.service plocate-updatedb.timer systemd-networkd.service systemd-oomd.service sshd.service sysstat.service unbound.service"
 ssh $remote "arch-chroot /mnt systemctl disable remote-fs.target systemd-network-generator.service systemd-userdbd.socket"
diff --git a/chrony.conf b/etc/chrony.conf
similarity index 100%
rename from chrony.conf
rename to etc/chrony.conf
diff --git a/crypttab b/etc/crypttab
similarity index 100%
rename from crypttab
rename to etc/crypttab
diff --git a/grub b/etc/default/grub
similarity index 100%
rename from grub
rename to etc/default/grub
diff --git a/fstab.metal b/etc/fstab.metal
similarity index 100%
rename from fstab.metal
rename to etc/fstab.metal
diff --git a/fstab.virtual b/etc/fstab.virtual
similarity index 100%
rename from fstab.virtual
rename to etc/fstab.virtual
diff --git a/locale.conf b/etc/locale.conf
similarity index 100%
rename from locale.conf
rename to etc/locale.conf
diff --git a/logrotate.conf b/etc/logrotate.conf
similarity index 100%
rename from logrotate.conf
rename to etc/logrotate.conf
diff --git a/logrotate.d/letsencrypt b/etc/logrotate.d/letsencrypt
similarity index 100%
rename from logrotate.d/letsencrypt
rename to etc/logrotate.d/letsencrypt
diff --git a/mkinitcpio.conf b/etc/mkinitcpio.conf
similarity index 100%
rename from mkinitcpio.conf
rename to etc/mkinitcpio.conf
diff --git a/mkinitcpio.d/linux-lts.preset b/etc/mkinitcpio.d/linux-lts.preset
similarity index 100%
rename from mkinitcpio.d/linux-lts.preset
rename to etc/mkinitcpio.d/linux-lts.preset
diff --git a/modprobe.d/local.conf b/etc/modprobe.d/local.conf
similarity index 100%
rename from modprobe.d/local.conf
rename to etc/modprobe.d/local.conf
diff --git a/modules-load.d/local.conf b/etc/modules-load.d/local.conf
similarity index 100%
rename from modules-load.d/local.conf
rename to etc/modules-load.d/local.conf
diff --git a/modules-load.d/softdog.conf b/etc/modules-load.d/softdog.conf
similarity index 100%
rename from modules-load.d/softdog.conf
rename to etc/modules-load.d/softdog.conf
diff --git a/nftables/nftables-attestation.conf b/etc/nftables/nftables-attestation.conf
similarity index 100%
rename from nftables/nftables-attestation.conf
rename to etc/nftables/nftables-attestation.conf
diff --git a/nftables/nftables-discuss.conf b/etc/nftables/nftables-discuss.conf
similarity index 100%
rename from nftables/nftables-discuss.conf
rename to etc/nftables/nftables-discuss.conf
diff --git a/nftables/nftables-mail.conf b/etc/nftables/nftables-mail.conf
similarity index 100%
rename from nftables/nftables-mail.conf
rename to etc/nftables/nftables-mail.conf
diff --git a/nftables/nftables-matrix.conf b/etc/nftables/nftables-matrix.conf
similarity index 100%
rename from nftables/nftables-matrix.conf
rename to etc/nftables/nftables-matrix.conf
diff --git a/nftables/nftables-network.conf b/etc/nftables/nftables-network.conf
similarity index 100%
rename from nftables/nftables-network.conf
rename to etc/nftables/nftables-network.conf
diff --git a/nftables/nftables-ns1.conf b/etc/nftables/nftables-ns1.conf
similarity index 100%
rename from nftables/nftables-ns1.conf
rename to etc/nftables/nftables-ns1.conf
diff --git a/nftables/nftables-ns2.conf b/etc/nftables/nftables-ns2.conf
similarity index 100%
rename from nftables/nftables-ns2.conf
rename to etc/nftables/nftables-ns2.conf
diff --git a/nftables/nftables-social.conf b/etc/nftables/nftables-social.conf
similarity index 100%
rename from nftables/nftables-social.conf
rename to etc/nftables/nftables-social.conf
diff --git a/nftables/nftables-web.conf b/etc/nftables/nftables-web.conf
similarity index 100%
rename from nftables/nftables-web.conf
rename to etc/nftables/nftables-web.conf
diff --git a/pacman.conf b/etc/pacman.conf
similarity index 100%
rename from pacman.conf
rename to etc/pacman.conf
diff --git a/pacman.d/mirrorlist b/etc/pacman.d/mirrorlist
similarity index 100%
rename from pacman.d/mirrorlist
rename to etc/pacman.d/mirrorlist
diff --git a/pacreport.conf b/etc/pacreport.conf
similarity index 100%
rename from pacreport.conf
rename to etc/pacreport.conf
diff --git a/resolv.conf b/etc/resolv.conf
similarity index 100%
rename from resolv.conf
rename to etc/resolv.conf
diff --git a/ssh/ssh_config b/etc/ssh/ssh_config
similarity index 100%
rename from ssh/ssh_config
rename to etc/ssh/ssh_config
diff --git a/ssh/sshd_config b/etc/ssh/sshd_config
similarity index 100%
rename from ssh/sshd_config
rename to etc/ssh/sshd_config
diff --git a/sysconfig/chronyd b/etc/sysconfig/chronyd
similarity index 100%
rename from sysconfig/chronyd
rename to etc/sysconfig/chronyd
diff --git a/sysctl.d/local.conf b/etc/sysctl.d/local.conf
similarity index 100%
rename from sysctl.d/local.conf
rename to etc/sysctl.d/local.conf
diff --git a/systemd/journald.conf b/etc/systemd/journald.conf
similarity index 100%
rename from systemd/journald.conf
rename to etc/systemd/journald.conf
diff --git a/systemd/network/0.grapheneos.network.link b/etc/systemd/network/0.grapheneos.network.link
similarity index 100%
rename from systemd/network/0.grapheneos.network.link
rename to etc/systemd/network/0.grapheneos.network.link
diff --git a/systemd/network/0.grapheneos.network.network b/etc/systemd/network/0.grapheneos.network.network
similarity index 100%
rename from systemd/network/0.grapheneos.network.network
rename to etc/systemd/network/0.grapheneos.network.network
diff --git a/systemd/network/0.grapheneos.org.link b/etc/systemd/network/0.grapheneos.org.link
similarity index 100%
rename from systemd/network/0.grapheneos.org.link
rename to etc/systemd/network/0.grapheneos.org.link
diff --git a/systemd/network/0.grapheneos.org.network b/etc/systemd/network/0.grapheneos.org.network
similarity index 100%
rename from systemd/network/0.grapheneos.org.network
rename to etc/systemd/network/0.grapheneos.org.network
diff --git a/systemd/network/0.ns2.grapheneos.org.link b/etc/systemd/network/0.ns2.grapheneos.org.link
similarity index 100%
rename from systemd/network/0.ns2.grapheneos.org.link
rename to etc/systemd/network/0.ns2.grapheneos.org.link
diff --git a/systemd/network/0.ns2.grapheneos.org.network b/etc/systemd/network/0.ns2.grapheneos.org.network
similarity index 100%
rename from systemd/network/0.ns2.grapheneos.org.network
rename to etc/systemd/network/0.ns2.grapheneos.org.network
diff --git a/systemd/network/0.releases.grapheneos.org.link b/etc/systemd/network/0.releases.grapheneos.org.link
similarity index 100%
rename from systemd/network/0.releases.grapheneos.org.link
rename to etc/systemd/network/0.releases.grapheneos.org.link
diff --git a/systemd/network/0.releases.grapheneos.org.network b/etc/systemd/network/0.releases.grapheneos.org.network
similarity index 100%
rename from systemd/network/0.releases.grapheneos.org.network
rename to etc/systemd/network/0.releases.grapheneos.org.network
diff --git a/systemd/network/1.grapheneos.network.link b/etc/systemd/network/1.grapheneos.network.link
similarity index 100%
rename from systemd/network/1.grapheneos.network.link
rename to etc/systemd/network/1.grapheneos.network.link
diff --git a/systemd/network/1.grapheneos.network.network b/etc/systemd/network/1.grapheneos.network.network
similarity index 100%
rename from systemd/network/1.grapheneos.network.network
rename to etc/systemd/network/1.grapheneos.network.network
diff --git a/systemd/network/1.grapheneos.org.link b/etc/systemd/network/1.grapheneos.org.link
similarity index 100%
rename from systemd/network/1.grapheneos.org.link
rename to etc/systemd/network/1.grapheneos.org.link
diff --git a/systemd/network/1.grapheneos.org.network b/etc/systemd/network/1.grapheneos.org.network
similarity index 100%
rename from systemd/network/1.grapheneos.org.network
rename to etc/systemd/network/1.grapheneos.org.network
diff --git a/systemd/network/1.ns2.grapheneos.org.link b/etc/systemd/network/1.ns2.grapheneos.org.link
similarity index 100%
rename from systemd/network/1.ns2.grapheneos.org.link
rename to etc/systemd/network/1.ns2.grapheneos.org.link
diff --git a/systemd/network/1.ns2.grapheneos.org.network b/etc/systemd/network/1.ns2.grapheneos.org.network
similarity index 100%
rename from systemd/network/1.ns2.grapheneos.org.network
rename to etc/systemd/network/1.ns2.grapheneos.org.network
diff --git a/systemd/network/1.releases.grapheneos.org.link b/etc/systemd/network/1.releases.grapheneos.org.link
similarity index 100%
rename from systemd/network/1.releases.grapheneos.org.link
rename to etc/systemd/network/1.releases.grapheneos.org.link
diff --git a/systemd/network/1.releases.grapheneos.org.network b/etc/systemd/network/1.releases.grapheneos.org.network
similarity index 100%
rename from systemd/network/1.releases.grapheneos.org.network
rename to etc/systemd/network/1.releases.grapheneos.org.network
diff --git a/systemd/network/2.grapheneos.network.link b/etc/systemd/network/2.grapheneos.network.link
similarity index 100%
rename from systemd/network/2.grapheneos.network.link
rename to etc/systemd/network/2.grapheneos.network.link
diff --git a/systemd/network/2.grapheneos.network.network b/etc/systemd/network/2.grapheneos.network.network
similarity index 100%
rename from systemd/network/2.grapheneos.network.network
rename to etc/systemd/network/2.grapheneos.network.network
diff --git a/systemd/network/2.grapheneos.org.link b/etc/systemd/network/2.grapheneos.org.link
similarity index 100%
rename from systemd/network/2.grapheneos.org.link
rename to etc/systemd/network/2.grapheneos.org.link
diff --git a/systemd/network/2.grapheneos.org.network b/etc/systemd/network/2.grapheneos.org.network
similarity index 100%
rename from systemd/network/2.grapheneos.org.network
rename to etc/systemd/network/2.grapheneos.org.network
diff --git a/systemd/network/2.ns2.grapheneos.org.link b/etc/systemd/network/2.ns2.grapheneos.org.link
similarity index 100%
rename from systemd/network/2.ns2.grapheneos.org.link
rename to etc/systemd/network/2.ns2.grapheneos.org.link
diff --git a/systemd/network/2.ns2.grapheneos.org.network b/etc/systemd/network/2.ns2.grapheneos.org.network
similarity index 100%
rename from systemd/network/2.ns2.grapheneos.org.network
rename to etc/systemd/network/2.ns2.grapheneos.org.network
diff --git a/systemd/network/2.releases.grapheneos.org.link b/etc/systemd/network/2.releases.grapheneos.org.link
similarity index 100%
rename from systemd/network/2.releases.grapheneos.org.link
rename to etc/systemd/network/2.releases.grapheneos.org.link
diff --git a/systemd/network/2.releases.grapheneos.org.network b/etc/systemd/network/2.releases.grapheneos.org.network
similarity index 100%
rename from systemd/network/2.releases.grapheneos.org.network
rename to etc/systemd/network/2.releases.grapheneos.org.network
diff --git a/systemd/network/3.grapheneos.network.link b/etc/systemd/network/3.grapheneos.network.link
similarity index 100%
rename from systemd/network/3.grapheneos.network.link
rename to etc/systemd/network/3.grapheneos.network.link
diff --git a/systemd/network/3.grapheneos.network.network b/etc/systemd/network/3.grapheneos.network.network
similarity index 100%
rename from systemd/network/3.grapheneos.network.network
rename to etc/systemd/network/3.grapheneos.network.network
diff --git a/systemd/network/3.grapheneos.org.link b/etc/systemd/network/3.grapheneos.org.link
similarity index 100%
rename from systemd/network/3.grapheneos.org.link
rename to etc/systemd/network/3.grapheneos.org.link
diff --git a/systemd/network/3.grapheneos.org.network b/etc/systemd/network/3.grapheneos.org.network
similarity index 100%
rename from systemd/network/3.grapheneos.org.network
rename to etc/systemd/network/3.grapheneos.org.network
diff --git a/systemd/network/3.releases.grapheneos.org.link b/etc/systemd/network/3.releases.grapheneos.org.link
similarity index 100%
rename from systemd/network/3.releases.grapheneos.org.link
rename to etc/systemd/network/3.releases.grapheneos.org.link
diff --git a/systemd/network/3.releases.grapheneos.org.network b/etc/systemd/network/3.releases.grapheneos.org.network
similarity index 100%
rename from systemd/network/3.releases.grapheneos.org.network
rename to etc/systemd/network/3.releases.grapheneos.org.network
diff --git a/systemd/network/4.releases.grapheneos.org.link b/etc/systemd/network/4.releases.grapheneos.org.link
similarity index 100%
rename from systemd/network/4.releases.grapheneos.org.link
rename to etc/systemd/network/4.releases.grapheneos.org.link
diff --git a/systemd/network/4.releases.grapheneos.org.network b/etc/systemd/network/4.releases.grapheneos.org.network
similarity index 100%
rename from systemd/network/4.releases.grapheneos.org.network
rename to etc/systemd/network/4.releases.grapheneos.org.network
diff --git a/systemd/network/attestation.app.link b/etc/systemd/network/attestation.app.link
similarity index 100%
rename from systemd/network/attestation.app.link
rename to etc/systemd/network/attestation.app.link
diff --git a/systemd/network/attestation.app.network b/etc/systemd/network/attestation.app.network
similarity index 100%
rename from systemd/network/attestation.app.network
rename to etc/systemd/network/attestation.app.network
diff --git a/systemd/network/discuss.grapheneos.org.link b/etc/systemd/network/discuss.grapheneos.org.link
similarity index 100%
rename from systemd/network/discuss.grapheneos.org.link
rename to etc/systemd/network/discuss.grapheneos.org.link
diff --git a/systemd/network/discuss.grapheneos.org.network b/etc/systemd/network/discuss.grapheneos.org.network
similarity index 100%
rename from systemd/network/discuss.grapheneos.org.network
rename to etc/systemd/network/discuss.grapheneos.org.network
diff --git a/systemd/network/grapheneos.social.link b/etc/systemd/network/grapheneos.social.link
similarity index 100%
rename from systemd/network/grapheneos.social.link
rename to etc/systemd/network/grapheneos.social.link
diff --git a/systemd/network/grapheneos.social.network b/etc/systemd/network/grapheneos.social.network
similarity index 100%
rename from systemd/network/grapheneos.social.network
rename to etc/systemd/network/grapheneos.social.network
diff --git a/systemd/network/mail.grapheneos.org.link b/etc/systemd/network/mail.grapheneos.org.link
similarity index 100%
rename from systemd/network/mail.grapheneos.org.link
rename to etc/systemd/network/mail.grapheneos.org.link
diff --git a/systemd/network/mail.grapheneos.org.network b/etc/systemd/network/mail.grapheneos.org.network
similarity index 100%
rename from systemd/network/mail.grapheneos.org.network
rename to etc/systemd/network/mail.grapheneos.org.network
diff --git a/systemd/network/matrix.grapheneos.org.link b/etc/systemd/network/matrix.grapheneos.org.link
similarity index 100%
rename from systemd/network/matrix.grapheneos.org.link
rename to etc/systemd/network/matrix.grapheneos.org.link
diff --git a/systemd/network/matrix.grapheneos.org.network b/etc/systemd/network/matrix.grapheneos.org.network
similarity index 100%
rename from systemd/network/matrix.grapheneos.org.network
rename to etc/systemd/network/matrix.grapheneos.org.network
diff --git a/systemd/network/ns1.grapheneos.org.link b/etc/systemd/network/ns1.grapheneos.org.link
similarity index 100%
rename from systemd/network/ns1.grapheneos.org.link
rename to etc/systemd/network/ns1.grapheneos.org.link
diff --git a/systemd/network/ns1.grapheneos.org.network b/etc/systemd/network/ns1.grapheneos.org.network
similarity index 100%
rename from systemd/network/ns1.grapheneos.org.network
rename to etc/systemd/network/ns1.grapheneos.org.network
diff --git a/systemd/network/ns1.staging.grapheneos.org.link b/etc/systemd/network/ns1.staging.grapheneos.org.link
similarity index 100%
rename from systemd/network/ns1.staging.grapheneos.org.link
rename to etc/systemd/network/ns1.staging.grapheneos.org.link
diff --git a/systemd/network/ns1.staging.grapheneos.org.network b/etc/systemd/network/ns1.staging.grapheneos.org.network
similarity index 100%
rename from systemd/network/ns1.staging.grapheneos.org.network
rename to etc/systemd/network/ns1.staging.grapheneos.org.network
diff --git a/systemd/network/staging.attestation.app.link b/etc/systemd/network/staging.attestation.app.link
similarity index 100%
rename from systemd/network/staging.attestation.app.link
rename to etc/systemd/network/staging.attestation.app.link
diff --git a/systemd/network/staging.attestation.app.network b/etc/systemd/network/staging.attestation.app.network
similarity index 100%
rename from systemd/network/staging.attestation.app.network
rename to etc/systemd/network/staging.attestation.app.network
diff --git a/systemd/network/staging.grapheneos.org.link b/etc/systemd/network/staging.grapheneos.org.link
similarity index 100%
rename from systemd/network/staging.grapheneos.org.link
rename to etc/systemd/network/staging.grapheneos.org.link
diff --git a/systemd/network/staging.grapheneos.org.network b/etc/systemd/network/staging.grapheneos.org.network
similarity index 100%
rename from systemd/network/staging.grapheneos.org.network
rename to etc/systemd/network/staging.grapheneos.org.network
diff --git a/systemd/networkd.conf b/etc/systemd/networkd.conf
similarity index 100%
rename from systemd/networkd.conf
rename to etc/systemd/networkd.conf
diff --git a/systemd/sleep.conf b/etc/systemd/sleep.conf
similarity index 100%
rename from systemd/sleep.conf
rename to etc/systemd/sleep.conf
diff --git a/systemd/system.conf b/etc/systemd/system.conf
similarity index 100%
rename from systemd/system.conf
rename to etc/systemd/system.conf
diff --git a/systemd/system/-.slice.d/override.conf b/etc/systemd/system/-.slice.d/override.conf
similarity index 100%
rename from systemd/system/-.slice.d/override.conf
rename to etc/systemd/system/-.slice.d/override.conf
diff --git a/systemd/system/attestation.service.d/override.conf b/etc/systemd/system/attestation.service.d/override.conf
similarity index 100%
rename from systemd/system/attestation.service.d/override.conf
rename to etc/systemd/system/attestation.service.d/override.conf
diff --git a/systemd/system/certbot-ocsp-fetcher.service b/etc/systemd/system/certbot-ocsp-fetcher.service
similarity index 100%
rename from systemd/system/certbot-ocsp-fetcher.service
rename to etc/systemd/system/certbot-ocsp-fetcher.service
diff --git a/systemd/system/certbot-ocsp-fetcher.timer b/etc/systemd/system/certbot-ocsp-fetcher.timer
similarity index 100%
rename from systemd/system/certbot-ocsp-fetcher.timer
rename to etc/systemd/system/certbot-ocsp-fetcher.timer
diff --git a/systemd/system/certbot-renew.service.d/override.conf b/etc/systemd/system/certbot-renew.service.d/override.conf
similarity index 100%
rename from systemd/system/certbot-renew.service.d/override.conf
rename to etc/systemd/system/certbot-renew.service.d/override.conf
diff --git a/systemd/system/chronyd.service.d/override.conf b/etc/systemd/system/chronyd.service.d/override.conf
similarity index 100%
rename from systemd/system/chronyd.service.d/override.conf
rename to etc/systemd/system/chronyd.service.d/override.conf
diff --git a/systemd/system/fstrim.service.d/override.conf b/etc/systemd/system/fstrim.service.d/override.conf
similarity index 100%
rename from systemd/system/fstrim.service.d/override.conf
rename to etc/systemd/system/fstrim.service.d/override.conf
diff --git a/systemd/system/fstrim.timer.d/override.conf b/etc/systemd/system/fstrim.timer.d/override.conf
similarity index 100%
rename from systemd/system/fstrim.timer.d/override.conf
rename to etc/systemd/system/fstrim.timer.d/override.conf
diff --git a/systemd/system/nginx-create-session-ticket-keys.service b/etc/systemd/system/nginx-create-session-ticket-keys.service
similarity index 100%
rename from systemd/system/nginx-create-session-ticket-keys.service
rename to etc/systemd/system/nginx-create-session-ticket-keys.service
diff --git a/systemd/system/nginx-rotate-session-ticket-keys.service b/etc/systemd/system/nginx-rotate-session-ticket-keys.service
similarity index 100%
rename from systemd/system/nginx-rotate-session-ticket-keys.service
rename to etc/systemd/system/nginx-rotate-session-ticket-keys.service
diff --git a/systemd/system/nginx-rotate-session-ticket-keys.timer b/etc/systemd/system/nginx-rotate-session-ticket-keys.timer
similarity index 100%
rename from systemd/system/nginx-rotate-session-ticket-keys.timer
rename to etc/systemd/system/nginx-rotate-session-ticket-keys.timer
diff --git a/systemd/system/nginx.service.d/override.conf b/etc/systemd/system/nginx.service.d/override.conf
similarity index 100%
rename from systemd/system/nginx.service.d/override.conf
rename to etc/systemd/system/nginx.service.d/override.conf
diff --git a/systemd/system/plocate-updatedb.service.d/override.conf b/etc/systemd/system/plocate-updatedb.service.d/override.conf
similarity index 100%
rename from systemd/system/plocate-updatedb.service.d/override.conf
rename to etc/systemd/system/plocate-updatedb.service.d/override.conf
diff --git a/systemd/system/sshd.service.d/override.conf b/etc/systemd/system/sshd.service.d/override.conf
similarity index 100%
rename from systemd/system/sshd.service.d/override.conf
rename to etc/systemd/system/sshd.service.d/override.conf
diff --git a/systemd/system/sysstat-collect.timer.d/override.conf b/etc/systemd/system/sysstat-collect.timer.d/override.conf
similarity index 100%
rename from systemd/system/sysstat-collect.timer.d/override.conf
rename to etc/systemd/system/sysstat-collect.timer.d/override.conf
diff --git a/systemd/system/system.slice.d/override.conf b/etc/systemd/system/system.slice.d/override.conf
similarity index 100%
rename from systemd/system/system.slice.d/override.conf
rename to etc/systemd/system/system.slice.d/override.conf
diff --git a/systemd/system/systemd-boot-update.service.d/local.conf b/etc/systemd/system/systemd-boot-update.service.d/local.conf
similarity index 100%
rename from systemd/system/systemd-boot-update.service.d/local.conf
rename to etc/systemd/system/systemd-boot-update.service.d/local.conf
diff --git a/systemd/system/unbound.service.d/override.conf b/etc/systemd/system/unbound.service.d/override.conf
similarity index 100%
rename from systemd/system/unbound.service.d/override.conf
rename to etc/systemd/system/unbound.service.d/override.conf
diff --git a/systemd/system/xfs_fsr.service b/etc/systemd/system/xfs_fsr.service
similarity index 100%
rename from systemd/system/xfs_fsr.service
rename to etc/systemd/system/xfs_fsr.service
diff --git a/tmpfiles.d/chrony.conf b/etc/tmpfiles.d/chrony.conf
similarity index 100%
rename from tmpfiles.d/chrony.conf
rename to etc/tmpfiles.d/chrony.conf
diff --git a/unbound.conf b/etc/unbound/unbound.conf
similarity index 100%
rename from unbound.conf
rename to etc/unbound/unbound.conf