diff --git a/affine/docker-compose.yml b/confs/affine/docker-compose.yml
similarity index 96%
rename from affine/docker-compose.yml
rename to confs/affine/docker-compose.yml
index 6a8dc4d..cfa9a52 100644
--- a/affine/docker-compose.yml
+++ b/confs/affine/docker-compose.yml
@@ -1,21 +1,21 @@
-version: '3'
-
-services: 
-  affine:
-    image: ghcr.io/toeverything/affine:nightly-server-latest
-    restart: always
-    container_name: affine
-    networks:
-      - proxy
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.affine-secure.entrypoints=https"
-      - "traefik.http.routers.affine-secure.rule=Host(`affine.mrdev023.fr`)"
-      - "traefik.http.routers.affine-secure.tls=true"
-      - "traefik.http.routers.affine-secure.tls.certresolver=sslResolver"
-      - "traefik.http.services.affine-secure.loadbalancer.server.port=3000"
-      - "traefik.docker.network=proxy"
-
-networks:
-  proxy:
-    external: true
+version: '3'
+
+services: 
+  affine:
+    image: ghcr.io/toeverything/affine:nightly-server-latest
+    restart: always
+    container_name: affine
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.affine-secure.entrypoints=https"
+      - "traefik.http.routers.affine-secure.rule=Host(`affine.mrdev023.fr`)"
+      - "traefik.http.routers.affine-secure.tls=true"
+      - "traefik.http.routers.affine-secure.tls.certresolver=sslResolver"
+      - "traefik.http.services.affine-secure.loadbalancer.server.port=3000"
+      - "traefik.docker.network=proxy"
+
+networks:
+  proxy:
+    external: true
diff --git a/cloud/cron.sh b/confs/cloud/cron.sh
similarity index 100%
rename from cloud/cron.sh
rename to confs/cloud/cron.sh
diff --git a/cloud/docker-compose.yml b/confs/cloud/docker-compose.yml
similarity index 97%
rename from cloud/docker-compose.yml
rename to confs/cloud/docker-compose.yml
index 7ba0197..52fa22c 100644
--- a/cloud/docker-compose.yml
+++ b/confs/cloud/docker-compose.yml
@@ -1,70 +1,70 @@
-version: '3'
-
-services:
-  db:
-    image: postgres:14
-    restart: always
-    container_name: nextcloud_db
-    networks:
-      - internal
-    volumes:
-      - db:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_PASSWORD=nextcloud
-      - POSTGRES_DB=nextcloud
-      - POSTGRES_USER=nextcloud
-
-  nextcloud:
-    image: nextcloud
-    restart: always
-    container_name: nextcloud
-    networks:
-      - proxy
-      - protonmail
-      - internal
-    depends_on:
-      - db
-    volumes:
-      - nextcloud:/var/www/html
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.middlewares.nextcloud-compress.compress=true"
-      - "traefik.http.middlewares.nextcloud-regex-redirect.redirectregex.permanent=true"
-      - "traefik.http.middlewares.nextcloud-regex-redirect.redirectregex.regex=https://(.*)/.well-known/(card|cal)dav"
-      - "traefik.http.middlewares.nextcloud-regex-redirect.redirectregex.replacement=https://$$1/remote.php/dav/"
-      - "traefik.http.middlewares.nextcloud-headers.headers.frameDeny=true"
-      - "traefik.http.middlewares.nextcloud-headers.headers.sslRedirect=true"
-      - "traefik.http.middlewares.nextcloud-headers.headers.contentTypeNosniff=true"
-      - "traefik.http.middlewares.nextcloud-headers.headers.stsIncludeSubdomains=true"
-      - "traefik.http.middlewares.nextcloud-headers.headers.stsPreload=true"
-      - "traefik.http.middlewares.nextcloud-headers.headers.stsSeconds=31536000"
-      - "traefik.http.middlewares.nextcloud-headers.headers.referrerPolicy=same-origin"
-      - "traefik.http.middlewares.nextcloud-headers.headers.browserXssFilter=true"
-      - "traefik.http.middlewares.nextcloud-headers.headers.customRequestHeaders.X-Forwarded-Proto=https"
-      - "traefik.http.middlewares.nextcloud-headers.headers.customRequestHeaders.X-Robots-Tag=none"
-      - "traefik.http.middlewares.nextcloud-headers.headers.customFrameOptionsValue=SAMEORIGIN"
-      - "traefik.http.routers.nextcloud-secure.entrypoints=https"
-      - "traefik.http.routers.nextcloud-secure.rule=Host(`mycld.mrdev023.fr`)"
-      - "traefik.http.routers.nextcloud-secure.tls=true"
-      - "traefik.http.routers.nextcloud-secure.tls.certresolver=sslResolver"
-      - "traefik.http.routers.nextcloud-secure.middlewares=nextcloud-compress,nextcloud-regex-redirect,nextcloud-headers"
-      # - "traefik.http.routers.nextcloud-secure.service=nextcloud"
-      # - "traefik.http.services.nextcloud.loadbalancer.server.port=9002"
-      - "traefik.docker.network=proxy"
-    environment:
-      - POSTGRES_PASSWORD=nextcloud
-      - POSTGRES_DATABASE=nextcloud
-      - POSTGRES_USER=nextcloud
-      - POSTGRES_HOST=db
-      - OVERWRITEPROTOCOL=https
-
-volumes:
-  nextcloud:
-  db:
-
-networks:
-  internal:
-  proxy:
-    external: true
-  protonmail:
-    external: true
+version: '3'
+
+services:
+  db:
+    image: postgres:14
+    restart: always
+    container_name: nextcloud_db
+    networks:
+      - internal
+    volumes:
+      - db:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_PASSWORD=nextcloud
+      - POSTGRES_DB=nextcloud
+      - POSTGRES_USER=nextcloud
+
+  nextcloud:
+    image: nextcloud
+    restart: always
+    container_name: nextcloud
+    networks:
+      - proxy
+      - protonmail
+      - internal
+    depends_on:
+      - db
+    volumes:
+      - nextcloud:/var/www/html
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.middlewares.nextcloud-compress.compress=true"
+      - "traefik.http.middlewares.nextcloud-regex-redirect.redirectregex.permanent=true"
+      - "traefik.http.middlewares.nextcloud-regex-redirect.redirectregex.regex=https://(.*)/.well-known/(card|cal)dav"
+      - "traefik.http.middlewares.nextcloud-regex-redirect.redirectregex.replacement=https://$$1/remote.php/dav/"
+      - "traefik.http.middlewares.nextcloud-headers.headers.frameDeny=true"
+      - "traefik.http.middlewares.nextcloud-headers.headers.sslRedirect=true"
+      - "traefik.http.middlewares.nextcloud-headers.headers.contentTypeNosniff=true"
+      - "traefik.http.middlewares.nextcloud-headers.headers.stsIncludeSubdomains=true"
+      - "traefik.http.middlewares.nextcloud-headers.headers.stsPreload=true"
+      - "traefik.http.middlewares.nextcloud-headers.headers.stsSeconds=31536000"
+      - "traefik.http.middlewares.nextcloud-headers.headers.referrerPolicy=same-origin"
+      - "traefik.http.middlewares.nextcloud-headers.headers.browserXssFilter=true"
+      - "traefik.http.middlewares.nextcloud-headers.headers.customRequestHeaders.X-Forwarded-Proto=https"
+      - "traefik.http.middlewares.nextcloud-headers.headers.customRequestHeaders.X-Robots-Tag=none"
+      - "traefik.http.middlewares.nextcloud-headers.headers.customFrameOptionsValue=SAMEORIGIN"
+      - "traefik.http.routers.nextcloud-secure.entrypoints=https"
+      - "traefik.http.routers.nextcloud-secure.rule=Host(`mycld.mrdev023.fr`)"
+      - "traefik.http.routers.nextcloud-secure.tls=true"
+      - "traefik.http.routers.nextcloud-secure.tls.certresolver=sslResolver"
+      - "traefik.http.routers.nextcloud-secure.middlewares=nextcloud-compress,nextcloud-regex-redirect,nextcloud-headers"
+      # - "traefik.http.routers.nextcloud-secure.service=nextcloud"
+      # - "traefik.http.services.nextcloud.loadbalancer.server.port=9002"
+      - "traefik.docker.network=proxy"
+    environment:
+      - POSTGRES_PASSWORD=nextcloud
+      - POSTGRES_DATABASE=nextcloud
+      - POSTGRES_USER=nextcloud
+      - POSTGRES_HOST=db
+      - OVERWRITEPROTOCOL=https
+
+volumes:
+  nextcloud:
+  db:
+
+networks:
+  internal:
+  proxy:
+    external: true
+  protonmail:
+    external: true
diff --git a/dolibarr/.gitignore b/confs/dolibarr/.gitignore
similarity index 100%
rename from dolibarr/.gitignore
rename to confs/dolibarr/.gitignore
diff --git a/dolibarr/docker-compose.yml b/confs/dolibarr/docker-compose.yml
similarity index 96%
rename from dolibarr/docker-compose.yml
rename to confs/dolibarr/docker-compose.yml
index fa12f4d..2a603c9 100644
--- a/dolibarr/docker-compose.yml
+++ b/confs/dolibarr/docker-compose.yml
@@ -1,46 +1,46 @@
-version: '3'
-
-services:
-  mariadb:
-    image: mariadb:latest
-    environment:
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_DATABASE: dolibarr
-    volumes: 
-      - ./mysql/data:/var/lib/mysql
-      - ./dump:/root/dump
-    networks:
-      - internal
-
-  dolibarr:
-    image: upshift/dolibarr:latest
-    restart: always
-    container_name: dolibarr
-    environment:
-      DOLI_DB_HOST: mariadb
-      DOLI_DB_USER: root
-      DOLI_DB_PASSWORD: root
-      DOLI_DB_NAME: dolibarr
-      DOLI_URL_ROOT: 'http://0.0.0.0'
-      DOLI_ADMIN_LOGIN: admin
-      DOLI_ADMIN_PASSWORD: admin
-      PHP_INI_date.timezone: 'Europe/Paris'
-      DOLI_INSTALL_AUTO: 1
-    volumes: 
-      - ./dolibarr/documents:/var/www/documents
-      - ./dolibarr/html:/var/www/html
-    networks:
-      - proxy
-      - internal
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.dolibarr-secure.entrypoints=https"
-      - "traefik.http.routers.dolibarr-secure.rule=Host(`dolibarr.mrdev023.fr`)"
-      - "traefik.http.routers.dolibarr-secure.tls=true"
-      - "traefik.http.routers.dolibarr-secure.tls.certresolver=sslResolver"
-      - "traefik.docker.network=proxy"
-
-networks:
-  internal:
-  proxy:
-    external: true
+version: '3'
+
+services:
+  mariadb:
+    image: mariadb:latest
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_DATABASE: dolibarr
+    volumes: 
+      - ./mysql/data:/var/lib/mysql
+      - ./dump:/root/dump
+    networks:
+      - internal
+
+  dolibarr:
+    image: upshift/dolibarr:latest
+    restart: always
+    container_name: dolibarr
+    environment:
+      DOLI_DB_HOST: mariadb
+      DOLI_DB_USER: root
+      DOLI_DB_PASSWORD: root
+      DOLI_DB_NAME: dolibarr
+      DOLI_URL_ROOT: 'http://0.0.0.0'
+      DOLI_ADMIN_LOGIN: admin
+      DOLI_ADMIN_PASSWORD: admin
+      PHP_INI_date.timezone: 'Europe/Paris'
+      DOLI_INSTALL_AUTO: 1
+    volumes: 
+      - ./dolibarr/documents:/var/www/documents
+      - ./dolibarr/html:/var/www/html
+    networks:
+      - proxy
+      - internal
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.dolibarr-secure.entrypoints=https"
+      - "traefik.http.routers.dolibarr-secure.rule=Host(`dolibarr.mrdev023.fr`)"
+      - "traefik.http.routers.dolibarr-secure.tls=true"
+      - "traefik.http.routers.dolibarr-secure.tls.certresolver=sslResolver"
+      - "traefik.docker.network=proxy"
+
+networks:
+  internal:
+  proxy:
+    external: true
diff --git a/home_assistant/docker-compose.yml b/confs/home_assistant/docker-compose.yml
similarity index 100%
rename from home_assistant/docker-compose.yml
rename to confs/home_assistant/docker-compose.yml
diff --git a/matrix/docker-compose.yaml b/confs/matrix/docker-compose.yaml
similarity index 100%
rename from matrix/docker-compose.yaml
rename to confs/matrix/docker-compose.yaml
diff --git a/matrix/nginx/matrix.conf b/confs/matrix/nginx/matrix.conf
similarity index 100%
rename from matrix/nginx/matrix.conf
rename to confs/matrix/nginx/matrix.conf
diff --git a/matrix/nginx/www/.well-known/matrix/client b/confs/matrix/nginx/www/.well-known/matrix/client
similarity index 100%
rename from matrix/nginx/www/.well-known/matrix/client
rename to confs/matrix/nginx/www/.well-known/matrix/client
diff --git a/matrix/nginx/www/.well-known/matrix/server b/confs/matrix/nginx/www/.well-known/matrix/server
similarity index 100%
rename from matrix/nginx/www/.well-known/matrix/server
rename to confs/matrix/nginx/www/.well-known/matrix/server
diff --git a/n8n/docker-compose.yml b/confs/n8n/docker-compose.yml
similarity index 95%
rename from n8n/docker-compose.yml
rename to confs/n8n/docker-compose.yml
index 22d49ac..e071f14 100644
--- a/n8n/docker-compose.yml
+++ b/confs/n8n/docker-compose.yml
@@ -1,50 +1,50 @@
-version: '3'
-
-services:
-  db:
-    image: postgres:14
-    restart: always
-    container_name: n8n_db
-    networks:
-      - internal
-    volumes:
-      - db:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_PASSWORD=n8n
-      - POSTGRES_DB=n8n
-      - POSTGRES_USER=n8n
-
-  n8n:
-    image: n8nio/n8n
-    restart: always
-    container_name: n8n
-    networks:
-      - internal
-      - proxy
-    volumes:
-      - n8n:/home/node/.n8n
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.n8n-secure.entrypoints=https"
-      - "traefik.http.routers.n8n-secure.rule=Host(`n8n.mrdev023.fr`)"
-      - "traefik.http.routers.n8n-secure.tls=true"
-      - "traefik.http.routers.n8n-secure.tls.certresolver=sslResolver"
-      # - "traefik.http.routers.whoami-secure.service=whoami"
-      # - "traefik.http.services.whoami.loadbalancer.server.port=9002"
-      - "traefik.docker.network=proxy"
-    environment:
-      - DB_TYPE=postgresdb
-      - DB_POSTGRESDB_PORT=5432
-      - DB_POSTGRESDB_HOST=db
-      - DB_POSTGRESDB_DATABASE=n8n
-      - DB_POSTGRESDB_USER=n8n
-      - DB_POSTGRESDB_PASSWORD=n8n
-
-volumes:
-  n8n:
-  db:
-
-networks:
-  internal:
-  proxy:
-    external: true
+version: '3'
+
+services:
+  db:
+    image: postgres:14
+    restart: always
+    container_name: n8n_db
+    networks:
+      - internal
+    volumes:
+      - db:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_PASSWORD=n8n
+      - POSTGRES_DB=n8n
+      - POSTGRES_USER=n8n
+
+  n8n:
+    image: n8nio/n8n
+    restart: always
+    container_name: n8n
+    networks:
+      - internal
+      - proxy
+    volumes:
+      - n8n:/home/node/.n8n
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.n8n-secure.entrypoints=https"
+      - "traefik.http.routers.n8n-secure.rule=Host(`n8n.mrdev023.fr`)"
+      - "traefik.http.routers.n8n-secure.tls=true"
+      - "traefik.http.routers.n8n-secure.tls.certresolver=sslResolver"
+      # - "traefik.http.routers.whoami-secure.service=whoami"
+      # - "traefik.http.services.whoami.loadbalancer.server.port=9002"
+      - "traefik.docker.network=proxy"
+    environment:
+      - DB_TYPE=postgresdb
+      - DB_POSTGRESDB_PORT=5432
+      - DB_POSTGRESDB_HOST=db
+      - DB_POSTGRESDB_DATABASE=n8n
+      - DB_POSTGRESDB_USER=n8n
+      - DB_POSTGRESDB_PASSWORD=n8n
+
+volumes:
+  n8n:
+  db:
+
+networks:
+  internal:
+  proxy:
+    external: true
diff --git a/outline/docker-compose.yml b/confs/outline/docker-compose.yml
similarity index 95%
rename from outline/docker-compose.yml
rename to confs/outline/docker-compose.yml
index 3377565..e651dff 100644
--- a/outline/docker-compose.yml
+++ b/confs/outline/docker-compose.yml
@@ -1,72 +1,72 @@
-version: "3"
-services:
-
-  outline:
-    image: outlinewiki/outline
-    env_file: ./docker.env
-    depends_on:
-      - postgres
-      - redis
-      - storage
-    networks:
-      - proxy
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.outline-secure.entrypoints=https"
-      - "traefik.http.routers.outline-secure.rule=Host(`outline.mrdev023.fr`)"
-      - "traefik.http.routers.outline-secure.tls=true"
-      - "traefik.http.routers.outline-secure.tls.certresolver=sslResolver"
-      - "traefik.http.services.whoami.loadbalancer.server.port=3000"
-      - "traefik.docker.network=proxy"
-
-  redis:
-    image: redis
-    env_file: ./docker.env
-    volumes:
-      - ./redis.conf:/redis.conf
-    command: ["redis-server", "/redis.conf"]
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 10s
-      timeout: 30s
-      retries: 3
-
-  postgres:
-    image: postgres
-    env_file: ./docker.env
-    volumes:
-      - database-data:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD", "pg_isready"]
-      interval: 30s
-      timeout: 20s
-      retries: 3
-    environment:
-      POSTGRES_USER: 'user'
-      POSTGRES_PASSWORD: 'pass'
-      POSTGRES_DB: 'outline'
-
-  storage:
-    image: minio/minio
-    env_file: ./docker.env
-    entrypoint: sh
-    command: -c 'minio server'
-    deploy:
-      restart_policy:
-        condition: on-failure
-    volumes:
-      - storage-data:/data
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
-      interval: 30s
-      timeout: 20s
-      retries: 3
-
-volumes:
-  https-portal-data:
-  storage-data:
-  database-data:
-networks:
-  proxy:
-    external: true
-
+version: "3"
+services:
+
+  outline:
+    image: outlinewiki/outline
+    env_file: ./docker.env
+    depends_on:
+      - postgres
+      - redis
+      - storage
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.outline-secure.entrypoints=https"
+      - "traefik.http.routers.outline-secure.rule=Host(`outline.mrdev023.fr`)"
+      - "traefik.http.routers.outline-secure.tls=true"
+      - "traefik.http.routers.outline-secure.tls.certresolver=sslResolver"
+      - "traefik.http.services.whoami.loadbalancer.server.port=3000"
+      - "traefik.docker.network=proxy"
+
+  redis:
+    image: redis
+    env_file: ./docker.env
+    volumes:
+      - ./redis.conf:/redis.conf
+    command: ["redis-server", "/redis.conf"]
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 30s
+      retries: 3
+
+  postgres:
+    image: postgres
+    env_file: ./docker.env
+    volumes:
+      - database-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD", "pg_isready"]
+      interval: 30s
+      timeout: 20s
+      retries: 3
+    environment:
+      POSTGRES_USER: 'user'
+      POSTGRES_PASSWORD: 'pass'
+      POSTGRES_DB: 'outline'
+
+  storage:
+    image: minio/minio
+    env_file: ./docker.env
+    entrypoint: sh
+    command: -c 'minio server'
+    deploy:
+      restart_policy:
+        condition: on-failure
+    volumes:
+      - storage-data:/data
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      interval: 30s
+      timeout: 20s
+      retries: 3
+
+volumes:
+  https-portal-data:
+  storage-data:
+  database-data:
+networks:
+  proxy:
+    external: true
+
diff --git a/penpot/config.env b/confs/penpot/config.env
similarity index 100%
rename from penpot/config.env
rename to confs/penpot/config.env
diff --git a/penpot/docker-compose.yml b/confs/penpot/docker-compose.yml
similarity index 100%
rename from penpot/docker-compose.yml
rename to confs/penpot/docker-compose.yml
diff --git a/pihole/docker-compose.yml b/confs/pihole/docker-compose.yml
similarity index 100%
rename from pihole/docker-compose.yml
rename to confs/pihole/docker-compose.yml
diff --git a/pihole/etc-dnsmasq.d/01-pihole.conf b/confs/pihole/etc-dnsmasq.d/01-pihole.conf
similarity index 100%
rename from pihole/etc-dnsmasq.d/01-pihole.conf
rename to confs/pihole/etc-dnsmasq.d/01-pihole.conf
diff --git a/pihole/etc-dnsmasq.d/06-rfc6761.conf b/confs/pihole/etc-dnsmasq.d/06-rfc6761.conf
similarity index 100%
rename from pihole/etc-dnsmasq.d/06-rfc6761.conf
rename to confs/pihole/etc-dnsmasq.d/06-rfc6761.conf
diff --git a/pihole/etc-pihole/adlists.list b/confs/pihole/etc-pihole/adlists.list
similarity index 100%
rename from pihole/etc-pihole/adlists.list
rename to confs/pihole/etc-pihole/adlists.list
diff --git a/pihole/etc-pihole/custom.list b/confs/pihole/etc-pihole/custom.list
similarity index 100%
rename from pihole/etc-pihole/custom.list
rename to confs/pihole/etc-pihole/custom.list
diff --git a/pihole/etc-pihole/dhcp.leases b/confs/pihole/etc-pihole/dhcp.leases
similarity index 100%
rename from pihole/etc-pihole/dhcp.leases
rename to confs/pihole/etc-pihole/dhcp.leases
diff --git a/pihole/etc-pihole/dns-servers.conf b/confs/pihole/etc-pihole/dns-servers.conf
similarity index 100%
rename from pihole/etc-pihole/dns-servers.conf
rename to confs/pihole/etc-pihole/dns-servers.conf
diff --git a/pihole/etc-pihole/gravity.db b/confs/pihole/etc-pihole/gravity.db
similarity index 100%
rename from pihole/etc-pihole/gravity.db
rename to confs/pihole/etc-pihole/gravity.db
diff --git a/pihole/etc-pihole/gravity_old.db b/confs/pihole/etc-pihole/gravity_old.db
similarity index 100%
rename from pihole/etc-pihole/gravity_old.db
rename to confs/pihole/etc-pihole/gravity_old.db
diff --git a/pihole/etc-pihole/list.1.raw.githubusercontent.com.domains b/confs/pihole/etc-pihole/list.1.raw.githubusercontent.com.domains
similarity index 100%
rename from pihole/etc-pihole/list.1.raw.githubusercontent.com.domains
rename to confs/pihole/etc-pihole/list.1.raw.githubusercontent.com.domains
diff --git a/pihole/etc-pihole/list.1.raw.githubusercontent.com.domains.sha1 b/confs/pihole/etc-pihole/list.1.raw.githubusercontent.com.domains.sha1
similarity index 100%
rename from pihole/etc-pihole/list.1.raw.githubusercontent.com.domains.sha1
rename to confs/pihole/etc-pihole/list.1.raw.githubusercontent.com.domains.sha1
diff --git a/pihole/etc-pihole/list.2.raw.githubusercontent.com.domains b/confs/pihole/etc-pihole/list.2.raw.githubusercontent.com.domains
similarity index 100%
rename from pihole/etc-pihole/list.2.raw.githubusercontent.com.domains
rename to confs/pihole/etc-pihole/list.2.raw.githubusercontent.com.domains
diff --git a/pihole/etc-pihole/list.2.raw.githubusercontent.com.domains.sha1 b/confs/pihole/etc-pihole/list.2.raw.githubusercontent.com.domains.sha1
similarity index 100%
rename from pihole/etc-pihole/list.2.raw.githubusercontent.com.domains.sha1
rename to confs/pihole/etc-pihole/list.2.raw.githubusercontent.com.domains.sha1
diff --git a/pihole/etc-pihole/local.list b/confs/pihole/etc-pihole/local.list
similarity index 100%
rename from pihole/etc-pihole/local.list
rename to confs/pihole/etc-pihole/local.list
diff --git a/pihole/etc-pihole/logrotate b/confs/pihole/etc-pihole/logrotate
similarity index 100%
rename from pihole/etc-pihole/logrotate
rename to confs/pihole/etc-pihole/logrotate
diff --git a/pihole/etc-pihole/macvendor.db b/confs/pihole/etc-pihole/macvendor.db
similarity index 100%
rename from pihole/etc-pihole/macvendor.db
rename to confs/pihole/etc-pihole/macvendor.db
diff --git a/pihole/etc-pihole/migration_backup/adlists.list b/confs/pihole/etc-pihole/migration_backup/adlists.list
similarity index 100%
rename from pihole/etc-pihole/migration_backup/adlists.list
rename to confs/pihole/etc-pihole/migration_backup/adlists.list
diff --git a/pihole/etc-pihole/pihole-FTL.conf b/confs/pihole/etc-pihole/pihole-FTL.conf
similarity index 100%
rename from pihole/etc-pihole/pihole-FTL.conf
rename to confs/pihole/etc-pihole/pihole-FTL.conf
diff --git a/pihole/etc-pihole/pihole-FTL.db b/confs/pihole/etc-pihole/pihole-FTL.db
similarity index 100%
rename from pihole/etc-pihole/pihole-FTL.db
rename to confs/pihole/etc-pihole/pihole-FTL.db
diff --git a/pihole/etc-pihole/setupVars.conf b/confs/pihole/etc-pihole/setupVars.conf
similarity index 100%
rename from pihole/etc-pihole/setupVars.conf
rename to confs/pihole/etc-pihole/setupVars.conf
diff --git a/pihole/etc-pihole/setupVars.conf.update.bak b/confs/pihole/etc-pihole/setupVars.conf.update.bak
similarity index 100%
rename from pihole/etc-pihole/setupVars.conf.update.bak
rename to confs/pihole/etc-pihole/setupVars.conf.update.bak
diff --git a/pihole/etc-pihole/versions b/confs/pihole/etc-pihole/versions
similarity index 100%
rename from pihole/etc-pihole/versions
rename to confs/pihole/etc-pihole/versions
diff --git a/prometheus/alert.rules b/confs/prometheus/alert.rules
similarity index 100%
rename from prometheus/alert.rules
rename to confs/prometheus/alert.rules
diff --git a/prometheus/prometheus.yml b/confs/prometheus/prometheus.yml
similarity index 100%
rename from prometheus/prometheus.yml
rename to confs/prometheus/prometheus.yml
diff --git a/protonmail/docker-compose.yml b/confs/protonmail/docker-compose.yml
similarity index 93%
rename from protonmail/docker-compose.yml
rename to confs/protonmail/docker-compose.yml
index 7b86001..f5a7501 100644
--- a/protonmail/docker-compose.yml
+++ b/confs/protonmail/docker-compose.yml
@@ -1,18 +1,18 @@
-version: '3'
-
-services: 
-  protonmail-bridge:
-    image: shenxn/protonmail-bridge
-    restart: always
-    container_name: protonmail-bridge
-    networks:
-      - protonmail
-    volumes:
-      - protonmail:/root
-
-volumes:
-  protonmail:
-
-networks:
-  protonmail:
-      external: true
+version: '3'
+
+services: 
+  protonmail-bridge:
+    image: shenxn/protonmail-bridge
+    restart: always
+    container_name: protonmail-bridge
+    networks:
+      - protonmail
+    volumes:
+      - protonmail:/root
+
+volumes:
+  protonmail:
+
+networks:
+  protonmail:
+      external: true
diff --git a/protonmail/init.sh b/confs/protonmail/init.sh
similarity index 100%
rename from protonmail/init.sh
rename to confs/protonmail/init.sh
diff --git a/rhasspy/docker-compose.yml b/confs/rhasspy/docker-compose.yml
similarity index 100%
rename from rhasspy/docker-compose.yml
rename to confs/rhasspy/docker-compose.yml
diff --git a/config/.gitignore b/confs/traefik/config/.gitignore
similarity index 100%
rename from config/.gitignore
rename to confs/traefik/config/.gitignore
diff --git a/config/dynamic_conf.yaml b/confs/traefik/config/dynamic_conf.yaml
similarity index 100%
rename from config/dynamic_conf.yaml
rename to confs/traefik/config/dynamic_conf.yaml
diff --git a/config/traefik.yml b/confs/traefik/config/traefik.yml
similarity index 94%
rename from config/traefik.yml
rename to confs/traefik/config/traefik.yml
index b9b0875..7c3d11c 100644
--- a/config/traefik.yml
+++ b/confs/traefik/config/traefik.yml
@@ -1,51 +1,51 @@
-log:
-  level: DEBUG
-
-api:
-  dashboard: true
-
-accessLog:
-  filePath: "/var/log/traefik/access.log"
-  format: json
-
-entryPoints:
-  http:
-    address: ":80"
-    http:
-      redirections:
-        entryPoint:
-          to: https
-          scheme: https
-  https:
-    address: ":443"
-  metrics:
-    address: ":8080"
-
-metrics:
-  prometheus:
-    entryPoint: metrics
-    buckets:
-      - 0.1
-      - 0.3
-      - 1.2
-      - 5.0
-    addEntryPointsLabels: true
-    addServicesLabels: true
-
-providers:
-  docker:
-    endpoint: "unix:///var/run/docker.sock"
-    exposedByDefault: false
-  http:
-    endpoint: "http://http_provider/dynamic_conf.yaml"
-
-certificatesResolvers:
-  sslResolver:
-    acme:
-      email: florian.richer.97@outlook.com
-      tlschallenge: {}
-      storage: acme.json
-      keyType: RSA4096
-      #caServer: "https://acme-staging-v02.api.letsencrypt.org/directory"
-      httpChallenge:
-        entryPoint: http
+log:
+  level: DEBUG
+
+api:
+  dashboard: true
+
+accessLog:
+  filePath: "/var/log/traefik/access.log"
+  format: json
+
+entryPoints:
+  http:
+    address: ":80"
+    http:
+      redirections:
+        entryPoint:
+          to: https
+          scheme: https
+  https:
+    address: ":443"
+  metrics:
+    address: ":8080"
+
+metrics:
+  prometheus:
+    entryPoint: metrics
+    buckets:
+      - 0.1
+      - 0.3
+      - 1.2
+      - 5.0
+    addEntryPointsLabels: true
+    addServicesLabels: true
+
+providers:
+  docker:
+    endpoint: "unix:///var/run/docker.sock"
+    exposedByDefault: false
+  http:
+    endpoint: "http://http_provider/dynamic_conf.yaml"
+
+certificatesResolvers:
+  sslResolver:
+    acme:
+      email: florian.richer.97@outlook.com
+      tlschallenge: {}
+      storage: acme.json
+      keyType: RSA4096
+      #caServer: "https://acme-staging-v02.api.letsencrypt.org/directory"
+      httpChallenge:
+        entryPoint: http
diff --git a/docker-compose.yml b/confs/traefik/docker-compose.yml
similarity index 100%
rename from docker-compose.yml
rename to confs/traefik/docker-compose.yml
diff --git a/grafana.env b/confs/traefik/grafana.env
similarity index 100%
rename from grafana.env
rename to confs/traefik/grafana.env
diff --git a/grafana/provisioning/dashboards/dashboard.yml b/confs/traefik/grafana/provisioning/dashboards/dashboard.yml
similarity index 100%
rename from grafana/provisioning/dashboards/dashboard.yml
rename to confs/traefik/grafana/provisioning/dashboards/dashboard.yml
diff --git a/grafana/provisioning/dashboards/reverse-proxy_rev1.json b/confs/traefik/grafana/provisioning/dashboards/reverse-proxy_rev1.json
similarity index 100%
rename from grafana/provisioning/dashboards/reverse-proxy_rev1.json
rename to confs/traefik/grafana/provisioning/dashboards/reverse-proxy_rev1.json
diff --git a/grafana/provisioning/datasources/datasource.yml b/confs/traefik/grafana/provisioning/datasources/datasource.yml
similarity index 100%
rename from grafana/provisioning/datasources/datasource.yml
rename to confs/traefik/grafana/provisioning/datasources/datasource.yml
diff --git a/whoami/docker-compose.yml b/confs/whoami/docker-compose.yml
similarity index 96%
rename from whoami/docker-compose.yml
rename to confs/whoami/docker-compose.yml
index d84a992..304c518 100644
--- a/whoami/docker-compose.yml
+++ b/confs/whoami/docker-compose.yml
@@ -1,22 +1,22 @@
-version: '3'
-
-services: 
-  whoami:
-    image: "containous/whoami"
-    restart: always
-    container_name: "whoami"
-    networks:
-      - proxy
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.whoami-secure.entrypoints=https"
-      - "traefik.http.routers.whoami-secure.rule=Host(`whoami.mrdev023.fr`)"
-      - "traefik.http.routers.whoami-secure.tls=true"
-      - "traefik.http.routers.whoami-secure.tls.certresolver=sslResolver"
-      # - "traefik.http.routers.whoami-secure.service=whoami"
-      # - "traefik.http.services.whoami.loadbalancer.server.port=9002"
-      - "traefik.docker.network=proxy"
-
-networks:
-  proxy:
-    external: true
+version: '3'
+
+services: 
+  whoami:
+    image: "containous/whoami"
+    restart: always
+    container_name: "whoami"
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.whoami-secure.entrypoints=https"
+      - "traefik.http.routers.whoami-secure.rule=Host(`whoami.mrdev023.fr`)"
+      - "traefik.http.routers.whoami-secure.tls=true"
+      - "traefik.http.routers.whoami-secure.tls.certresolver=sslResolver"
+      # - "traefik.http.routers.whoami-secure.service=whoami"
+      # - "traefik.http.services.whoami.loadbalancer.server.port=9002"
+      - "traefik.docker.network=proxy"
+
+networks:
+  proxy:
+    external: true