diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/DEBUG b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/DEBUG
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/DEBUG
rename to seed/applicationservice/2022.03.08/nginx-reverse-proxy/DEBUG
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/applicationservice.yml b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/applicationservice.yml
rename to seed/applicationservice/2022.03.08/nginx-reverse-proxy/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/dictionaries/25_nginx.xml b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/dictionaries/25_nginx.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/dictionaries/25_nginx.xml
rename to seed/applicationservice/2022.03.08/nginx-reverse-proxy/dictionaries/25_nginx.xml
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/extras/machine/20_unbound.xml b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/extras/machine/20_unbound.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/extras/machine/20_unbound.xml
rename to seed/applicationservice/2022.03.08/nginx-reverse-proxy/extras/machine/20_unbound.xml
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/extras/nginx/00-nginx.xml b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/extras/nginx/00-nginx.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/extras/nginx/00-nginx.xml
rename to seed/applicationservice/2022.03.08/nginx-reverse-proxy/extras/nginx/00-nginx.xml
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/funcs/nginx.py b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/funcs/nginx.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/funcs/nginx.py
rename to seed/applicationservice/2022.03.08/nginx-reverse-proxy/funcs/nginx.py
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/ca.crt b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/ca.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/ca.crt
rename to seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/ca.crt
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/ca_InternalReverseProxy.crt b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/ca_InternalReverseProxy.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/ca_InternalReverseProxy.crt
rename to seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/ca_InternalReverseProxy.crt
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/certificate.crt b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/certificate.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/certificate.crt
rename to seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/certificate.crt
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/nginx-options-rp.conf b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/nginx-options-rp.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/nginx-options-rp.conf
rename to seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/nginx-options-rp.conf
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/nginx.index.html b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/nginx.index.html
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/nginx.index.html
rename to seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/nginx.index.html
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/nginx.service b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/nginx.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/nginx.service
rename to seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/nginx.service
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/private.key b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/private.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/private.key
rename to seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/private.key
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/revprox-nginx.conf b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/revprox-nginx.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/nginx-reverse-proxy-server/templates/revprox-nginx.conf
rename to seed/applicationservice/2022.03.08/nginx-reverse-proxy/templates/revprox-nginx.conf
diff --git a/seed/applicationservice/2022.03.08/openldap-server/DEBUG.md b/seed/applicationservice/2022.03.08/openldap/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/DEBUG.md
rename to seed/applicationservice/2022.03.08/openldap/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/openldap-server/README.md b/seed/applicationservice/2022.03.08/openldap/README.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/README.md
rename to seed/applicationservice/2022.03.08/openldap/README.md
diff --git a/seed/applicationservice/2022.03.08/openldap-server/a_voir/sauvegarde/bareos/fichier/annuaire.conf b/seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/bareos/fichier/annuaire.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/a_voir/sauvegarde/bareos/fichier/annuaire.conf
rename to seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/bareos/fichier/annuaire.conf
diff --git a/seed/applicationservice/2022.03.08/openldap-server/a_voir/sauvegarde/bareos/restore/ldap.py b/seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/bareos/restore/ldap.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/a_voir/sauvegarde/bareos/restore/ldap.py
rename to seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/bareos/restore/ldap.py
diff --git a/seed/applicationservice/2022.03.08/openldap-server/a_voir/sauvegarde/extra/schedule/01_annuaire.xml b/seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/extra/schedule/01_annuaire.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/a_voir/sauvegarde/extra/schedule/01_annuaire.xml
rename to seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/extra/schedule/01_annuaire.xml
diff --git a/seed/applicationservice/2022.03.08/openldap-server/a_voir/sauvegarde/schedule/scripts/annuaire b/seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/schedule/scripts/annuaire
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/a_voir/sauvegarde/schedule/scripts/annuaire
rename to seed/applicationservice/2022.03.08/openldap/a_voir/sauvegarde/schedule/scripts/annuaire
diff --git a/seed/applicationservice/2022.03.08/openldap-server/applicationservice.yml b/seed/applicationservice/2022.03.08/openldap/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/applicationservice.yml
rename to seed/applicationservice/2022.03.08/openldap/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/openldap-server/dictionaries/21_openldap-server.xml b/seed/applicationservice/2022.03.08/openldap/dictionaries/21_openldap-server.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/dictionaries/21_openldap-server.xml
rename to seed/applicationservice/2022.03.08/openldap/dictionaries/21_openldap-server.xml
diff --git a/seed/applicationservice/2022.03.08/openldap-server/extras/accounts/00_account.xml b/seed/applicationservice/2022.03.08/openldap/extras/accounts/00_account.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/extras/accounts/00_account.xml
rename to seed/applicationservice/2022.03.08/openldap/extras/accounts/00_account.xml
diff --git a/seed/applicationservice/2022.03.08/openldap-server/funcs/ldap.py b/seed/applicationservice/2022.03.08/openldap/funcs/ldap.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/funcs/ldap.py
rename to seed/applicationservice/2022.03.08/openldap/funcs/ldap.py
diff --git a/seed/applicationservice/2022.03.08/openldap-server/ldap.service b/seed/applicationservice/2022.03.08/openldap/ldap.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/ldap.service
rename to seed/applicationservice/2022.03.08/openldap/ldap.service
diff --git a/seed/applicationservice/2022.03.08/openldap-server/manual/image/postinstall/openldap_server.sh b/seed/applicationservice/2022.03.08/openldap/manual/image/postinstall/openldap_server.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/manual/image/postinstall/openldap_server.sh
rename to seed/applicationservice/2022.03.08/openldap/manual/image/postinstall/openldap_server.sh
diff --git a/seed/applicationservice/2022.03.08/openldap-server/manual/image/preinstall/openldap_server.sh b/seed/applicationservice/2022.03.08/openldap/manual/image/preinstall/openldap_server.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/manual/image/preinstall/openldap_server.sh
rename to seed/applicationservice/2022.03.08/openldap/manual/image/preinstall/openldap_server.sh
diff --git a/seed/applicationservice/2022.03.08/openldap-server/templates/DB_CONFIG b/seed/applicationservice/2022.03.08/openldap/templates/DB_CONFIG
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/templates/DB_CONFIG
rename to seed/applicationservice/2022.03.08/openldap/templates/DB_CONFIG
diff --git a/seed/applicationservice/2022.03.08/openldap-server/templates/admin_ldap.pwd b/seed/applicationservice/2022.03.08/openldap/templates/admin_ldap.pwd
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/templates/admin_ldap.pwd
rename to seed/applicationservice/2022.03.08/openldap/templates/admin_ldap.pwd
diff --git a/seed/applicationservice/2022.03.08/openldap-server/templates/config.ldif b/seed/applicationservice/2022.03.08/openldap/templates/config.ldif
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/templates/config.ldif
rename to seed/applicationservice/2022.03.08/openldap/templates/config.ldif
diff --git a/seed/applicationservice/2022.03.08/openldap-server/templates/config_acl.ldif b/seed/applicationservice/2022.03.08/openldap/templates/config_acl.ldif
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/templates/config_acl.ldif
rename to seed/applicationservice/2022.03.08/openldap/templates/config_acl.ldif
diff --git a/seed/applicationservice/2022.03.08/openldap-server/templates/default.slapd b/seed/applicationservice/2022.03.08/openldap/templates/default.slapd
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/templates/default.slapd
rename to seed/applicationservice/2022.03.08/openldap/templates/default.slapd
diff --git a/seed/applicationservice/2022.03.08/openldap-server/templates/openldap.crt b/seed/applicationservice/2022.03.08/openldap/templates/openldap.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/templates/openldap.crt
rename to seed/applicationservice/2022.03.08/openldap/templates/openldap.crt
diff --git a/seed/applicationservice/2022.03.08/openldap-server/templates/openldap.key b/seed/applicationservice/2022.03.08/openldap/templates/openldap.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/templates/openldap.key
rename to seed/applicationservice/2022.03.08/openldap/templates/openldap.key
diff --git a/seed/applicationservice/2022.03.08/openldap-server/templates/replication.conf b/seed/applicationservice/2022.03.08/openldap/templates/replication.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/templates/replication.conf
rename to seed/applicationservice/2022.03.08/openldap/templates/replication.conf
diff --git a/seed/applicationservice/2022.03.08/openldap-server/templates/risotto-openldap.conf b/seed/applicationservice/2022.03.08/openldap/templates/risotto-openldap.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/templates/risotto-openldap.conf
rename to seed/applicationservice/2022.03.08/openldap/templates/risotto-openldap.conf
diff --git a/seed/applicationservice/2022.03.08/openldap-server/templates/slapd.service b/seed/applicationservice/2022.03.08/openldap/templates/slapd.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/templates/slapd.service
rename to seed/applicationservice/2022.03.08/openldap/templates/slapd.service
diff --git a/seed/applicationservice/2022.03.08/openldap-server/templates/tmpfile-openldap-server.conf b/seed/applicationservice/2022.03.08/openldap/templates/tmpfile-openldap-server.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/templates/tmpfile-openldap-server.conf
rename to seed/applicationservice/2022.03.08/openldap/templates/tmpfile-openldap-server.conf
diff --git a/seed/applicationservice/2022.03.08/openldap-server/templates/users.ldif b/seed/applicationservice/2022.03.08/openldap/templates/users.ldif
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/templates/users.ldif
rename to seed/applicationservice/2022.03.08/openldap/templates/users.ldif
diff --git a/seed/applicationservice/2022.03.08/openldap-server/templates/users_mod.ldif b/seed/applicationservice/2022.03.08/openldap/templates/users_mod.ldif
similarity index 100%
rename from seed/applicationservice/2022.03.08/openldap-server/templates/users_mod.ldif
rename to seed/applicationservice/2022.03.08/openldap/templates/users_mod.ldif
diff --git a/seed/applicationservice/2022.03.08/postgresql-server/applicationservice.yml b/seed/applicationservice/2022.03.08/postgresql/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-server/applicationservice.yml
rename to seed/applicationservice/2022.03.08/postgresql/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/postgresql-server/dictionaries/22_postgresql.xml b/seed/applicationservice/2022.03.08/postgresql/dictionaries/22_postgresql.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-server/dictionaries/22_postgresql.xml
rename to seed/applicationservice/2022.03.08/postgresql/dictionaries/22_postgresql.xml
diff --git a/seed/applicationservice/2022.03.08/postgresql-server/manual/image/preinstall/postgresql_server.sh b/seed/applicationservice/2022.03.08/postgresql/manual/image/preinstall/postgresql_server.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-server/manual/image/preinstall/postgresql_server.sh
rename to seed/applicationservice/2022.03.08/postgresql/manual/image/preinstall/postgresql_server.sh
diff --git a/seed/applicationservice/2022.03.08/postgresql-server/templates/ca_PostgreSQL.crt b/seed/applicationservice/2022.03.08/postgresql/templates/ca_PostgreSQL.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-server/templates/ca_PostgreSQL.crt
rename to seed/applicationservice/2022.03.08/postgresql/templates/ca_PostgreSQL.crt
diff --git a/seed/applicationservice/2022.03.08/postgresql-server/templates/pg_hba.conf b/seed/applicationservice/2022.03.08/postgresql/templates/pg_hba.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-server/templates/pg_hba.conf
rename to seed/applicationservice/2022.03.08/postgresql/templates/pg_hba.conf
diff --git a/seed/applicationservice/2022.03.08/postgresql-server/templates/pg_ident.conf b/seed/applicationservice/2022.03.08/postgresql/templates/pg_ident.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-server/templates/pg_ident.conf
rename to seed/applicationservice/2022.03.08/postgresql/templates/pg_ident.conf
diff --git a/seed/applicationservice/2022.03.08/postgresql-server/templates/postgresql.conf b/seed/applicationservice/2022.03.08/postgresql/templates/postgresql.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-server/templates/postgresql.conf
rename to seed/applicationservice/2022.03.08/postgresql/templates/postgresql.conf
diff --git a/seed/applicationservice/2022.03.08/postgresql-server/templates/postgresql.crt b/seed/applicationservice/2022.03.08/postgresql/templates/postgresql.crt
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-server/templates/postgresql.crt
rename to seed/applicationservice/2022.03.08/postgresql/templates/postgresql.crt
diff --git a/seed/applicationservice/2022.03.08/postgresql-server/templates/postgresql.key b/seed/applicationservice/2022.03.08/postgresql/templates/postgresql.key
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-server/templates/postgresql.key
rename to seed/applicationservice/2022.03.08/postgresql/templates/postgresql.key
diff --git a/seed/applicationservice/2022.03.08/postgresql-server/templates/postgresql.service b/seed/applicationservice/2022.03.08/postgresql/templates/postgresql.service
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-server/templates/postgresql.service
rename to seed/applicationservice/2022.03.08/postgresql/templates/postgresql.service
diff --git a/seed/applicationservice/2022.03.08/postgresql-server/templates/postgresql.sql b/seed/applicationservice/2022.03.08/postgresql/templates/postgresql.sql
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-server/templates/postgresql.sql
rename to seed/applicationservice/2022.03.08/postgresql/templates/postgresql.sql
diff --git a/seed/applicationservice/2022.03.08/postgresql-server/templates/postgresql_init b/seed/applicationservice/2022.03.08/postgresql/templates/postgresql_init
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-server/templates/postgresql_init
rename to seed/applicationservice/2022.03.08/postgresql/templates/postgresql_init
diff --git a/seed/applicationservice/2022.03.08/postgresql-server/templates/sysuser-postgresql.conf b/seed/applicationservice/2022.03.08/postgresql/templates/sysuser-postgresql.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/postgresql-server/templates/sysuser-postgresql.conf
rename to seed/applicationservice/2022.03.08/postgresql/templates/sysuser-postgresql.conf
diff --git a/seed/applicationservice/2022.03.08/redis-server/DEBUG.md b/seed/applicationservice/2022.03.08/redis/DEBUG.md
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-server/DEBUG.md
rename to seed/applicationservice/2022.03.08/redis/DEBUG.md
diff --git a/seed/applicationservice/2022.03.08/redis-server/applicationservice.yml b/seed/applicationservice/2022.03.08/redis/applicationservice.yml
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-server/applicationservice.yml
rename to seed/applicationservice/2022.03.08/redis/applicationservice.yml
diff --git a/seed/applicationservice/2022.03.08/redis-server/creolefuncs/redis.py b/seed/applicationservice/2022.03.08/redis/creolefuncs/redis.py
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-server/creolefuncs/redis.py
rename to seed/applicationservice/2022.03.08/redis/creolefuncs/redis.py
diff --git a/seed/applicationservice/2022.03.08/redis-server/dictionaries/90_redis.xml b/seed/applicationservice/2022.03.08/redis/dictionaries/90_redis.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-server/dictionaries/90_redis.xml
rename to seed/applicationservice/2022.03.08/redis/dictionaries/90_redis.xml
diff --git a/seed/applicationservice/2022.03.08/redis-server/extras/account/00_account.xml b/seed/applicationservice/2022.03.08/redis/extras/account/00_account.xml
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-server/extras/account/00_account.xml
rename to seed/applicationservice/2022.03.08/redis/extras/account/00_account.xml
diff --git a/seed/applicationservice/2022.03.08/redis-server/manual/image/preinstall/redis-server.sh b/seed/applicationservice/2022.03.08/redis/manual/image/preinstall/redis-server.sh
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-server/manual/image/preinstall/redis-server.sh
rename to seed/applicationservice/2022.03.08/redis/manual/image/preinstall/redis-server.sh
diff --git a/seed/applicationservice/2022.03.08/redis-server/templates/redis.conf b/seed/applicationservice/2022.03.08/redis/templates/redis.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-server/templates/redis.conf
rename to seed/applicationservice/2022.03.08/redis/templates/redis.conf
diff --git a/seed/applicationservice/2022.03.08/redis-server/templates/sysuser-redis.conf b/seed/applicationservice/2022.03.08/redis/templates/sysuser-redis.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-server/templates/sysuser-redis.conf
rename to seed/applicationservice/2022.03.08/redis/templates/sysuser-redis.conf
diff --git a/seed/applicationservice/2022.03.08/redis-server/templates/tmpfile-redis.conf b/seed/applicationservice/2022.03.08/redis/templates/tmpfile-redis.conf
similarity index 100%
rename from seed/applicationservice/2022.03.08/redis-server/templates/tmpfile-redis.conf
rename to seed/applicationservice/2022.03.08/redis/templates/tmpfile-redis.conf