diff --git a/active/systemd_borg/backup.service b/active/software_borg/backup.service
similarity index 100%
rename from active/systemd_borg/backup.service
rename to active/software_borg/backup.service
diff --git a/active/systemd_borg/backup.sh.j2 b/active/software_borg/backup.sh.j2
similarity index 100%
rename from active/systemd_borg/backup.sh.j2
rename to active/software_borg/backup.sh.j2
diff --git a/active/systemd_borg/backup.timer b/active/software_borg/backup.timer
similarity index 100%
rename from active/systemd_borg/backup.timer
rename to active/software_borg/backup.timer
diff --git a/active/systemd_borg/borg.md b/active/software_borg/borg.md
similarity index 100%
rename from active/systemd_borg/borg.md
rename to active/software_borg/borg.md
diff --git a/active/systemd_borg/install_backup.yaml b/active/software_borg/install_backup.yaml
similarity index 100%
rename from active/systemd_borg/install_backup.yaml
rename to active/software_borg/install_backup.yaml
diff --git a/active/systemd_stablediffusion/nginx.conf b/active/software_stablediffusion/nginx.conf
similarity index 100%
rename from active/systemd_stablediffusion/nginx.conf
rename to active/software_stablediffusion/nginx.conf
diff --git a/active/systemd_stablediffusion/reesimulate.reeseapps.com b/active/software_stablediffusion/reesimulate.reeseapps.com
similarity index 100%
rename from active/systemd_stablediffusion/reesimulate.reeseapps.com
rename to active/software_stablediffusion/reesimulate.reeseapps.com
diff --git a/active/systemd_stablediffusion/stablediffusion.md b/active/software_stablediffusion/stablediffusion.md
similarity index 100%
rename from active/systemd_stablediffusion/stablediffusion.md
rename to active/software_stablediffusion/stablediffusion.md
diff --git a/active/systemd_unifi-server/unifi-server.md b/active/software_unifi-server/unifi-server.md
similarity index 100%
rename from active/systemd_unifi-server/unifi-server.md
rename to active/software_unifi-server/unifi-server.md
diff --git a/active/systemd_wireguard/Dockerfile b/active/software_wireguard/Dockerfile
similarity index 100%
rename from active/systemd_wireguard/Dockerfile
rename to active/software_wireguard/Dockerfile
diff --git a/active/systemd_wireguard/install.sh b/active/software_wireguard/install.sh
similarity index 100%
rename from active/systemd_wireguard/install.sh
rename to active/software_wireguard/install.sh
diff --git a/active/systemd_wireguard/install_wireguard.yaml b/active/software_wireguard/install_wireguard.yaml
similarity index 100%
rename from active/systemd_wireguard/install_wireguard.yaml
rename to active/software_wireguard/install_wireguard.yaml
diff --git a/active/systemd_wireguard/newclient.sh b/active/software_wireguard/newclient.sh
similarity index 100%
rename from active/systemd_wireguard/newclient.sh
rename to active/software_wireguard/newclient.sh
diff --git a/active/systemd_wireguard/qr.sh b/active/software_wireguard/qr.sh
similarity index 100%
rename from active/systemd_wireguard/qr.sh
rename to active/software_wireguard/qr.sh
diff --git a/active/systemd_wireguard/wg0.conf.j2 b/active/software_wireguard/wg0.conf.j2
similarity index 100%
rename from active/systemd_wireguard/wg0.conf.j2
rename to active/software_wireguard/wg0.conf.j2
diff --git a/active/systemd_wireguard/wireguard.md b/active/software_wireguard/wireguard.md
similarity index 100%
rename from active/systemd_wireguard/wireguard.md
rename to active/software_wireguard/wireguard.md
diff --git a/active/systemd_wyoming/finished.wav b/active/software_wyoming/finished.wav
similarity index 100%
rename from active/systemd_wyoming/finished.wav
rename to active/software_wyoming/finished.wav
diff --git a/active/systemd_wyoming/install_wyoming.yaml b/active/software_wyoming/install_wyoming.yaml
similarity index 100%
rename from active/systemd_wyoming/install_wyoming.yaml
rename to active/software_wyoming/install_wyoming.yaml
diff --git a/active/systemd_wyoming/jarvis_v2.tflite b/active/software_wyoming/jarvis_v2.tflite
similarity index 100%
rename from active/systemd_wyoming/jarvis_v2.tflite
rename to active/software_wyoming/jarvis_v2.tflite
diff --git a/active/systemd_wyoming/listening.wav b/active/software_wyoming/listening.wav
similarity index 100%
rename from active/systemd_wyoming/listening.wav
rename to active/software_wyoming/listening.wav
diff --git a/active/systemd_wyoming/vars.yaml b/active/software_wyoming/vars.yaml
similarity index 100%
rename from active/systemd_wyoming/vars.yaml
rename to active/software_wyoming/vars.yaml
diff --git a/active/systemd_wyoming/wakeword.service b/active/software_wyoming/wakeword.service
similarity index 100%
rename from active/systemd_wyoming/wakeword.service
rename to active/software_wyoming/wakeword.service
diff --git a/active/systemd_wyoming/wyoming.md b/active/software_wyoming/wyoming.md
similarity index 100%
rename from active/systemd_wyoming/wyoming.md
rename to active/software_wyoming/wyoming.md
diff --git a/active/systemd_wyoming/wyoming.service b/active/software_wyoming/wyoming.service
similarity index 100%
rename from active/systemd_wyoming/wyoming.service
rename to active/software_wyoming/wyoming.service
diff --git a/templates/systemd/foobar.md b/templates/software/foobar.md
similarity index 100%
rename from templates/systemd/foobar.md
rename to templates/software/foobar.md
diff --git a/templates/systemd/foobar.service b/templates/software/foobar.service
similarity index 100%
rename from templates/systemd/foobar.service
rename to templates/software/foobar.service
diff --git a/templates/systemd/foobar.sh.j2 b/templates/software/foobar.sh.j2
similarity index 100%
rename from templates/systemd/foobar.sh.j2
rename to templates/software/foobar.sh.j2
diff --git a/templates/systemd/foobar.timer b/templates/software/foobar.timer
similarity index 100%
rename from templates/systemd/foobar.timer
rename to templates/software/foobar.timer
diff --git a/templates/systemd/install_foobar.yaml b/templates/software/install_foobar.yaml
similarity index 100%
rename from templates/systemd/install_foobar.yaml
rename to templates/software/install_foobar.yaml
diff --git a/templates/systemd/vars.yaml b/templates/software/vars.yaml
similarity index 100%
rename from templates/systemd/vars.yaml
rename to templates/software/vars.yaml