diff --git a/nomad-job/MQTT.nomad b/nomad-job/apps/MQTT.nomad
similarity index 100%
rename from nomad-job/MQTT.nomad
rename to nomad-job/apps/MQTT.nomad
diff --git a/nomad-job/actualbudget.nomad b/nomad-job/apps/actualbudget.nomad
similarity index 100%
rename from nomad-job/actualbudget.nomad
rename to nomad-job/apps/actualbudget.nomad
diff --git a/nomad-job/borgmatic.nomad b/nomad-job/apps/borgmatic.nomad
similarity index 100%
rename from nomad-job/borgmatic.nomad
rename to nomad-job/apps/borgmatic.nomad
diff --git a/nomad-job/chainetv.nomad b/nomad-job/apps/chainetv.nomad
similarity index 100%
rename from nomad-job/chainetv.nomad
rename to nomad-job/apps/chainetv.nomad
diff --git a/nomad-job/dockermailserver.nomad b/nomad-job/apps/dockermailserver.nomad
similarity index 100%
rename from nomad-job/dockermailserver.nomad
rename to nomad-job/apps/dockermailserver.nomad
diff --git a/nomad-job/filestash.nomad b/nomad-job/apps/filestash.nomad
similarity index 100%
rename from nomad-job/filestash.nomad
rename to nomad-job/apps/filestash.nomad
diff --git a/nomad-job/ghostfolio.nomad b/nomad-job/apps/ghostfolio.nomad
similarity index 100%
rename from nomad-job/ghostfolio.nomad
rename to nomad-job/apps/ghostfolio.nomad
diff --git a/nomad-job/homeassistant.nomad b/nomad-job/apps/homeassistant.nomad
similarity index 100%
rename from nomad-job/homeassistant.nomad
rename to nomad-job/apps/homeassistant.nomad
diff --git a/nomad-job/immich.nomad.hcl b/nomad-job/apps/immich.nomad.hcl
similarity index 100%
rename from nomad-job/immich.nomad.hcl
rename to nomad-job/apps/immich.nomad.hcl
diff --git a/nomad-job/jellyfin.nomad b/nomad-job/apps/jellyfin.nomad
similarity index 100%
rename from nomad-job/jellyfin.nomad
rename to nomad-job/apps/jellyfin.nomad
diff --git a/nomad-job/mealie.nomad.hcl b/nomad-job/apps/mealie.nomad.hcl
similarity index 100%
rename from nomad-job/mealie.nomad.hcl
rename to nomad-job/apps/mealie.nomad.hcl
diff --git a/nomad-job/pacoloco.nomad b/nomad-job/apps/pacoloco.nomad
similarity index 100%
rename from nomad-job/pacoloco.nomad
rename to nomad-job/apps/pacoloco.nomad
diff --git a/nomad-job/paperless-ng.nomad b/nomad-job/apps/paperless-ng.nomad
similarity index 100%
rename from nomad-job/paperless-ng.nomad
rename to nomad-job/apps/paperless-ng.nomad
diff --git a/nomad-job/radicale.nomad b/nomad-job/apps/radicale.nomad
similarity index 100%
rename from nomad-job/radicale.nomad
rename to nomad-job/apps/radicale.nomad
diff --git a/nomad-job/rutorrent.nomad b/nomad-job/apps/rutorrent.nomad
similarity index 100%
rename from nomad-job/rutorrent.nomad
rename to nomad-job/apps/rutorrent.nomad
diff --git a/nomad-job/supysonic.nomad b/nomad-job/apps/supysonic.nomad
similarity index 100%
rename from nomad-job/supysonic.nomad
rename to nomad-job/apps/supysonic.nomad
diff --git a/nomad-job/syncthing.nomad b/nomad-job/apps/syncthing.nomad
similarity index 100%
rename from nomad-job/syncthing.nomad
rename to nomad-job/apps/syncthing.nomad
diff --git a/nomad-job/tt-rss.nomad b/nomad-job/apps/tt-rss.nomad
similarity index 100%
rename from nomad-job/tt-rss.nomad
rename to nomad-job/apps/tt-rss.nomad
diff --git a/nomad-job/vaultwarden.nomad b/nomad-job/apps/vaultwarden.nomad
similarity index 100%
rename from nomad-job/vaultwarden.nomad
rename to nomad-job/apps/vaultwarden.nomad
diff --git a/nomad-job/vikunja.nomad b/nomad-job/apps/vikunja.nomad
similarity index 100%
rename from nomad-job/vikunja.nomad
rename to nomad-job/apps/vikunja.nomad
diff --git a/nomad-job/www.nomad b/nomad-job/apps/www.nomad
similarity index 100%
rename from nomad-job/www.nomad
rename to nomad-job/apps/www.nomad
diff --git a/nomad-job/backup-consul.nomad b/nomad-job/batch/backup-consul.nomad
similarity index 100%
rename from nomad-job/backup-consul.nomad
rename to nomad-job/batch/backup-consul.nomad
diff --git a/nomad-job/backup-postgress.nomad b/nomad-job/batch/backup-postgress.nomad
similarity index 100%
rename from nomad-job/backup-postgress.nomad
rename to nomad-job/batch/backup-postgress.nomad
diff --git a/nomad-job/backup-vault.nomad b/nomad-job/batch/backup-vault.nomad
similarity index 100%
rename from nomad-job/backup-vault.nomad
rename to nomad-job/batch/backup-vault.nomad
diff --git a/nomad-job/batch-rutorrent.nomad b/nomad-job/batch/batch-rutorrent.nomad
similarity index 100%
rename from nomad-job/batch-rutorrent.nomad
rename to nomad-job/batch/batch-rutorrent.nomad
diff --git a/nomad-job/batch-seedboxsync.nomad b/nomad-job/batch/batch-seedboxsync.nomad
similarity index 100%
rename from nomad-job/batch-seedboxsync.nomad
rename to nomad-job/batch/batch-seedboxsync.nomad
diff --git a/nomad-job/torrent_automation.nomad.hcl b/nomad-job/batch/torrent_automation.nomad.hcl
similarity index 100%
rename from nomad-job/torrent_automation.nomad.hcl
rename to nomad-job/batch/torrent_automation.nomad.hcl
diff --git a/nomad-job/alertmanager.nomad b/nomad-job/platform/alertmanager.nomad
similarity index 100%
rename from nomad-job/alertmanager.nomad
rename to nomad-job/platform/alertmanager.nomad
diff --git a/nomad-job/authelia.nomad.hcl b/nomad-job/platform/authelia.nomad.hcl
similarity index 100%
rename from nomad-job/authelia.nomad.hcl
rename to nomad-job/platform/authelia.nomad.hcl
diff --git a/nomad-job/crowdsec-agent.nomad b/nomad-job/platform/crowdsec-agent.nomad
similarity index 100%
rename from nomad-job/crowdsec-agent.nomad
rename to nomad-job/platform/crowdsec-agent.nomad
diff --git a/nomad-job/crowdsec-api.nomad b/nomad-job/platform/crowdsec-api.nomad
similarity index 100%
rename from nomad-job/crowdsec-api.nomad
rename to nomad-job/platform/crowdsec-api.nomad
diff --git a/nomad-job/dashboard.nomad b/nomad-job/platform/dashboard.nomad
similarity index 100%
rename from nomad-job/dashboard.nomad
rename to nomad-job/platform/dashboard.nomad
diff --git a/nomad-job/drone-runner.nomad b/nomad-job/platform/drone-runner.nomad
similarity index 100%
rename from nomad-job/drone-runner.nomad
rename to nomad-job/platform/drone-runner.nomad
diff --git a/nomad-job/drone.nomad b/nomad-job/platform/drone.nomad
similarity index 100%
rename from nomad-job/drone.nomad
rename to nomad-job/platform/drone.nomad
diff --git a/nomad-job/gitea.nomad b/nomad-job/platform/gitea.nomad
similarity index 100%
rename from nomad-job/gitea.nomad
rename to nomad-job/platform/gitea.nomad
diff --git a/nomad-job/grafana.nomad b/nomad-job/platform/grafana.nomad
similarity index 100%
rename from nomad-job/grafana.nomad
rename to nomad-job/platform/grafana.nomad
diff --git a/nomad-job/loki.nomad b/nomad-job/platform/loki.nomad
similarity index 100%
rename from nomad-job/loki.nomad
rename to nomad-job/platform/loki.nomad
diff --git a/nomad-job/node-exporter.nomad b/nomad-job/platform/node-exporter.nomad
similarity index 100%
rename from nomad-job/node-exporter.nomad
rename to nomad-job/platform/node-exporter.nomad
diff --git a/nomad-job/nut_exporter.nomad b/nomad-job/platform/nut_exporter.nomad
similarity index 100%
rename from nomad-job/nut_exporter.nomad
rename to nomad-job/platform/nut_exporter.nomad
diff --git a/nomad-job/prometheus.nomad b/nomad-job/platform/prometheus.nomad
similarity index 100%
rename from nomad-job/prometheus.nomad
rename to nomad-job/platform/prometheus.nomad
diff --git a/nomad-job/vector.nomad b/nomad-job/platform/vector.nomad
similarity index 100%
rename from nomad-job/vector.nomad
rename to nomad-job/platform/vector.nomad
diff --git a/nomad-job/csi-nfs-controler.nomad b/nomad-job/system/csi-nfs-controler.nomad
similarity index 100%
rename from nomad-job/csi-nfs-controler.nomad
rename to nomad-job/system/csi-nfs-controler.nomad
diff --git a/nomad-job/csi-nfs-node.nomad b/nomad-job/system/csi-nfs-node.nomad
similarity index 100%
rename from nomad-job/csi-nfs-node.nomad
rename to nomad-job/system/csi-nfs-node.nomad
diff --git a/nomad-job/openldap/memberofOverlay.ldif b/nomad-job/system/openldap/memberofOverlay.ldif
similarity index 100%
rename from nomad-job/openldap/memberofOverlay.ldif
rename to nomad-job/system/openldap/memberofOverlay.ldif
diff --git a/nomad-job/openldap/openldap.nomad.hcl b/nomad-job/system/openldap/openldap.nomad.hcl
similarity index 100%
rename from nomad-job/openldap/openldap.nomad.hcl
rename to nomad-job/system/openldap/openldap.nomad.hcl
diff --git a/nomad-job/openldap/rfc2307bis.ldif b/nomad-job/system/openldap/rfc2307bis.ldif
similarity index 100%
rename from nomad-job/openldap/rfc2307bis.ldif
rename to nomad-job/system/openldap/rfc2307bis.ldif
diff --git a/nomad-job/openldap/samba.ldif b/nomad-job/system/openldap/samba.ldif
similarity index 100%
rename from nomad-job/openldap/samba.ldif
rename to nomad-job/system/openldap/samba.ldif
diff --git a/nomad-job/openldap/smbkrb5pwd.ldif b/nomad-job/system/openldap/smbkrb5pwd.ldif
similarity index 100%
rename from nomad-job/openldap/smbkrb5pwd.ldif
rename to nomad-job/system/openldap/smbkrb5pwd.ldif
diff --git a/nomad-job/openldap/tree.ldif b/nomad-job/system/openldap/tree.ldif
similarity index 100%
rename from nomad-job/openldap/tree.ldif
rename to nomad-job/system/openldap/tree.ldif
diff --git a/nomad-job/pdns-auth.nomad b/nomad-job/system/pdns-auth.nomad
similarity index 100%
rename from nomad-job/pdns-auth.nomad
rename to nomad-job/system/pdns-auth.nomad
diff --git a/nomad-job/pihole.nomad b/nomad-job/system/pihole.nomad
similarity index 100%
rename from nomad-job/pihole.nomad
rename to nomad-job/system/pihole.nomad
diff --git a/nomad-job/registry.nomad.hcl b/nomad-job/system/registry.nomad.hcl
similarity index 100%
rename from nomad-job/registry.nomad.hcl
rename to nomad-job/system/registry.nomad.hcl
diff --git a/nomad-job/traefik-ingress.nomad b/nomad-job/system/traefik-ingress.nomad
similarity index 100%
rename from nomad-job/traefik-ingress.nomad
rename to nomad-job/system/traefik-ingress.nomad
diff --git a/nomad-job/traefik-local.nomad b/nomad-job/system/traefik-local.nomad
similarity index 100%
rename from nomad-job/traefik-local.nomad
rename to nomad-job/system/traefik-local.nomad