diff --git a/app/config/secrets/.gitignore b/app/.gitignore
similarity index 82%
rename from app/config/secrets/.gitignore
rename to app/.gitignore
index 2ff3cd5..cc6b143 100644
--- a/app/config/secrets/.gitignore
+++ b/app/.gitignore
@@ -1,6 +1,6 @@
 # Blacklist everything cleverly
-*
-!*/
+*/secrets/*
+!*/secrets/*/
 
 # Whitelist some patterns
 !*.sample
diff --git a/app/build/README.md b/app/README.md
similarity index 100%
rename from app/build/README.md
rename to app/README.md
diff --git a/app/build/backup-consul/Dockerfile b/app/backup/build/backup-consul/Dockerfile
similarity index 100%
rename from app/build/backup-consul/Dockerfile
rename to app/backup/build/backup-consul/Dockerfile
diff --git a/app/build/backup-consul/do_backup.sh b/app/backup/build/backup-consul/do_backup.sh
similarity index 100%
rename from app/build/backup-consul/do_backup.sh
rename to app/backup/build/backup-consul/do_backup.sh
diff --git a/app/deployment/backup.hcl b/app/backup/deploy/backup.hcl
similarity index 100%
rename from app/deployment/backup.hcl
rename to app/backup/deploy/backup.hcl
diff --git a/app/build/blog-quentin/.dockerenv b/app/build/blog-quentin/.dockerenv
deleted file mode 100755
index e69de29..0000000
diff --git a/app/build/blog-quentin/Dockerfile b/app/build/blog-quentin/Dockerfile
deleted file mode 100644
index 61f5c40..0000000
--- a/app/build/blog-quentin/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM amd64/debian:stretch as builder
-
-COPY ./quentin.dufour.io/Gemfile /root/quentin.dufour.io/Gemfile
-
-WORKDIR /root/quentin.dufour.io
-
-RUN apt-get update && \
-    apt-get install -y ruby-dev gem build-essential bundler zlib1g-dev libxml2-dev && \
-    bundle install
-
-COPY ./quentin.dufour.io/ /root/quentin.dufour.io/
-RUN bundle exec jekyll build
-
-FROM superboum/amd64_webserver:v2
-COPY --from=builder /root/quentin.dufour.io/_site /srv/http
-
diff --git a/app/build/blog-quentin/README.md b/app/build/blog-quentin/README.md
deleted file mode 100644
index 25ac463..0000000
--- a/app/build/blog-quentin/README.md
+++ /dev/null
@@ -1 +0,0 @@
-sudo docker build -t superboum/amd64_blog:v19 .
diff --git a/app/build/coturn/Dockerfile b/app/build/coturn/Dockerfile
deleted file mode 100644
index 0d23161..0000000
--- a/app/build/coturn/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM amd64/debian:buster
-
-RUN apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install -y \
-      coturn
-
-CMD ["/usr/bin/turnserver"]
diff --git a/app/build/coturn/README.md b/app/build/coturn/README.md
deleted file mode 100644
index e882146..0000000
--- a/app/build/coturn/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
-## Génère l'image
-```
-sudo docker build -t registry.gitlab.com/superboum/ankh-morpork/amd64_coturn:v1 .
-```
-
-## Run bash dans le container
-```
-sudo docker run --rm -t -i registry.gitlab.com/superboum/ankh-morpork/amd64_coturn:v1 bash
-sudo docker run --rm -t -i -p 3478:3478/udp -p 3479:3479/udp -p 3478:3478/tcp -p 3479:3479/tcp registry.gitlab.com/superboum/ankh-morpork/amd64_coturn:v1 
-```
-
-## Used ports
-- udp/tcp 3478 3479 
-
-## Publish
-sudo docker push registry.gitlab.com/superboum/ankh-morpork/amd64_coturn:v1
diff --git a/app/build/landing/README.md b/app/build/landing/README.md
deleted file mode 100644
index 5d2cb2b..0000000
--- a/app/build/landing/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-```
-docker build -t superboum/amd64_landing:v8 .
-```
diff --git a/app/build/static/Dockerfile b/app/build/static/Dockerfile
deleted file mode 100644
index cdba59a..0000000
--- a/app/build/static/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM golang:1.11.1-stretch as builder
-
-COPY ./goStatic /goStatic
-WORKDIR /goStatic
-RUN CGO_ENABLED=0 go build -a -o web-server .
-
-FROM scratch
-COPY --from=builder /goStatic/web-server /
-ENTRYPOINT ["/web-server"]
diff --git a/app/build/static/README.md b/app/build/static/README.md
deleted file mode 100644
index d50390c..0000000
--- a/app/build/static/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-```
-sudo docker build -t superboum/amd64_webserver:v3 .
-sudo docker push superboum/amd64_webserver:v3
-``` 
diff --git a/app/build/static/goStatic b/app/build/static/goStatic
deleted file mode 160000
index 3f97f57..0000000
--- a/app/build/static/goStatic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3f97f57aaee09a142afe3ca0f1a5d51acd856436
diff --git a/app/config/secrets/seafile/conf/mykey.peer.sample b/app/config/secrets/seafile/conf/mykey.peer.sample
deleted file mode 100644
index e69de29..0000000
diff --git a/app/deployment/core.hcl b/app/core/deploy/core.hcl
similarity index 100%
rename from app/deployment/core.hcl
rename to app/core/deploy/core.hcl
diff --git a/app/config/configuration/directory/bottin/config.json b/app/directory/config/bottin/config.json
similarity index 100%
rename from app/config/configuration/directory/bottin/config.json
rename to app/directory/config/bottin/config.json
diff --git a/app/config/configuration/directory/guichet/config.json.tpl b/app/directory/config/guichet/config.json.tpl
similarity index 100%
rename from app/config/configuration/directory/guichet/config.json.tpl
rename to app/directory/config/guichet/config.json.tpl
diff --git a/app/deployment/directory.hcl b/app/directory/deploy/directory.hcl
similarity index 93%
rename from app/deployment/directory.hcl
rename to app/directory/deploy/directory.hcl
index 0acc08f..a6eb885 100644
--- a/app/deployment/directory.hcl
+++ b/app/directory/deploy/directory.hcl
@@ -35,7 +35,7 @@ job "directory" {
       }
 
       template {
-        data = file("../config/configuration/directory/bottin/config.json")
+        data = file("../config/bottin/config.json")
         destination = "secrets/config.json"
       }
 
@@ -78,7 +78,7 @@ job "directory" {
       }
 
       template {
-        data = file("../config/configuration/directory/guichet/config.json.tpl")
+        data = file("../config/guichet/config.json.tpl")
         destination = "secrets/config.json"
       }
 
diff --git a/app/build/docker-compose.yml b/app/docker-compose.yml
similarity index 79%
rename from app/build/docker-compose.yml
rename to app/docker-compose.yml
index f58bf1f..df7fee4 100644
--- a/app/build/docker-compose.yml
+++ b/app/docker-compose.yml
@@ -3,7 +3,7 @@ services:
 
   mariadb:
     build:
-      context: ./mariadb
+      context: ./seafile/build/mariadb
       args:
         VERSION: 4 # fake for now
     image: superboum/amd64_mariadb:v4 
@@ -11,7 +11,7 @@ services:
   # Instant Messaging
   riot:
     build:
-      context: ./riotweb
+      context: ./im/build/riotweb
       args:
         # https://github.com/vector-im/riot-web/releases
         VERSION: 1.7.16
@@ -19,7 +19,7 @@ services:
 
   synapse:
     build: 
-      context: ./matrix-synapse
+      context: ./im/build/matrix-synapse
       args:
         # https://github.com/matrix-org/synapse/releases
         VERSION: 1.25.0
@@ -28,7 +28,7 @@ services:
   # Email
   sogo:
     build:
-      context: ./sogo
+      context: ./email/build/sogo
       args:
         # fake for now
         VERSION: 5.0.0
@@ -36,7 +36,7 @@ services:
 
   alps:
     build:
-      context: ./alps
+      context: ./email/build/alps
       args:
         VERSION: 5cef0aaff2b8b6ee3e00b566123517e241d8cfb8
     image: superboum/amd64_alps:v1
@@ -44,7 +44,7 @@ services:
   # VoIP
   jitsi-meet:
     build:
-      context: ./jitsi-meet
+      context: ./jitsi/build/jitsi-meet
       args:
         # https://github.com/jitsi/jitsi-meet
         PREFIXV: stable/jitsi-meet_
@@ -53,7 +53,7 @@ services:
 
   jitsi-conference-focus:
     build:
-      context: ./jitsi-conference-focus
+      context: ./jitsi/build/jitsi-conference-focus
       args:
         # https://github.com/jitsi/jicofo
         PREFIXV: stable/jitsi-meet_
@@ -62,7 +62,7 @@ services:
 
   jitsi-videobridge:
     build:
-      context: ./jitsi-videobridge
+      context: ./jitsi/build/jitsi-videobridge
       args:
         # https://github.com/jitsi/jitsi-videobridge
         PREFIXV: stable/jitsi-meet_
@@ -71,21 +71,21 @@ services:
 
   jitsi-xmpp:
     build:
-      context: ./jitsi-xmpp
+      context: ./jitsi/build/jitsi-xmpp
       args:
         VERSION: 0.11.2-1
     image: superboum/amd64_jitsi_xmpp:v8
 
   plume:
     build:
-      context: ./plume
+      context: ./plume/build/plume
       args:
         VERSION: 0.6.0
     image: superboum/plume:v2
 
   postfix:
     build:
-      context: ./postfix
+      context: ./email/build/postfix
       args:
         # https://packages.debian.org/fr/buster/postfix
         VERSION: 3.4.14-0+deb10u1
diff --git a/app/build/alps/Dockerfile b/app/email/build/alps/Dockerfile
similarity index 100%
rename from app/build/alps/Dockerfile
rename to app/email/build/alps/Dockerfile
diff --git a/app/build/alps/skipverify.patch b/app/email/build/alps/skipverify.patch
similarity index 100%
rename from app/build/alps/skipverify.patch
rename to app/email/build/alps/skipverify.patch
diff --git a/app/build/dovecot/.gitignore b/app/email/build/dovecot/.gitignore
similarity index 100%
rename from app/build/dovecot/.gitignore
rename to app/email/build/dovecot/.gitignore
diff --git a/app/build/dovecot/Dockerfile b/app/email/build/dovecot/Dockerfile
similarity index 100%
rename from app/build/dovecot/Dockerfile
rename to app/email/build/dovecot/Dockerfile
diff --git a/app/build/dovecot/README.md b/app/email/build/dovecot/README.md
similarity index 100%
rename from app/build/dovecot/README.md
rename to app/email/build/dovecot/README.md
diff --git a/app/build/dovecot/conf/all_before.sieve b/app/email/build/dovecot/conf/all_before.sieve
similarity index 100%
rename from app/build/dovecot/conf/all_before.sieve
rename to app/email/build/dovecot/conf/all_before.sieve
diff --git a/app/build/dovecot/conf/dovecot-ldap.sample.conf b/app/email/build/dovecot/conf/dovecot-ldap.sample.conf
similarity index 100%
rename from app/build/dovecot/conf/dovecot-ldap.sample.conf
rename to app/email/build/dovecot/conf/dovecot-ldap.sample.conf
diff --git a/app/build/dovecot/conf/dovecot.conf b/app/email/build/dovecot/conf/dovecot.conf
similarity index 100%
rename from app/build/dovecot/conf/dovecot.conf
rename to app/email/build/dovecot/conf/dovecot.conf
diff --git a/app/build/dovecot/conf/report-ham.sieve b/app/email/build/dovecot/conf/report-ham.sieve
similarity index 100%
rename from app/build/dovecot/conf/report-ham.sieve
rename to app/email/build/dovecot/conf/report-ham.sieve
diff --git a/app/build/dovecot/conf/report-spam.sieve b/app/email/build/dovecot/conf/report-spam.sieve
similarity index 100%
rename from app/build/dovecot/conf/report-spam.sieve
rename to app/email/build/dovecot/conf/report-spam.sieve
diff --git a/app/build/dovecot/entrypoint.sh b/app/email/build/dovecot/entrypoint.sh
similarity index 100%
rename from app/build/dovecot/entrypoint.sh
rename to app/email/build/dovecot/entrypoint.sh
diff --git a/app/build/opendkim/Dockerfile b/app/email/build/opendkim/Dockerfile
similarity index 100%
rename from app/build/opendkim/Dockerfile
rename to app/email/build/opendkim/Dockerfile
diff --git a/app/build/opendkim/README.md b/app/email/build/opendkim/README.md
similarity index 100%
rename from app/build/opendkim/README.md
rename to app/email/build/opendkim/README.md
diff --git a/app/build/opendkim/opendkim.conf b/app/email/build/opendkim/opendkim.conf
similarity index 100%
rename from app/build/opendkim/opendkim.conf
rename to app/email/build/opendkim/opendkim.conf
diff --git a/app/build/postfix/Dockerfile b/app/email/build/postfix/Dockerfile
similarity index 100%
rename from app/build/postfix/Dockerfile
rename to app/email/build/postfix/Dockerfile
diff --git a/app/build/postfix/README.md b/app/email/build/postfix/README.md
similarity index 100%
rename from app/build/postfix/README.md
rename to app/email/build/postfix/README.md
diff --git a/app/build/postfix/entrypoint.sh b/app/email/build/postfix/entrypoint.sh
similarity index 100%
rename from app/build/postfix/entrypoint.sh
rename to app/email/build/postfix/entrypoint.sh
diff --git a/app/build/sogo/Dockerfile b/app/email/build/sogo/Dockerfile
similarity index 100%
rename from app/build/sogo/Dockerfile
rename to app/email/build/sogo/Dockerfile
diff --git a/app/build/sogo/README.md b/app/email/build/sogo/README.md
similarity index 100%
rename from app/build/sogo/README.md
rename to app/email/build/sogo/README.md
diff --git a/app/build/sogo/entrypoint b/app/email/build/sogo/entrypoint
similarity index 100%
rename from app/build/sogo/entrypoint
rename to app/email/build/sogo/entrypoint
diff --git a/app/build/sogo/sogo.nginx.conf b/app/email/build/sogo/sogo.nginx.conf
similarity index 100%
rename from app/build/sogo/sogo.nginx.conf
rename to app/email/build/sogo/sogo.nginx.conf
diff --git a/app/config/configuration/email/dkim/keytable b/app/email/config/dkim/keytable
similarity index 100%
rename from app/config/configuration/email/dkim/keytable
rename to app/email/config/dkim/keytable
diff --git a/app/config/configuration/email/dkim/signingtable b/app/email/config/dkim/signingtable
similarity index 100%
rename from app/config/configuration/email/dkim/signingtable
rename to app/email/config/dkim/signingtable
diff --git a/app/config/configuration/email/dkim/smtp.private.sample b/app/email/config/dkim/smtp.private.sample
similarity index 100%
rename from app/config/configuration/email/dkim/smtp.private.sample
rename to app/email/config/dkim/smtp.private.sample
diff --git a/app/config/configuration/email/dkim/smtp.txt.sample b/app/email/config/dkim/smtp.txt.sample
similarity index 100%
rename from app/config/configuration/email/dkim/smtp.txt.sample
rename to app/email/config/dkim/smtp.txt.sample
diff --git a/app/config/configuration/email/dkim/trusted b/app/email/config/dkim/trusted
similarity index 100%
rename from app/config/configuration/email/dkim/trusted
rename to app/email/config/dkim/trusted
diff --git a/app/config/configuration/email/dovecot/certs.gen b/app/email/config/dovecot/certs.gen
similarity index 100%
rename from app/config/configuration/email/dovecot/certs.gen
rename to app/email/config/dovecot/certs.gen
diff --git a/app/config/configuration/email/dovecot/dovecot-ldap.conf.tpl b/app/email/config/dovecot/dovecot-ldap.conf.tpl
similarity index 100%
rename from app/config/configuration/email/dovecot/dovecot-ldap.conf.tpl
rename to app/email/config/dovecot/dovecot-ldap.conf.tpl
diff --git a/app/config/configuration/email/postfix/certs.gen b/app/email/config/postfix/certs.gen
similarity index 100%
rename from app/config/configuration/email/postfix/certs.gen
rename to app/email/config/postfix/certs.gen
diff --git a/app/config/configuration/email/postfix/dynamicmaps.cf b/app/email/config/postfix/dynamicmaps.cf
similarity index 100%
rename from app/config/configuration/email/postfix/dynamicmaps.cf
rename to app/email/config/postfix/dynamicmaps.cf
diff --git a/app/config/configuration/email/postfix/header_checks b/app/email/config/postfix/header_checks
similarity index 100%
rename from app/config/configuration/email/postfix/header_checks
rename to app/email/config/postfix/header_checks
diff --git a/app/config/configuration/email/postfix/ldap-account.cf.tpl b/app/email/config/postfix/ldap-account.cf.tpl
similarity index 100%
rename from app/config/configuration/email/postfix/ldap-account.cf.tpl
rename to app/email/config/postfix/ldap-account.cf.tpl
diff --git a/app/config/configuration/email/postfix/ldap-alias.cf.tpl b/app/email/config/postfix/ldap-alias.cf.tpl
similarity index 100%
rename from app/config/configuration/email/postfix/ldap-alias.cf.tpl
rename to app/email/config/postfix/ldap-alias.cf.tpl
diff --git a/app/config/configuration/email/postfix/ldap-virtual-domains.cf.tpl b/app/email/config/postfix/ldap-virtual-domains.cf.tpl
similarity index 100%
rename from app/config/configuration/email/postfix/ldap-virtual-domains.cf.tpl
rename to app/email/config/postfix/ldap-virtual-domains.cf.tpl
diff --git a/app/config/configuration/email/postfix/main.cf b/app/email/config/postfix/main.cf
similarity index 100%
rename from app/config/configuration/email/postfix/main.cf
rename to app/email/config/postfix/main.cf
diff --git a/app/config/configuration/email/postfix/master.cf b/app/email/config/postfix/master.cf
similarity index 100%
rename from app/config/configuration/email/postfix/master.cf
rename to app/email/config/postfix/master.cf
diff --git a/app/config/configuration/email/postfix/transport b/app/email/config/postfix/transport
similarity index 100%
rename from app/config/configuration/email/postfix/transport
rename to app/email/config/postfix/transport
diff --git a/app/config/configuration/email/postfix/transport.db b/app/email/config/postfix/transport.db
similarity index 100%
rename from app/config/configuration/email/postfix/transport.db
rename to app/email/config/postfix/transport.db
diff --git a/app/config/configuration/email/sogo/sogo.conf.tpl b/app/email/config/sogo/sogo.conf.tpl
similarity index 100%
rename from app/config/configuration/email/sogo/sogo.conf.tpl
rename to app/email/config/sogo/sogo.conf.tpl
diff --git a/app/deployment/email.hcl b/app/email/deploy/email.hcl
similarity index 91%
rename from app/deployment/email.hcl
rename to app/email/deploy/email.hcl
index 3d9e15b..bef7268 100644
--- a/app/deployment/email.hcl
+++ b/app/email/deploy/email.hcl
@@ -131,7 +131,7 @@ job "email" {
       }
 
       template {
-        data = file("../config/configuration/email/dovecot/dovecot-ldap.conf.tpl")
+        data = file("../config/dovecot/dovecot-ldap.conf.tpl")
         destination = "secrets/conf/dovecot-ldap.conf"
         perms = "400"
       }
@@ -200,15 +200,15 @@ job "email" {
       }
 
       template {
-        data = file("../config/configuration/email/dkim/keytable")
+        data = file("../config/dkim/keytable")
         destination = "secrets/dkim/keytable"
       }
       template {
-        data = file("../config/configuration/email/dkim/signingtable")
+        data = file("../config/dkim/signingtable")
         destination = "secrets/dkim/signingtable"
       }
       template {
-        data = file("../config/configuration/email/dkim/trusted")
+        data = file("../config/dkim/trusted")
         destination = "secrets/dkim/trusted"
       }
 
@@ -329,42 +329,42 @@ job "email" {
       }
 
       template {
-        data = file("../config/configuration/email/postfix/ldap-account.cf.tpl")
+        data = file("../config/postfix/ldap-account.cf.tpl")
         destination = "secrets/postfix/ldap-account.cf"
       }
 
       template {
-        data = file("../config/configuration/email/postfix/ldap-alias.cf.tpl")
+        data = file("../config/postfix/ldap-alias.cf.tpl")
         destination = "secrets/postfix/ldap-alias.cf"
       }
 
       template {
-        data = file("../config/configuration/email/postfix/ldap-virtual-domains.cf.tpl")
+        data = file("../config/postfix/ldap-virtual-domains.cf.tpl")
         destination = "secrets/postfix/ldap-virtual-domains.cf"
       }
  
       template {
-        data = file("../config/configuration/email/postfix/dynamicmaps.cf")
+        data = file("../config/postfix/dynamicmaps.cf")
         destination = "secrets/postfix/dynamicmaps.cf"
       }
 
       template {
-        data = file("../config/configuration/email/postfix/header_checks")
+        data = file("../config/postfix/header_checks")
         destination = "secrets/postfix/header_checks"
       }
 
       template {
-        data = file("../config/configuration/email/postfix/main.cf")
+        data = file("../config/postfix/main.cf")
         destination = "secrets/postfix/main.cf"
       }
 
       template {
-        data = file("../config/configuration/email/postfix/master.cf")
+        data = file("../config/postfix/master.cf")
         destination = "secrets/postfix/master.cf"
       }
 
       template {
-        data = file("../config/configuration/email/postfix/transport")
+        data = file("../config/postfix/transport")
         destination = "secrets/postfix/transport"
       }
 
@@ -450,7 +450,7 @@ job "email" {
       }
 
       template {
-        data = file("../config/configuration/email/sogo/sogo.conf.tpl")
+        data = file("../config/sogo/sogo.conf.tpl")
         destination = "secrets/sogo.conf"
       }
 
diff --git a/app/config/secrets/email/dkim/smtp.private.sample b/app/email/secrets/email/dkim/smtp.private.sample
similarity index 100%
rename from app/config/secrets/email/dkim/smtp.private.sample
rename to app/email/secrets/email/dkim/smtp.private.sample
diff --git a/app/config/secrets/email/dovecot/dovecot.crt.sample b/app/email/secrets/email/dovecot/dovecot.crt.sample
similarity index 100%
rename from app/config/secrets/email/dovecot/dovecot.crt.sample
rename to app/email/secrets/email/dovecot/dovecot.crt.sample
diff --git a/app/config/secrets/email/dovecot/dovecot.key.sample b/app/email/secrets/email/dovecot/dovecot.key.sample
similarity index 100%
rename from app/config/secrets/email/dovecot/dovecot.key.sample
rename to app/email/secrets/email/dovecot/dovecot.key.sample
diff --git a/app/config/secrets/chat/synapse/ldap_binddn.sample b/app/email/secrets/email/dovecot/ldap_binddn.sample
similarity index 100%
rename from app/config/secrets/chat/synapse/ldap_binddn.sample
rename to app/email/secrets/email/dovecot/ldap_binddn.sample
diff --git a/app/config/secrets/email/dovecot/ldap_bindpwd.sample b/app/email/secrets/email/dovecot/ldap_bindpwd.sample
similarity index 100%
rename from app/config/secrets/email/dovecot/ldap_bindpwd.sample
rename to app/email/secrets/email/dovecot/ldap_bindpwd.sample
diff --git a/app/config/secrets/email/postfix/postfix.crt.sample b/app/email/secrets/email/postfix/postfix.crt.sample
similarity index 100%
rename from app/config/secrets/email/postfix/postfix.crt.sample
rename to app/email/secrets/email/postfix/postfix.crt.sample
diff --git a/app/config/secrets/email/postfix/postfix.key.sample b/app/email/secrets/email/postfix/postfix.key.sample
similarity index 100%
rename from app/config/secrets/email/postfix/postfix.key.sample
rename to app/email/secrets/email/postfix/postfix.key.sample
diff --git a/app/config/secrets/email/dovecot/ldap_binddn.sample b/app/email/secrets/email/sogo/ldap_binddn.sample
similarity index 100%
rename from app/config/secrets/email/dovecot/ldap_binddn.sample
rename to app/email/secrets/email/sogo/ldap_binddn.sample
diff --git a/app/config/secrets/chat/synapse/ldap_bindpw.sample b/app/email/secrets/email/sogo/ldap_bindpw.sample
similarity index 100%
rename from app/config/secrets/chat/synapse/ldap_bindpw.sample
rename to app/email/secrets/email/sogo/ldap_bindpw.sample
diff --git a/app/config/secrets/email/sogo/postgre_auth.sample b/app/email/secrets/email/sogo/postgre_auth.sample
similarity index 100%
rename from app/config/secrets/email/sogo/postgre_auth.sample
rename to app/email/secrets/email/sogo/postgre_auth.sample
diff --git a/app/config/configuration/garage/garage.toml b/app/garage/config/garage.toml
similarity index 100%
rename from app/config/configuration/garage/garage.toml
rename to app/garage/config/garage.toml
diff --git a/app/deployment/garage.hcl b/app/garage/deploy/garage.hcl
similarity index 97%
rename from app/deployment/garage.hcl
rename to app/garage/deploy/garage.hcl
index 20ee3cd..1be68aa 100644
--- a/app/deployment/garage.hcl
+++ b/app/garage/deploy/garage.hcl
@@ -32,7 +32,7 @@ job "garage" {
       }
 
       template {
-        data = file("../config/configuration/garage/garage.toml")
+        data = file("../config/garage.toml")
         destination = "secrets/garage.toml"
       }
 
diff --git a/app/build/matrix-synapse/Dockerfile b/app/im/build/matrix-synapse/Dockerfile
similarity index 100%
rename from app/build/matrix-synapse/Dockerfile
rename to app/im/build/matrix-synapse/Dockerfile
diff --git a/app/build/matrix-synapse/entrypoint.sh b/app/im/build/matrix-synapse/entrypoint.sh
similarity index 100%
rename from app/build/matrix-synapse/entrypoint.sh
rename to app/im/build/matrix-synapse/entrypoint.sh
diff --git a/app/build/riotweb/Dockerfile b/app/im/build/riotweb/Dockerfile
similarity index 100%
rename from app/build/riotweb/Dockerfile
rename to app/im/build/riotweb/Dockerfile
diff --git a/app/config/configuration/chat/coturn/turnserver.conf.tpl b/app/im/config/coturn/turnserver.conf.tpl
similarity index 100%
rename from app/config/configuration/chat/coturn/turnserver.conf.tpl
rename to app/im/config/coturn/turnserver.conf.tpl
diff --git a/app/config/configuration/chat/easybridge/config.json.tpl b/app/im/config/easybridge/config.json.tpl
similarity index 100%
rename from app/config/configuration/chat/easybridge/config.json.tpl
rename to app/im/config/easybridge/config.json.tpl
diff --git a/app/config/configuration/chat/easybridge/registration.yaml.tpl b/app/im/config/easybridge/registration.yaml.tpl
similarity index 100%
rename from app/config/configuration/chat/easybridge/registration.yaml.tpl
rename to app/im/config/easybridge/registration.yaml.tpl
diff --git a/app/config/configuration/chat/fb2mx/config.yaml b/app/im/config/fb2mx/config.yaml
similarity index 100%
rename from app/config/configuration/chat/fb2mx/config.yaml
rename to app/im/config/fb2mx/config.yaml
diff --git a/app/config/configuration/chat/fb2mx/registration.yaml b/app/im/config/fb2mx/registration.yaml
similarity index 100%
rename from app/config/configuration/chat/fb2mx/registration.yaml
rename to app/im/config/fb2mx/registration.yaml
diff --git a/app/config/configuration/chat/riot_web/config.json b/app/im/config/riot_web/config.json
similarity index 100%
rename from app/config/configuration/chat/riot_web/config.json
rename to app/im/config/riot_web/config.json
diff --git a/app/config/configuration/chat/synapse/conf.d/report_stats.yaml b/app/im/config/synapse/conf.d/report_stats.yaml
similarity index 100%
rename from app/config/configuration/chat/synapse/conf.d/report_stats.yaml
rename to app/im/config/synapse/conf.d/report_stats.yaml
diff --git a/app/config/configuration/chat/synapse/conf.d/server_name.yaml b/app/im/config/synapse/conf.d/server_name.yaml
similarity index 100%
rename from app/config/configuration/chat/synapse/conf.d/server_name.yaml
rename to app/im/config/synapse/conf.d/server_name.yaml
diff --git a/app/config/configuration/chat/synapse/homeserver.yaml b/app/im/config/synapse/homeserver.yaml
similarity index 100%
rename from app/config/configuration/chat/synapse/homeserver.yaml
rename to app/im/config/synapse/homeserver.yaml
diff --git a/app/config/configuration/chat/synapse/log.yaml b/app/im/config/synapse/log.yaml
similarity index 100%
rename from app/config/configuration/chat/synapse/log.yaml
rename to app/im/config/synapse/log.yaml
diff --git a/app/deployment/im.hcl b/app/im/deploy/im.hcl
similarity index 90%
rename from app/deployment/im.hcl
rename to app/im/deploy/im.hcl
index 636f78e..c9591e6 100644
--- a/app/deployment/im.hcl
+++ b/app/im/deploy/im.hcl
@@ -35,27 +35,27 @@ job "im" {
       }
       
       template {
-        data = file("../config/configuration/chat/synapse/homeserver.yaml")
+        data = file("../config/synapse/homeserver.yaml")
         destination = "secrets/conf/homeserver.yaml"
       }
 
       template {
-        data = file("../config/configuration/chat/easybridge/registration.yaml.tpl")
+        data = file("../config/easybridge/registration.yaml.tpl")
         destination = "secrets/conf/easybridge_registration.yaml"
       }
 
       template {
-        data = file("../config/configuration/chat/synapse/log.yaml")
+        data = file("../config/synapse/log.yaml")
         destination = "secrets/conf/log.yaml"
       }
 
       template {
-        data = file("../config/configuration/chat/synapse/conf.d/server_name.yaml")
+        data = file("../config/synapse/conf.d/server_name.yaml")
         destination = "secrets/conf/server_name.yaml"
       }
 
       template {
-        data = file("../config/configuration/chat/synapse/conf.d/report_stats.yaml")
+        data = file("../config/synapse/conf.d/report_stats.yaml")
         destination = "secrets/conf/report_stats.yaml"
       }
 
@@ -152,12 +152,12 @@ job "im" {
       }
 
       template {
-        data = file("../config/configuration/chat/easybridge/registration.yaml.tpl")
+        data = file("../config/easybridge/registration.yaml.tpl")
         destination = "secrets/conf/registration.yaml"
       }
 
       template {
-        data = file("../config/configuration/chat/easybridge/config.json.tpl")
+        data = file("../config/easybridge/config.json.tpl")
         destination = "secrets/conf/config.json"
       }
 
@@ -228,7 +228,7 @@ job "im" {
       }
 
       template {
-        data = file("../config/configuration/chat/riot_web/config.json")
+        data = file("../config/riot_web/config.json")
         destination   = "secrets/config.json"
       }
 
diff --git a/app/config/secrets/chat/coturn/static-auth.sample b/app/im/secrets/chat/coturn/static-auth.sample
similarity index 100%
rename from app/config/secrets/chat/coturn/static-auth.sample
rename to app/im/secrets/chat/coturn/static-auth.sample
diff --git a/app/config/secrets/chat/fb2mx/as_token.sample b/app/im/secrets/chat/fb2mx/as_token.sample
similarity index 100%
rename from app/config/secrets/chat/fb2mx/as_token.sample
rename to app/im/secrets/chat/fb2mx/as_token.sample
diff --git a/app/config/secrets/chat/fb2mx/db_url.sample b/app/im/secrets/chat/fb2mx/db_url.sample
similarity index 100%
rename from app/config/secrets/chat/fb2mx/db_url.sample
rename to app/im/secrets/chat/fb2mx/db_url.sample
diff --git a/app/config/secrets/chat/fb2mx/hs_token.sample b/app/im/secrets/chat/fb2mx/hs_token.sample
similarity index 100%
rename from app/config/secrets/chat/fb2mx/hs_token.sample
rename to app/im/secrets/chat/fb2mx/hs_token.sample
diff --git a/app/config/secrets/chat/synapse/homeserver.tls.crt.sample b/app/im/secrets/chat/synapse/homeserver.tls.crt.sample
similarity index 100%
rename from app/config/secrets/chat/synapse/homeserver.tls.crt.sample
rename to app/im/secrets/chat/synapse/homeserver.tls.crt.sample
diff --git a/app/config/secrets/chat/synapse/homeserver.tls.dh.sample b/app/im/secrets/chat/synapse/homeserver.tls.dh.sample
similarity index 100%
rename from app/config/secrets/chat/synapse/homeserver.tls.dh.sample
rename to app/im/secrets/chat/synapse/homeserver.tls.dh.sample
diff --git a/app/config/secrets/chat/synapse/homeserver.tls.key.sample b/app/im/secrets/chat/synapse/homeserver.tls.key.sample
similarity index 100%
rename from app/config/secrets/chat/synapse/homeserver.tls.key.sample
rename to app/im/secrets/chat/synapse/homeserver.tls.key.sample
diff --git a/app/config/secrets/email/sogo/ldap_binddn.sample b/app/im/secrets/chat/synapse/ldap_binddn.sample
similarity index 100%
rename from app/config/secrets/email/sogo/ldap_binddn.sample
rename to app/im/secrets/chat/synapse/ldap_binddn.sample
diff --git a/app/config/secrets/email/sogo/ldap_bindpw.sample b/app/im/secrets/chat/synapse/ldap_bindpw.sample
similarity index 100%
rename from app/config/secrets/email/sogo/ldap_bindpw.sample
rename to app/im/secrets/chat/synapse/ldap_bindpw.sample
diff --git a/app/config/secrets/chat/synapse/postgres_db.sample b/app/im/secrets/chat/synapse/postgres_db.sample
similarity index 100%
rename from app/config/secrets/chat/synapse/postgres_db.sample
rename to app/im/secrets/chat/synapse/postgres_db.sample
diff --git a/app/config/secrets/chat/synapse/postgres_pwd.sample b/app/im/secrets/chat/synapse/postgres_pwd.sample
similarity index 100%
rename from app/config/secrets/chat/synapse/postgres_pwd.sample
rename to app/im/secrets/chat/synapse/postgres_pwd.sample
diff --git a/app/config/secrets/chat/synapse/postgres_user.sample b/app/im/secrets/chat/synapse/postgres_user.sample
similarity index 100%
rename from app/config/secrets/chat/synapse/postgres_user.sample
rename to app/im/secrets/chat/synapse/postgres_user.sample
diff --git a/app/config/secrets/chat/synapse/registration_shared_secret.sample b/app/im/secrets/chat/synapse/registration_shared_secret.sample
similarity index 100%
rename from app/config/secrets/chat/synapse/registration_shared_secret.sample
rename to app/im/secrets/chat/synapse/registration_shared_secret.sample
diff --git a/app/build/jitsi-conference-focus/Dockerfile b/app/jitsi/build/jitsi-conference-focus/Dockerfile
similarity index 100%
rename from app/build/jitsi-conference-focus/Dockerfile
rename to app/jitsi/build/jitsi-conference-focus/Dockerfile
diff --git a/app/build/jitsi-conference-focus/jicofo b/app/jitsi/build/jitsi-conference-focus/jicofo
similarity index 100%
rename from app/build/jitsi-conference-focus/jicofo
rename to app/jitsi/build/jitsi-conference-focus/jicofo
diff --git a/app/build/jitsi-conference-focus/sip-communicator.properties b/app/jitsi/build/jitsi-conference-focus/sip-communicator.properties
similarity index 100%
rename from app/build/jitsi-conference-focus/sip-communicator.properties
rename to app/jitsi/build/jitsi-conference-focus/sip-communicator.properties
diff --git a/app/build/jitsi-meet/Dockerfile b/app/jitsi/build/jitsi-meet/Dockerfile
similarity index 100%
rename from app/build/jitsi-meet/Dockerfile
rename to app/jitsi/build/jitsi-meet/Dockerfile
diff --git a/app/build/jitsi-meet/config.js b/app/jitsi/build/jitsi-meet/config.js
similarity index 100%
rename from app/build/jitsi-meet/config.js
rename to app/jitsi/build/jitsi-meet/config.js
diff --git a/app/build/jitsi-meet/entrypoint.sh b/app/jitsi/build/jitsi-meet/entrypoint.sh
similarity index 100%
rename from app/build/jitsi-meet/entrypoint.sh
rename to app/jitsi/build/jitsi-meet/entrypoint.sh
diff --git a/app/build/jitsi-videobridge/Dockerfile b/app/jitsi/build/jitsi-videobridge/Dockerfile
similarity index 100%
rename from app/build/jitsi-videobridge/Dockerfile
rename to app/jitsi/build/jitsi-videobridge/Dockerfile
diff --git a/app/build/jitsi-videobridge/jvb_run b/app/jitsi/build/jitsi-videobridge/jvb_run
similarity index 100%
rename from app/build/jitsi-videobridge/jvb_run
rename to app/jitsi/build/jitsi-videobridge/jvb_run
diff --git a/app/build/jitsi-xmpp/Dockerfile b/app/jitsi/build/jitsi-xmpp/Dockerfile
similarity index 100%
rename from app/build/jitsi-xmpp/Dockerfile
rename to app/jitsi/build/jitsi-xmpp/Dockerfile
diff --git a/app/build/jitsi-xmpp/external_components.cfg.lua b/app/jitsi/build/jitsi-xmpp/external_components.cfg.lua
similarity index 100%
rename from app/build/jitsi-xmpp/external_components.cfg.lua
rename to app/jitsi/build/jitsi-xmpp/external_components.cfg.lua
diff --git a/app/build/jitsi-xmpp/xmpp_conf b/app/jitsi/build/jitsi-xmpp/xmpp_conf
similarity index 100%
rename from app/build/jitsi-xmpp/xmpp_conf
rename to app/jitsi/build/jitsi-xmpp/xmpp_conf
diff --git a/app/build/jitsi-xmpp/xmpp_gen b/app/jitsi/build/jitsi-xmpp/xmpp_gen
similarity index 100%
rename from app/build/jitsi-xmpp/xmpp_gen
rename to app/jitsi/build/jitsi-xmpp/xmpp_gen
diff --git a/app/build/jitsi-xmpp/xmpp_run b/app/jitsi/build/jitsi-xmpp/xmpp_run
similarity index 100%
rename from app/build/jitsi-xmpp/xmpp_run
rename to app/jitsi/build/jitsi-xmpp/xmpp_run
diff --git a/app/config/configuration/jitsi/global_env.tpl b/app/jitsi/config/global_env.tpl
similarity index 100%
rename from app/config/configuration/jitsi/global_env.tpl
rename to app/jitsi/config/global_env.tpl
diff --git a/app/deployment/jitsi.hcl b/app/jitsi/deploy/jitsi.hcl
similarity index 95%
rename from app/deployment/jitsi.hcl
rename to app/jitsi/deploy/jitsi.hcl
index 04c3f9f..852e1e6 100644
--- a/app/deployment/jitsi.hcl
+++ b/app/jitsi/deploy/jitsi.hcl
@@ -27,7 +27,7 @@ job "jitsi" {
       }
 
       template {
-        data = file("../config/configuration/jitsi/global_env.tpl")
+        data = file("../config/global_env.tpl")
         destination = "secrets/global_env"
         env = true
       }
@@ -100,7 +100,7 @@ job "jitsi" {
       }
 
       template {
-        data = file("../config/configuration/jitsi/global_env.tpl")
+        data = file("../config/global_env.tpl")
         destination = "secrets/global_env"
         env = true
       }
@@ -153,7 +153,7 @@ job "jitsi" {
       }
 
       template {
-        data = file("../config/configuration/jitsi/global_env.tpl")
+        data = file("../config/global_env.tpl")
         destination = "secrets/global_env"
         env = true
       }
@@ -194,7 +194,7 @@ job "jitsi" {
       }
 
       template {
-        data = file("../config/configuration/jitsi/global_env.tpl")
+        data = file("../config/global_env.tpl")
         destination = "secrets/global_env"
         env = true
       }
diff --git a/app/integration/jitsi/01_gen_certs.yml b/app/jitsi/integratio/01_gen_certs.yml
similarity index 100%
rename from app/integration/jitsi/01_gen_certs.yml
rename to app/jitsi/integratio/01_gen_certs.yml
diff --git a/app/integration/jitsi/02_run.yml b/app/jitsi/integratio/02_run.yml
similarity index 100%
rename from app/integration/jitsi/02_run.yml
rename to app/jitsi/integratio/02_run.yml
diff --git a/app/integration/jitsi/README.md b/app/jitsi/integratio/README.md
similarity index 100%
rename from app/integration/jitsi/README.md
rename to app/jitsi/integratio/README.md
diff --git a/app/integration/jitsi/dev.env b/app/jitsi/integratio/dev.env
similarity index 100%
rename from app/integration/jitsi/dev.env
rename to app/jitsi/integratio/dev.env
diff --git a/app/integration/jitsi/jitsi-certs/.gitignore b/app/jitsi/integratio/jitsi-certs/.gitignore
similarity index 100%
rename from app/integration/jitsi/jitsi-certs/.gitignore
rename to app/jitsi/integratio/jitsi-certs/.gitignore
diff --git a/app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample b/app/jitsi/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample
similarity index 100%
rename from app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample
rename to app/jitsi/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample
diff --git a/app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample b/app/jitsi/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample
similarity index 100%
rename from app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample
rename to app/jitsi/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample
diff --git a/app/config/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample b/app/jitsi/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample
similarity index 100%
rename from app/config/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample
rename to app/jitsi/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample
diff --git a/app/config/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample b/app/jitsi/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample
similarity index 100%
rename from app/config/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample
rename to app/jitsi/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample
diff --git a/app/build/nextcloud/Dockerfile b/app/nextcloud/build/nextcloud/Dockerfile
similarity index 100%
rename from app/build/nextcloud/Dockerfile
rename to app/nextcloud/build/nextcloud/Dockerfile
diff --git a/app/build/nextcloud/container-setup.sh b/app/nextcloud/build/nextcloud/container-setup.sh
similarity index 100%
rename from app/build/nextcloud/container-setup.sh
rename to app/nextcloud/build/nextcloud/container-setup.sh
diff --git a/app/build/nextcloud/entrypoint.sh b/app/nextcloud/build/nextcloud/entrypoint.sh
similarity index 100%
rename from app/build/nextcloud/entrypoint.sh
rename to app/nextcloud/build/nextcloud/entrypoint.sh
diff --git a/app/config/configuration/nextcloud/config.php.tpl b/app/nextcloud/config/config.php.tpl
similarity index 100%
rename from app/config/configuration/nextcloud/config.php.tpl
rename to app/nextcloud/config/config.php.tpl
diff --git a/app/deployment/nextcloud.hcl b/app/nextcloud/deploy/nextcloud.hcl
similarity index 94%
rename from app/deployment/nextcloud.hcl
rename to app/nextcloud/deploy/nextcloud.hcl
index 8eed7d9..8852787 100644
--- a/app/deployment/nextcloud.hcl
+++ b/app/nextcloud/deploy/nextcloud.hcl
@@ -28,7 +28,7 @@ job "nextcloud" {
       }
 
       template {
-        data = file("../config/configuration/nextcloud/config.php.tpl")
+        data = file("../config/config.php.tpl")
         destination = "secrets/config.php"
       }
 
diff --git a/app/integration/nextcloud/README.md b/app/nextcloud/integration/README.md
similarity index 100%
rename from app/integration/nextcloud/README.md
rename to app/nextcloud/integration/README.md
diff --git a/app/integration/nextcloud/bottin.json b/app/nextcloud/integration/bottin.json
similarity index 100%
rename from app/integration/nextcloud/bottin.json
rename to app/nextcloud/integration/bottin.json
diff --git a/app/integration/nextcloud/docker-compose.yml b/app/nextcloud/integration/docker-compose.yml
similarity index 100%
rename from app/integration/nextcloud/docker-compose.yml
rename to app/nextcloud/integration/docker-compose.yml
diff --git a/app/deployment/platoo.hcl b/app/platoo/deploy/platoo.hcl
similarity index 100%
rename from app/deployment/platoo.hcl
rename to app/platoo/deploy/platoo.hcl
diff --git a/app/config/secrets/platoo/bddpw.sample b/app/platoo/secrets/platoo/bddpw.sample
similarity index 100%
rename from app/config/secrets/platoo/bddpw.sample
rename to app/platoo/secrets/platoo/bddpw.sample
diff --git a/app/build/plume/Dockerfile b/app/plume/build/plume/Dockerfile
similarity index 100%
rename from app/build/plume/Dockerfile
rename to app/plume/build/plume/Dockerfile
diff --git a/app/build/plume/README.md b/app/plume/build/plume/README.md
similarity index 100%
rename from app/build/plume/README.md
rename to app/plume/build/plume/README.md
diff --git a/app/build/plume/plm-start b/app/plume/build/plume/plm-start
similarity index 100%
rename from app/build/plume/plm-start
rename to app/plume/build/plume/plm-start
diff --git a/app/config/configuration/plume/app.env b/app/plume/config/app.env
similarity index 100%
rename from app/config/configuration/plume/app.env
rename to app/plume/config/app.env
diff --git a/app/deployment/plume.hcl b/app/plume/deploy/plume.hcl
similarity index 95%
rename from app/deployment/plume.hcl
rename to app/plume/deploy/plume.hcl
index 1bdc332..0a82c57 100644
--- a/app/deployment/plume.hcl
+++ b/app/plume/deploy/plume.hcl
@@ -29,7 +29,7 @@ job "plume" {
       }
 
       template {
-        data = file("../config/configuration/plume/app.env")
+        data = file("../config/app.env")
         destination = "secrets/app.env"
         env = true
       }
diff --git a/app/integration/plume/bottin.json b/app/plume/integration/bottin.json
similarity index 100%
rename from app/integration/plume/bottin.json
rename to app/plume/integration/bottin.json
diff --git a/app/integration/plume/docker-compose.yml b/app/plume/integration/docker-compose.yml
similarity index 100%
rename from app/integration/plume/docker-compose.yml
rename to app/plume/integration/docker-compose.yml
diff --git a/app/integration/plume/plume.env b/app/plume/integration/plume.env
similarity index 100%
rename from app/integration/plume/plume.env
rename to app/plume/integration/plume.env
diff --git a/app/config/secrets/plume/pgsql_pw.sh b/app/plume/secrets/plume/pgsql_pw.sh
similarity index 100%
rename from app/config/secrets/plume/pgsql_pw.sh
rename to app/plume/secrets/plume/pgsql_pw.sh
diff --git a/app/config/secrets/plume/secret_key.sh b/app/plume/secrets/plume/secret_key.sh
similarity index 100%
rename from app/config/secrets/plume/secret_key.sh
rename to app/plume/secrets/plume/secret_key.sh
diff --git a/app/build/postgres/Dockerfile b/app/postgres/build/postgres/Dockerfile
similarity index 100%
rename from app/build/postgres/Dockerfile
rename to app/postgres/build/postgres/Dockerfile
diff --git a/app/build/postgres/README.md b/app/postgres/build/postgres/README.md
similarity index 100%
rename from app/build/postgres/README.md
rename to app/postgres/build/postgres/README.md
diff --git a/app/build/postgres/postgresql.conf b/app/postgres/build/postgres/postgresql.conf
similarity index 100%
rename from app/build/postgres/postgresql.conf
rename to app/postgres/build/postgres/postgresql.conf
diff --git a/app/build/postgres/start.sh b/app/postgres/build/postgres/start.sh
similarity index 100%
rename from app/build/postgres/start.sh
rename to app/postgres/build/postgres/start.sh
diff --git a/app/config/configuration/postgres/keeper/env.tpl b/app/postgres/config/keeper/env.tpl
similarity index 100%
rename from app/config/configuration/postgres/keeper/env.tpl
rename to app/postgres/config/keeper/env.tpl
diff --git a/app/deployment/postgres.hcl b/app/postgres/deploy/postgres.hcl
similarity index 97%
rename from app/deployment/postgres.hcl
rename to app/postgres/deploy/postgres.hcl
index 388c65e..f5eec51 100644
--- a/app/deployment/postgres.hcl
+++ b/app/postgres/deploy/postgres.hcl
@@ -101,7 +101,7 @@ job "postgres" {
       }
 
       template {
-        data = file("../config/configuration/postgres/keeper/env.tpl")
+        data = file("../config/keeper/env.tpl")
         destination = "secrets/env"
         env = true
       }
diff --git a/app/config/secrets/postgres/keeper/pg_repl_pwd.sample b/app/postgres/secrets/postgres/keeper/pg_repl_pwd.sample
similarity index 100%
rename from app/config/secrets/postgres/keeper/pg_repl_pwd.sample
rename to app/postgres/secrets/postgres/keeper/pg_repl_pwd.sample
diff --git a/app/config/secrets/postgres/keeper/pg_repl_username.sample b/app/postgres/secrets/postgres/keeper/pg_repl_username.sample
similarity index 100%
rename from app/config/secrets/postgres/keeper/pg_repl_username.sample
rename to app/postgres/secrets/postgres/keeper/pg_repl_username.sample
diff --git a/app/config/secrets/postgres/keeper/pg_su_pwd.sample b/app/postgres/secrets/postgres/keeper/pg_su_pwd.sample
similarity index 100%
rename from app/config/secrets/postgres/keeper/pg_su_pwd.sample
rename to app/postgres/secrets/postgres/keeper/pg_su_pwd.sample
diff --git a/app/deployment/science.hcl b/app/science/deploy/science.hcl
similarity index 100%
rename from app/deployment/science.hcl
rename to app/science/deploy/science.hcl
diff --git a/app/build/mariadb/60-disable-dialog.cnf b/app/seafile/build/mariadb/60-disable-dialog.cnf
similarity index 100%
rename from app/build/mariadb/60-disable-dialog.cnf
rename to app/seafile/build/mariadb/60-disable-dialog.cnf
diff --git a/app/build/mariadb/60-ldap.cnf b/app/seafile/build/mariadb/60-ldap.cnf
similarity index 100%
rename from app/build/mariadb/60-ldap.cnf
rename to app/seafile/build/mariadb/60-ldap.cnf
diff --git a/app/build/mariadb/60-remote.cnf b/app/seafile/build/mariadb/60-remote.cnf
similarity index 100%
rename from app/build/mariadb/60-remote.cnf
rename to app/seafile/build/mariadb/60-remote.cnf
diff --git a/app/build/mariadb/Dockerfile b/app/seafile/build/mariadb/Dockerfile
similarity index 100%
rename from app/build/mariadb/Dockerfile
rename to app/seafile/build/mariadb/Dockerfile
diff --git a/app/build/mariadb/README.md b/app/seafile/build/mariadb/README.md
similarity index 100%
rename from app/build/mariadb/README.md
rename to app/seafile/build/mariadb/README.md
diff --git a/app/build/mariadb/entrypoint.sh b/app/seafile/build/mariadb/entrypoint.sh
similarity index 100%
rename from app/build/mariadb/entrypoint.sh
rename to app/seafile/build/mariadb/entrypoint.sh
diff --git a/app/build/mariadb/nsswitch.conf b/app/seafile/build/mariadb/nsswitch.conf
similarity index 100%
rename from app/build/mariadb/nsswitch.conf
rename to app/seafile/build/mariadb/nsswitch.conf
diff --git a/app/build/mariadb/pam-mariadb b/app/seafile/build/mariadb/pam-mariadb
similarity index 100%
rename from app/build/mariadb/pam-mariadb
rename to app/seafile/build/mariadb/pam-mariadb
diff --git a/app/build/seafile/Dockerfile b/app/seafile/build/seafile/Dockerfile
similarity index 100%
rename from app/build/seafile/Dockerfile
rename to app/seafile/build/seafile/Dockerfile
diff --git a/app/build/seafile/README.md b/app/seafile/build/seafile/README.md
similarity index 100%
rename from app/build/seafile/README.md
rename to app/seafile/build/seafile/README.md
diff --git a/app/build/seafile/seadocker b/app/seafile/build/seafile/seadocker
similarity index 100%
rename from app/build/seafile/seadocker
rename to app/seafile/build/seafile/seadocker
diff --git a/app/build/seafile/seaenv b/app/seafile/build/seafile/seaenv
similarity index 100%
rename from app/build/seafile/seaenv
rename to app/seafile/build/seafile/seaenv
diff --git a/app/config/configuration/seafile/ccnet/seafile.ini b/app/seafile/config/ccnet/seafile.ini
similarity index 100%
rename from app/config/configuration/seafile/ccnet/seafile.ini
rename to app/seafile/config/ccnet/seafile.ini
diff --git a/app/config/configuration/seafile/conf/ccnet.conf.tpl b/app/seafile/config/conf/ccnet.conf.tpl
similarity index 100%
rename from app/config/configuration/seafile/conf/ccnet.conf.tpl
rename to app/seafile/config/conf/ccnet.conf.tpl
diff --git a/app/config/configuration/seafile/conf/gunicorn.conf b/app/seafile/config/conf/gunicorn.conf
similarity index 100%
rename from app/config/configuration/seafile/conf/gunicorn.conf
rename to app/seafile/config/conf/gunicorn.conf
diff --git a/app/config/configuration/seafile/ccnet/mykey.peer.sample b/app/seafile/config/conf/mykey.peer.sample
similarity index 100%
rename from app/config/configuration/seafile/ccnet/mykey.peer.sample
rename to app/seafile/config/conf/mykey.peer.sample
diff --git a/app/config/configuration/seafile/conf/seafdav.conf b/app/seafile/config/conf/seafdav.conf
similarity index 100%
rename from app/config/configuration/seafile/conf/seafdav.conf
rename to app/seafile/config/conf/seafdav.conf
diff --git a/app/config/configuration/seafile/conf/seafile.conf.tpl b/app/seafile/config/conf/seafile.conf.tpl
similarity index 100%
rename from app/config/configuration/seafile/conf/seafile.conf.tpl
rename to app/seafile/config/conf/seafile.conf.tpl
diff --git a/app/config/configuration/seafile/conf/seahub_settings.py.tpl b/app/seafile/config/conf/seahub_settings.py.tpl
similarity index 100%
rename from app/config/configuration/seafile/conf/seahub_settings.py.tpl
rename to app/seafile/config/conf/seahub_settings.py.tpl
diff --git a/app/config/configuration/mariadb/main/env.tpl b/app/seafile/config/mariadb/main/env.tpl
similarity index 100%
rename from app/config/configuration/mariadb/main/env.tpl
rename to app/seafile/config/mariadb/main/env.tpl
diff --git a/app/deployment/seafile.hcl b/app/seafile/deploy/seafile.hcl
similarity index 90%
rename from app/deployment/seafile.hcl
rename to app/seafile/deploy/seafile.hcl
index 3af7db3..d8488d2 100644
--- a/app/deployment/seafile.hcl
+++ b/app/seafile/deploy/seafile.hcl
@@ -35,7 +35,7 @@ job "seafile" {
       }
 
       template {
-        data = file("../config/configuration/mariadb/main/env.tpl")
+        data = file("../config/mariadb/main/env.tpl")
         destination = "secrets/env"
         env = true
       }
@@ -179,30 +179,30 @@ job "seafile" {
       }
 
       template {
-        data = file("../config/configuration/seafile/conf/ccnet.conf.tpl")
+        data = file("../config/conf/ccnet.conf.tpl")
         destination = "secrets/conf/ccnet.conf"
       }
 
       template {
-        data = file("../config/configuration/seafile/conf/seafile.conf.tpl")
+        data = file("../config/conf/seafile.conf.tpl")
         destination = "secrets/conf/seafile.conf"
       }
 
       template {
-        data = file("../config/configuration/seafile/conf/seahub_settings.py.tpl")
+        data = file("../config/conf/seahub_settings.py.tpl")
         destination = "secrets/conf/seahub_settings.py"
       }
 
       template {
-        data = file("../config/configuration/seafile/ccnet/seafile.ini")
+        data = file("../config/ccnet/seafile.ini")
         destination = "secrets/ccnet/seafile.ini"
       }
       template {
-        data = file("../config/configuration/seafile/conf/seafdav.conf")
+        data = file("../config/conf/seafdav.conf")
         destination = "secrets/conf/seafdav.conf"
       }
       template {
-        data = file("../config/configuration/seafile/conf/gunicorn.conf")
+        data = file("../config/conf/gunicorn.conf")
         destination = "secrets/conf/gunicorn.conf"
       }
 
diff --git a/app/config/secrets/mariadb/main/ldap_binddn.sample b/app/seafile/secrets/mariadb/main/ldap_binddn.sample
similarity index 100%
rename from app/config/secrets/mariadb/main/ldap_binddn.sample
rename to app/seafile/secrets/mariadb/main/ldap_binddn.sample
diff --git a/app/config/secrets/mariadb/main/ldap_bindpwd.sample b/app/seafile/secrets/mariadb/main/ldap_bindpwd.sample
similarity index 100%
rename from app/config/secrets/mariadb/main/ldap_bindpwd.sample
rename to app/seafile/secrets/mariadb/main/ldap_bindpwd.sample
diff --git a/app/config/secrets/mariadb/main/mysql_pwd.sample b/app/seafile/secrets/mariadb/main/mysql_pwd.sample
similarity index 100%
rename from app/config/secrets/mariadb/main/mysql_pwd.sample
rename to app/seafile/secrets/mariadb/main/mysql_pwd.sample
diff --git a/app/config/configuration/seafile/conf/mykey.peer.sample b/app/seafile/secrets/seafile/conf/mykey.peer.sample
similarity index 100%
rename from app/config/configuration/seafile/conf/mykey.peer.sample
rename to app/seafile/secrets/seafile/conf/mykey.peer.sample
diff --git a/app/config/configuration/traefik/traefik.toml b/app/traefik/config/traefik.toml
similarity index 100%
rename from app/config/configuration/traefik/traefik.toml
rename to app/traefik/config/traefik.toml
diff --git a/app/deployment/traefik.hcl b/app/traefik/deploy/traefik.hcl
similarity index 95%
rename from app/deployment/traefik.hcl
rename to app/traefik/deploy/traefik.hcl
index d0dc129..bcfa95b 100644
--- a/app/deployment/traefik.hcl
+++ b/app/traefik/deploy/traefik.hcl
@@ -29,7 +29,7 @@ job "frontend" {
       }
 
       template {
-        data = file("../config/configuration/traefik/traefik.toml")
+        data = file("../config/traefik.toml")
         destination = "secrets/traefik.toml"
       }
 
diff --git a/app/build/webpull/.gitignore b/app/web_static/build/webpull/.gitignore
similarity index 100%
rename from app/build/webpull/.gitignore
rename to app/web_static/build/webpull/.gitignore
diff --git a/app/build/webpull/Dockerfile.nodejs b/app/web_static/build/webpull/Dockerfile.nodejs
similarity index 100%
rename from app/build/webpull/Dockerfile.nodejs
rename to app/web_static/build/webpull/Dockerfile.nodejs
diff --git a/app/build/webpull/Dockerfile.ruby b/app/web_static/build/webpull/Dockerfile.ruby
similarity index 100%
rename from app/build/webpull/Dockerfile.ruby
rename to app/web_static/build/webpull/Dockerfile.ruby
diff --git a/app/build/webpull/README.md b/app/web_static/build/webpull/README.md
similarity index 100%
rename from app/build/webpull/README.md
rename to app/web_static/build/webpull/README.md
diff --git a/app/build/webpull/main.go b/app/web_static/build/webpull/main.go
similarity index 100%
rename from app/build/webpull/main.go
rename to app/web_static/build/webpull/main.go
diff --git a/app/deployment/web_static.hcl b/app/web_static/deploy/web_static.hcl
similarity index 100%
rename from app/deployment/web_static.hcl
rename to app/web_static/deploy/web_static.hcl
diff --git a/app/config/secrets/web/home_token.sample b/app/web_static/secrets/web/home_token.sample
similarity index 100%
rename from app/config/secrets/web/home_token.sample
rename to app/web_static/secrets/web/home_token.sample
diff --git a/app/config/secrets/web/quentin.dufour.io_token.sample b/app/web_static/secrets/web/quentin.dufour.io_token.sample
similarity index 100%
rename from app/config/secrets/web/quentin.dufour.io_token.sample
rename to app/web_static/secrets/web/quentin.dufour.io_token.sample