diff --git a/.gitmodules b/.gitmodules
index aec303d..7da38dc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "docker/static/goStatic"]
-	path = docker/static/goStatic
+	path = app/build/static/goStatic
 	url = https://github.com/PierreZ/goStatic
 [submodule "docker/blog/quentin.dufour.io"]
 	path = docker/blog-quentin/quentin.dufour.io
diff --git a/README.md b/README.md
index 1c0375b..7c7a3a6 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ We try to build a generic abstraction stack between our different resources (CPU
   * ansible (physical node conf)
   * nomad (schedule containers)
   * consul (distributed key value store / lock / service discovery)
-  * glusterfs (file storage)
+  * garage/glusterfs (file storage)
   * stolon + postgresql (distributed relational database)
   * docker (container tool)
   * bottin (LDAP server, auth)
@@ -23,6 +23,21 @@ Some services we provide:
 
 As a generic abstraction is provided, deploying new services should be easy.
 
+## I am lost, how this repo works?
+
+To ease the development, we make the choice of a fully integrated environment
+
+  1. `os` the base os for the cluster
+      1. `build`: where you will build our OS image based on Debian that you will install on your server
+      2. `config`: our Ansible recipes to configure and update your freshly installed server
+  2. `apps` apps we deploy on the cluster
+      1. `build`: our Docker files to build immutable images of our applications
+      2. `integration`: Our Docker compose files to test locally how our built images interact together
+      3. `config`: Files containing application configurations to be deployed on Consul Key Value Store
+      4. `deployment`: Files containing application definitions to be deployed on Nomad Scheduler
+  3. `op_guide`: Guides to explain you operations you can do cluster wide (like configuring postgres)
+
+
 ## Start hacking
 
 ### Clone the repository
diff --git a/docker/README.md b/app/build/README.md
similarity index 100%
rename from docker/README.md
rename to app/build/README.md
diff --git a/docker/blog-quentin/.dockerenv b/app/build/blog-quentin/.dockerenv
similarity index 100%
rename from docker/blog-quentin/.dockerenv
rename to app/build/blog-quentin/.dockerenv
diff --git a/docker/blog-quentin/Dockerfile b/app/build/blog-quentin/Dockerfile
similarity index 100%
rename from docker/blog-quentin/Dockerfile
rename to app/build/blog-quentin/Dockerfile
diff --git a/docker/blog-quentin/README.md b/app/build/blog-quentin/README.md
similarity index 100%
rename from docker/blog-quentin/README.md
rename to app/build/blog-quentin/README.md
diff --git a/docker/coturn/Dockerfile b/app/build/coturn/Dockerfile
similarity index 100%
rename from docker/coturn/Dockerfile
rename to app/build/coturn/Dockerfile
diff --git a/docker/coturn/README.md b/app/build/coturn/README.md
similarity index 100%
rename from docker/coturn/README.md
rename to app/build/coturn/README.md
diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml
new file mode 100644
index 0000000..94bc154
--- /dev/null
+++ b/app/build/docker-compose.yml
@@ -0,0 +1,63 @@
+version: '3.4'
+services:
+
+  # Instant Messaging
+  riot:
+    build:
+      context: ./riotweb
+      args:
+        # https://github.com/vector-im/riot-web/releases
+        VERSION: 1.7.5
+    image: superboum/amd64_riotweb:v15
+
+  synapse:
+    build: 
+      context: ./matrix-synapse
+      args:
+        # https://github.com/matrix-org/synapse/releases
+        VERSION: 1.19.1
+    image: superboum/amd64_synapse:v33
+
+  # Email
+  sogo:
+    build:
+      context: ./sogo
+      args:
+        # fake for now
+        VERSION: 5.0.0
+    image: superboum/amd64_sogo:v7
+
+  # VoIP
+  jitsi-meet:
+    build:
+      context: ./jitsi-meet
+      args:
+        # https://github.com/jitsi/jitsi-meet
+        PREFIXV: stable/jitsi-meet_
+        VERSION: 4966
+    image: superboum/amd64_jitsi_meet:v1
+
+  jitsi-conference-focus:
+    build:
+      context: ./jitsi-conference-focus
+      args:
+        # https://github.com/jitsi/jicofo
+        PREFIXV: stable/jitsi-meet_
+        VERSION: 4966
+    image: superboum/amd64_jitsi_conference_focus:v5
+
+  jitsi-videobridge:
+    build:
+      context: ./jitsi-videobridge
+      args:
+        # https://github.com/jitsi/jitsi-videobridge
+        PREFIXV: stable/jitsi-meet_
+        VERSION: 4966
+    image: superboum/amd64_jitsi_videobridge:v15
+
+  jitsi-xmpp:
+    build:
+      context: ./jitsi-xmpp
+      args:
+        VERSION: fake-1
+    image: superboum/amd64_jitsi_xmpp:v4
diff --git a/docker/dovecot/.gitignore b/app/build/dovecot/.gitignore
similarity index 100%
rename from docker/dovecot/.gitignore
rename to app/build/dovecot/.gitignore
diff --git a/docker/dovecot/Dockerfile b/app/build/dovecot/Dockerfile
similarity index 100%
rename from docker/dovecot/Dockerfile
rename to app/build/dovecot/Dockerfile
diff --git a/docker/dovecot/README.md b/app/build/dovecot/README.md
similarity index 100%
rename from docker/dovecot/README.md
rename to app/build/dovecot/README.md
diff --git a/docker/dovecot/entrypoint.sh b/app/build/dovecot/entrypoint.sh
similarity index 100%
rename from docker/dovecot/entrypoint.sh
rename to app/build/dovecot/entrypoint.sh
diff --git a/app/build/jitsi-conference-focus/Dockerfile b/app/build/jitsi-conference-focus/Dockerfile
new file mode 100644
index 0000000..e2c459c
--- /dev/null
+++ b/app/build/jitsi-conference-focus/Dockerfile
@@ -0,0 +1,27 @@
+FROM debian:buster AS builder
+
+ARG PREFIXV
+ARG VERSION
+RUN apt-get update && \
+    apt-get install -y openjdk-11-jdk maven wget unzip && \
+    wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip
+
+RUN unzip jicofo.zip && \
+    mv jicofo*${VERSION} jicofo && \
+    cd jicofo && \
+    mvn package -DskipTests -Dassembly.skipAssembly=false && \
+    unzip target/jicofo-1.1-SNAPSHOT-archive.zip && \
+    mv jicofo-1.1-SNAPSHOT /srv/build
+
+FROM debian:buster
+
+RUN apt-get update && \
+    apt-get install -y openjdk-11-jre-headless ca-certificates
+
+ENV JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/root -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=.sip-communicator -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi"
+
+COPY --from=builder /srv/build /srv/jicofo
+COPY jicofo /usr/local/bin/jicofo
+COPY sip-communicator.properties /root/.sip-communicator/sip-communicator.properties
+
+CMD ["/usr/local/bin/jicofo"]
diff --git a/docker/jitsi/jitsi-conference-focus/jicofo b/app/build/jitsi-conference-focus/jicofo
similarity index 100%
rename from docker/jitsi/jitsi-conference-focus/jicofo
rename to app/build/jitsi-conference-focus/jicofo
diff --git a/app/build/jitsi-conference-focus/sip-communicator.properties b/app/build/jitsi-conference-focus/sip-communicator.properties
new file mode 100644
index 0000000..53c32e2
--- /dev/null
+++ b/app/build/jitsi-conference-focus/sip-communicator.properties
@@ -0,0 +1,2 @@
+org.jitsi.jicofo.SHORT_ID=1
+org.jitsi.jicofo.BRIDGE_MUC=JvbBrewery@internal.auth.jitsi.deuxfleurs.fr
diff --git a/app/build/jitsi-meet/Dockerfile b/app/build/jitsi-meet/Dockerfile
new file mode 100644
index 0000000..feef115
--- /dev/null
+++ b/app/build/jitsi-meet/Dockerfile
@@ -0,0 +1,28 @@
+FROM debian:buster AS builder
+
+ARG PREFIXV
+ARG VERSION
+
+RUN apt-get update && \
+    apt-get install -y curl && \
+    curl -sL https://deb.nodesource.com/setup_14.x | bash - && \
+    apt-get install -y git nodejs make wget unzip && \
+    wget https://github.com/jitsi/jitsi-meet/archive/${PREFIXV}${VERSION}.zip -O jitsi-meet.zip
+
+RUN unzip jitsi-meet.zip && \
+    mv jitsi-meet-*${VERSION} jitsi-meet && \
+    cd jitsi-meet && \
+    npm install && \
+    make
+
+FROM debian:buster
+
+COPY --from=builder /jitsi-meet /srv/jitsi-meet
+RUN apt-get update && \
+    apt-get install -y nginx && \
+    rm /etc/nginx/sites-enabled/*
+
+COPY config.js /srv/jitsi-meet/config.js
+COPY entrypoint.sh /usr/local/bin/entrypoint
+ENTRYPOINT ["/usr/local/bin/entrypoint"]
+CMD ["/usr/sbin/nginx", "-g", "daemon off;"]
diff --git a/docker/jitsi/jitsi-front/config.js b/app/build/jitsi-meet/config.js
similarity index 100%
rename from docker/jitsi/jitsi-front/config.js
rename to app/build/jitsi-meet/config.js
diff --git a/docker/jitsi/jitsi-front/entrypoint.sh b/app/build/jitsi-meet/entrypoint.sh
similarity index 100%
rename from docker/jitsi/jitsi-front/entrypoint.sh
rename to app/build/jitsi-meet/entrypoint.sh
diff --git a/docker/jitsi/jitsi-videobridge/Dockerfile b/app/build/jitsi-videobridge/Dockerfile
similarity index 59%
rename from docker/jitsi/jitsi-videobridge/Dockerfile
rename to app/build/jitsi-videobridge/Dockerfile
index 16f59dc..c17fb4f 100644
--- a/docker/jitsi/jitsi-videobridge/Dockerfile
+++ b/app/build/jitsi-videobridge/Dockerfile
@@ -1,21 +1,24 @@
 FROM debian:buster AS builder
 
-RUN apt-get update && \
-    apt-get install -y wget unzip maven openjdk-11-jdk 
+ARG PREFIXV
+ARG VERSION
 
-ENV VERSION=4468
-RUN wget https://github.com/jitsi/jitsi-videobridge/archive/stable/jitsi-meet_${VERSION}.zip -O jvb.zip && \
-    unzip jvb.zip && \
-    mv jitsi-videobridge-stable-jitsi-meet_${VERSION} jvb && \
+RUN apt-get update && \
+    apt-get install -y wget unzip maven openjdk-11-jdk && \
+    wget https://github.com/jitsi/jitsi-videobridge/archive/${PREFIXV}${VERSION}.zip -O jvb.zip
+
+RUN unzip jvb.zip && \
+    mv jitsi-videobridge*${VERSION} jvb && \
     cd jvb && \
     mvn package  -DskipTests && \
-    unzip target/jitsi-videobridge-*.zip && \
+    ls jvb/target && \
+    unzip jvb/target/jitsi-videobridge*.zip && \
     mv jitsi-videobridge-*-SNAPSHOT build
 
 FROM debian:buster
 
 RUN apt-get update && \
-    apt-get install -y openjdk-11-jdk
+    apt-get install -y openjdk-11-jre-headless
 
 COPY --from=builder /jvb/build /srv/jvb
 ENV HOME=/root
diff --git a/docker/jitsi/jitsi-videobridge/jvb_run b/app/build/jitsi-videobridge/jvb_run
similarity index 64%
rename from docker/jitsi/jitsi-videobridge/jvb_run
rename to app/build/jitsi-videobridge/jvb_run
index 3352e8a..b86c911 100755
--- a/docker/jitsi/jitsi-videobridge/jvb_run
+++ b/app/build/jitsi-videobridge/jvb_run
@@ -8,9 +8,24 @@ EOF
 mkdir -p /root/.sip-communicator
 
 cat > /root/.sip-communicator/sip-communicator.properties <<EOF
+# Enable broadcasting stats/presence in a MUC
+org.jitsi.videobridge.ENABLE_STATISTICS=true
+org.jitsi.videobridge.STATISTICS_TRANSPORT=muc
+
+# Connect to the first XMPP server
+org.jitsi.videobridge.xmpp.user.shard.HOSTNAME=jitsi.deuxfleurs.fr
+org.jitsi.videobridge.xmpp.user.shard.DOMAIN=auth.jitsi.deuxfleurs.fr
+org.jitsi.videobridge.xmpp.user.shard.USERNAME=jvb
+org.jitsi.videobridge.xmpp.user.shard.PASSWORD=${JITSI_SECRET_VIDEOBRIDGE}
+org.jitsi.videobridge.xmpp.user.shard.MUC_JIDS=JvbBrewery@internal.auth.jitsi.deuxfleurs.fr
+org.jitsi.videobridge.xmpp.user.shard.MUC=JvbBrewery@internal.auth.jitsi.deuxfleurs.fr
+org.jitsi.videobridge.xmpp.user.shard.MUC_NICKNAME=singleton
+org.jitsi.videobridge.xmpp.user.shard.DISABLE_CERTIFICATE_VERIFICATION=true
+
+# Do we need it? @FIXME
 org.jitsi.impl.neomedia.transform.srtp.SRTPCryptoContext.checkReplay=false
-# The videobridge uses 443 by default with 4443 as a fallback, but since we're already
-# running nginx on 443 in this example doc, we specify 4443 manually to avoid a race condition
+
+# NAT things, two times just in case...
 org.ice4j.ice.harvest.TCP_HARVESTER_PORT=${JITSI_VIDEO_TCP}
 org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=${JITSI_NAT_LOCAL_IP}
 org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=${JITSI_NAT_PUBLIC_IP}
@@ -35,4 +50,5 @@ EOF
   --host=${JITSI_PROSODY_HOST} \
   --domain=jitsi.deuxfleurs.fr \
   --port=5347 \
-  --secret=${JITSI_SECRET_VIDEOBRIDGE}
+  --secret=${JITSI_SECRET_VIDEOBRIDGE} \
+  --apis=xmpp,rest
diff --git a/docker/jitsi/jitsi-xmpp/Dockerfile b/app/build/jitsi-xmpp/Dockerfile
similarity index 100%
rename from docker/jitsi/jitsi-xmpp/Dockerfile
rename to app/build/jitsi-xmpp/Dockerfile
diff --git a/docker/jitsi/jitsi-xmpp/external_components.cfg.lua b/app/build/jitsi-xmpp/external_components.cfg.lua
similarity index 100%
rename from docker/jitsi/jitsi-xmpp/external_components.cfg.lua
rename to app/build/jitsi-xmpp/external_components.cfg.lua
diff --git a/docker/jitsi/jitsi-xmpp/xmpp_conf b/app/build/jitsi-xmpp/xmpp_conf
similarity index 54%
rename from docker/jitsi/jitsi-xmpp/xmpp_conf
rename to app/build/jitsi-xmpp/xmpp_conf
index 2a9278e..5990d07 100755
--- a/docker/jitsi/jitsi-xmpp/xmpp_conf
+++ b/app/build/jitsi-xmpp/xmpp_conf
@@ -8,31 +8,36 @@ EOF
 mkdir -p /etc/prosody/conf.{d,avail}/
 cat > /etc/prosody/conf.avail/jitsi.deuxfleurs.fr.cfg.lua <<EOF
 VirtualHost "jitsi.deuxfleurs.fr"
-    authentication = "anonymous"
-    ssl = {
-        key = "/var/lib/prosody/jitsi.deuxfleurs.fr.key";
-        certificate = "/var/lib/prosody/jitsi.deuxfleurs.fr.crt";
-    }
-    modules_enabled = {
-        "bosh";
-        "pubsub";
-    }
-    c2s_require_encryption = false
+  authentication = "anonymous"
+  ssl = {
+    key = "/var/lib/prosody/jitsi.deuxfleurs.fr.key";
+    certificate = "/var/lib/prosody/jitsi.deuxfleurs.fr.crt";
+  }
+  modules_enabled = {
+    "bosh";
+    "pubsub";
+  }
+  c2s_require_encryption = false
 
 VirtualHost "auth.jitsi.deuxfleurs.fr"
-    ssl = {
-        key = "/var/lib/prosody/auth.jitsi.deuxfleurs.fr.key";
-        certificate = "/var/lib/prosody/auth.jitsi.deuxfleurs.fr.crt";
-    }
-    authentication = "internal_plain"
-
-admins = { "focus@auth.jitsi.deuxfleurs.fr" }
+  ssl = {
+    key = "/var/lib/prosody/auth.jitsi.deuxfleurs.fr.key";
+    certificate = "/var/lib/prosody/auth.jitsi.deuxfleurs.fr.crt";
+  }
+  authentication = "internal_plain"
+  admins = { "focus@auth.jitsi.deuxfleurs.fr"}
 
 Component "conference.jitsi.deuxfleurs.fr" "muc"
+Component "internal.auth.jitsi.deuxfleurs.fr" "muc"
+  storage = "memory"
+  modules_enabled = { "ping"; }
+  admins = { "focus@auth.jitsi.deuxfleurs.fr", "jvb@auth.jitsi.deuxfleurs.fr" }
+
 Component "jitsi-videobridge.jitsi.deuxfleurs.fr"
     component_secret = "${JITSI_SECRET_VIDEOBRIDGE}"
 Component "focus.jitsi.deuxfleurs.fr"
     component_secret = "${JITSI_SECRET_JICOFO_COMPONENT}"
+
 EOF
 
 ln -sf \
diff --git a/docker/jitsi/jitsi-xmpp/xmpp_gen b/app/build/jitsi-xmpp/xmpp_gen
similarity index 100%
rename from docker/jitsi/jitsi-xmpp/xmpp_gen
rename to app/build/jitsi-xmpp/xmpp_gen
diff --git a/docker/jitsi/jitsi-xmpp/xmpp_run b/app/build/jitsi-xmpp/xmpp_run
similarity index 87%
rename from docker/jitsi/jitsi-xmpp/xmpp_run
rename to app/build/jitsi-xmpp/xmpp_run
index 8dfdf86..6383b65 100755
--- a/docker/jitsi/jitsi-xmpp/xmpp_run
+++ b/app/build/jitsi-xmpp/xmpp_run
@@ -10,6 +10,7 @@ ln -sf \
   /usr/local/share/ca-certificates/auth.jitsi.deuxfleurs.fr.crt
 
 prosodyctl register focus auth.jitsi.deuxfleurs.fr ${JITSI_SECRET_JICOFO_USER}
+prosodyctl register jvb auth.jitsi.deuxfleurs.fr ${JITSI_SECRET_VIDEOBRIDGE}
 
 mkdir /run/prosody
 touch /run/prosody/prosody.pid
diff --git a/docker/landing/README.md b/app/build/landing/README.md
similarity index 100%
rename from docker/landing/README.md
rename to app/build/landing/README.md
diff --git a/docker/mariadb/60-disable-dialog.cnf b/app/build/mariadb/60-disable-dialog.cnf
similarity index 100%
rename from docker/mariadb/60-disable-dialog.cnf
rename to app/build/mariadb/60-disable-dialog.cnf
diff --git a/docker/mariadb/60-ldap.cnf b/app/build/mariadb/60-ldap.cnf
similarity index 100%
rename from docker/mariadb/60-ldap.cnf
rename to app/build/mariadb/60-ldap.cnf
diff --git a/docker/mariadb/60-remote.cnf b/app/build/mariadb/60-remote.cnf
similarity index 100%
rename from docker/mariadb/60-remote.cnf
rename to app/build/mariadb/60-remote.cnf
diff --git a/docker/mariadb/Dockerfile b/app/build/mariadb/Dockerfile
similarity index 100%
rename from docker/mariadb/Dockerfile
rename to app/build/mariadb/Dockerfile
diff --git a/docker/mariadb/README.md b/app/build/mariadb/README.md
similarity index 100%
rename from docker/mariadb/README.md
rename to app/build/mariadb/README.md
diff --git a/docker/mariadb/entrypoint.sh b/app/build/mariadb/entrypoint.sh
similarity index 100%
rename from docker/mariadb/entrypoint.sh
rename to app/build/mariadb/entrypoint.sh
diff --git a/docker/mariadb/nsswitch.conf b/app/build/mariadb/nsswitch.conf
similarity index 100%
rename from docker/mariadb/nsswitch.conf
rename to app/build/mariadb/nsswitch.conf
diff --git a/docker/mariadb/pam-mariadb b/app/build/mariadb/pam-mariadb
similarity index 100%
rename from docker/mariadb/pam-mariadb
rename to app/build/mariadb/pam-mariadb
diff --git a/docker/matrix-synapse/Dockerfile b/app/build/matrix-synapse/Dockerfile
similarity index 100%
rename from docker/matrix-synapse/Dockerfile
rename to app/build/matrix-synapse/Dockerfile
diff --git a/docker/matrix-synapse/entrypoint.sh b/app/build/matrix-synapse/entrypoint.sh
similarity index 100%
rename from docker/matrix-synapse/entrypoint.sh
rename to app/build/matrix-synapse/entrypoint.sh
diff --git a/docker/nextcloud/Dockerfile b/app/build/nextcloud/Dockerfile
similarity index 100%
rename from docker/nextcloud/Dockerfile
rename to app/build/nextcloud/Dockerfile
diff --git a/docker/nextcloud/container-setup.sh b/app/build/nextcloud/container-setup.sh
similarity index 100%
rename from docker/nextcloud/container-setup.sh
rename to app/build/nextcloud/container-setup.sh
diff --git a/docker/nextcloud/entrypoint.sh b/app/build/nextcloud/entrypoint.sh
similarity index 100%
rename from docker/nextcloud/entrypoint.sh
rename to app/build/nextcloud/entrypoint.sh
diff --git a/docker/opendkim/Dockerfile b/app/build/opendkim/Dockerfile
similarity index 100%
rename from docker/opendkim/Dockerfile
rename to app/build/opendkim/Dockerfile
diff --git a/docker/opendkim/README.md b/app/build/opendkim/README.md
similarity index 100%
rename from docker/opendkim/README.md
rename to app/build/opendkim/README.md
diff --git a/docker/opendkim/opendkim.conf b/app/build/opendkim/opendkim.conf
similarity index 100%
rename from docker/opendkim/opendkim.conf
rename to app/build/opendkim/opendkim.conf
diff --git a/docker/pithos/0.7.5.tar.gz b/app/build/pithos/0.7.5.tar.gz
similarity index 100%
rename from docker/pithos/0.7.5.tar.gz
rename to app/build/pithos/0.7.5.tar.gz
diff --git a/docker/pithos/Dockerfile b/app/build/pithos/Dockerfile
similarity index 100%
rename from docker/pithos/Dockerfile
rename to app/build/pithos/Dockerfile
diff --git a/docker/pithos/README.md b/app/build/pithos/README.md
similarity index 100%
rename from docker/pithos/README.md
rename to app/build/pithos/README.md
diff --git a/docker/pithos/pithos-0.7.5-standalone.jar b/app/build/pithos/pithos-0.7.5-standalone.jar
similarity index 100%
rename from docker/pithos/pithos-0.7.5-standalone.jar
rename to app/build/pithos/pithos-0.7.5-standalone.jar
diff --git a/docker/postfix/Dockerfile b/app/build/postfix/Dockerfile
similarity index 100%
rename from docker/postfix/Dockerfile
rename to app/build/postfix/Dockerfile
diff --git a/docker/postfix/README.md b/app/build/postfix/README.md
similarity index 100%
rename from docker/postfix/README.md
rename to app/build/postfix/README.md
diff --git a/docker/postfix/entrypoint.sh b/app/build/postfix/entrypoint.sh
similarity index 100%
rename from docker/postfix/entrypoint.sh
rename to app/build/postfix/entrypoint.sh
diff --git a/docker/postgres/Dockerfile b/app/build/postgres/Dockerfile
similarity index 100%
rename from docker/postgres/Dockerfile
rename to app/build/postgres/Dockerfile
diff --git a/docker/postgres/README.md b/app/build/postgres/README.md
similarity index 100%
rename from docker/postgres/README.md
rename to app/build/postgres/README.md
diff --git a/docker/postgres/postgresql.conf b/app/build/postgres/postgresql.conf
similarity index 100%
rename from docker/postgres/postgresql.conf
rename to app/build/postgres/postgresql.conf
diff --git a/docker/postgres/start.sh b/app/build/postgres/start.sh
similarity index 100%
rename from docker/postgres/start.sh
rename to app/build/postgres/start.sh
diff --git a/docker/riotweb/Dockerfile b/app/build/riotweb/Dockerfile
similarity index 100%
rename from docker/riotweb/Dockerfile
rename to app/build/riotweb/Dockerfile
diff --git a/docker/riotweb/config.json b/app/build/riotweb/config.json
similarity index 100%
rename from docker/riotweb/config.json
rename to app/build/riotweb/config.json
diff --git a/docker/seafile/Dockerfile b/app/build/seafile/Dockerfile
similarity index 100%
rename from docker/seafile/Dockerfile
rename to app/build/seafile/Dockerfile
diff --git a/docker/seafile/README.md b/app/build/seafile/README.md
similarity index 100%
rename from docker/seafile/README.md
rename to app/build/seafile/README.md
diff --git a/docker/seafile/seadocker b/app/build/seafile/seadocker
similarity index 100%
rename from docker/seafile/seadocker
rename to app/build/seafile/seadocker
diff --git a/docker/seafile/seaenv b/app/build/seafile/seaenv
similarity index 100%
rename from docker/seafile/seaenv
rename to app/build/seafile/seaenv
diff --git a/docker/sogo/Dockerfile b/app/build/sogo/Dockerfile
similarity index 100%
rename from docker/sogo/Dockerfile
rename to app/build/sogo/Dockerfile
diff --git a/docker/sogo/README.md b/app/build/sogo/README.md
similarity index 100%
rename from docker/sogo/README.md
rename to app/build/sogo/README.md
diff --git a/docker/sogo/entrypoint b/app/build/sogo/entrypoint
similarity index 100%
rename from docker/sogo/entrypoint
rename to app/build/sogo/entrypoint
diff --git a/docker/sogo/sogo.nginx.conf b/app/build/sogo/sogo.nginx.conf
similarity index 100%
rename from docker/sogo/sogo.nginx.conf
rename to app/build/sogo/sogo.nginx.conf
diff --git a/docker/static/Dockerfile b/app/build/static/Dockerfile
similarity index 100%
rename from docker/static/Dockerfile
rename to app/build/static/Dockerfile
diff --git a/docker/static/README.md b/app/build/static/README.md
similarity index 100%
rename from docker/static/README.md
rename to app/build/static/README.md
diff --git a/docker/static/goStatic b/app/build/static/goStatic
similarity index 100%
rename from docker/static/goStatic
rename to app/build/static/goStatic
diff --git a/docker/webpull/.gitignore b/app/build/webpull/.gitignore
similarity index 100%
rename from docker/webpull/.gitignore
rename to app/build/webpull/.gitignore
diff --git a/docker/webpull/Dockerfile.nodejs b/app/build/webpull/Dockerfile.nodejs
similarity index 100%
rename from docker/webpull/Dockerfile.nodejs
rename to app/build/webpull/Dockerfile.nodejs
diff --git a/docker/webpull/Dockerfile.ruby b/app/build/webpull/Dockerfile.ruby
similarity index 100%
rename from docker/webpull/Dockerfile.ruby
rename to app/build/webpull/Dockerfile.ruby
diff --git a/docker/webpull/README.md b/app/build/webpull/README.md
similarity index 100%
rename from docker/webpull/README.md
rename to app/build/webpull/README.md
diff --git a/docker/webpull/main.go b/app/build/webpull/main.go
similarity index 100%
rename from docker/webpull/main.go
rename to app/build/webpull/main.go
diff --git a/consul/configuration/.gitignore b/app/config/configuration/.gitignore
similarity index 100%
rename from consul/configuration/.gitignore
rename to app/config/configuration/.gitignore
diff --git a/consul/configuration/chat/coturn/turnserver.conf.tpl b/app/config/configuration/chat/coturn/turnserver.conf.tpl
similarity index 100%
rename from consul/configuration/chat/coturn/turnserver.conf.tpl
rename to app/config/configuration/chat/coturn/turnserver.conf.tpl
diff --git a/consul/configuration/chat/easybridge/config.json.tpl b/app/config/configuration/chat/easybridge/config.json.tpl
similarity index 100%
rename from consul/configuration/chat/easybridge/config.json.tpl
rename to app/config/configuration/chat/easybridge/config.json.tpl
diff --git a/consul/configuration/chat/easybridge/registration.yaml.tpl b/app/config/configuration/chat/easybridge/registration.yaml.tpl
similarity index 100%
rename from consul/configuration/chat/easybridge/registration.yaml.tpl
rename to app/config/configuration/chat/easybridge/registration.yaml.tpl
diff --git a/consul/configuration/chat/fb2mx/config.yaml b/app/config/configuration/chat/fb2mx/config.yaml
similarity index 100%
rename from consul/configuration/chat/fb2mx/config.yaml
rename to app/config/configuration/chat/fb2mx/config.yaml
diff --git a/consul/configuration/chat/fb2mx/registration.yaml b/app/config/configuration/chat/fb2mx/registration.yaml
similarity index 100%
rename from consul/configuration/chat/fb2mx/registration.yaml
rename to app/config/configuration/chat/fb2mx/registration.yaml
diff --git a/consul/configuration/chat/riot_web/config.json b/app/config/configuration/chat/riot_web/config.json
similarity index 100%
rename from consul/configuration/chat/riot_web/config.json
rename to app/config/configuration/chat/riot_web/config.json
diff --git a/consul/configuration/chat/synapse/conf.d/report_stats.yaml b/app/config/configuration/chat/synapse/conf.d/report_stats.yaml
similarity index 100%
rename from consul/configuration/chat/synapse/conf.d/report_stats.yaml
rename to app/config/configuration/chat/synapse/conf.d/report_stats.yaml
diff --git a/consul/configuration/chat/synapse/conf.d/server_name.yaml b/app/config/configuration/chat/synapse/conf.d/server_name.yaml
similarity index 100%
rename from consul/configuration/chat/synapse/conf.d/server_name.yaml
rename to app/config/configuration/chat/synapse/conf.d/server_name.yaml
diff --git a/consul/configuration/chat/synapse/homeserver.yaml b/app/config/configuration/chat/synapse/homeserver.yaml
similarity index 100%
rename from consul/configuration/chat/synapse/homeserver.yaml
rename to app/config/configuration/chat/synapse/homeserver.yaml
diff --git a/consul/configuration/chat/synapse/log.yaml b/app/config/configuration/chat/synapse/log.yaml
similarity index 100%
rename from consul/configuration/chat/synapse/log.yaml
rename to app/config/configuration/chat/synapse/log.yaml
diff --git a/consul/configuration/directory/bottin/config.json b/app/config/configuration/directory/bottin/config.json
similarity index 100%
rename from consul/configuration/directory/bottin/config.json
rename to app/config/configuration/directory/bottin/config.json
diff --git a/consul/configuration/directory/guichet/config.json.tpl b/app/config/configuration/directory/guichet/config.json.tpl
similarity index 100%
rename from consul/configuration/directory/guichet/config.json.tpl
rename to app/config/configuration/directory/guichet/config.json.tpl
diff --git a/consul/configuration/email/dkim/keytable b/app/config/configuration/email/dkim/keytable
similarity index 100%
rename from consul/configuration/email/dkim/keytable
rename to app/config/configuration/email/dkim/keytable
diff --git a/consul/configuration/email/dkim/signingtable b/app/config/configuration/email/dkim/signingtable
similarity index 100%
rename from consul/configuration/email/dkim/signingtable
rename to app/config/configuration/email/dkim/signingtable
diff --git a/consul/configuration/email/dkim/smtp.private.sample b/app/config/configuration/email/dkim/smtp.private.sample
similarity index 100%
rename from consul/configuration/email/dkim/smtp.private.sample
rename to app/config/configuration/email/dkim/smtp.private.sample
diff --git a/consul/configuration/email/dkim/smtp.txt.sample b/app/config/configuration/email/dkim/smtp.txt.sample
similarity index 100%
rename from consul/configuration/email/dkim/smtp.txt.sample
rename to app/config/configuration/email/dkim/smtp.txt.sample
diff --git a/consul/configuration/email/dkim/trusted b/app/config/configuration/email/dkim/trusted
similarity index 100%
rename from consul/configuration/email/dkim/trusted
rename to app/config/configuration/email/dkim/trusted
diff --git a/consul/configuration/email/dovecot/certs.gen b/app/config/configuration/email/dovecot/certs.gen
similarity index 100%
rename from consul/configuration/email/dovecot/certs.gen
rename to app/config/configuration/email/dovecot/certs.gen
diff --git a/consul/configuration/email/dovecot/dovecot-ldap.conf.tpl b/app/config/configuration/email/dovecot/dovecot-ldap.conf.tpl
similarity index 100%
rename from consul/configuration/email/dovecot/dovecot-ldap.conf.tpl
rename to app/config/configuration/email/dovecot/dovecot-ldap.conf.tpl
diff --git a/consul/configuration/email/postfix/certs.gen b/app/config/configuration/email/postfix/certs.gen
similarity index 100%
rename from consul/configuration/email/postfix/certs.gen
rename to app/config/configuration/email/postfix/certs.gen
diff --git a/consul/configuration/email/postfix/dynamicmaps.cf b/app/config/configuration/email/postfix/dynamicmaps.cf
similarity index 100%
rename from consul/configuration/email/postfix/dynamicmaps.cf
rename to app/config/configuration/email/postfix/dynamicmaps.cf
diff --git a/consul/configuration/email/postfix/header_checks b/app/config/configuration/email/postfix/header_checks
similarity index 100%
rename from consul/configuration/email/postfix/header_checks
rename to app/config/configuration/email/postfix/header_checks
diff --git a/consul/configuration/email/postfix/ldap-account.cf.tpl b/app/config/configuration/email/postfix/ldap-account.cf.tpl
similarity index 100%
rename from consul/configuration/email/postfix/ldap-account.cf.tpl
rename to app/config/configuration/email/postfix/ldap-account.cf.tpl
diff --git a/consul/configuration/email/postfix/ldap-alias.cf.tpl b/app/config/configuration/email/postfix/ldap-alias.cf.tpl
similarity index 100%
rename from consul/configuration/email/postfix/ldap-alias.cf.tpl
rename to app/config/configuration/email/postfix/ldap-alias.cf.tpl
diff --git a/consul/configuration/email/postfix/ldap-virtual-domains.cf.tpl b/app/config/configuration/email/postfix/ldap-virtual-domains.cf.tpl
similarity index 100%
rename from consul/configuration/email/postfix/ldap-virtual-domains.cf.tpl
rename to app/config/configuration/email/postfix/ldap-virtual-domains.cf.tpl
diff --git a/consul/configuration/email/postfix/main.cf b/app/config/configuration/email/postfix/main.cf
similarity index 100%
rename from consul/configuration/email/postfix/main.cf
rename to app/config/configuration/email/postfix/main.cf
diff --git a/consul/configuration/email/postfix/master.cf b/app/config/configuration/email/postfix/master.cf
similarity index 100%
rename from consul/configuration/email/postfix/master.cf
rename to app/config/configuration/email/postfix/master.cf
diff --git a/consul/configuration/email/postfix/transport b/app/config/configuration/email/postfix/transport
similarity index 100%
rename from consul/configuration/email/postfix/transport
rename to app/config/configuration/email/postfix/transport
diff --git a/consul/configuration/email/postfix/transport.db b/app/config/configuration/email/postfix/transport.db
similarity index 100%
rename from consul/configuration/email/postfix/transport.db
rename to app/config/configuration/email/postfix/transport.db
diff --git a/consul/configuration/email/sogo/sogo.conf.tpl b/app/config/configuration/email/sogo/sogo.conf.tpl
similarity index 100%
rename from consul/configuration/email/sogo/sogo.conf.tpl
rename to app/config/configuration/email/sogo/sogo.conf.tpl
diff --git a/consul/configuration/mariadb/main/env.tpl b/app/config/configuration/mariadb/main/env.tpl
similarity index 100%
rename from consul/configuration/mariadb/main/env.tpl
rename to app/config/configuration/mariadb/main/env.tpl
diff --git a/consul/configuration/nextcloud/config.php.tpl b/app/config/configuration/nextcloud/config.php.tpl
similarity index 100%
rename from consul/configuration/nextcloud/config.php.tpl
rename to app/config/configuration/nextcloud/config.php.tpl
diff --git a/consul/configuration/postgres/keeper/env.tpl b/app/config/configuration/postgres/keeper/env.tpl
similarity index 100%
rename from consul/configuration/postgres/keeper/env.tpl
rename to app/config/configuration/postgres/keeper/env.tpl
diff --git a/consul/configuration/seafile/ccnet/mykey.peer.sample b/app/config/configuration/seafile/ccnet/mykey.peer.sample
similarity index 100%
rename from consul/configuration/seafile/ccnet/mykey.peer.sample
rename to app/config/configuration/seafile/ccnet/mykey.peer.sample
diff --git a/consul/configuration/seafile/ccnet/seafile.ini b/app/config/configuration/seafile/ccnet/seafile.ini
similarity index 100%
rename from consul/configuration/seafile/ccnet/seafile.ini
rename to app/config/configuration/seafile/ccnet/seafile.ini
diff --git a/consul/configuration/seafile/conf/ccnet.conf.tpl b/app/config/configuration/seafile/conf/ccnet.conf.tpl
similarity index 100%
rename from consul/configuration/seafile/conf/ccnet.conf.tpl
rename to app/config/configuration/seafile/conf/ccnet.conf.tpl
diff --git a/consul/configuration/seafile/conf/mykey.peer.sample b/app/config/configuration/seafile/conf/mykey.peer.sample
similarity index 100%
rename from consul/configuration/seafile/conf/mykey.peer.sample
rename to app/config/configuration/seafile/conf/mykey.peer.sample
diff --git a/consul/configuration/seafile/conf/seafdav.conf b/app/config/configuration/seafile/conf/seafdav.conf
similarity index 100%
rename from consul/configuration/seafile/conf/seafdav.conf
rename to app/config/configuration/seafile/conf/seafdav.conf
diff --git a/consul/configuration/seafile/conf/seafile.conf.tpl b/app/config/configuration/seafile/conf/seafile.conf.tpl
similarity index 100%
rename from consul/configuration/seafile/conf/seafile.conf.tpl
rename to app/config/configuration/seafile/conf/seafile.conf.tpl
diff --git a/consul/configuration/seafile/conf/seahub_settings.py.tpl b/app/config/configuration/seafile/conf/seahub_settings.py.tpl
similarity index 100%
rename from consul/configuration/seafile/conf/seahub_settings.py.tpl
rename to app/config/configuration/seafile/conf/seahub_settings.py.tpl
diff --git a/consul/configuration/traefik/traefik.toml b/app/config/configuration/traefik/traefik.toml
similarity index 100%
rename from consul/configuration/traefik/traefik.toml
rename to app/config/configuration/traefik/traefik.toml
diff --git a/consul/restore_configuration.sh b/app/config/restore_configuration.sh
similarity index 100%
rename from consul/restore_configuration.sh
rename to app/config/restore_configuration.sh
diff --git a/consul/secrets/.gitignore b/app/config/secrets/.gitignore
similarity index 100%
rename from consul/secrets/.gitignore
rename to app/config/secrets/.gitignore
diff --git a/consul/secrets/chat/coturn/static-auth.sample b/app/config/secrets/chat/coturn/static-auth.sample
similarity index 100%
rename from consul/secrets/chat/coturn/static-auth.sample
rename to app/config/secrets/chat/coturn/static-auth.sample
diff --git a/consul/secrets/chat/fb2mx/as_token.sample b/app/config/secrets/chat/fb2mx/as_token.sample
similarity index 100%
rename from consul/secrets/chat/fb2mx/as_token.sample
rename to app/config/secrets/chat/fb2mx/as_token.sample
diff --git a/consul/secrets/chat/fb2mx/db_url.sample b/app/config/secrets/chat/fb2mx/db_url.sample
similarity index 100%
rename from consul/secrets/chat/fb2mx/db_url.sample
rename to app/config/secrets/chat/fb2mx/db_url.sample
diff --git a/consul/secrets/chat/fb2mx/hs_token.sample b/app/config/secrets/chat/fb2mx/hs_token.sample
similarity index 100%
rename from consul/secrets/chat/fb2mx/hs_token.sample
rename to app/config/secrets/chat/fb2mx/hs_token.sample
diff --git a/consul/secrets/chat/synapse/homeserver.tls.crt.sample b/app/config/secrets/chat/synapse/homeserver.tls.crt.sample
similarity index 100%
rename from consul/secrets/chat/synapse/homeserver.tls.crt.sample
rename to app/config/secrets/chat/synapse/homeserver.tls.crt.sample
diff --git a/consul/secrets/chat/synapse/homeserver.tls.dh.sample b/app/config/secrets/chat/synapse/homeserver.tls.dh.sample
similarity index 100%
rename from consul/secrets/chat/synapse/homeserver.tls.dh.sample
rename to app/config/secrets/chat/synapse/homeserver.tls.dh.sample
diff --git a/consul/secrets/chat/synapse/homeserver.tls.key.sample b/app/config/secrets/chat/synapse/homeserver.tls.key.sample
similarity index 100%
rename from consul/secrets/chat/synapse/homeserver.tls.key.sample
rename to app/config/secrets/chat/synapse/homeserver.tls.key.sample
diff --git a/consul/secrets/chat/synapse/ldap_binddn.sample b/app/config/secrets/chat/synapse/ldap_binddn.sample
similarity index 100%
rename from consul/secrets/chat/synapse/ldap_binddn.sample
rename to app/config/secrets/chat/synapse/ldap_binddn.sample
diff --git a/consul/secrets/chat/synapse/ldap_bindpw.sample b/app/config/secrets/chat/synapse/ldap_bindpw.sample
similarity index 100%
rename from consul/secrets/chat/synapse/ldap_bindpw.sample
rename to app/config/secrets/chat/synapse/ldap_bindpw.sample
diff --git a/consul/secrets/chat/synapse/postgres_db.sample b/app/config/secrets/chat/synapse/postgres_db.sample
similarity index 100%
rename from consul/secrets/chat/synapse/postgres_db.sample
rename to app/config/secrets/chat/synapse/postgres_db.sample
diff --git a/consul/secrets/chat/synapse/postgres_pwd.sample b/app/config/secrets/chat/synapse/postgres_pwd.sample
similarity index 100%
rename from consul/secrets/chat/synapse/postgres_pwd.sample
rename to app/config/secrets/chat/synapse/postgres_pwd.sample
diff --git a/consul/secrets/chat/synapse/postgres_user.sample b/app/config/secrets/chat/synapse/postgres_user.sample
similarity index 100%
rename from consul/secrets/chat/synapse/postgres_user.sample
rename to app/config/secrets/chat/synapse/postgres_user.sample
diff --git a/consul/secrets/chat/synapse/registration_shared_secret.sample b/app/config/secrets/chat/synapse/registration_shared_secret.sample
similarity index 100%
rename from consul/secrets/chat/synapse/registration_shared_secret.sample
rename to app/config/secrets/chat/synapse/registration_shared_secret.sample
diff --git a/consul/secrets/email/sogo/ldap_binddn.sample b/app/config/secrets/email/sogo/ldap_binddn.sample
similarity index 100%
rename from consul/secrets/email/sogo/ldap_binddn.sample
rename to app/config/secrets/email/sogo/ldap_binddn.sample
diff --git a/consul/secrets/email/sogo/ldap_bindpw.sample b/app/config/secrets/email/sogo/ldap_bindpw.sample
similarity index 100%
rename from consul/secrets/email/sogo/ldap_bindpw.sample
rename to app/config/secrets/email/sogo/ldap_bindpw.sample
diff --git a/consul/secrets/email/sogo/postgre_auth.sample b/app/config/secrets/email/sogo/postgre_auth.sample
similarity index 100%
rename from consul/secrets/email/sogo/postgre_auth.sample
rename to app/config/secrets/email/sogo/postgre_auth.sample
diff --git a/consul/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample b/app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample
similarity index 100%
rename from consul/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample
rename to app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample
diff --git a/consul/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample b/app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample
similarity index 100%
rename from consul/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample
rename to app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample
diff --git a/consul/secrets/jitsi/global_env.sample b/app/config/secrets/jitsi/global_env.sample
similarity index 100%
rename from consul/secrets/jitsi/global_env.sample
rename to app/config/secrets/jitsi/global_env.sample
diff --git a/consul/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample b/app/config/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample
similarity index 100%
rename from consul/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample
rename to app/config/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample
diff --git a/consul/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample b/app/config/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample
similarity index 100%
rename from consul/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample
rename to app/config/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample
diff --git a/consul/secrets/mariadb/main/ldap_binddn.sample b/app/config/secrets/mariadb/main/ldap_binddn.sample
similarity index 100%
rename from consul/secrets/mariadb/main/ldap_binddn.sample
rename to app/config/secrets/mariadb/main/ldap_binddn.sample
diff --git a/consul/secrets/mariadb/main/ldap_bindpwd.sample b/app/config/secrets/mariadb/main/ldap_bindpwd.sample
similarity index 100%
rename from consul/secrets/mariadb/main/ldap_bindpwd.sample
rename to app/config/secrets/mariadb/main/ldap_bindpwd.sample
diff --git a/consul/secrets/mariadb/main/mysql_pwd.sample b/app/config/secrets/mariadb/main/mysql_pwd.sample
similarity index 100%
rename from consul/secrets/mariadb/main/mysql_pwd.sample
rename to app/config/secrets/mariadb/main/mysql_pwd.sample
diff --git a/consul/secrets/platoo/bddpw.sample b/app/config/secrets/platoo/bddpw.sample
similarity index 100%
rename from consul/secrets/platoo/bddpw.sample
rename to app/config/secrets/platoo/bddpw.sample
diff --git a/consul/secrets/postgres/keeper/pg_repl_pwd.sample b/app/config/secrets/postgres/keeper/pg_repl_pwd.sample
similarity index 100%
rename from consul/secrets/postgres/keeper/pg_repl_pwd.sample
rename to app/config/secrets/postgres/keeper/pg_repl_pwd.sample
diff --git a/consul/secrets/postgres/keeper/pg_repl_username.sample b/app/config/secrets/postgres/keeper/pg_repl_username.sample
similarity index 100%
rename from consul/secrets/postgres/keeper/pg_repl_username.sample
rename to app/config/secrets/postgres/keeper/pg_repl_username.sample
diff --git a/consul/secrets/postgres/keeper/pg_su_pwd.sample b/app/config/secrets/postgres/keeper/pg_su_pwd.sample
similarity index 100%
rename from consul/secrets/postgres/keeper/pg_su_pwd.sample
rename to app/config/secrets/postgres/keeper/pg_su_pwd.sample
diff --git a/consul/secrets/web/home_token.sample b/app/config/secrets/web/home_token.sample
similarity index 100%
rename from consul/secrets/web/home_token.sample
rename to app/config/secrets/web/home_token.sample
diff --git a/consul/secrets/web/quentin.dufour.io_token.sample b/app/config/secrets/web/quentin.dufour.io_token.sample
similarity index 100%
rename from consul/secrets/web/quentin.dufour.io_token.sample
rename to app/config/secrets/web/quentin.dufour.io_token.sample
diff --git a/nomad/bottin2.hcl b/app/deployment/bottin2.hcl
similarity index 100%
rename from nomad/bottin2.hcl
rename to app/deployment/bottin2.hcl
diff --git a/nomad/core.hcl b/app/deployment/core.hcl
similarity index 100%
rename from nomad/core.hcl
rename to app/deployment/core.hcl
diff --git a/nomad/email.hcl b/app/deployment/email.hcl
similarity index 100%
rename from nomad/email.hcl
rename to app/deployment/email.hcl
diff --git a/nomad/garage.hcl b/app/deployment/garage.hcl
similarity index 100%
rename from nomad/garage.hcl
rename to app/deployment/garage.hcl
diff --git a/nomad/im.hcl b/app/deployment/im.hcl
similarity index 100%
rename from nomad/im.hcl
rename to app/deployment/im.hcl
diff --git a/nomad/jitsi.hcl b/app/deployment/jitsi.hcl
similarity index 95%
rename from nomad/jitsi.hcl
rename to app/deployment/jitsi.hcl
index 4ef2f98..c1bee73 100644
--- a/nomad/jitsi.hcl
+++ b/app/deployment/jitsi.hcl
@@ -1,9 +1,3 @@
-/*
- * WIP WIP WIP WIP
- *
- *   + NEED TO SET ENV VARIABLES
- */
-
 job "jitsi" {
   datacenters = ["dc1"]
   type = "service"
@@ -17,7 +11,7 @@ job "jitsi" {
     task "xmpp" {
       driver = "docker"
       config {
-        image = "superboum/amd64_jitsi_xmpp:v1"
+        image = "superboum/amd64_jitsi_xmpp:v4"
         network_mode = "host"
         port_map {
           xmpp_port = 5222
@@ -93,7 +87,7 @@ job "jitsi" {
     task "front" {
       driver = "docker"
       config {
-        image = "superboum/amd64_jitsi_front:v5"
+        image = "superboum/amd64_jitsi_meet:v1"
         network_mode = "host"
         port_map {
           https_port = 443
@@ -157,7 +151,7 @@ job "jitsi" {
     task "jicofo" {
       driver = "docker"
       config {
-        image = "superboum/amd64_jitsi_conference_focus:v2"
+        image = "superboum/amd64_jitsi_conference_focus:v5"
         network_mode = "host"
       }
 
@@ -189,7 +183,7 @@ job "jitsi" {
     task "videobridge" {
       driver = "docker"
       config {
-        image = "superboum/amd64_jitsi_videobridge:v9"
+        image = "superboum/amd64_jitsi_videobridge:v15"
         network_mode = "host"
         port_map {
           video1_port = 8080
diff --git a/nomad/mariadb.hcl b/app/deployment/mariadb.hcl
similarity index 100%
rename from nomad/mariadb.hcl
rename to app/deployment/mariadb.hcl
diff --git a/nomad/nextcloud.hcl b/app/deployment/nextcloud.hcl
similarity index 100%
rename from nomad/nextcloud.hcl
rename to app/deployment/nextcloud.hcl
diff --git a/nomad/object_storage.hcl b/app/deployment/object_storage.hcl
similarity index 100%
rename from nomad/object_storage.hcl
rename to app/deployment/object_storage.hcl
diff --git a/nomad/platoo.hcl b/app/deployment/platoo.hcl
similarity index 100%
rename from nomad/platoo.hcl
rename to app/deployment/platoo.hcl
diff --git a/nomad/postgres.hcl b/app/deployment/postgres.hcl
similarity index 100%
rename from nomad/postgres.hcl
rename to app/deployment/postgres.hcl
diff --git a/nomad/science.hcl b/app/deployment/science.hcl
similarity index 100%
rename from nomad/science.hcl
rename to app/deployment/science.hcl
diff --git a/nomad/seafile.hcl b/app/deployment/seafile.hcl
similarity index 100%
rename from nomad/seafile.hcl
rename to app/deployment/seafile.hcl
diff --git a/nomad/traefik.hcl b/app/deployment/traefik.hcl
similarity index 100%
rename from nomad/traefik.hcl
rename to app/deployment/traefik.hcl
diff --git a/nomad/web_static.hcl b/app/deployment/web_static.hcl
similarity index 100%
rename from nomad/web_static.hcl
rename to app/deployment/web_static.hcl
diff --git a/nomad/webcap.hcl b/app/deployment/webcap.hcl
similarity index 100%
rename from nomad/webcap.hcl
rename to app/deployment/webcap.hcl
diff --git a/docker/jitsi/01_gen_certs.yml b/app/integration/jitsi/01_gen_certs.yml
similarity index 78%
rename from docker/jitsi/01_gen_certs.yml
rename to app/integration/jitsi/01_gen_certs.yml
index 8c97384..bf73291 100644
--- a/docker/jitsi/01_gen_certs.yml
+++ b/app/integration/jitsi/01_gen_certs.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   jitsi-xmpp:
-    build: ./jitsi-xmpp
+    image: superboum/amd64_jitsi_xmpp:v2
     command: ["/usr/local/bin/xmpp_gen"]
     volumes: [ './jitsi-certs/:/certs:rw' ]
     env_file: [ 'dev.env' ]
diff --git a/docker/jitsi/02_run.yml b/app/integration/jitsi/02_run.yml
similarity index 50%
rename from docker/jitsi/02_run.yml
rename to app/integration/jitsi/02_run.yml
index 3fc0e26..73eefad 100644
--- a/docker/jitsi/02_run.yml
+++ b/app/integration/jitsi/02_run.yml
@@ -1,41 +1,27 @@
 version: '3.4'
 services:
   jitsi-xmpp:
-    build: ./jitsi-xmpp
-    image: superboum/amd64_jitsi_xmpp:v1
-    network_mode: host
+    image: superboum/amd64_jitsi_xmpp:v3
     ports:
       - "5222:5222"
       - "5347:5347"
       - "5280:5280"
     env_file: [ 'dev.env' ]
     volumes: [ './jitsi-certs/:/certs:ro' ]
-  jitsi-front:
-    build: 
-      context: ./jitsi-front
-      network: host
-      #^-- I have some DNS problems on Fedora 32 in Docker
-    image: superboum/amd64_jitsi_front:v5
+  jitsi-meet:
+    image: superboum/amd64_jitsi_meet:v1
     ports:
       - "443:443"
     env_file: [ 'dev.env' ]
     volumes: [ './jitsi-certs/:/certs:ro' ]
   jitsi-conference-focus:
-    build: 
-      context: ./jitsi-conference-focus
-      network: host
-    image: superboum/amd64_jitsi_conference_focus:v2
+    image: superboum/amd64_jitsi_conference_focus:v4
     env_file: [ 'dev.env' ]
     volumes: [ './jitsi-certs/:/certs:ro' ]
   jitsi-videobridge:
-    build: 
-      context: ./jitsi-videobridge
-      network: host
-    image: superboum/amd64_jitsi_videobridge:v9
-    network_mode: host
+    image: superboum/amd64_jitsi_videobridge:v14
     ports:
       - "8080:8080/tcp"
       - "10000:10000/udp"
     env_file: [ 'dev.env' ]
     volumes: [ './jitsi-certs/:/certs:ro' ]
-    
diff --git a/docker/jitsi/README.md b/app/integration/jitsi/README.md
similarity index 100%
rename from docker/jitsi/README.md
rename to app/integration/jitsi/README.md
diff --git a/docker/jitsi/dev.env b/app/integration/jitsi/dev.env
similarity index 58%
rename from docker/jitsi/dev.env
rename to app/integration/jitsi/dev.env
index 4fff8c1..1dd2122 100644
--- a/docker/jitsi/dev.env
+++ b/app/integration/jitsi/dev.env
@@ -2,9 +2,9 @@ JITSI_SECRET_VIDEOBRIDGE=S3CR3T01
 JITSI_SECRET_JICOFO_COMPONENT=S3CR3T02
 JITSI_SECRET_JICOFO_USER=S3CR3T03
 JITSI_PROSODY_BOSH_PORT=5280
-JITSI_PROSODY_BOSH_HOST=127.0.0.1
-JITSI_PROSODY_HOST=127.0.0.1
+JITSI_PROSODY_BOSH_HOST=172.17.0.1
+JITSI_PROSODY_HOST=172.17.0.1
 JITSI_CERTS_FOLDER=/certs/
-JITSI_NAT_PUBLIC_IP=77.204.7.239
-JITSI_NAT_LOCAL_IP=192.168.0.18
+JITSI_NAT_PUBLIC_IP=37.164.35.154
+JITSI_NAT_LOCAL_IP=192.168.0.231
 JITSI_VIDEO_TCP=8080
diff --git a/docker/jitsi/jitsi-certs/.gitignore b/app/integration/jitsi/jitsi-certs/.gitignore
similarity index 100%
rename from docker/jitsi/jitsi-certs/.gitignore
rename to app/integration/jitsi/jitsi-certs/.gitignore
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
deleted file mode 100644
index 966ed90..0000000
--- a/docker/docker-compose.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: '3.4'
-services:
-  riot:
-    build:
-      context: ./riotweb
-      args:
-        # https://github.com/vector-im/riot-web/releases
-        VERSION: 1.7.5
-    image: superboum/amd64_riotweb:v15
-  synapse:
-    build: 
-      context: ./matrix-synapse
-      args:
-        # https://github.com/matrix-org/synapse/releases
-        VERSION: 1.19.1
-    image: superboum/amd64_synapse:v33
-  sogo:
-    build:
-      context: ./sogo
-      args:
-        # fake for now
-        VERSION: 5.0.0
-    image: superboum/amd64_sogo:v7
-
diff --git a/docker/jitsi/jitsi-conference-focus/Dockerfile b/docker/jitsi/jitsi-conference-focus/Dockerfile
deleted file mode 100644
index 7b6410a..0000000
--- a/docker/jitsi/jitsi-conference-focus/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM debian:buster AS builder
-
-ENV VERSION=4510
-RUN apt-get update && \
-    apt-get install -y openjdk-11-jdk maven wget unzip && \
-    wget https://github.com/jitsi/jicofo/archive/jitsi-meet_${VERSION}.zip -O jicofo.zip && \
-    unzip jicofo.zip && \
-    mv jicofo-jitsi-meet_${VERSION} jicofo && \
-    cd jicofo && \
-    mvn package -DskipTests -Dassembly.skipAssembly=false && \
-    unzip target/jicofo-1.1-SNAPSHOT-archive.zip && \
-    mv jicofo-1.1-SNAPSHOT /srv/build
-
-FROM debian:buster
-
-RUN apt-get update && \
-    apt-get install -y openjdk-11-jdk ca-certificates
-
-COPY --from=builder /srv/build /srv/jicofo
-COPY jicofo /usr/local/bin/jicofo
-
-CMD ["/usr/local/bin/jicofo"]
diff --git a/docker/jitsi/jitsi-front/Dockerfile b/docker/jitsi/jitsi-front/Dockerfile
deleted file mode 100644
index d30682c..0000000
--- a/docker/jitsi/jitsi-front/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM debian:buster AS builder
-
-ENV VERSION=4048
-RUN apt-get update && \
-    apt-get install -y npm git nodejs make wget unzip && \
-    wget https://github.com/jitsi/jitsi-meet/archive/${VERSION}.zip -O jitsi-meet.zip && \
-    unzip jitsi-meet.zip && \
-    mv jitsi-meet-${VERSION} jitsi-meet && \
-    cd jitsi-meet && \
-    npm install && \
-    make && \
-    sed -i \
-      "s/OPTIMAL_BROWSERS: \[.*\],/    OPTIMAL_BROWSERS: [ 'chrome', 'chromium', 'nwjs', 'electron' ],/g" \
-      interface_config.js && \
-    sed -i \
-      "s/UNSUPPORTED_BROWSERS: \[.*\],/    UNSUPPORTED_BROWSERS: [ 'firefox' ],/g" \
-      interface_config.js
-
-FROM debian:buster
-
-COPY --from=builder /jitsi-meet /srv/jitsi-meet
-RUN apt-get update && \
-    apt-get install -y nginx && \
-    rm /etc/nginx/sites-enabled/*
-
-COPY config.js /srv/jitsi-meet/config.js
-COPY entrypoint.sh /usr/local/bin/entrypoint
-ENTRYPOINT ["/usr/local/bin/entrypoint"]
-CMD ["/usr/sbin/nginx", "-g", "daemon off;"]
diff --git a/man/create_database/README.md b/op_guide/create_database/README.md
similarity index 100%
rename from man/create_database/README.md
rename to op_guide/create_database/README.md
diff --git a/man/init_stolon/README.md b/op_guide/init_stolon/README.md
similarity index 100%
rename from man/init_stolon/README.md
rename to op_guide/init_stolon/README.md
diff --git a/man/nextcloud/README.md b/op_guide/nextcloud/README.md
similarity index 100%
rename from man/nextcloud/README.md
rename to op_guide/nextcloud/README.md
diff --git a/bootstrap/README.md b/os/build/README.md
similarity index 100%
rename from bootstrap/README.md
rename to os/build/README.md
diff --git a/bootstrap/build-installer.sh b/os/build/build-installer.sh
similarity index 100%
rename from bootstrap/build-installer.sh
rename to os/build/build-installer.sh
diff --git a/ansible/README.md b/os/config/README.md
similarity index 100%
rename from ansible/README.md
rename to os/config/README.md
diff --git a/ansible/README.more.md b/os/config/README.more.md
similarity index 100%
rename from ansible/README.more.md
rename to os/config/README.more.md
diff --git a/ansible/cluster_nodes.yml b/os/config/cluster_nodes.yml
similarity index 100%
rename from ansible/cluster_nodes.yml
rename to os/config/cluster_nodes.yml
diff --git a/ansible/group_vars/all/.gitignore b/os/config/group_vars/all/.gitignore
similarity index 100%
rename from ansible/group_vars/all/.gitignore
rename to os/config/group_vars/all/.gitignore
diff --git a/ansible/group_vars/all/vars_file.yml.sample b/os/config/group_vars/all/vars_file.yml.sample
similarity index 100%
rename from ansible/group_vars/all/vars_file.yml.sample
rename to os/config/group_vars/all/vars_file.yml.sample
diff --git a/ansible/production b/os/config/production
similarity index 100%
rename from ansible/production
rename to os/config/production
diff --git a/ansible/roles/common/tasks/main.yml b/os/config/roles/common/tasks/main.yml
similarity index 100%
rename from ansible/roles/common/tasks/main.yml
rename to os/config/roles/common/tasks/main.yml
diff --git a/ansible/roles/consul/files/consul.service b/os/config/roles/consul/files/consul.service
similarity index 100%
rename from ansible/roles/consul/files/consul.service
rename to os/config/roles/consul/files/consul.service
diff --git a/ansible/roles/consul/tasks/main.yml b/os/config/roles/consul/tasks/main.yml
similarity index 100%
rename from ansible/roles/consul/tasks/main.yml
rename to os/config/roles/consul/tasks/main.yml
diff --git a/ansible/roles/consul/templates/consul.json.j2 b/os/config/roles/consul/templates/consul.json.j2
similarity index 100%
rename from ansible/roles/consul/templates/consul.json.j2
rename to os/config/roles/consul/templates/consul.json.j2
diff --git a/ansible/roles/consul/templates/resolv.conf.j2 b/os/config/roles/consul/templates/resolv.conf.j2
similarity index 100%
rename from ansible/roles/consul/templates/resolv.conf.j2
rename to os/config/roles/consul/templates/resolv.conf.j2
diff --git a/ansible/roles/consul/vars/.gitignore b/os/config/roles/consul/vars/.gitignore
similarity index 100%
rename from ansible/roles/consul/vars/.gitignore
rename to os/config/roles/consul/vars/.gitignore
diff --git a/ansible/roles/consul/vars/main.yml.sample b/os/config/roles/consul/vars/main.yml.sample
similarity index 100%
rename from ansible/roles/consul/vars/main.yml.sample
rename to os/config/roles/consul/vars/main.yml.sample
diff --git a/ansible/roles/network/files/rules.v6 b/os/config/roles/network/files/rules.v6
similarity index 100%
rename from ansible/roles/network/files/rules.v6
rename to os/config/roles/network/files/rules.v6
diff --git a/ansible/roles/network/tasks/main.yml b/os/config/roles/network/tasks/main.yml
similarity index 100%
rename from ansible/roles/network/tasks/main.yml
rename to os/config/roles/network/tasks/main.yml
diff --git a/ansible/roles/network/templates/rules.v4.j2 b/os/config/roles/network/templates/rules.v4.j2
similarity index 100%
rename from ansible/roles/network/templates/rules.v4.j2
rename to os/config/roles/network/templates/rules.v4.j2
diff --git a/ansible/roles/nomad/files/nomad.service b/os/config/roles/nomad/files/nomad.service
similarity index 100%
rename from ansible/roles/nomad/files/nomad.service
rename to os/config/roles/nomad/files/nomad.service
diff --git a/ansible/roles/nomad/tasks/main.yml b/os/config/roles/nomad/tasks/main.yml
similarity index 100%
rename from ansible/roles/nomad/tasks/main.yml
rename to os/config/roles/nomad/tasks/main.yml
diff --git a/ansible/roles/nomad/templates/nomad.hcl.j2 b/os/config/roles/nomad/templates/nomad.hcl.j2
similarity index 100%
rename from ansible/roles/nomad/templates/nomad.hcl.j2
rename to os/config/roles/nomad/templates/nomad.hcl.j2
diff --git a/ansible/roles/storage/handlers/main.yml b/os/config/roles/storage/handlers/main.yml
similarity index 100%
rename from ansible/roles/storage/handlers/main.yml
rename to os/config/roles/storage/handlers/main.yml
diff --git a/ansible/roles/storage/tasks/main.yml b/os/config/roles/storage/tasks/main.yml
similarity index 100%
rename from ansible/roles/storage/tasks/main.yml
rename to os/config/roles/storage/tasks/main.yml
diff --git a/ansible/roles/users/files/alex-key1.pub b/os/config/roles/users/files/alex-key1.pub
similarity index 100%
rename from ansible/roles/users/files/alex-key1.pub
rename to os/config/roles/users/files/alex-key1.pub
diff --git a/ansible/roles/users/files/alex-key2.pub b/os/config/roles/users/files/alex-key2.pub
similarity index 100%
rename from ansible/roles/users/files/alex-key2.pub
rename to os/config/roles/users/files/alex-key2.pub
diff --git a/ansible/roles/users/files/florian-key1.pub b/os/config/roles/users/files/florian-key1.pub
similarity index 100%
rename from ansible/roles/users/files/florian-key1.pub
rename to os/config/roles/users/files/florian-key1.pub
diff --git a/ansible/roles/users/files/florian-key2.pub b/os/config/roles/users/files/florian-key2.pub
similarity index 100%
rename from ansible/roles/users/files/florian-key2.pub
rename to os/config/roles/users/files/florian-key2.pub
diff --git a/ansible/roles/users/files/maximilien-key1.pub b/os/config/roles/users/files/maximilien-key1.pub
similarity index 100%
rename from ansible/roles/users/files/maximilien-key1.pub
rename to os/config/roles/users/files/maximilien-key1.pub
diff --git a/ansible/roles/users/files/quentin-key1.pub b/os/config/roles/users/files/quentin-key1.pub
similarity index 100%
rename from ansible/roles/users/files/quentin-key1.pub
rename to os/config/roles/users/files/quentin-key1.pub
diff --git a/ansible/roles/users/files/quentin-key2.pub b/os/config/roles/users/files/quentin-key2.pub
similarity index 100%
rename from ansible/roles/users/files/quentin-key2.pub
rename to os/config/roles/users/files/quentin-key2.pub
diff --git a/ansible/roles/users/tasks/main.yml b/os/config/roles/users/tasks/main.yml
similarity index 100%
rename from ansible/roles/users/tasks/main.yml
rename to os/config/roles/users/tasks/main.yml
diff --git a/ansible/roles/users/vars/main.yml b/os/config/roles/users/vars/main.yml
similarity index 100%
rename from ansible/roles/users/vars/main.yml
rename to os/config/roles/users/vars/main.yml
diff --git a/ansible/site.yml b/os/config/site.yml
similarity index 100%
rename from ansible/site.yml
rename to os/config/site.yml