diff --git a/seed/applicationservice/2022.03.08/apache/FIXME b/seed/apache/FIXME
similarity index 100%
rename from seed/applicationservice/2022.03.08/apache/FIXME
rename to seed/apache/FIXME
diff --git a/seed/applicationservice/2022.03.08/apache/applicationservice.yml b/seed/apache/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/apache/applicationservice.yml
rename to seed/apache/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/apache/dictionaries/20_web.xml b/seed/apache/dictionaries/20_web.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/apache/dictionaries/20_web.xml
rename to seed/apache/dictionaries/20_web.xml
diff --git a/seed/applicationservice/2022.03.08/apache/manual/image/preinstall/apache.sh b/seed/apache/manual/image/preinstall/apache.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/apache/manual/image/preinstall/apache.sh
rename to seed/apache/manual/image/preinstall/apache.sh
diff --git a/seed/applicationservice/2022.03.08/apache/templates/httpd.conf b/seed/apache/templates/httpd.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/apache/templates/httpd.conf
rename to seed/apache/templates/httpd.conf
diff --git a/seed/applicationservice/2022.03.08/apache/templates/risotto.conf b/seed/apache/templates/risotto.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/apache/templates/risotto.conf
rename to seed/apache/templates/risotto.conf
diff --git a/seed/applicationservice/2022.03.08/apache/templates/server.ca b/seed/apache/templates/server.ca
similarity index 100%
rename from seed/applicationservice/2022.03.08/apache/templates/server.ca
rename to seed/apache/templates/server.ca
diff --git a/seed/applicationservice/2022.03.08/apache/templates/server.crt b/seed/apache/templates/server.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/apache/templates/server.crt
rename to seed/apache/templates/server.crt
diff --git a/seed/applicationservice/2022.03.08/apache/templates/server.key b/seed/apache/templates/server.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/apache/templates/server.key
rename to seed/apache/templates/server.key
diff --git a/seed/applicationservice/2022.03.08/apache/templates/ssl.conf b/seed/apache/templates/ssl.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/apache/templates/ssl.conf
rename to seed/apache/templates/ssl.conf
diff --git a/seed/applicationservice/2022.03.08/apache/templates/sysuser-httpd.conf b/seed/apache/templates/sysuser-httpd.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/apache/templates/sysuser-httpd.conf
rename to seed/apache/templates/sysuser-httpd.conf
diff --git a/seed/applicationservice/2022.03.08/apache/templates/tmpfile-httpd.conf b/seed/apache/templates/tmpfile-httpd.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/apache/templates/tmpfile-httpd.conf
rename to seed/apache/templates/tmpfile-httpd.conf
diff --git a/seed/applicationservice/releases.yml b/seed/applicationservice/releases.yml
deleted file mode 100644
index 986f1a94..00000000
--- a/seed/applicationservice/releases.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-stable:
-  target: '2022.03.08'
diff --git a/seed/applicationservice/2022.03.08/base-debian-bullseye/applicationservice.yml b/seed/base-debian-bullseye/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-debian-bullseye/applicationservice.yml
rename to seed/base-debian-bullseye/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/base-debian-bullseye/dictionaries/00-debian-bullseye.xml b/seed/base-debian-bullseye/dictionaries/00-debian-bullseye.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-debian-bullseye/dictionaries/00-debian-bullseye.xml
rename to seed/base-debian-bullseye/dictionaries/00-debian-bullseye.xml
diff --git a/seed/applicationservice/2022.03.08/base-debian-bullseye/manual/image/preinstall/base_debian_bullseye.sh b/seed/base-debian-bullseye/manual/image/preinstall/base_debian_bullseye.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-debian-bullseye/manual/image/preinstall/base_debian_bullseye.sh
rename to seed/base-debian-bullseye/manual/image/preinstall/base_debian_bullseye.sh
diff --git a/seed/applicationservice/2022.03.08/base-debian-bullseye/templates/local.negative b/seed/base-debian-bullseye/templates/local.negative
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-debian-bullseye/templates/local.negative
rename to seed/base-debian-bullseye/templates/local.negative
diff --git a/seed/applicationservice/2022.03.08/base-debian/applicationservice.yml b/seed/base-debian/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-debian/applicationservice.yml
rename to seed/base-debian/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/base-debian/dictionaries/11-debian-base.xml b/seed/base-debian/dictionaries/11-debian-base.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-debian/dictionaries/11-debian-base.xml
rename to seed/base-debian/dictionaries/11-debian-base.xml
diff --git a/seed/applicationservice/2022.03.08/base-debian/dictionaries/17-debian-base.xml b/seed/base-debian/dictionaries/17-debian-base.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-debian/dictionaries/17-debian-base.xml
rename to seed/base-debian/dictionaries/17-debian-base.xml
diff --git a/seed/applicationservice/2022.03.08/base-debian/manual/image/postinstall/debian.sh b/seed/base-debian/manual/image/postinstall/debian.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-debian/manual/image/postinstall/debian.sh
rename to seed/base-debian/manual/image/postinstall/debian.sh
diff --git a/seed/applicationservice/2022.03.08/base-debian/manual/image/preinstall/base_debian.sh b/seed/base-debian/manual/image/preinstall/base_debian.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-debian/manual/image/preinstall/base_debian.sh
rename to seed/base-debian/manual/image/preinstall/base_debian.sh
diff --git a/seed/applicationservice/2022.03.08/base-debian/templates/locale b/seed/base-debian/templates/locale
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-debian/templates/locale
rename to seed/base-debian/templates/locale
diff --git a/seed/applicationservice/2022.03.08/base-debian/templates/tmpfile-tmp.conf b/seed/base-debian/templates/tmpfile-tmp.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-debian/templates/tmpfile-tmp.conf
rename to seed/base-debian/templates/tmpfile-tmp.conf
diff --git a/seed/applicationservice/2022.03.08/base-debian/templates/update-ca-certificates.service b/seed/base-debian/templates/update-ca-certificates.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-debian/templates/update-ca-certificates.service
rename to seed/base-debian/templates/update-ca-certificates.service
diff --git a/seed/applicationservice/2022.03.08/base-fedora-35/applicationservice.yml b/seed/base-fedora-35/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora-35/applicationservice.yml
rename to seed/base-fedora-35/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/base-fedora-35/dictionaries/11-fedora-35.xml b/seed/base-fedora-35/dictionaries/11-fedora-35.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora-35/dictionaries/11-fedora-35.xml
rename to seed/base-fedora-35/dictionaries/11-fedora-35.xml
diff --git a/seed/applicationservice/2022.03.08/base-fedora-35/manual/image/postinstall/base_fedora_35.sh b/seed/base-fedora-35/manual/image/postinstall/base_fedora_35.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora-35/manual/image/postinstall/base_fedora_35.sh
rename to seed/base-fedora-35/manual/image/postinstall/base_fedora_35.sh
diff --git a/seed/applicationservice/2022.03.08/base-fedora-35/manual/image/preinstall/base_fedora_35.sh b/seed/base-fedora-35/manual/image/preinstall/base_fedora_35.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora-35/manual/image/preinstall/base_fedora_35.sh
rename to seed/base-fedora-35/manual/image/preinstall/base_fedora_35.sh
diff --git a/seed/applicationservice/2022.03.08/base-fedora-36/applicationservice.yml b/seed/base-fedora-36/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora-36/applicationservice.yml
rename to seed/base-fedora-36/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/base-fedora-36/dictionaries/11-fedora-version.xml b/seed/base-fedora-36/dictionaries/11-fedora-version.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora-36/dictionaries/11-fedora-version.xml
rename to seed/base-fedora-36/dictionaries/11-fedora-version.xml
diff --git a/seed/applicationservice/2022.03.08/base-fedora-36/manual/image/postinstall/base_fedora_version.sh b/seed/base-fedora-36/manual/image/postinstall/base_fedora_version.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora-36/manual/image/postinstall/base_fedora_version.sh
rename to seed/base-fedora-36/manual/image/postinstall/base_fedora_version.sh
diff --git a/seed/applicationservice/2022.03.08/base-fedora-36/manual/image/preinstall/base_fedora_36.sh b/seed/base-fedora-36/manual/image/preinstall/base_fedora_36.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora-36/manual/image/preinstall/base_fedora_36.sh
rename to seed/base-fedora-36/manual/image/preinstall/base_fedora_36.sh
diff --git a/seed/applicationservice/2022.03.08/base-fedora-36/manual/image/preinstall/base_fedora_version.sh b/seed/base-fedora-36/manual/image/preinstall/base_fedora_version.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora-36/manual/image/preinstall/base_fedora_version.sh
rename to seed/base-fedora-36/manual/image/preinstall/base_fedora_version.sh
diff --git a/seed/applicationservice/2022.03.08/base-fedora-36/templates/login b/seed/base-fedora-36/templates/login
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora-36/templates/login
rename to seed/base-fedora-36/templates/login
diff --git a/seed/applicationservice/2022.03.08/base-fedora/README.md b/seed/base-fedora/README.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora/README.md
rename to seed/base-fedora/README.md
diff --git a/seed/applicationservice/2022.03.08/base-fedora/applicationservice.yml b/seed/base-fedora/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora/applicationservice.yml
rename to seed/base-fedora/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/base-fedora/dictionaries/11-fedora-base.xml b/seed/base-fedora/dictionaries/11-fedora-base.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora/dictionaries/11-fedora-base.xml
rename to seed/base-fedora/dictionaries/11-fedora-base.xml
diff --git a/seed/applicationservice/2022.03.08/base-fedora/dictionaries/17-fedora-base.xml b/seed/base-fedora/dictionaries/17-fedora-base.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora/dictionaries/17-fedora-base.xml
rename to seed/base-fedora/dictionaries/17-fedora-base.xml
diff --git a/seed/applicationservice/2022.03.08/base-fedora/manual/image/preinstall/base_fedora.sh b/seed/base-fedora/manual/image/preinstall/base_fedora.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora/manual/image/preinstall/base_fedora.sh
rename to seed/base-fedora/manual/image/preinstall/base_fedora.sh
diff --git a/seed/applicationservice/2022.03.08/base-fedora/templates/fedora.conf b/seed/base-fedora/templates/fedora.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora/templates/fedora.conf
rename to seed/base-fedora/templates/fedora.conf
diff --git a/seed/applicationservice/2022.03.08/base-fedora/templates/update-ca-trust.service b/seed/base-fedora/templates/update-ca-trust.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-fedora/templates/update-ca-trust.service
rename to seed/base-fedora/templates/update-ca-trust.service
diff --git a/seed/applicationservice/2022.03.08/base-machine/applicationservice.yml b/seed/base-machine/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/applicationservice.yml
rename to seed/base-machine/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/base-machine/dictionaries/12-base.xml b/seed/base-machine/dictionaries/12-base.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/dictionaries/12-base.xml
rename to seed/base-machine/dictionaries/12-base.xml
diff --git a/seed/applicationservice/2022.03.08/base-machine/doc.md b/seed/base-machine/doc.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/doc.md
rename to seed/base-machine/doc.md
diff --git a/seed/applicationservice/2022.03.08/base-machine/extras/machine/00_base.xml b/seed/base-machine/extras/machine/00_base.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/extras/machine/00_base.xml
rename to seed/base-machine/extras/machine/00_base.xml
diff --git a/seed/applicationservice/2022.03.08/base-machine/funcs/funcs.py b/seed/base-machine/funcs/funcs.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/funcs/funcs.py
rename to seed/base-machine/funcs/funcs.py
diff --git a/seed/applicationservice/2022.03.08/base-machine/manual/install/config.sh b/seed/base-machine/manual/install/config.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/manual/install/config.sh
rename to seed/base-machine/manual/install/config.sh
diff --git a/seed/applicationservice/2022.03.08/base-machine/manual/install/config_machine.sh b/seed/base-machine/manual/install/config_machine.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/manual/install/config_machine.sh
rename to seed/base-machine/manual/install/config_machine.sh
diff --git a/seed/applicationservice/2022.03.08/base-machine/manual/install/diff.py b/seed/base-machine/manual/install/diff.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/manual/install/diff.py
rename to seed/base-machine/manual/install/diff.py
diff --git a/seed/applicationservice/2022.03.08/base-machine/manual/install/install_host b/seed/base-machine/manual/install/install_host
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/manual/install/install_host
rename to seed/base-machine/manual/install/install_host
diff --git a/seed/applicationservice/2022.03.08/base-machine/manual/install/install_image b/seed/base-machine/manual/install/install_image
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/manual/install/install_image
rename to seed/base-machine/manual/install/install_image
diff --git a/seed/applicationservice/2022.03.08/base-machine/manual/install/install_images b/seed/base-machine/manual/install/install_images
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/manual/install/install_images
rename to seed/base-machine/manual/install/install_images
diff --git a/seed/applicationservice/2022.03.08/base-machine/manual/install/install_machine b/seed/base-machine/manual/install/install_machine
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/manual/install/install_machine
rename to seed/base-machine/manual/install/install_machine
diff --git a/seed/applicationservice/2022.03.08/base-machine/manual/install/install_machines b/seed/base-machine/manual/install/install_machines
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/manual/install/install_machines
rename to seed/base-machine/manual/install/install_machines
diff --git a/seed/applicationservice/2022.03.08/base-machine/manual/install/make_changelog b/seed/base-machine/manual/install/make_changelog
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/manual/install/make_changelog
rename to seed/base-machine/manual/install/make_changelog
diff --git a/seed/applicationservice/2022.03.08/base-machine/manual/install/make_volatile b/seed/base-machine/manual/install/make_volatile
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/manual/install/make_volatile
rename to seed/base-machine/manual/install/make_volatile
diff --git a/seed/applicationservice/2022.03.08/base-machine/templates/locale.conf b/seed/base-machine/templates/locale.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/base-machine/templates/locale.conf
rename to seed/base-machine/templates/locale.conf
diff --git a/seed/applicationservice/2022.03.08/base/applicationservice.yml b/seed/base/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/base/applicationservice.yml
rename to seed/base/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/base/funcs/base.py b/seed/base/funcs/base.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/base/funcs/base.py
rename to seed/base/funcs/base.py
diff --git a/seed/applicationservice/2022.03.08/dovecot/DEBUG.md b/seed/dovecot/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/DEBUG.md
rename to seed/dovecot/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/dovecot/DOC.md b/seed/dovecot/DOC.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/DOC.md
rename to seed/dovecot/DOC.md
diff --git a/seed/applicationservice/2022.03.08/dovecot/FIXME b/seed/dovecot/FIXME
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/FIXME
rename to seed/dovecot/FIXME
diff --git a/seed/applicationservice/2022.03.08/dovecot/applicationservice.yml b/seed/dovecot/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/applicationservice.yml
rename to seed/dovecot/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/dovecot/dictionaries/26_dovecot.xml b/seed/dovecot/dictionaries/26_dovecot.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/dictionaries/26_dovecot.xml
rename to seed/dovecot/dictionaries/26_dovecot.xml
diff --git a/seed/applicationservice/2022.03.08/dovecot/funcs/dovecot.py b/seed/dovecot/funcs/dovecot.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/funcs/dovecot.py
rename to seed/dovecot/funcs/dovecot.py
diff --git a/seed/applicationservice/2022.03.08/dovecot/manual/image/preinstall/postfix_dovecot.sh b/seed/dovecot/manual/image/preinstall/postfix_dovecot.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/manual/image/preinstall/postfix_dovecot.sh
rename to seed/dovecot/manual/image/preinstall/postfix_dovecot.sh
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/00-risotto.conf b/seed/dovecot/templates/00-risotto.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/00-risotto.conf
rename to seed/dovecot/templates/00-risotto.conf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/10-auth.conf b/seed/dovecot/templates/10-auth.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/10-auth.conf
rename to seed/dovecot/templates/10-auth.conf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/10-logging.conf b/seed/dovecot/templates/10-logging.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/10-logging.conf
rename to seed/dovecot/templates/10-logging.conf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/10-mail.conf b/seed/dovecot/templates/10-mail.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/10-mail.conf
rename to seed/dovecot/templates/10-mail.conf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/10-master.conf b/seed/dovecot/templates/10-master.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/10-master.conf
rename to seed/dovecot/templates/10-master.conf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/10-ssl.conf b/seed/dovecot/templates/10-ssl.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/10-ssl.conf
rename to seed/dovecot/templates/10-ssl.conf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/12-managesieve.conf b/seed/dovecot/templates/12-managesieve.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/12-managesieve.conf
rename to seed/dovecot/templates/12-managesieve.conf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/15-ldap.conf b/seed/dovecot/templates/15-ldap.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/15-ldap.conf
rename to seed/dovecot/templates/15-ldap.conf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/30-service-stats.conf b/seed/dovecot/templates/30-service-stats.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/30-service-stats.conf
rename to seed/dovecot/templates/30-service-stats.conf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/auth-ldap.conf.ext b/seed/dovecot/templates/auth-ldap.conf.ext
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/auth-ldap.conf.ext
rename to seed/dovecot/templates/auth-ldap.conf.ext
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/auth-oauth2.conf.ext b/seed/dovecot/templates/auth-oauth2.conf.ext
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/auth-oauth2.conf.ext
rename to seed/dovecot/templates/auth-oauth2.conf.ext
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/autoconfig.conf b/seed/dovecot/templates/autoconfig.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/autoconfig.conf
rename to seed/dovecot/templates/autoconfig.conf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/ca_IMAPServer.crt b/seed/dovecot/templates/ca_IMAPServer.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/ca_IMAPServer.crt
rename to seed/dovecot/templates/ca_IMAPServer.crt
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/ca_MailServer.crt b/seed/dovecot/templates/ca_MailServer.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/ca_MailServer.crt
rename to seed/dovecot/templates/ca_MailServer.crt
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/config-v1.1.xml b/seed/dovecot/templates/config-v1.1.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/config-v1.1.xml
rename to seed/dovecot/templates/config-v1.1.xml
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/dovecot-init.service b/seed/dovecot/templates/dovecot-init.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/dovecot-init.service
rename to seed/dovecot/templates/dovecot-init.service
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/dovecot-ldap.conf.ext b/seed/dovecot/templates/dovecot-ldap.conf.ext
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/dovecot-ldap.conf.ext
rename to seed/dovecot/templates/dovecot-ldap.conf.ext
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/dovecot-oauth2.conf.ext b/seed/dovecot/templates/dovecot-oauth2.conf.ext
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/dovecot-oauth2.conf.ext
rename to seed/dovecot/templates/dovecot-oauth2.conf.ext
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/dovecot.crt b/seed/dovecot/templates/dovecot.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/dovecot.crt
rename to seed/dovecot/templates/dovecot.crt
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/dovecot.key b/seed/dovecot/templates/dovecot.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/dovecot.key
rename to seed/dovecot/templates/dovecot.key
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/external_imap.crt b/seed/dovecot/templates/external_imap.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/external_imap.crt
rename to seed/dovecot/templates/external_imap.crt
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/external_imap.key b/seed/dovecot/templates/external_imap.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/external_imap.key
rename to seed/dovecot/templates/external_imap.key
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/ldapsource.cf b/seed/dovecot/templates/ldapsource.cf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/ldapsource.cf
rename to seed/dovecot/templates/ldapsource.cf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/main.cf b/seed/dovecot/templates/main.cf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/main.cf
rename to seed/dovecot/templates/main.cf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/master.cf b/seed/dovecot/templates/master.cf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/master.cf
rename to seed/dovecot/templates/master.cf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/postfix.crt b/seed/dovecot/templates/postfix.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/postfix.crt
rename to seed/dovecot/templates/postfix.crt
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/postfix.key b/seed/dovecot/templates/postfix.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/postfix.key
rename to seed/dovecot/templates/postfix.key
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/postfix.pem b/seed/dovecot/templates/postfix.pem
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/postfix.pem
rename to seed/dovecot/templates/postfix.pem
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/postfix.service b/seed/dovecot/templates/postfix.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/postfix.service
rename to seed/dovecot/templates/postfix.service
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/postfix_sni.pem b/seed/dovecot/templates/postfix_sni.pem
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/postfix_sni.pem
rename to seed/dovecot/templates/postfix_sni.pem
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/relay_passwd b/seed/dovecot/templates/relay_passwd
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/relay_passwd
rename to seed/dovecot/templates/relay_passwd
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/sni b/seed/dovecot/templates/sni
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/sni
rename to seed/dovecot/templates/sni
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/sysuser-dovecot.conf b/seed/dovecot/templates/sysuser-dovecot.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/sysuser-dovecot.conf
rename to seed/dovecot/templates/sysuser-dovecot.conf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/sysuser-postfix.conf b/seed/dovecot/templates/sysuser-postfix.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/sysuser-postfix.conf
rename to seed/dovecot/templates/sysuser-postfix.conf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/tmpfile-dovecot.conf b/seed/dovecot/templates/tmpfile-dovecot.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/tmpfile-dovecot.conf
rename to seed/dovecot/templates/tmpfile-dovecot.conf
diff --git a/seed/applicationservice/2022.03.08/dovecot/templates/tmpfile-postfix.conf b/seed/dovecot/templates/tmpfile-postfix.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/dovecot/templates/tmpfile-postfix.conf
rename to seed/dovecot/templates/tmpfile-postfix.conf
diff --git a/seed/applicationservice/2022.03.08/gitea/DEBUG.md b/seed/gitea/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/gitea/DEBUG.md
rename to seed/gitea/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/gitea/applicationservice.yml b/seed/gitea/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/gitea/applicationservice.yml
rename to seed/gitea/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/gitea/dictionaries/31_gitea.xml b/seed/gitea/dictionaries/31_gitea.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/gitea/dictionaries/31_gitea.xml
rename to seed/gitea/dictionaries/31_gitea.xml
diff --git a/seed/applicationservice/2022.03.08/gitea/manual/image/postinstall/gitea.sh b/seed/gitea/manual/image/postinstall/gitea.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/gitea/manual/image/postinstall/gitea.sh
rename to seed/gitea/manual/image/postinstall/gitea.sh
diff --git a/seed/applicationservice/2022.03.08/gitea/manual/image/preinstall/gitea.sh b/seed/gitea/manual/image/preinstall/gitea.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/gitea/manual/image/preinstall/gitea.sh
rename to seed/gitea/manual/image/preinstall/gitea.sh
diff --git a/seed/applicationservice/2022.03.08/gitea/templates/app.ini b/seed/gitea/templates/app.ini
similarity index 100%
rename from seed/applicationservice/2022.03.08/gitea/templates/app.ini
rename to seed/gitea/templates/app.ini
diff --git a/seed/applicationservice/2022.03.08/gitea/templates/gitea.service b/seed/gitea/templates/gitea.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/gitea/templates/gitea.service
rename to seed/gitea/templates/gitea.service
diff --git a/seed/applicationservice/2022.03.08/gitea/templates/sysuser-gitea.conf b/seed/gitea/templates/sysuser-gitea.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/gitea/templates/sysuser-gitea.conf
rename to seed/gitea/templates/sysuser-gitea.conf
diff --git a/seed/applicationservice/2022.03.08/gitea/templates/tmpfile-gitea.conf b/seed/gitea/templates/tmpfile-gitea.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/gitea/templates/tmpfile-gitea.conf
rename to seed/gitea/templates/tmpfile-gitea.conf
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/applicationservice.yml b/seed/host-systemd-machined/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/applicationservice.yml
rename to seed/host-systemd-machined/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/dictionaries/21-machined.xml b/seed/host-systemd-machined/dictionaries/21-machined.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/dictionaries/21-machined.xml
rename to seed/host-systemd-machined/dictionaries/21-machined.xml
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/doc.md b/seed/host-systemd-machined/doc.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/doc.md
rename to seed/host-systemd-machined/doc.md
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/extras/machined/00-machined.xml b/seed/host-systemd-machined/extras/machined/00-machined.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/extras/machined/00-machined.xml
rename to seed/host-systemd-machined/extras/machined/00-machined.xml
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/0asystemd-nspawn.conf b/seed/host-systemd-machined/templates/0asystemd-nspawn.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/0asystemd-nspawn.conf
rename to seed/host-systemd-machined/templates/0asystemd-nspawn.conf
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/70-container.netdev b/seed/host-systemd-machined/templates/70-container.netdev
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/70-container.netdev
rename to seed/host-systemd-machined/templates/70-container.netdev
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/70-container.network b/seed/host-systemd-machined/templates/70-container.network
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/70-container.network
rename to seed/host-systemd-machined/templates/70-container.network
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/80-container-vz.network b/seed/host-systemd-machined/templates/80-container-vz.network
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/80-container-vz.network
rename to seed/host-systemd-machined/templates/80-container-vz.network
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/90-risotto.conf b/seed/host-systemd-machined/templates/90-risotto.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/90-risotto.conf
rename to seed/host-systemd-machined/templates/90-risotto.conf
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/RPM-GPG-KEY-fedora-35-x86_64 b/seed/host-systemd-machined/templates/RPM-GPG-KEY-fedora-35-x86_64
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/RPM-GPG-KEY-fedora-35-x86_64
rename to seed/host-systemd-machined/templates/RPM-GPG-KEY-fedora-35-x86_64
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/RPM-GPG-KEY-fedora-36-x86_64 b/seed/host-systemd-machined/templates/RPM-GPG-KEY-fedora-36-x86_64
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/RPM-GPG-KEY-fedora-36-x86_64
rename to seed/host-systemd-machined/templates/RPM-GPG-KEY-fedora-36-x86_64
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/RPM-GPG-KEY-rpmfusion-free-fedora-36 b/seed/host-systemd-machined/templates/RPM-GPG-KEY-rpmfusion-free-fedora-36
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/RPM-GPG-KEY-rpmfusion-free-fedora-36
rename to seed/host-systemd-machined/templates/RPM-GPG-KEY-rpmfusion-free-fedora-36
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/boot.repo b/seed/host-systemd-machined/templates/boot.repo
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/boot.repo
rename to seed/host-systemd-machined/templates/boot.repo
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/dhcp.network b/seed/host-systemd-machined/templates/dhcp.network
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/dhcp.network
rename to seed/host-systemd-machined/templates/dhcp.network
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/network-script b/seed/host-systemd-machined/templates/network-script
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/network-script
rename to seed/host-systemd-machined/templates/network-script
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/nspawn b/seed/host-systemd-machined/templates/nspawn
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/nspawn
rename to seed/host-systemd-machined/templates/nspawn
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/risotto-images.service b/seed/host-systemd-machined/templates/risotto-images.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/risotto-images.service
rename to seed/host-systemd-machined/templates/risotto-images.service
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/risotto-images.timer b/seed/host-systemd-machined/templates/risotto-images.timer
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/risotto-images.timer
rename to seed/host-systemd-machined/templates/risotto-images.timer
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/risottofirewall.service b/seed/host-systemd-machined/templates/risottofirewall.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/risottofirewall.service
rename to seed/host-systemd-machined/templates/risottofirewall.service
diff --git a/seed/applicationservice/2022.03.08/host-systemd-machined/templates/systemd-nspawn@.conf b/seed/host-systemd-machined/templates/systemd-nspawn@.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/host-systemd-machined/templates/systemd-nspawn@.conf
rename to seed/host-systemd-machined/templates/systemd-nspawn@.conf
diff --git a/seed/applicationservice/2022.03.08/imap-client/applicationservice.yml b/seed/imap-client/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/imap-client/applicationservice.yml
rename to seed/imap-client/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/imap-client/dictionaries/21_imap_client.xml b/seed/imap-client/dictionaries/21_imap_client.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/imap-client/dictionaries/21_imap_client.xml
rename to seed/imap-client/dictionaries/21_imap_client.xml
diff --git a/seed/applicationservice/2022.03.08/imap-client/templates/ca_IMAPServer.crt b/seed/imap-client/templates/ca_IMAPServer.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/imap-client/templates/ca_IMAPServer.crt
rename to seed/imap-client/templates/ca_IMAPServer.crt
diff --git a/seed/applicationservice/2022.03.08/ldap-client-debian/applicationservice.yml b/seed/ldap-client-debian/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/ldap-client-debian/applicationservice.yml
rename to seed/ldap-client-debian/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/ldap-client-debian/dictionaries/22_ldap-client-debian.xml b/seed/ldap-client-debian/dictionaries/22_ldap-client-debian.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/ldap-client-debian/dictionaries/22_ldap-client-debian.xml
rename to seed/ldap-client-debian/dictionaries/22_ldap-client-debian.xml
diff --git a/seed/applicationservice/2022.03.08/ldap-client-fedora/applicationservice.yml b/seed/ldap-client-fedora/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/ldap-client-fedora/applicationservice.yml
rename to seed/ldap-client-fedora/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/ldap-client-fedora/dictionaries/22_ldap-client-fedora.xml b/seed/ldap-client-fedora/dictionaries/22_ldap-client-fedora.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/ldap-client-fedora/dictionaries/22_ldap-client-fedora.xml
rename to seed/ldap-client-fedora/dictionaries/22_ldap-client-fedora.xml
diff --git a/seed/applicationservice/2022.03.08/ldap-client/applicationservice.yml b/seed/ldap-client/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/ldap-client/applicationservice.yml
rename to seed/ldap-client/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/ldap-client/dictionaries/21_ldap-client.xml b/seed/ldap-client/dictionaries/21_ldap-client.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/ldap-client/dictionaries/21_ldap-client.xml
rename to seed/ldap-client/dictionaries/21_ldap-client.xml
diff --git a/seed/applicationservice/2022.03.08/ldap-client/funcs/openldap_client.py b/seed/ldap-client/funcs/openldap_client.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/ldap-client/funcs/openldap_client.py
rename to seed/ldap-client/funcs/openldap_client.py
diff --git a/seed/applicationservice/2022.03.08/ldap-client/templates/ca_LDAP.crt b/seed/ldap-client/templates/ca_LDAP.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/ldap-client/templates/ca_LDAP.crt
rename to seed/ldap-client/templates/ca_LDAP.crt
diff --git a/seed/applicationservice/2022.03.08/ldap-client/templates/ldap.conf b/seed/ldap-client/templates/ldap.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/ldap-client/templates/ldap.conf
rename to seed/ldap-client/templates/ldap.conf
diff --git a/seed/applicationservice/2022.03.08/ldap-client/templates/ldap_client.crt b/seed/ldap-client/templates/ldap_client.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/ldap-client/templates/ldap_client.crt
rename to seed/ldap-client/templates/ldap_client.crt
diff --git a/seed/applicationservice/2022.03.08/ldap-client/templates/ldap_client.key b/seed/ldap-client/templates/ldap_client.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/ldap-client/templates/ldap_client.key
rename to seed/ldap-client/templates/ldap_client.key
diff --git a/seed/applicationservice/2022.03.08/lemonldap/DEBUG.md b/seed/lemonldap/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/DEBUG.md
rename to seed/lemonldap/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/lemonldap/applicationservice.yml b/seed/lemonldap/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/applicationservice.yml
rename to seed/lemonldap/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/lemonldap/dictionaries/70_lemonldap_ng.xml b/seed/lemonldap/dictionaries/70_lemonldap_ng.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/dictionaries/70_lemonldap_ng.xml
rename to seed/lemonldap/dictionaries/70_lemonldap_ng.xml
diff --git a/seed/applicationservice/2022.03.08/lemonldap/doc.md b/seed/lemonldap/doc.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/doc.md
rename to seed/lemonldap/doc.md
diff --git a/seed/applicationservice/2022.03.08/lemonldap/extras/oauth2/00_oauth2.xml b/seed/lemonldap/extras/oauth2/00_oauth2.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/extras/oauth2/00_oauth2.xml
rename to seed/lemonldap/extras/oauth2/00_oauth2.xml
diff --git a/seed/applicationservice/2022.03.08/lemonldap/funcs/lemonldap.py b/seed/lemonldap/funcs/lemonldap.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/funcs/lemonldap.py
rename to seed/lemonldap/funcs/lemonldap.py
diff --git a/seed/applicationservice/2022.03.08/lemonldap/manual/image/preinstall/lemonldap.sh b/seed/lemonldap/manual/image/preinstall/lemonldap.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/manual/image/preinstall/lemonldap.sh
rename to seed/lemonldap/manual/image/preinstall/lemonldap.sh
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/demo.png b/seed/lemonldap/templates/demo.png
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/demo.png
rename to seed/lemonldap/templates/demo.png
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/handler-nginx.conf b/seed/lemonldap/templates/handler-nginx.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/handler-nginx.conf
rename to seed/lemonldap/templates/handler-nginx.conf
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/interne_well_known.pl b/seed/lemonldap/templates/interne_well_known.pl
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/interne_well_known.pl
rename to seed/lemonldap/templates/interne_well_known.pl
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/lemonldap-ng-fastcgi-server b/seed/lemonldap/templates/lemonldap-ng-fastcgi-server
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/lemonldap-ng-fastcgi-server
rename to seed/lemonldap/templates/lemonldap-ng-fastcgi-server
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/lemonldap-ng-fastcgi-server.service b/seed/lemonldap/templates/lemonldap-ng-fastcgi-server.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/lemonldap-ng-fastcgi-server.service
rename to seed/lemonldap/templates/lemonldap-ng-fastcgi-server.service
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/lemonldap-ng.ini b/seed/lemonldap/templates/lemonldap-ng.ini
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/lemonldap-ng.ini
rename to seed/lemonldap/templates/lemonldap-ng.ini
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/lmConf-1.json b/seed/lemonldap/templates/lmConf-1.json
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/lmConf-1.json
rename to seed/lemonldap/templates/lmConf-1.json
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/logo.png b/seed/lemonldap/templates/logo.png
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/logo.png
rename to seed/lemonldap/templates/logo.png
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/nginx-lmlog.conf b/seed/lemonldap/templates/nginx-lmlog.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/nginx-lmlog.conf
rename to seed/lemonldap/templates/nginx-lmlog.conf
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/portal-nginx.conf b/seed/lemonldap/templates/portal-nginx.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/portal-nginx.conf
rename to seed/lemonldap/templates/portal-nginx.conf
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/risotto.css b/seed/lemonldap/templates/risotto.css
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/risotto.css
rename to seed/lemonldap/templates/risotto.css
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/silique_email.png b/seed/lemonldap/templates/silique_email.png
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/silique_email.png
rename to seed/lemonldap/templates/silique_email.png
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/silique_folder.png b/seed/lemonldap/templates/silique_folder.png
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/silique_folder.png
rename to seed/lemonldap/templates/silique_folder.png
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/silique_image.png b/seed/lemonldap/templates/silique_image.png
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/silique_image.png
rename to seed/lemonldap/templates/silique_image.png
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/silique_note.png b/seed/lemonldap/templates/silique_note.png
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/silique_note.png
rename to seed/lemonldap/templates/silique_note.png
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/silique_video.png b/seed/lemonldap/templates/silique_video.png
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/silique_video.png
rename to seed/lemonldap/templates/silique_video.png
diff --git a/seed/applicationservice/2022.03.08/lemonldap/templates/tmpfile-lemonldap.conf b/seed/lemonldap/templates/tmpfile-lemonldap.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/lemonldap/templates/tmpfile-lemonldap.conf
rename to seed/lemonldap/templates/tmpfile-lemonldap.conf
diff --git a/seed/applicationservice/2022.03.08/letsencrypt/README.md b/seed/letsencrypt/README.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/letsencrypt/README.md
rename to seed/letsencrypt/README.md
diff --git a/seed/applicationservice/2022.03.08/letsencrypt/applicationservice.yml b/seed/letsencrypt/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/letsencrypt/applicationservice.yml
rename to seed/letsencrypt/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/letsencrypt/dictionaries/20-letsencrypt.xml b/seed/letsencrypt/dictionaries/20-letsencrypt.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/letsencrypt/dictionaries/20-letsencrypt.xml
rename to seed/letsencrypt/dictionaries/20-letsencrypt.xml
diff --git a/seed/applicationservice/2022.03.08/letsencrypt/funcs/letsencrypt.py b/seed/letsencrypt/funcs/letsencrypt.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/letsencrypt/funcs/letsencrypt.py
rename to seed/letsencrypt/funcs/letsencrypt.py
diff --git a/seed/applicationservice/2022.03.08/mailman/DEBUG.md b/seed/mailman/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/DEBUG.md
rename to seed/mailman/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/mailman/FIXME.md b/seed/mailman/FIXME.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/FIXME.md
rename to seed/mailman/FIXME.md
diff --git a/seed/applicationservice/2022.03.08/mailman/applicationservice.yml b/seed/mailman/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/applicationservice.yml
rename to seed/mailman/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/mailman/dictionaries/31_mailman.xml b/seed/mailman/dictionaries/31_mailman.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/dictionaries/31_mailman.xml
rename to seed/mailman/dictionaries/31_mailman.xml
diff --git a/seed/applicationservice/2022.03.08/mailman/extras/machine/20_mailman.xml b/seed/mailman/extras/machine/20_mailman.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/extras/machine/20_mailman.xml
rename to seed/mailman/extras/machine/20_mailman.xml
diff --git a/seed/applicationservice/2022.03.08/mailman/extras/mailman/20_mailman.xml b/seed/mailman/extras/mailman/20_mailman.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/extras/mailman/20_mailman.xml
rename to seed/mailman/extras/mailman/20_mailman.xml
diff --git a/seed/applicationservice/2022.03.08/mailman/funcs/mailman.py b/seed/mailman/funcs/mailman.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/funcs/mailman.py
rename to seed/mailman/funcs/mailman.py
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/lemonldap/__init__.py b/seed/mailman/manual/image/postinstall/lemonldap/__init__.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/lemonldap/__init__.py
rename to seed/mailman/manual/image/postinstall/lemonldap/__init__.py
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/lemonldap/provider.py b/seed/mailman/manual/image/postinstall/lemonldap/provider.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/lemonldap/provider.py
rename to seed/mailman/manual/image/postinstall/lemonldap/provider.py
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/lemonldap/urls.py b/seed/mailman/manual/image/postinstall/lemonldap/urls.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/lemonldap/urls.py
rename to seed/mailman/manual/image/postinstall/lemonldap/urls.py
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/lemonldap/views.py b/seed/mailman/manual/image/postinstall/lemonldap/views.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/lemonldap/views.py
rename to seed/mailman/manual/image/postinstall/lemonldap/views.py
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/postorius.sh b/seed/mailman/manual/image/postinstall/postorius.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/postorius.sh
rename to seed/mailman/manual/image/postinstall/postorius.sh
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/postorius/README.md b/seed/mailman/manual/image/postinstall/postorius/README.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/postorius/README.md
rename to seed/mailman/manual/image/postinstall/postorius/README.md
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/postorius/m_postorius/__init__.py b/seed/mailman/manual/image/postinstall/postorius/m_postorius/__init__.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/postorius/m_postorius/__init__.py
rename to seed/mailman/manual/image/postinstall/postorius/m_postorius/__init__.py
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/postorius/m_postorius/settings.py b/seed/mailman/manual/image/postinstall/postorius/m_postorius/settings.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/postorius/m_postorius/settings.py
rename to seed/mailman/manual/image/postinstall/postorius/m_postorius/settings.py
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/postorius/m_postorius/urls.py b/seed/mailman/manual/image/postinstall/postorius/m_postorius/urls.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/postorius/m_postorius/urls.py
rename to seed/mailman/manual/image/postinstall/postorius/m_postorius/urls.py
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/postorius/m_postorius/wsgi.py b/seed/mailman/manual/image/postinstall/postorius/m_postorius/wsgi.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/postorius/m_postorius/wsgi.py
rename to seed/mailman/manual/image/postinstall/postorius/m_postorius/wsgi.py
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/postorius/manage.py b/seed/mailman/manual/image/postinstall/postorius/manage.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/postorius/manage.py
rename to seed/mailman/manual/image/postinstall/postorius/manage.py
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/risotto/__init__.py b/seed/mailman/manual/image/postinstall/risotto/__init__.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/risotto/__init__.py
rename to seed/mailman/manual/image/postinstall/risotto/__init__.py
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/risotto/provider.py b/seed/mailman/manual/image/postinstall/risotto/provider.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/risotto/provider.py
rename to seed/mailman/manual/image/postinstall/risotto/provider.py
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/risotto/urls.py b/seed/mailman/manual/image/postinstall/risotto/urls.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/risotto/urls.py
rename to seed/mailman/manual/image/postinstall/risotto/urls.py
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/risotto/views.py b/seed/mailman/manual/image/postinstall/risotto/views.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/postinstall/risotto/views.py
rename to seed/mailman/manual/image/postinstall/risotto/views.py
diff --git a/seed/applicationservice/2022.03.08/mailman/manual/image/preinstall/mailman.sh b/seed/mailman/manual/image/preinstall/mailman.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/manual/image/preinstall/mailman.sh
rename to seed/mailman/manual/image/preinstall/mailman.sh
diff --git a/seed/applicationservice/2022.03.08/mailman/templates/config-nginx.conf b/seed/mailman/templates/config-nginx.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/templates/config-nginx.conf
rename to seed/mailman/templates/config-nginx.conf
diff --git a/seed/applicationservice/2022.03.08/mailman/templates/gunicorn_config.py b/seed/mailman/templates/gunicorn_config.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/templates/gunicorn_config.py
rename to seed/mailman/templates/gunicorn_config.py
diff --git a/seed/applicationservice/2022.03.08/mailman/templates/mailman.cfg b/seed/mailman/templates/mailman.cfg
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/templates/mailman.cfg
rename to seed/mailman/templates/mailman.cfg
diff --git a/seed/applicationservice/2022.03.08/mailman/templates/mailman3.service b/seed/mailman/templates/mailman3.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/templates/mailman3.service
rename to seed/mailman/templates/mailman3.service
diff --git a/seed/applicationservice/2022.03.08/mailman/templates/postfix.cfg b/seed/mailman/templates/postfix.cfg
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/templates/postfix.cfg
rename to seed/mailman/templates/postfix.cfg
diff --git a/seed/applicationservice/2022.03.08/mailman/templates/postgresql_postorius.key b/seed/mailman/templates/postgresql_postorius.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/templates/postgresql_postorius.key
rename to seed/mailman/templates/postgresql_postorius.key
diff --git a/seed/applicationservice/2022.03.08/mailman/templates/postorius-settings.py b/seed/mailman/templates/postorius-settings.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/templates/postorius-settings.py
rename to seed/mailman/templates/postorius-settings.py
diff --git a/seed/applicationservice/2022.03.08/mailman/templates/postorius.service b/seed/mailman/templates/postorius.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/templates/postorius.service
rename to seed/mailman/templates/postorius.service
diff --git a/seed/applicationservice/2022.03.08/mailman/templates/sysuser-mailman.conf b/seed/mailman/templates/sysuser-mailman.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/templates/sysuser-mailman.conf
rename to seed/mailman/templates/sysuser-mailman.conf
diff --git a/seed/applicationservice/2022.03.08/mailman/templates/sysuser-postorius.conf b/seed/mailman/templates/sysuser-postorius.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/templates/sysuser-postorius.conf
rename to seed/mailman/templates/sysuser-postorius.conf
diff --git a/seed/applicationservice/2022.03.08/mailman/templates/tmpfile-mailman.conf b/seed/mailman/templates/tmpfile-mailman.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/mailman/templates/tmpfile-mailman.conf
rename to seed/mailman/templates/tmpfile-mailman.conf
diff --git a/seed/applicationservice/2022.03.08/mariadb-client/applicationservice.yml b/seed/mariadb-client/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/mariadb-client/applicationservice.yml
rename to seed/mariadb-client/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/mariadb-client/dictionaries/20_mariadb.xml b/seed/mariadb-client/dictionaries/20_mariadb.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/mariadb-client/dictionaries/20_mariadb.xml
rename to seed/mariadb-client/dictionaries/20_mariadb.xml
diff --git a/seed/applicationservice/2022.03.08/mariadb-client/templates/mariadbclient.service b/seed/mariadb-client/templates/mariadbclient.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/mariadb-client/templates/mariadbclient.service
rename to seed/mariadb-client/templates/mariadbclient.service
diff --git a/seed/applicationservice/2022.03.08/mariadb/applicationservice.yml b/seed/mariadb/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/mariadb/applicationservice.yml
rename to seed/mariadb/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/mariadb/dictionaries/20_mariadb.xml b/seed/mariadb/dictionaries/20_mariadb.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/mariadb/dictionaries/20_mariadb.xml
rename to seed/mariadb/dictionaries/20_mariadb.xml
diff --git a/seed/applicationservice/2022.03.08/mariadb/manual/image/preinstall/mariadb_server.sh b/seed/mariadb/manual/image/preinstall/mariadb_server.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/mariadb/manual/image/preinstall/mariadb_server.sh
rename to seed/mariadb/manual/image/preinstall/mariadb_server.sh
diff --git a/seed/applicationservice/2022.03.08/mariadb/templates/mariadb.service b/seed/mariadb/templates/mariadb.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/mariadb/templates/mariadb.service
rename to seed/mariadb/templates/mariadb.service
diff --git a/seed/applicationservice/2022.03.08/mariadb/templates/mariadb.sql b/seed/mariadb/templates/mariadb.sql
similarity index 100%
rename from seed/applicationservice/2022.03.08/mariadb/templates/mariadb.sql
rename to seed/mariadb/templates/mariadb.sql
diff --git a/seed/applicationservice/2022.03.08/mariadb/templates/risotto.cnf b/seed/mariadb/templates/risotto.cnf
similarity index 100%
rename from seed/applicationservice/2022.03.08/mariadb/templates/risotto.cnf
rename to seed/mariadb/templates/risotto.cnf
diff --git a/seed/applicationservice/2022.03.08/mariadb/templates/tmpfile-mariadb.conf b/seed/mariadb/templates/tmpfile-mariadb.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/mariadb/templates/tmpfile-mariadb.conf
rename to seed/mariadb/templates/tmpfile-mariadb.conf
diff --git a/seed/applicationservice/2022.03.08/nextcloud/DEBUG.md b/seed/nextcloud/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/nextcloud/DEBUG.md
rename to seed/nextcloud/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/nextcloud/applicationservice.yml b/seed/nextcloud/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nextcloud/applicationservice.yml
rename to seed/nextcloud/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/nextcloud/dictionaries/31_nextcloud.xml b/seed/nextcloud/dictionaries/31_nextcloud.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nextcloud/dictionaries/31_nextcloud.xml
rename to seed/nextcloud/dictionaries/31_nextcloud.xml
diff --git a/seed/applicationservice/2022.03.08/nextcloud/manual/image/postinstall/nextcloud.sh b/seed/nextcloud/manual/image/postinstall/nextcloud.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/nextcloud/manual/image/postinstall/nextcloud.sh
rename to seed/nextcloud/manual/image/postinstall/nextcloud.sh
diff --git a/seed/applicationservice/2022.03.08/nextcloud/manual/image/preinstall/nextcloud.sh b/seed/nextcloud/manual/image/preinstall/nextcloud.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/nextcloud/manual/image/preinstall/nextcloud.sh
rename to seed/nextcloud/manual/image/preinstall/nextcloud.sh
diff --git a/seed/applicationservice/2022.03.08/nextcloud/templates/20-pgsql.ini b/seed/nextcloud/templates/20-pgsql.ini
similarity index 100%
rename from seed/applicationservice/2022.03.08/nextcloud/templates/20-pgsql.ini
rename to seed/nextcloud/templates/20-pgsql.ini
diff --git a/seed/applicationservice/2022.03.08/nextcloud/templates/a-nextcloud-access.conf b/seed/nextcloud/templates/a-nextcloud-access.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nextcloud/templates/a-nextcloud-access.conf
rename to seed/nextcloud/templates/a-nextcloud-access.conf
diff --git a/seed/applicationservice/2022.03.08/nextcloud/templates/nextcloud-config.php b/seed/nextcloud/templates/nextcloud-config.php
similarity index 100%
rename from seed/applicationservice/2022.03.08/nextcloud/templates/nextcloud-config.php
rename to seed/nextcloud/templates/nextcloud-config.php
diff --git a/seed/applicationservice/2022.03.08/nextcloud/templates/nextcloud.init b/seed/nextcloud/templates/nextcloud.init
similarity index 100%
rename from seed/applicationservice/2022.03.08/nextcloud/templates/nextcloud.init
rename to seed/nextcloud/templates/nextcloud.init
diff --git a/seed/applicationservice/2022.03.08/nextcloud/templates/nextcloud.service b/seed/nextcloud/templates/nextcloud.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/nextcloud/templates/nextcloud.service
rename to seed/nextcloud/templates/nextcloud.service
diff --git a/seed/applicationservice/2022.03.08/nextcloud/templates/nextcloudcron.service b/seed/nextcloud/templates/nextcloudcron.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/nextcloud/templates/nextcloudcron.service
rename to seed/nextcloud/templates/nextcloudcron.service
diff --git a/seed/applicationservice/2022.03.08/nextcloud/templates/nextcloudcron.timer b/seed/nextcloud/templates/nextcloudcron.timer
similarity index 100%
rename from seed/applicationservice/2022.03.08/nextcloud/templates/nextcloudcron.timer
rename to seed/nextcloud/templates/nextcloudcron.timer
diff --git a/seed/applicationservice/2022.03.08/nextcloud/templates/tmpfile-nextcloud.conf b/seed/nextcloud/templates/tmpfile-nextcloud.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nextcloud/templates/tmpfile-nextcloud.conf
rename to seed/nextcloud/templates/tmpfile-nextcloud.conf
diff --git a/seed/applicationservice/2022.03.08/nextcloud/templates/z-nextcloud-access.conf b/seed/nextcloud/templates/z-nextcloud-access.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nextcloud/templates/z-nextcloud-access.conf
rename to seed/nextcloud/templates/z-nextcloud-access.conf
diff --git a/seed/applicationservice/2022.03.08/nginx-common/DEBUG b/seed/nginx-common/DEBUG
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-common/DEBUG
rename to seed/nginx-common/DEBUG
diff --git a/seed/applicationservice/2022.03.08/nginx-common/applicationservice.yml b/seed/nginx-common/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-common/applicationservice.yml
rename to seed/nginx-common/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/nginx-common/dictionaries/20_nginx.xml b/seed/nginx-common/dictionaries/20_nginx.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-common/dictionaries/20_nginx.xml
rename to seed/nginx-common/dictionaries/20_nginx.xml
diff --git a/seed/applicationservice/2022.03.08/nginx-common/manual/image/preinstall/nginx_common.sh b/seed/nginx-common/manual/image/preinstall/nginx_common.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-common/manual/image/preinstall/nginx_common.sh
rename to seed/nginx-common/manual/image/preinstall/nginx_common.sh
diff --git a/seed/applicationservice/2022.03.08/nginx-common/templates/default b/seed/nginx-common/templates/default
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-common/templates/default
rename to seed/nginx-common/templates/default
diff --git a/seed/applicationservice/2022.03.08/nginx-common/templates/default-nginx.conf b/seed/nginx-common/templates/default-nginx.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-common/templates/default-nginx.conf
rename to seed/nginx-common/templates/default-nginx.conf
diff --git a/seed/applicationservice/2022.03.08/nginx-common/templates/error.html b/seed/nginx-common/templates/error.html
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-common/templates/error.html
rename to seed/nginx-common/templates/error.html
diff --git a/seed/applicationservice/2022.03.08/nginx-common/templates/nginx-options.conf b/seed/nginx-common/templates/nginx-options.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-common/templates/nginx-options.conf
rename to seed/nginx-common/templates/nginx-options.conf
diff --git a/seed/applicationservice/2022.03.08/nginx-common/templates/nginx.conf b/seed/nginx-common/templates/nginx.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-common/templates/nginx.conf
rename to seed/nginx-common/templates/nginx.conf
diff --git a/seed/applicationservice/2022.03.08/nginx-common/templates/nginx.index.html b/seed/nginx-common/templates/nginx.index.html
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-common/templates/nginx.index.html
rename to seed/nginx-common/templates/nginx.index.html
diff --git a/seed/applicationservice/2022.03.08/nginx-common/templates/sysusers.nginx.conf b/seed/nginx-common/templates/sysusers.nginx.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-common/templates/sysusers.nginx.conf
rename to seed/nginx-common/templates/sysusers.nginx.conf
diff --git a/seed/applicationservice/2022.03.08/nginx-common/templates/tmpfiles.nginx.conf b/seed/nginx-common/templates/tmpfiles.nginx.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-common/templates/tmpfiles.nginx.conf
rename to seed/nginx-common/templates/tmpfiles.nginx.conf
diff --git a/seed/applicationservice/2022.03.08/nginx-https/applicationservice.yml b/seed/nginx-https/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-https/applicationservice.yml
rename to seed/nginx-https/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/nginx-https/dictionaries/25_nginx.xml b/seed/nginx-https/dictionaries/25_nginx.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-https/dictionaries/25_nginx.xml
rename to seed/nginx-https/dictionaries/25_nginx.xml
diff --git a/seed/applicationservice/2022.03.08/nginx-https/templates/nginx.crt b/seed/nginx-https/templates/nginx.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-https/templates/nginx.crt
rename to seed/nginx-https/templates/nginx.crt
diff --git a/seed/applicationservice/2022.03.08/nginx-https/templates/nginx.index.html b/seed/nginx-https/templates/nginx.index.html
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-https/templates/nginx.index.html
rename to seed/nginx-https/templates/nginx.index.html
diff --git a/seed/applicationservice/2022.03.08/nginx-https/templates/nginx.key b/seed/nginx-https/templates/nginx.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-https/templates/nginx.key
rename to seed/nginx-https/templates/nginx.key
diff --git a/seed/applicationservice/2022.03.08/nginx-https/templates/risotto.conf b/seed/nginx-https/templates/risotto.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-https/templates/risotto.conf
rename to seed/nginx-https/templates/risotto.conf
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/applicationservice.yml b/seed/nginx-reverse-proxy/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy/applicationservice.yml
rename to seed/nginx-reverse-proxy/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/dictionaries/25_nginx.xml b/seed/nginx-reverse-proxy/dictionaries/25_nginx.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy/dictionaries/25_nginx.xml
rename to seed/nginx-reverse-proxy/dictionaries/25_nginx.xml
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/doc.md b/seed/nginx-reverse-proxy/doc.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy/doc.md
rename to seed/nginx-reverse-proxy/doc.md
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/extras/machine/20_reverse_proxy.xml b/seed/nginx-reverse-proxy/extras/machine/20_reverse_proxy.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy/extras/machine/20_reverse_proxy.xml
rename to seed/nginx-reverse-proxy/extras/machine/20_reverse_proxy.xml
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/extras/nginx/00-nginx.xml b/seed/nginx-reverse-proxy/extras/nginx/00-nginx.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy/extras/nginx/00-nginx.xml
rename to seed/nginx-reverse-proxy/extras/nginx/00-nginx.xml
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/funcs/nginx.py b/seed/nginx-reverse-proxy/funcs/nginx.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy/funcs/nginx.py
rename to seed/nginx-reverse-proxy/funcs/nginx.py
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/ca.crt b/seed/nginx-reverse-proxy/templates/ca.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/ca.crt
rename to seed/nginx-reverse-proxy/templates/ca.crt
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/ca_InternalReverseProxy.crt b/seed/nginx-reverse-proxy/templates/ca_InternalReverseProxy.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/ca_InternalReverseProxy.crt
rename to seed/nginx-reverse-proxy/templates/ca_InternalReverseProxy.crt
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/certificate.crt b/seed/nginx-reverse-proxy/templates/certificate.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/certificate.crt
rename to seed/nginx-reverse-proxy/templates/certificate.crt
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/nginx-options-rp.conf b/seed/nginx-reverse-proxy/templates/nginx-options-rp.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/nginx-options-rp.conf
rename to seed/nginx-reverse-proxy/templates/nginx-options-rp.conf
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/nginx.index.html b/seed/nginx-reverse-proxy/templates/nginx.index.html
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/nginx.index.html
rename to seed/nginx-reverse-proxy/templates/nginx.index.html
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/nginx.service b/seed/nginx-reverse-proxy/templates/nginx.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/nginx.service
rename to seed/nginx-reverse-proxy/templates/nginx.service
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/private.key b/seed/nginx-reverse-proxy/templates/private.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/private.key
rename to seed/nginx-reverse-proxy/templates/private.key
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/revprox-nginx.conf b/seed/nginx-reverse-proxy/templates/revprox-nginx.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/revprox-nginx.conf
rename to seed/nginx-reverse-proxy/templates/revprox-nginx.conf
diff --git a/seed/applicationservice/2022.03.08/nsd/DEBUG.md b/seed/nsd/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/DEBUG.md
rename to seed/nsd/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/nsd/applicationservice.yml b/seed/nsd/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/applicationservice.yml
rename to seed/nsd/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/nsd/dictionaries/20_nsd.xml b/seed/nsd/dictionaries/20_nsd.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/dictionaries/20_nsd.xml
rename to seed/nsd/dictionaries/20_nsd.xml
diff --git a/seed/applicationservice/2022.03.08/nsd/doc.md b/seed/nsd/doc.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/doc.md
rename to seed/nsd/doc.md
diff --git a/seed/applicationservice/2022.03.08/nsd/extras/machine/20_nsd.xml b/seed/nsd/extras/machine/20_nsd.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/extras/machine/20_nsd.xml
rename to seed/nsd/extras/machine/20_nsd.xml
diff --git a/seed/applicationservice/2022.03.08/nsd/extras/nsd/00_nsd.xml b/seed/nsd/extras/nsd/00_nsd.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/extras/nsd/00_nsd.xml
rename to seed/nsd/extras/nsd/00_nsd.xml
diff --git a/seed/applicationservice/2022.03.08/nsd/funcs/funcs.py b/seed/nsd/funcs/funcs.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/funcs/funcs.py
rename to seed/nsd/funcs/funcs.py
diff --git a/seed/applicationservice/2022.03.08/nsd/manual/image/preinstall/nsd.sh b/seed/nsd/manual/image/preinstall/nsd.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/manual/image/preinstall/nsd.sh
rename to seed/nsd/manual/image/preinstall/nsd.sh
diff --git a/seed/applicationservice/2022.03.08/nsd/templates/nsd.reverse b/seed/nsd/templates/nsd.reverse
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/templates/nsd.reverse
rename to seed/nsd/templates/nsd.reverse
diff --git a/seed/applicationservice/2022.03.08/nsd/templates/nsd.service b/seed/nsd/templates/nsd.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/templates/nsd.service
rename to seed/nsd/templates/nsd.service
diff --git a/seed/applicationservice/2022.03.08/nsd/templates/nsd.signed b/seed/nsd/templates/nsd.signed
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/templates/nsd.signed
rename to seed/nsd/templates/nsd.signed
diff --git a/seed/applicationservice/2022.03.08/nsd/templates/nsd.yml b/seed/nsd/templates/nsd.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/templates/nsd.yml
rename to seed/nsd/templates/nsd.yml
diff --git a/seed/applicationservice/2022.03.08/nsd/templates/nsd.zone b/seed/nsd/templates/nsd.zone
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/templates/nsd.zone
rename to seed/nsd/templates/nsd.zone
diff --git a/seed/applicationservice/2022.03.08/nsd/templates/risotto.conf b/seed/nsd/templates/risotto.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/templates/risotto.conf
rename to seed/nsd/templates/risotto.conf
diff --git a/seed/applicationservice/2022.03.08/nsd/templates/sysuser-nsd.conf b/seed/nsd/templates/sysuser-nsd.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/templates/sysuser-nsd.conf
rename to seed/nsd/templates/sysuser-nsd.conf
diff --git a/seed/applicationservice/2022.03.08/nsd/templates/tmpfile-nsd.conf b/seed/nsd/templates/tmpfile-nsd.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/templates/tmpfile-nsd.conf
rename to seed/nsd/templates/tmpfile-nsd.conf
diff --git a/seed/applicationservice/2022.03.08/nsd/tests/FIXME b/seed/nsd/tests/FIXME
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/tests/FIXME
rename to seed/nsd/tests/FIXME
diff --git a/seed/applicationservice/2022.03.08/nsd/tests/test_dns.py b/seed/nsd/tests/test_dns.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/nsd/tests/test_dns.py
rename to seed/nsd/tests/test_dns.py
diff --git a/seed/applicationservice/2022.03.08/oauth2-client/applicationservice.yml b/seed/oauth2-client/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/oauth2-client/applicationservice.yml
rename to seed/oauth2-client/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/oauth2-client/dictionaries/30_oauth2_client.xml b/seed/oauth2-client/dictionaries/30_oauth2_client.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/oauth2-client/dictionaries/30_oauth2_client.xml
rename to seed/oauth2-client/dictionaries/30_oauth2_client.xml
diff --git a/seed/applicationservice/2022.03.08/oauth2-client/funcs/oauth2_client.py b/seed/oauth2-client/funcs/oauth2_client.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/oauth2-client/funcs/oauth2_client.py
rename to seed/oauth2-client/funcs/oauth2_client.py
diff --git a/seed/applicationservice/2022.03.08/openldap/DEBUG.md b/seed/openldap/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/DEBUG.md
rename to seed/openldap/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/openldap/README.md b/seed/openldap/README.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/README.md
rename to seed/openldap/README.md
diff --git a/seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/bareos/fichier/annuaire.conf b/seed/openldap/a_voir/sauvegarde/bareos/fichier/annuaire.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/bareos/fichier/annuaire.conf
rename to seed/openldap/a_voir/sauvegarde/bareos/fichier/annuaire.conf
diff --git a/seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/bareos/restore/ldap.py b/seed/openldap/a_voir/sauvegarde/bareos/restore/ldap.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/bareos/restore/ldap.py
rename to seed/openldap/a_voir/sauvegarde/bareos/restore/ldap.py
diff --git a/seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/extra/schedule/01_annuaire.xml b/seed/openldap/a_voir/sauvegarde/extra/schedule/01_annuaire.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/extra/schedule/01_annuaire.xml
rename to seed/openldap/a_voir/sauvegarde/extra/schedule/01_annuaire.xml
diff --git a/seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/schedule/scripts/annuaire b/seed/openldap/a_voir/sauvegarde/schedule/scripts/annuaire
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/schedule/scripts/annuaire
rename to seed/openldap/a_voir/sauvegarde/schedule/scripts/annuaire
diff --git a/seed/applicationservice/2022.03.08/openldap/applicationservice.yml b/seed/openldap/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/applicationservice.yml
rename to seed/openldap/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/openldap/dictionaries/21_openldap-server.xml b/seed/openldap/dictionaries/21_openldap-server.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/dictionaries/21_openldap-server.xml
rename to seed/openldap/dictionaries/21_openldap-server.xml
diff --git a/seed/applicationservice/2022.03.08/openldap/doc.md b/seed/openldap/doc.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/doc.md
rename to seed/openldap/doc.md
diff --git a/seed/applicationservice/2022.03.08/openldap/extras/accounts/00_account.xml b/seed/openldap/extras/accounts/00_account.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/extras/accounts/00_account.xml
rename to seed/openldap/extras/accounts/00_account.xml
diff --git a/seed/applicationservice/2022.03.08/openldap/funcs/ldap.py b/seed/openldap/funcs/ldap.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/funcs/ldap.py
rename to seed/openldap/funcs/ldap.py
diff --git a/seed/applicationservice/2022.03.08/openldap/ldap.service b/seed/openldap/ldap.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/ldap.service
rename to seed/openldap/ldap.service
diff --git a/seed/applicationservice/2022.03.08/openldap/manual/image/postinstall/openldap_server.sh b/seed/openldap/manual/image/postinstall/openldap_server.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/manual/image/postinstall/openldap_server.sh
rename to seed/openldap/manual/image/postinstall/openldap_server.sh
diff --git a/seed/applicationservice/2022.03.08/openldap/manual/image/preinstall/openldap_server.sh b/seed/openldap/manual/image/preinstall/openldap_server.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/manual/image/preinstall/openldap_server.sh
rename to seed/openldap/manual/image/preinstall/openldap_server.sh
diff --git a/seed/applicationservice/2022.03.08/openldap/templates/DB_CONFIG b/seed/openldap/templates/DB_CONFIG
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/templates/DB_CONFIG
rename to seed/openldap/templates/DB_CONFIG
diff --git a/seed/applicationservice/2022.03.08/openldap/templates/admin_ldap.pwd b/seed/openldap/templates/admin_ldap.pwd
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/templates/admin_ldap.pwd
rename to seed/openldap/templates/admin_ldap.pwd
diff --git a/seed/applicationservice/2022.03.08/openldap/templates/config.ldif b/seed/openldap/templates/config.ldif
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/templates/config.ldif
rename to seed/openldap/templates/config.ldif
diff --git a/seed/applicationservice/2022.03.08/openldap/templates/config_acl.ldif b/seed/openldap/templates/config_acl.ldif
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/templates/config_acl.ldif
rename to seed/openldap/templates/config_acl.ldif
diff --git a/seed/applicationservice/2022.03.08/openldap/templates/default.slapd b/seed/openldap/templates/default.slapd
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/templates/default.slapd
rename to seed/openldap/templates/default.slapd
diff --git a/seed/applicationservice/2022.03.08/openldap/templates/openldap.crt b/seed/openldap/templates/openldap.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/templates/openldap.crt
rename to seed/openldap/templates/openldap.crt
diff --git a/seed/applicationservice/2022.03.08/openldap/templates/openldap.key b/seed/openldap/templates/openldap.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/templates/openldap.key
rename to seed/openldap/templates/openldap.key
diff --git a/seed/applicationservice/2022.03.08/openldap/templates/replication.conf b/seed/openldap/templates/replication.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/templates/replication.conf
rename to seed/openldap/templates/replication.conf
diff --git a/seed/applicationservice/2022.03.08/openldap/templates/risotto-openldap.conf b/seed/openldap/templates/risotto-openldap.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/templates/risotto-openldap.conf
rename to seed/openldap/templates/risotto-openldap.conf
diff --git a/seed/applicationservice/2022.03.08/openldap/templates/slapd.service b/seed/openldap/templates/slapd.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/templates/slapd.service
rename to seed/openldap/templates/slapd.service
diff --git a/seed/applicationservice/2022.03.08/openldap/templates/tmpfile-openldap-server.conf b/seed/openldap/templates/tmpfile-openldap-server.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/templates/tmpfile-openldap-server.conf
rename to seed/openldap/templates/tmpfile-openldap-server.conf
diff --git a/seed/applicationservice/2022.03.08/openldap/templates/users.ldif b/seed/openldap/templates/users.ldif
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/templates/users.ldif
rename to seed/openldap/templates/users.ldif
diff --git a/seed/applicationservice/2022.03.08/openldap/templates/users_mod.ldif b/seed/openldap/templates/users_mod.ldif
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap/templates/users_mod.ldif
rename to seed/openldap/templates/users_mod.ldif
diff --git a/seed/applicationservice/2022.03.08/peertube/DEBUG.md b/seed/peertube/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/peertube/DEBUG.md
rename to seed/peertube/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/peertube/FIXME b/seed/peertube/FIXME
similarity index 100%
rename from seed/applicationservice/2022.03.08/peertube/FIXME
rename to seed/peertube/FIXME
diff --git a/seed/applicationservice/2022.03.08/peertube/applicationservice.yml b/seed/peertube/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/peertube/applicationservice.yml
rename to seed/peertube/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/peertube/dictionaries/30_peertube.xml b/seed/peertube/dictionaries/30_peertube.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/peertube/dictionaries/30_peertube.xml
rename to seed/peertube/dictionaries/30_peertube.xml
diff --git a/seed/applicationservice/2022.03.08/peertube/manual/image/postinstall/peertube.patch b/seed/peertube/manual/image/postinstall/peertube.patch
similarity index 100%
rename from seed/applicationservice/2022.03.08/peertube/manual/image/postinstall/peertube.patch
rename to seed/peertube/manual/image/postinstall/peertube.patch
diff --git a/seed/applicationservice/2022.03.08/peertube/manual/image/postinstall/peertube.sh b/seed/peertube/manual/image/postinstall/peertube.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/peertube/manual/image/postinstall/peertube.sh
rename to seed/peertube/manual/image/postinstall/peertube.sh
diff --git a/seed/applicationservice/2022.03.08/peertube/manual/image/preinstall/peertube.sh b/seed/peertube/manual/image/preinstall/peertube.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/peertube/manual/image/preinstall/peertube.sh
rename to seed/peertube/manual/image/preinstall/peertube.sh
diff --git a/seed/applicationservice/2022.03.08/peertube/templates/nginx.peertube.conf b/seed/peertube/templates/nginx.peertube.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/peertube/templates/nginx.peertube.conf
rename to seed/peertube/templates/nginx.peertube.conf
diff --git a/seed/applicationservice/2022.03.08/peertube/templates/peertube.service b/seed/peertube/templates/peertube.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/peertube/templates/peertube.service
rename to seed/peertube/templates/peertube.service
diff --git a/seed/applicationservice/2022.03.08/peertube/templates/production.yaml b/seed/peertube/templates/production.yaml
similarity index 100%
rename from seed/applicationservice/2022.03.08/peertube/templates/production.yaml
rename to seed/peertube/templates/production.yaml
diff --git a/seed/applicationservice/2022.03.08/peertube/templates/sysuser-peertube.conf b/seed/peertube/templates/sysuser-peertube.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/peertube/templates/sysuser-peertube.conf
rename to seed/peertube/templates/sysuser-peertube.conf
diff --git a/seed/applicationservice/2022.03.08/peertube/templates/tmpfile-peertube.conf b/seed/peertube/templates/tmpfile-peertube.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/peertube/templates/tmpfile-peertube.conf
rename to seed/peertube/templates/tmpfile-peertube.conf
diff --git a/seed/applicationservice/2022.03.08/php-fpm/DEBUG.md b/seed/php-fpm/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/php-fpm/DEBUG.md
rename to seed/php-fpm/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/php-fpm/applicationservice.yml b/seed/php-fpm/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/php-fpm/applicationservice.yml
rename to seed/php-fpm/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/php-fpm/dictionaries/20_phpfpm.xml b/seed/php-fpm/dictionaries/20_phpfpm.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/php-fpm/dictionaries/20_phpfpm.xml
rename to seed/php-fpm/dictionaries/20_phpfpm.xml
diff --git a/seed/applicationservice/2022.03.08/php-fpm/manual/image/preinstall/phpfpm.sh b/seed/php-fpm/manual/image/preinstall/phpfpm.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/php-fpm/manual/image/preinstall/phpfpm.sh
rename to seed/php-fpm/manual/image/preinstall/phpfpm.sh
diff --git a/seed/applicationservice/2022.03.08/php-fpm/templates/php-fpm.conf b/seed/php-fpm/templates/php-fpm.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/php-fpm/templates/php-fpm.conf
rename to seed/php-fpm/templates/php-fpm.conf
diff --git a/seed/applicationservice/2022.03.08/php-fpm/templates/sysuser-phpfpm.conf b/seed/php-fpm/templates/sysuser-phpfpm.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/php-fpm/templates/sysuser-phpfpm.conf
rename to seed/php-fpm/templates/sysuser-phpfpm.conf
diff --git a/seed/applicationservice/2022.03.08/php-fpm/templates/tmpfile-phpfpm.conf b/seed/php-fpm/templates/tmpfile-phpfpm.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/php-fpm/templates/tmpfile-phpfpm.conf
rename to seed/php-fpm/templates/tmpfile-phpfpm.conf
diff --git a/seed/applicationservice/2022.03.08/php-fpm/templates/www.conf b/seed/php-fpm/templates/www.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/php-fpm/templates/www.conf
rename to seed/php-fpm/templates/www.conf
diff --git a/seed/applicationservice/2022.03.08/php/DEBUG.md b/seed/php/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/php/DEBUG.md
rename to seed/php/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/php/applicationservice.yml b/seed/php/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/php/applicationservice.yml
rename to seed/php/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/php/dictionaries/20_php.xml b/seed/php/dictionaries/20_php.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/php/dictionaries/20_php.xml
rename to seed/php/dictionaries/20_php.xml
diff --git a/seed/applicationservice/2022.03.08/php/templates/php.ini b/seed/php/templates/php.ini
similarity index 100%
rename from seed/applicationservice/2022.03.08/php/templates/php.ini
rename to seed/php/templates/php.ini
diff --git a/seed/applicationservice/2022.03.08/piwigo/applicationservice.yml b/seed/piwigo/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/piwigo/applicationservice.yml
rename to seed/piwigo/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/piwigo/dictionaries/31_piwigo.xml b/seed/piwigo/dictionaries/31_piwigo.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/piwigo/dictionaries/31_piwigo.xml
rename to seed/piwigo/dictionaries/31_piwigo.xml
diff --git a/seed/applicationservice/2022.03.08/piwigo/funcs/piwigo.sh b/seed/piwigo/funcs/piwigo.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/piwigo/funcs/piwigo.sh
rename to seed/piwigo/funcs/piwigo.sh
diff --git a/seed/applicationservice/2022.03.08/piwigo/manual/image/postinstall/osmmap.php b/seed/piwigo/manual/image/postinstall/osmmap.php
similarity index 100%
rename from seed/applicationservice/2022.03.08/piwigo/manual/image/postinstall/osmmap.php
rename to seed/piwigo/manual/image/postinstall/osmmap.php
diff --git a/seed/applicationservice/2022.03.08/piwigo/manual/image/postinstall/piwigo.patch b/seed/piwigo/manual/image/postinstall/piwigo.patch
similarity index 100%
rename from seed/applicationservice/2022.03.08/piwigo/manual/image/postinstall/piwigo.patch
rename to seed/piwigo/manual/image/postinstall/piwigo.patch
diff --git a/seed/applicationservice/2022.03.08/piwigo/manual/image/postinstall/piwigo.sh b/seed/piwigo/manual/image/postinstall/piwigo.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/piwigo/manual/image/postinstall/piwigo.sh
rename to seed/piwigo/manual/image/postinstall/piwigo.sh
diff --git a/seed/applicationservice/2022.03.08/piwigo/manual/image/postinstall/piwigo_cli.php b/seed/piwigo/manual/image/postinstall/piwigo_cli.php
similarity index 100%
rename from seed/applicationservice/2022.03.08/piwigo/manual/image/postinstall/piwigo_cli.php
rename to seed/piwigo/manual/image/postinstall/piwigo_cli.php
diff --git a/seed/applicationservice/2022.03.08/piwigo/manual/image/preinstall/piwigo.sh b/seed/piwigo/manual/image/preinstall/piwigo.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/piwigo/manual/image/preinstall/piwigo.sh
rename to seed/piwigo/manual/image/preinstall/piwigo.sh
diff --git a/seed/applicationservice/2022.03.08/piwigo/templates/config.inc.php b/seed/piwigo/templates/config.inc.php
similarity index 100%
rename from seed/applicationservice/2022.03.08/piwigo/templates/config.inc.php
rename to seed/piwigo/templates/config.inc.php
diff --git a/seed/applicationservice/2022.03.08/piwigo/templates/database.inc.php b/seed/piwigo/templates/database.inc.php
similarity index 100%
rename from seed/applicationservice/2022.03.08/piwigo/templates/database.inc.php
rename to seed/piwigo/templates/database.inc.php
diff --git a/seed/applicationservice/2022.03.08/piwigo/templates/piwigo.conf b/seed/piwigo/templates/piwigo.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/piwigo/templates/piwigo.conf
rename to seed/piwigo/templates/piwigo.conf
diff --git a/seed/applicationservice/2022.03.08/piwigo/templates/piwigo.service b/seed/piwigo/templates/piwigo.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/piwigo/templates/piwigo.service
rename to seed/piwigo/templates/piwigo.service
diff --git a/seed/applicationservice/2022.03.08/piwigo/templates/piwigo.sh b/seed/piwigo/templates/piwigo.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/piwigo/templates/piwigo.sh
rename to seed/piwigo/templates/piwigo.sh
diff --git a/seed/applicationservice/2022.03.08/piwigo/templates/tmpfile-piwigo.conf b/seed/piwigo/templates/tmpfile-piwigo.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/piwigo/templates/tmpfile-piwigo.conf
rename to seed/piwigo/templates/tmpfile-piwigo.conf
diff --git a/seed/applicationservice/2022.03.08/pleroma/applicationservice.yml b/seed/pleroma/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/pleroma/applicationservice.yml
rename to seed/pleroma/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/pleroma/dictionaries/30_pleroma.xml b/seed/pleroma/dictionaries/30_pleroma.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/pleroma/dictionaries/30_pleroma.xml
rename to seed/pleroma/dictionaries/30_pleroma.xml
diff --git a/seed/applicationservice/2022.03.08/pleroma/manual/image/postinstall/pleroma.sh b/seed/pleroma/manual/image/postinstall/pleroma.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/pleroma/manual/image/postinstall/pleroma.sh
rename to seed/pleroma/manual/image/postinstall/pleroma.sh
diff --git a/seed/applicationservice/2022.03.08/pleroma/manual/image/preinstall/pleroma.sh b/seed/pleroma/manual/image/preinstall/pleroma.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/pleroma/manual/image/preinstall/pleroma.sh
rename to seed/pleroma/manual/image/preinstall/pleroma.sh
diff --git a/seed/applicationservice/2022.03.08/pleroma/templates/login b/seed/pleroma/templates/login
similarity index 100%
rename from seed/applicationservice/2022.03.08/pleroma/templates/login
rename to seed/pleroma/templates/login
diff --git a/seed/applicationservice/2022.03.08/pleroma/templates/nginx.peertube.conf b/seed/pleroma/templates/nginx.peertube.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/pleroma/templates/nginx.peertube.conf
rename to seed/pleroma/templates/nginx.peertube.conf
diff --git a/seed/applicationservice/2022.03.08/pleroma/templates/peertube.service b/seed/pleroma/templates/peertube.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/pleroma/templates/peertube.service
rename to seed/pleroma/templates/peertube.service
diff --git a/seed/applicationservice/2022.03.08/pleroma/templates/production.yaml b/seed/pleroma/templates/production.yaml
similarity index 100%
rename from seed/applicationservice/2022.03.08/pleroma/templates/production.yaml
rename to seed/pleroma/templates/production.yaml
diff --git a/seed/applicationservice/2022.03.08/pleroma/templates/sysuser-peertube.conf b/seed/pleroma/templates/sysuser-peertube.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/pleroma/templates/sysuser-peertube.conf
rename to seed/pleroma/templates/sysuser-peertube.conf
diff --git a/seed/applicationservice/2022.03.08/pleroma/templates/tmpfile-peertube.conf b/seed/pleroma/templates/tmpfile-peertube.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/pleroma/templates/tmpfile-peertube.conf
rename to seed/pleroma/templates/tmpfile-peertube.conf
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/DEBUG.md b/seed/postfix-relay/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/DEBUG.md
rename to seed/postfix-relay/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/FIXME b/seed/postfix-relay/FIXME
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/FIXME
rename to seed/postfix-relay/FIXME
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/applicationservice.yml b/seed/postfix-relay/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/applicationservice.yml
rename to seed/postfix-relay/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/dictionaries/30_postfix.xml b/seed/postfix-relay/dictionaries/30_postfix.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/dictionaries/30_postfix.xml
rename to seed/postfix-relay/dictionaries/30_postfix.xml
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/doc.md b/seed/postfix-relay/doc.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/doc.md
rename to seed/postfix-relay/doc.md
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/extras/lmtp/00-lmtp.xml b/seed/postfix-relay/extras/lmtp/00-lmtp.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/extras/lmtp/00-lmtp.xml
rename to seed/postfix-relay/extras/lmtp/00-lmtp.xml
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/funcs/opendkim.py b/seed/postfix-relay/funcs/opendkim.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/funcs/opendkim.py
rename to seed/postfix-relay/funcs/opendkim.py
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/funcs/postfix.py b/seed/postfix-relay/funcs/postfix.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/funcs/postfix.py
rename to seed/postfix-relay/funcs/postfix.py
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/manual/image/preinstall/postfix_relay.sh b/seed/postfix-relay/manual/image/preinstall/postfix_relay.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/manual/image/preinstall/postfix_relay.sh
rename to seed/postfix-relay/manual/image/preinstall/postfix_relay.sh
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/12-managesieve.conf b/seed/postfix-relay/templates/12-managesieve.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/12-managesieve.conf
rename to seed/postfix-relay/templates/12-managesieve.conf
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/KeyTable b/seed/postfix-relay/templates/KeyTable
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/KeyTable
rename to seed/postfix-relay/templates/KeyTable
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/SigningTable b/seed/postfix-relay/templates/SigningTable
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/SigningTable
rename to seed/postfix-relay/templates/SigningTable
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/TrustedHosts b/seed/postfix-relay/templates/TrustedHosts
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/TrustedHosts
rename to seed/postfix-relay/templates/TrustedHosts
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/ca_MailServer.crt b/seed/postfix-relay/templates/ca_MailServer.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/ca_MailServer.crt
rename to seed/postfix-relay/templates/ca_MailServer.crt
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/lmtp b/seed/postfix-relay/templates/lmtp
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/lmtp
rename to seed/postfix-relay/templates/lmtp
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/main.cf b/seed/postfix-relay/templates/main.cf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/main.cf
rename to seed/postfix-relay/templates/main.cf
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/master.cf b/seed/postfix-relay/templates/master.cf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/master.cf
rename to seed/postfix-relay/templates/master.cf
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/opendkim.conf b/seed/postfix-relay/templates/opendkim.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/opendkim.conf
rename to seed/postfix-relay/templates/opendkim.conf
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/opendkim.key b/seed/postfix-relay/templates/opendkim.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/opendkim.key
rename to seed/postfix-relay/templates/opendkim.key
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/opendmarc.conf b/seed/postfix-relay/templates/opendmarc.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/opendmarc.conf
rename to seed/postfix-relay/templates/opendmarc.conf
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/postfix.crt b/seed/postfix-relay/templates/postfix.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/postfix.crt
rename to seed/postfix-relay/templates/postfix.crt
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/postfix.key b/seed/postfix-relay/templates/postfix.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/postfix.key
rename to seed/postfix-relay/templates/postfix.key
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/postfix.service b/seed/postfix-relay/templates/postfix.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/postfix.service
rename to seed/postfix-relay/templates/postfix.service
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/smtpd.conf b/seed/postfix-relay/templates/smtpd.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/smtpd.conf
rename to seed/postfix-relay/templates/smtpd.conf
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/sni b/seed/postfix-relay/templates/sni
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/sni
rename to seed/postfix-relay/templates/sni
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/sni.pem b/seed/postfix-relay/templates/sni.pem
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/sni.pem
rename to seed/postfix-relay/templates/sni.pem
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/sysuser-opendkim.conf b/seed/postfix-relay/templates/sysuser-opendkim.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/sysuser-opendkim.conf
rename to seed/postfix-relay/templates/sysuser-opendkim.conf
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/sysuser-opendmarc.conf b/seed/postfix-relay/templates/sysuser-opendmarc.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/sysuser-opendmarc.conf
rename to seed/postfix-relay/templates/sysuser-opendmarc.conf
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/sysuser-postfix.conf b/seed/postfix-relay/templates/sysuser-postfix.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/sysuser-postfix.conf
rename to seed/postfix-relay/templates/sysuser-postfix.conf
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/tmpfile-opendmarc.conf b/seed/postfix-relay/templates/tmpfile-opendmarc.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/tmpfile-opendmarc.conf
rename to seed/postfix-relay/templates/tmpfile-opendmarc.conf
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/tmpfile-postfix.conf b/seed/postfix-relay/templates/tmpfile-postfix.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postfix-relay/templates/tmpfile-postfix.conf
rename to seed/postfix-relay/templates/tmpfile-postfix.conf
diff --git a/seed/applicationservice/2022.03.08/postgresql-client/applicationservice.yml b/seed/postgresql-client/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-client/applicationservice.yml
rename to seed/postgresql-client/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/postgresql-client/dictionaries/23_postgresql.xml b/seed/postgresql-client/dictionaries/23_postgresql.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-client/dictionaries/23_postgresql.xml
rename to seed/postgresql-client/dictionaries/23_postgresql.xml
diff --git a/seed/applicationservice/2022.03.08/postgresql-client/manual/image/preinstall/postgresql_client.sh b/seed/postgresql-client/manual/image/preinstall/postgresql_client.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-client/manual/image/preinstall/postgresql_client.sh
rename to seed/postgresql-client/manual/image/preinstall/postgresql_client.sh
diff --git a/seed/applicationservice/2022.03.08/postgresql-client/templates/ca_PostgreSQL.crt b/seed/postgresql-client/templates/ca_PostgreSQL.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-client/templates/ca_PostgreSQL.crt
rename to seed/postgresql-client/templates/ca_PostgreSQL.crt
diff --git a/seed/applicationservice/2022.03.08/postgresql-client/templates/postgresql.crt b/seed/postgresql-client/templates/postgresql.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-client/templates/postgresql.crt
rename to seed/postgresql-client/templates/postgresql.crt
diff --git a/seed/applicationservice/2022.03.08/postgresql-client/templates/postgresql.key b/seed/postgresql-client/templates/postgresql.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-client/templates/postgresql.key
rename to seed/postgresql-client/templates/postgresql.key
diff --git a/seed/applicationservice/2022.03.08/postgresql-client/templates/postgresql.pass b/seed/postgresql-client/templates/postgresql.pass
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-client/templates/postgresql.pass
rename to seed/postgresql-client/templates/postgresql.pass
diff --git a/seed/applicationservice/2022.03.08/postgresql-client/templates/postgresqlclient.service b/seed/postgresql-client/templates/postgresqlclient.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-client/templates/postgresqlclient.service
rename to seed/postgresql-client/templates/postgresqlclient.service
diff --git a/seed/applicationservice/2022.03.08/postgresql/applicationservice.yml b/seed/postgresql/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql/applicationservice.yml
rename to seed/postgresql/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/postgresql/dictionaries/22_postgresql.xml b/seed/postgresql/dictionaries/22_postgresql.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql/dictionaries/22_postgresql.xml
rename to seed/postgresql/dictionaries/22_postgresql.xml
diff --git a/seed/applicationservice/2022.03.08/postgresql/manual/image/preinstall/postgresql_server.sh b/seed/postgresql/manual/image/preinstall/postgresql_server.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql/manual/image/preinstall/postgresql_server.sh
rename to seed/postgresql/manual/image/preinstall/postgresql_server.sh
diff --git a/seed/applicationservice/2022.03.08/postgresql/templates/ca_PostgreSQL.crt b/seed/postgresql/templates/ca_PostgreSQL.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql/templates/ca_PostgreSQL.crt
rename to seed/postgresql/templates/ca_PostgreSQL.crt
diff --git a/seed/applicationservice/2022.03.08/postgresql/templates/pg_hba.conf b/seed/postgresql/templates/pg_hba.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql/templates/pg_hba.conf
rename to seed/postgresql/templates/pg_hba.conf
diff --git a/seed/applicationservice/2022.03.08/postgresql/templates/pg_ident.conf b/seed/postgresql/templates/pg_ident.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql/templates/pg_ident.conf
rename to seed/postgresql/templates/pg_ident.conf
diff --git a/seed/applicationservice/2022.03.08/postgresql/templates/postgresql.conf b/seed/postgresql/templates/postgresql.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql/templates/postgresql.conf
rename to seed/postgresql/templates/postgresql.conf
diff --git a/seed/applicationservice/2022.03.08/postgresql/templates/postgresql.crt b/seed/postgresql/templates/postgresql.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql/templates/postgresql.crt
rename to seed/postgresql/templates/postgresql.crt
diff --git a/seed/applicationservice/2022.03.08/postgresql/templates/postgresql.key b/seed/postgresql/templates/postgresql.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql/templates/postgresql.key
rename to seed/postgresql/templates/postgresql.key
diff --git a/seed/applicationservice/2022.03.08/postgresql/templates/postgresql.service b/seed/postgresql/templates/postgresql.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql/templates/postgresql.service
rename to seed/postgresql/templates/postgresql.service
diff --git a/seed/applicationservice/2022.03.08/postgresql/templates/postgresql.sql b/seed/postgresql/templates/postgresql.sql
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql/templates/postgresql.sql
rename to seed/postgresql/templates/postgresql.sql
diff --git a/seed/applicationservice/2022.03.08/postgresql/templates/postgresql_init b/seed/postgresql/templates/postgresql_init
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql/templates/postgresql_init
rename to seed/postgresql/templates/postgresql_init
diff --git a/seed/applicationservice/2022.03.08/postgresql/templates/sysuser-postgresql.conf b/seed/postgresql/templates/sysuser-postgresql.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql/templates/sysuser-postgresql.conf
rename to seed/postgresql/templates/sysuser-postgresql.conf
diff --git a/seed/applicationservice/2022.03.08/provider-systemd-machined/applicationservice.yml b/seed/provider-systemd-machined/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/provider-systemd-machined/applicationservice.yml
rename to seed/provider-systemd-machined/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/provider-systemd-machined/dictionaries/10-machined.xml b/seed/provider-systemd-machined/dictionaries/10-machined.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/provider-systemd-machined/dictionaries/10-machined.xml
rename to seed/provider-systemd-machined/dictionaries/10-machined.xml
diff --git a/seed/applicationservice/2022.03.08/provider-systemd-machined/dictionaries/16-machined.xml b/seed/provider-systemd-machined/dictionaries/16-machined.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/provider-systemd-machined/dictionaries/16-machined.xml
rename to seed/provider-systemd-machined/dictionaries/16-machined.xml
diff --git a/seed/applicationservice/2022.03.08/provider-systemd-machined/extras/machine/11_systemd.xml b/seed/provider-systemd-machined/extras/machine/11_systemd.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/provider-systemd-machined/extras/machine/11_systemd.xml
rename to seed/provider-systemd-machined/extras/machine/11_systemd.xml
diff --git a/seed/applicationservice/2022.03.08/redis-client/applicationservice.yml b/seed/redis-client/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-client/applicationservice.yml
rename to seed/redis-client/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/redis-client/dictionaries/23_redis.xml b/seed/redis-client/dictionaries/23_redis.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-client/dictionaries/23_redis.xml
rename to seed/redis-client/dictionaries/23_redis.xml
diff --git a/seed/applicationservice/2022.03.08/redis-client/templates/ca_Redis.crt b/seed/redis-client/templates/ca_Redis.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-client/templates/ca_Redis.crt
rename to seed/redis-client/templates/ca_Redis.crt
diff --git a/seed/applicationservice/2022.03.08/redis-client/templates/redis.crt b/seed/redis-client/templates/redis.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-client/templates/redis.crt
rename to seed/redis-client/templates/redis.crt
diff --git a/seed/applicationservice/2022.03.08/redis-client/templates/redis.key b/seed/redis-client/templates/redis.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-client/templates/redis.key
rename to seed/redis-client/templates/redis.key
diff --git a/seed/applicationservice/2022.03.08/redis-client/templates/redis.pem b/seed/redis-client/templates/redis.pem
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-client/templates/redis.pem
rename to seed/redis-client/templates/redis.pem
diff --git a/seed/applicationservice/2022.03.08/redis/DEBUG.md b/seed/redis/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis/DEBUG.md
rename to seed/redis/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/redis/applicationservice.yml b/seed/redis/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis/applicationservice.yml
rename to seed/redis/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/redis/creolefuncs/redis.py b/seed/redis/creolefuncs/redis.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis/creolefuncs/redis.py
rename to seed/redis/creolefuncs/redis.py
diff --git a/seed/applicationservice/2022.03.08/redis/dictionaries/90_redis.xml b/seed/redis/dictionaries/90_redis.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis/dictionaries/90_redis.xml
rename to seed/redis/dictionaries/90_redis.xml
diff --git a/seed/applicationservice/2022.03.08/redis/doc.md b/seed/redis/doc.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis/doc.md
rename to seed/redis/doc.md
diff --git a/seed/applicationservice/2022.03.08/redis/extras/account/00_account.xml b/seed/redis/extras/account/00_account.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis/extras/account/00_account.xml
rename to seed/redis/extras/account/00_account.xml
diff --git a/seed/applicationservice/2022.03.08/redis/manual/image/preinstall/redis-server.sh b/seed/redis/manual/image/preinstall/redis-server.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis/manual/image/preinstall/redis-server.sh
rename to seed/redis/manual/image/preinstall/redis-server.sh
diff --git a/seed/applicationservice/2022.03.08/redis/templates/ca_Redis.crt b/seed/redis/templates/ca_Redis.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis/templates/ca_Redis.crt
rename to seed/redis/templates/ca_Redis.crt
diff --git a/seed/applicationservice/2022.03.08/redis/templates/redis.conf b/seed/redis/templates/redis.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis/templates/redis.conf
rename to seed/redis/templates/redis.conf
diff --git a/seed/applicationservice/2022.03.08/redis/templates/redis.crt b/seed/redis/templates/redis.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis/templates/redis.crt
rename to seed/redis/templates/redis.crt
diff --git a/seed/applicationservice/2022.03.08/redis/templates/redis.key b/seed/redis/templates/redis.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis/templates/redis.key
rename to seed/redis/templates/redis.key
diff --git a/seed/applicationservice/2022.03.08/redis/templates/sysuser-redis.conf b/seed/redis/templates/sysuser-redis.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis/templates/sysuser-redis.conf
rename to seed/redis/templates/sysuser-redis.conf
diff --git a/seed/applicationservice/2022.03.08/redis/templates/tmpfile-redis.conf b/seed/redis/templates/tmpfile-redis.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis/templates/tmpfile-redis.conf
rename to seed/redis/templates/tmpfile-redis.conf
diff --git a/seed/applicationservice/2022.03.08/relay-mail-client/applicationservice.yml b/seed/relay-mail-client/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/relay-mail-client/applicationservice.yml
rename to seed/relay-mail-client/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/relay-mail-client/dictionaries/20_smtp_client.xml b/seed/relay-mail-client/dictionaries/20_smtp_client.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/relay-mail-client/dictionaries/20_smtp_client.xml
rename to seed/relay-mail-client/dictionaries/20_smtp_client.xml
diff --git a/seed/applicationservice/2022.03.08/relay-mail-client/templates/ca_MailRelay.crt b/seed/relay-mail-client/templates/ca_MailRelay.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/relay-mail-client/templates/ca_MailRelay.crt
rename to seed/relay-mail-client/templates/ca_MailRelay.crt
diff --git a/seed/applicationservice/2022.03.08/reverse-proxy-client/applicationservice.yml b/seed/reverse-proxy-client/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/reverse-proxy-client/applicationservice.yml
rename to seed/reverse-proxy-client/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/reverse-proxy-client/dictionaries/21_nginx_client.xml b/seed/reverse-proxy-client/dictionaries/21_nginx_client.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/reverse-proxy-client/dictionaries/21_nginx_client.xml
rename to seed/reverse-proxy-client/dictionaries/21_nginx_client.xml
diff --git a/seed/applicationservice/2022.03.08/reverse-proxy-client/doc.md b/seed/reverse-proxy-client/doc.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/reverse-proxy-client/doc.md
rename to seed/reverse-proxy-client/doc.md
diff --git a/seed/applicationservice/2022.03.08/reverse-proxy-client/funcs/revprox_client.py b/seed/reverse-proxy-client/funcs/revprox_client.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/reverse-proxy-client/funcs/revprox_client.py
rename to seed/reverse-proxy-client/funcs/revprox_client.py
diff --git a/seed/applicationservice/2022.03.08/reverse-proxy-client/templates/ca_InternalReverseProxy.crt b/seed/reverse-proxy-client/templates/ca_InternalReverseProxy.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/reverse-proxy-client/templates/ca_InternalReverseProxy.crt
rename to seed/reverse-proxy-client/templates/ca_InternalReverseProxy.crt
diff --git a/seed/applicationservice/2022.03.08/reverse-proxy-client/templates/revprox.crt b/seed/reverse-proxy-client/templates/revprox.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/reverse-proxy-client/templates/revprox.crt
rename to seed/reverse-proxy-client/templates/revprox.crt
diff --git a/seed/applicationservice/2022.03.08/reverse-proxy-client/templates/revprox.key b/seed/reverse-proxy-client/templates/revprox.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/reverse-proxy-client/templates/revprox.key
rename to seed/reverse-proxy-client/templates/revprox.key
diff --git a/seed/applicationservice/2022.03.08/roundcube/DEBUG.md b/seed/roundcube/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/DEBUG.md
rename to seed/roundcube/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/roundcube/applicationservice.yml b/seed/roundcube/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/applicationservice.yml
rename to seed/roundcube/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/roundcube/dictionaries/31_roundcube.xml b/seed/roundcube/dictionaries/31_roundcube.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/dictionaries/31_roundcube.xml
rename to seed/roundcube/dictionaries/31_roundcube.xml
diff --git a/seed/applicationservice/2022.03.08/roundcube/extras/machine/20_roundcube.xml b/seed/roundcube/extras/machine/20_roundcube.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/extras/machine/20_roundcube.xml
rename to seed/roundcube/extras/machine/20_roundcube.xml
diff --git a/seed/applicationservice/2022.03.08/roundcube/funcs/roundcube.py b/seed/roundcube/funcs/roundcube.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/funcs/roundcube.py
rename to seed/roundcube/funcs/roundcube.py
diff --git a/seed/applicationservice/2022.03.08/roundcube/manual/image/postinstall/roundcube.sh b/seed/roundcube/manual/image/postinstall/roundcube.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/manual/image/postinstall/roundcube.sh
rename to seed/roundcube/manual/image/postinstall/roundcube.sh
diff --git a/seed/applicationservice/2022.03.08/roundcube/manual/image/preinstall/roundcube.sh b/seed/roundcube/manual/image/preinstall/roundcube.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/manual/image/preinstall/roundcube.sh
rename to seed/roundcube/manual/image/preinstall/roundcube.sh
diff --git a/seed/applicationservice/2022.03.08/roundcube/templates/ca_MailServer.crt b/seed/roundcube/templates/ca_MailServer.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/templates/ca_MailServer.crt
rename to seed/roundcube/templates/ca_MailServer.crt
diff --git a/seed/applicationservice/2022.03.08/roundcube/templates/config.inc.php b/seed/roundcube/templates/config.inc.php
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/templates/config.inc.php
rename to seed/roundcube/templates/config.inc.php
diff --git a/seed/applicationservice/2022.03.08/roundcube/templates/domain.inc.php b/seed/roundcube/templates/domain.inc.php
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/templates/domain.inc.php
rename to seed/roundcube/templates/domain.inc.php
diff --git a/seed/applicationservice/2022.03.08/roundcube/templates/roundcube-init.php b/seed/roundcube/templates/roundcube-init.php
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/templates/roundcube-init.php
rename to seed/roundcube/templates/roundcube-init.php
diff --git a/seed/applicationservice/2022.03.08/roundcube/templates/roundcube.service b/seed/roundcube/templates/roundcube.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/templates/roundcube.service
rename to seed/roundcube/templates/roundcube.service
diff --git a/seed/applicationservice/2022.03.08/roundcube/templates/roundcubemail.conf b/seed/roundcube/templates/roundcubemail.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/templates/roundcubemail.conf
rename to seed/roundcube/templates/roundcubemail.conf
diff --git a/seed/applicationservice/2022.03.08/roundcube/templates/silique_cloud.svg b/seed/roundcube/templates/silique_cloud.svg
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/templates/silique_cloud.svg
rename to seed/roundcube/templates/silique_cloud.svg
diff --git a/seed/applicationservice/2022.03.08/roundcube/templates/watermark.html b/seed/roundcube/templates/watermark.html
similarity index 100%
rename from seed/applicationservice/2022.03.08/roundcube/templates/watermark.html
rename to seed/roundcube/templates/watermark.html
diff --git a/seed/applicationservice/2022.03.08/server/applicationservice.yml b/seed/server/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/server/applicationservice.yml
rename to seed/server/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/server/doc.md b/seed/server/doc.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/server/doc.md
rename to seed/server/doc.md
diff --git a/seed/applicationservice/2022.03.08/server/extras/accounts/00_accounts.xml b/seed/server/extras/accounts/00_accounts.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/server/extras/accounts/00_accounts.xml
rename to seed/server/extras/accounts/00_accounts.xml
diff --git a/seed/applicationservice/2022.03.08/systemd/applicationservice.yml b/seed/systemd/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/applicationservice.yml
rename to seed/systemd/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/systemd/dictionaries/15-systemd.xml b/seed/systemd/dictionaries/15-systemd.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/dictionaries/15-systemd.xml
rename to seed/systemd/dictionaries/15-systemd.xml
diff --git a/seed/applicationservice/2022.03.08/systemd/extras/machine/10_systemd.xml b/seed/systemd/extras/machine/10_systemd.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/extras/machine/10_systemd.xml
rename to seed/systemd/extras/machine/10_systemd.xml
diff --git a/seed/applicationservice/2022.03.08/systemd/manual/image/postinstall/systemd.sh b/seed/systemd/manual/image/postinstall/systemd.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/manual/image/postinstall/systemd.sh
rename to seed/systemd/manual/image/postinstall/systemd.sh
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/30-swap.conf b/seed/systemd/templates/30-swap.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/30-swap.conf
rename to seed/systemd/templates/30-swap.conf
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/40-tmp.conf b/seed/systemd/templates/40-tmp.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/40-tmp.conf
rename to seed/systemd/templates/40-tmp.conf
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/50-var.conf b/seed/systemd/templates/50-var.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/50-var.conf
rename to seed/systemd/templates/50-var.conf
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/60-srv.conf b/seed/systemd/templates/60-srv.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/60-srv.conf
rename to seed/systemd/templates/60-srv.conf
diff --git "a/seed/applicationservice/2022.03.08/systemd/templates/dev-disk-by\\x2dpartlabel-swap.swap" "b/seed/systemd/templates/dev-disk-by\\x2dpartlabel-swap.swap"
similarity index 100%
rename from "seed/applicationservice/2022.03.08/systemd/templates/dev-disk-by\\x2dpartlabel-swap.swap"
rename to "seed/systemd/templates/dev-disk-by\\x2dpartlabel-swap.swap"
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/include.mount b/seed/systemd/templates/include.mount
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/include.mount
rename to seed/systemd/templates/include.mount
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/link b/seed/systemd/templates/link
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/link
rename to seed/systemd/templates/link
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/network b/seed/systemd/templates/network
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/network
rename to seed/systemd/templates/network
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/risotto-volatile.conf b/seed/systemd/templates/risotto-volatile.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/risotto-volatile.conf
rename to seed/systemd/templates/risotto-volatile.conf
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/root.pwd b/seed/systemd/templates/root.pwd
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/root.pwd
rename to seed/systemd/templates/root.pwd
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/srv.mount b/seed/systemd/templates/srv.mount
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/srv.mount
rename to seed/systemd/templates/srv.mount
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/systemd-firstboot.service b/seed/systemd/templates/systemd-firstboot.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/systemd-firstboot.service
rename to seed/systemd/templates/systemd-firstboot.service
diff --git "a/seed/applicationservice/2022.03.08/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-srv.service" "b/seed/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-srv.service"
similarity index 100%
rename from "seed/applicationservice/2022.03.08/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-srv.service"
rename to "seed/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-srv.service"
diff --git "a/seed/applicationservice/2022.03.08/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-swap.service" "b/seed/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-swap.service"
similarity index 100%
rename from "seed/applicationservice/2022.03.08/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-swap.service"
rename to "seed/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-swap.service"
diff --git "a/seed/applicationservice/2022.03.08/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-var-tmp.service" "b/seed/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-var-tmp.service"
similarity index 100%
rename from "seed/applicationservice/2022.03.08/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-var-tmp.service"
rename to "seed/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-var-tmp.service"
diff --git "a/seed/applicationservice/2022.03.08/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-var.service" "b/seed/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-var.service"
similarity index 100%
rename from "seed/applicationservice/2022.03.08/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-var.service"
rename to "seed/systemd/templates/systemd-makefs@dev-disk-by\\x2dpartlabel-var.service"
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/systemd-makefs@dev-disk-byx2dpartlabel.service b/seed/systemd/templates/systemd-makefs@dev-disk-byx2dpartlabel.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/systemd-makefs@dev-disk-byx2dpartlabel.service
rename to seed/systemd/templates/systemd-makefs@dev-disk-byx2dpartlabel.service
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/systemd-repart.service b/seed/systemd/templates/systemd-repart.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/systemd-repart.service
rename to seed/systemd/templates/systemd-repart.service
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/var-tmp.mount b/seed/systemd/templates/var-tmp.mount
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/var-tmp.mount
rename to seed/systemd/templates/var-tmp.mount
diff --git a/seed/applicationservice/2022.03.08/systemd/templates/var.mount b/seed/systemd/templates/var.mount
similarity index 100%
rename from seed/applicationservice/2022.03.08/systemd/templates/var.mount
rename to seed/systemd/templates/var.mount
diff --git a/seed/applicationservice/2022.03.08/unbound/DEBUG.md b/seed/unbound/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/unbound/DEBUG.md
rename to seed/unbound/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/unbound/applicationservice.yml b/seed/unbound/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/unbound/applicationservice.yml
rename to seed/unbound/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/unbound/dictionaries/20_unbound.xml b/seed/unbound/dictionaries/20_unbound.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/unbound/dictionaries/20_unbound.xml
rename to seed/unbound/dictionaries/20_unbound.xml
diff --git a/seed/applicationservice/2022.03.08/unbound/doc.md b/seed/unbound/doc.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/unbound/doc.md
rename to seed/unbound/doc.md
diff --git a/seed/applicationservice/2022.03.08/unbound/extras/machine/20_unbound.xml b/seed/unbound/extras/machine/20_unbound.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/unbound/extras/machine/20_unbound.xml
rename to seed/unbound/extras/machine/20_unbound.xml
diff --git a/seed/applicationservice/2022.03.08/unbound/funcs/funcs.py b/seed/unbound/funcs/funcs.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/unbound/funcs/funcs.py
rename to seed/unbound/funcs/funcs.py
diff --git a/seed/applicationservice/2022.03.08/unbound/manual/image/preinstall/unbound.sh b/seed/unbound/manual/image/preinstall/unbound.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/unbound/manual/image/preinstall/unbound.sh
rename to seed/unbound/manual/image/preinstall/unbound.sh
diff --git a/seed/applicationservice/2022.03.08/unbound/templates/risotto.conf b/seed/unbound/templates/risotto.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/unbound/templates/risotto.conf
rename to seed/unbound/templates/risotto.conf
diff --git a/seed/applicationservice/2022.03.08/unbound/templates/sysuser-unbound.conf b/seed/unbound/templates/sysuser-unbound.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/unbound/templates/sysuser-unbound.conf
rename to seed/unbound/templates/sysuser-unbound.conf
diff --git a/seed/applicationservice/2022.03.08/unbound/templates/tmpfile-unbound.conf b/seed/unbound/templates/tmpfile-unbound.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/unbound/templates/tmpfile-unbound.conf
rename to seed/unbound/templates/tmpfile-unbound.conf
diff --git a/seed/applicationservice/2022.03.08/unbound/templates/unbound-anchor.service b/seed/unbound/templates/unbound-anchor.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/unbound/templates/unbound-anchor.service
rename to seed/unbound/templates/unbound-anchor.service
diff --git a/seed/applicationservice/2022.03.08/unbound/templates/unbound.conf b/seed/unbound/templates/unbound.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/unbound/templates/unbound.conf
rename to seed/unbound/templates/unbound.conf
diff --git a/seed/applicationservice/2022.03.08/unbound/templates/unbound.service b/seed/unbound/templates/unbound.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/unbound/templates/unbound.service
rename to seed/unbound/templates/unbound.service
diff --git a/seed/applicationservice/2022.03.08/vaultwarden/applicationservice.yml b/seed/vaultwarden/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/vaultwarden/applicationservice.yml
rename to seed/vaultwarden/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/vaultwarden/dictionaries/40_vaultwarden.xml b/seed/vaultwarden/dictionaries/40_vaultwarden.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/vaultwarden/dictionaries/40_vaultwarden.xml
rename to seed/vaultwarden/dictionaries/40_vaultwarden.xml
diff --git a/seed/applicationservice/2022.03.08/vaultwarden/funcs/risotto_setting.py b/seed/vaultwarden/funcs/risotto_setting.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/vaultwarden/funcs/risotto_setting.py
rename to seed/vaultwarden/funcs/risotto_setting.py
diff --git a/seed/applicationservice/2022.03.08/vaultwarden/funcs/vaultwarden.py b/seed/vaultwarden/funcs/vaultwarden.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/vaultwarden/funcs/vaultwarden.py
rename to seed/vaultwarden/funcs/vaultwarden.py
diff --git a/seed/applicationservice/2022.03.08/vaultwarden/manual/image/postinstall/vaultwarden.sh b/seed/vaultwarden/manual/image/postinstall/vaultwarden.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/vaultwarden/manual/image/postinstall/vaultwarden.sh
rename to seed/vaultwarden/manual/image/postinstall/vaultwarden.sh
diff --git a/seed/applicationservice/2022.03.08/vaultwarden/manual/image/preinstall/vaultwarden.sh b/seed/vaultwarden/manual/image/preinstall/vaultwarden.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/vaultwarden/manual/image/preinstall/vaultwarden.sh
rename to seed/vaultwarden/manual/image/preinstall/vaultwarden.sh
diff --git a/seed/applicationservice/2022.03.08/vaultwarden/templates/tmpfile-vaultwarden.conf b/seed/vaultwarden/templates/tmpfile-vaultwarden.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/vaultwarden/templates/tmpfile-vaultwarden.conf
rename to seed/vaultwarden/templates/tmpfile-vaultwarden.conf
diff --git a/seed/applicationservice/2022.03.08/vaultwarden/templates/vaultwarden.service b/seed/vaultwarden/templates/vaultwarden.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/vaultwarden/templates/vaultwarden.service
rename to seed/vaultwarden/templates/vaultwarden.service
diff --git a/seed/applicationservice/2022.03.08/vaultwarden/templates/vaultwarden_config.env b/seed/vaultwarden/templates/vaultwarden_config.env
similarity index 100%
rename from seed/applicationservice/2022.03.08/vaultwarden/templates/vaultwarden_config.env
rename to seed/vaultwarden/templates/vaultwarden_config.env