diff --git a/home-server/docker-compose.yml b/home-server/docker-compose.yml
index 3e495c3..bf2015d 100644
--- a/home-server/docker-compose.yml
+++ b/home-server/docker-compose.yml
@@ -26,8 +26,8 @@ services:
     ports:
       - 3306:3306
     env_file:
-      - envs/local.env
-      - envs/production.env
+      - environment-variables/local.env
+      - environment-variables/production.env
     volumes:
       - ${STORAGE_DIR}/mariadb:/var/lib/mysql
   homeassistant:
@@ -40,8 +40,8 @@ services:
       - ${REPO_DIR}/configurations/home-assistant/configuration-production.yaml:/config/configuration.yaml
     restart: unless-stopped
     env_file:
-      - envs/local.env
-      - envs/production.env
+      - environment-variables/local.env
+      - environment-variables/production.env
   syncthing:
     image: lscr.io/linuxserver/syncthing:latest
     container_name: syncthing
@@ -96,8 +96,8 @@ services:
     volumes:
       - ${STORAGE_DIR}/grafana:/var/lib/grafana
     env_file:
-      - envs/local.env
-      - envs/production.env
+      - environment-variables/local.env
+      - environment-variables/production.env
     labels:
       - traefik.http.routers.grafana.rule=Host(`grafana.pladijs`)
       - traefik.http.services.grafana.loadbalancer.server.port=3000
@@ -112,8 +112,8 @@ services:
       - TZ=Europe/Brussels
       - DOCKER_INFLUXDB_INIT_MODE=setup
     env_file:
-      - envs/local.env
-      - envs/production.env
+      - environment-variables/local.env
+      - environment-variables/production.env
     volumes:
       - ${STORAGE_DIR}/influxdb/data:/var/lib/influxdb2
       - ${STORAGE_DIR}/influxdb/config/:/etc/influxdb2
diff --git a/home-server/envs/local.env b/home-server/environment-variables/local.env
similarity index 100%
rename from home-server/envs/local.env
rename to home-server/environment-variables/local.env
diff --git a/home-server/envs/readme.md b/home-server/readme.md
similarity index 100%
rename from home-server/envs/readme.md
rename to home-server/readme.md
diff --git a/raspberrypi/docker-compose.yml b/raspberrypi/docker-compose.yml
deleted file mode 100644
index f9c212e..0000000
--- a/raspberrypi/docker-compose.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-version: "3.9"
-services:
-  whoami:
-    restart: unless-stopped
-    network_mode: "host"
-    image: traefik/whoami
-    command:
-      - --port=2001
-  traefik:
-    restart: unless-stopped
-    network_mode: "host"
-    image: "traefik:1.7.10"
-    volumes:
-      - /home/pi/repos/homeAutomation/configurations/traefik/traefik.1.7.10.toml:/etc/traefik/traefik.toml
-  mosquitto:
-    restart: unless-stopped
-    image: eclipse-mosquitto:2
-    volumes:
-      - /home/pi/repos/homeAutomation/configurations/eclipse-mosquitto/:/mosquitto/config/:ro
-      - ./log/:/mosquitto/log/
-    ports:
-      - 2883:1883
-      - 9001:9001
-  node-exporter:
-    image: prom/node-exporter:latest
-    container_name: node-exporter
-    restart: unless-stopped
-    volumes:
-      - /proc:/host/proc:ro
-      - /sys:/host/sys:ro
-      - /:/rootfs:ro
-    command:
-      - '--path.procfs=/host/proc'
-      - '--path.rootfs=/rootfs'
-      - '--path.sysfs=/host/sys'
-      - '--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)'
-    ports:
-      - 9100:9100
diff --git a/raspberrypi/log/.gitkeep b/raspberrypi/log/.gitkeep
deleted file mode 100644
index e69de29..0000000