diff --git a/nginx.conf b/conf/nginx.conf
similarity index 100%
rename from nginx.conf
rename to conf/nginx.conf
diff --git a/prometheus-statsd-mapping.yml b/conf/prometheus-statsd-mapping.yml
similarity index 100%
rename from prometheus-statsd-mapping.yml
rename to conf/prometheus-statsd-mapping.yml
diff --git a/prometheus.yml b/conf/prometheus.yml
similarity index 100%
rename from prometheus.yml
rename to conf/prometheus.yml
diff --git a/docker-compose.yml b/docker-compose.yml
index 99e324b..bb5efc5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,398 +1,398 @@
 version: '2'
 
 services:
 
   amqp:
     image: rabbitmq:3.6-management
     ports:
       - 5072:5672
 
   flower:
     image: mher/flower
     command: --broker=amqp://guest:guest@amqp:5672// --url_prefix=flower
     ports:
       - 5055:5555
     depends_on:
       - amqp
 
   zookeeper:
     image: wurstmeister/zookeeper
 
   kafka:
     image: wurstmeister/kafka
     ports:
       - 5092:9092
-    env_file: ./kafka.env
+    env_file: ./env/kafka.env
     depends_on:
       - zookeeper
 
   prometheus:
     image: prom/prometheus
     command:
       # Needed for the reverse-proxy
       - "--web.external-url=/prometheus"
       - "--config.file=/etc/prometheus/prometheus.yml"
     volumes:
-      - "./prometheus.yml:/etc/prometheus/prometheus.yml:ro"
+      - "./conf/prometheus.yml:/etc/prometheus/prometheus.yml:ro"
     restart: unless-stopped
 
   prometheus-statsd-exporter:
     image: prom/statsd-exporter
     command:
       - "--statsd.mapping-config=/etc/prometheus/statsd-mapping.yml"
     volumes:
-      - "./prometheus-statsd-mapping.yml:/etc/prometheus/statsd-mapping.yml:ro"
+      - "./conf/prometheus-statsd-mapping.yml:/etc/prometheus/statsd-mapping.yml:ro"
     restart: unless-stopped
 
   nginx:
     image: nginx
     volumes:
-      - "./nginx.conf:/etc/nginx/nginx.conf:ro"
+      - "./conf/nginx.conf:/etc/nginx/nginx.conf:ro"
     ports:
       - 5080:5080
 
 # Scheduler
 
   swh-scheduler-db:
     image: postgres:10
     environment:
       POSTGRES_PASSWORD: testpassword
       POSTGRES_DB: swh-scheduler
 
   swh-scheduler-api:
     image: swh/scheduler-api
     build: ./dockerfiles/swh-scheduler-api
-    env_file: ./scheduler.env
+    env_file: ./env/scheduler.env
     depends_on:
       - swh-scheduler-db
     ports:
       - 5008:5008
 
   swh-scheduler-listener:
     image: swh/scheduler-worker
     build: ./dockerfiles/swh-scheduler-worker
-    env_file: ./scheduler.env
+    env_file: ./env/scheduler.env
     command: listener
     depends_on:
       - swh-scheduler-api
       - amqp
 
   swh-scheduler-runner:
     image: swh/scheduler-worker
     build: ./dockerfiles/swh-scheduler-worker
-    env_file: ./scheduler.env
+    env_file: ./env/scheduler.env
     command: runner -p 10
     depends_on:
       - swh-scheduler-api
       - amqp
 
 # Graph storage
 
   swh-storage-db:
     image: postgres:10
     environment:
       POSTGRES_PASSWORD: testpassword
       POSTGRES_DB: swh-storage
 
   swh-storage:
     build: ./dockerfiles/swh-storage
     image: swh/storage
     ports:
       - 5002:5002
     depends_on:
       - swh-storage-db
       - swh-objstorage
-    env_file: ./storage.env
+    env_file: ./env/storage.env
 
 # Object storage
 
   swh-objstorage:
     build: ./dockerfiles/swh-objstorage
     image: swh/objstorage
     ports:
       - 5003:5003
 
 # Indexer storage
 
   swh-idx-storage-db:
     image: postgres:10
     environment:
       POSTGRES_PASSWORD: testpassword
       POSTGRES_DB: swh-idx-storage
 
   swh-idx-storage:
     build: ./dockerfiles/swh-indexer-storage
     image: swh/indexer-storage
     ports:
       - 5007:5007
     depends_on:
       - swh-idx-storage-db
     environment:
       POSTGRES_PASSWORD: testpassword
       POSTGRES_DB: swh-idx-storage
       PGHOST: swh-idx-storage-db
       PGUSER: postgres
 
 # Web interface
 
   swh-web:
     build: ./dockerfiles/swh-web
     image: swh/web
     ports:
       - 5004:5004
     depends_on:
       - swh-objstorage
       - swh-storage
       - swh-idx-storage
 
   swh-deposit-db:
     image: postgres:10
-    env_file: ./deposit.env
+    env_file: ./env/deposit.env
 
   swh-deposit:
     build: ./dockerfiles/swh-deposit
     image: swh/deposit
     ports:
       - 5006:5006
     depends_on:
       - swh-deposit-db
       - swh-scheduler-api
-    env_file: ./deposit.env
+    env_file: ./env/deposit.env
     environment:
       PGHOST: swh-deposit-db
 
 # Lister Celery workers
 
   swh-listers-db:
     image: postgres:10
     environment:
       POSTGRES_PASSWORD: testpassword
 
   swh-lister-debian:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
-    env_file: ./listers.env
+    env_file: ./env/listers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: debian
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-scheduler-runner
       - swh-storage
       - amqp
 
   swh-lister-bitbucket:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
-    env_file: ./listers.env
+    env_file: ./env/listers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: bitbucket
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-scheduler-runner
       - swh-storage
       - amqp
 
   swh-lister-github:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
-    env_file: ./listers.env
+    env_file: ./env/listers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: github
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-scheduler-runner
       - swh-storage
       - amqp
 
   swh-lister-gitlab:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
-    env_file: ./listers.env
+    env_file: ./env/listers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: gitlab
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-scheduler-runner
       - swh-storage
       - amqp
 
   swh-lister-npm:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
-    env_file: ./listers.env
+    env_file: ./env/listers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: npm
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-scheduler-runner
       - swh-storage
       - amqp
 
   swh-lister-pypi:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
-    env_file: ./listers.env
+    env_file: ./env/listers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: pypi
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-scheduler-runner
       - swh-storage
       - amqp
 
 # Indexer Celery workers
 
   swh-indexer:
     image: swh/indexer-worker
     build: ./dockerfiles/swh-indexer-worker
-    env_file: ./indexers.env
+    env_file: ./env/indexers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
     depends_on:
       - swh-scheduler-runner
       - swh-idx-storage
       - swh-storage
       - swh-objstorage
       - amqp
 
     depends_on:
       - swh-scheduler-runner
       - swh-idx-storage
       - swh-storage
       - swh-objstorage
       - amqp
 
   swh-indexer-journal-client:
     image: swh/indexer-journal-client
     build: ./dockerfiles/swh-indexer-journal-client
     depends_on:
       - swh-journal-publisher
       - swh-scheduler-api
 
 # Journal related
 
   swh-storage-listener:
     image: swh/storage-listener
     build: ./dockerfiles/swh-storage-listener
-    env_file: ./storage.env
+    env_file: ./env/storage.env
     depends_on:
       - swh-storage-db
       - kafka
 
   swh-journal-publisher:
     image: swh/journal-publisher
     build: ./dockerfiles/swh-journal-publisher
     depends_on:
       - kafka
       - swh-storage-listener
 
   swh-journal-client:
     image: swh/journal-client
     build: ./dockerfiles/swh-journal-client
     depends_on:
       - swh-journal-publisher
 
 # Loader Celery workers
 
   swh-loader-debian:
     image: swh/loaders-worker
     build: ./dockerfiles/swh-loaders-worker
-    env_file: ./listers.env
+    env_file: ./env/listers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: debian
     depends_on:
       - swh-storage
       - amqp
 
   swh-loader-dir:
     image: swh/loaders-worker
     build: ./dockerfiles/swh-loaders-worker
-    env_file: ./listers.env
+    env_file: ./env/listers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: dir
     depends_on:
       - swh-storage
       - amqp
 
   swh-loader-git:
     image: swh/loaders-worker
     build: ./dockerfiles/swh-loaders-worker
-    env_file: ./listers.env
+    env_file: ./env/listers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: git
     depends_on:
       - swh-storage
       - amqp
 
   swh-loader-mercurial:
     image: swh/loaders-worker
     build: ./dockerfiles/swh-loaders-worker
-    env_file: ./listers.env
+    env_file: ./env/listers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: mercurial
     depends_on:
       - swh-storage
       - amqp
 
   swh-loader-pypi:
     image: swh/loaders-worker
     build: ./dockerfiles/swh-loaders-worker
-    env_file: ./listers.env
+    env_file: ./env/listers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: pypi
     depends_on:
       - swh-storage
       - amqp
 
   swh-loader-svn:
     image: swh/loaders-worker
     build: ./dockerfiles/swh-loaders-worker
-    env_file: ./listers.env
+    env_file: ./env/listers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: svn
     depends_on:
       - swh-storage
       - amqp
 
   swh-loader-tar:
     image: swh/loaders-worker
     build: ./dockerfiles/swh-loaders-worker
-    env_file: ./listers.env
+    env_file: ./env/listers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: tar
     depends_on:
       - swh-storage
       - amqp
diff --git a/deposit.env b/env/deposit.env
similarity index 100%
rename from deposit.env
rename to env/deposit.env
diff --git a/indexers.env b/env/indexers.env
similarity index 100%
rename from indexers.env
rename to env/indexers.env
diff --git a/kafka.env b/env/kafka.env
similarity index 100%
rename from kafka.env
rename to env/kafka.env
diff --git a/listers.env b/env/listers.env
similarity index 100%
rename from listers.env
rename to env/listers.env
diff --git a/scheduler.env b/env/scheduler.env
similarity index 100%
rename from scheduler.env
rename to env/scheduler.env
diff --git a/storage.env b/env/storage.env
similarity index 100%
rename from storage.env
rename to env/storage.env