diff --git a/app/Dockerfile b/app/consumer/Dockerfile
similarity index 100%
rename from app/Dockerfile
rename to app/consumer/Dockerfile
diff --git a/app/main.py b/app/consumer/main.py
similarity index 100%
rename from app/main.py
rename to app/consumer/main.py
diff --git a/app/requirements.txt b/app/consumer/requirements.txt
similarity index 100%
rename from app/requirements.txt
rename to app/consumer/requirements.txt
diff --git a/app/docker-compose.yml b/app/docker-compose.yml
new file mode 100644
index 0000000..e7c249f
--- /dev/null
+++ b/app/docker-compose.yml
@@ -0,0 +1,4 @@
+services:
+  consumer:
+    build: ./consumer
+    restart: unless-stopped
\ No newline at end of file
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-eu868.toml b/lora-gateway/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-eu868.toml
similarity index 100%
rename from configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-eu868.toml
rename to lora-gateway/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-eu868.toml
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge.toml b/lora-gateway/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge.toml
similarity index 100%
rename from configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge.toml
rename to lora-gateway/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge.toml
diff --git a/configuration/chirpstack/chirpstack.toml b/lora-gateway/configuration/chirpstack/chirpstack.toml
similarity index 100%
rename from configuration/chirpstack/chirpstack.toml
rename to lora-gateway/configuration/chirpstack/chirpstack.toml
diff --git a/configuration/chirpstack/region_eu868.toml b/lora-gateway/configuration/chirpstack/region_eu868.toml
similarity index 100%
rename from configuration/chirpstack/region_eu868.toml
rename to lora-gateway/configuration/chirpstack/region_eu868.toml
diff --git a/configuration/mosquitto/config/mosquitto.conf b/lora-gateway/configuration/mosquitto/config/mosquitto.conf
similarity index 100%
rename from configuration/mosquitto/config/mosquitto.conf
rename to lora-gateway/configuration/mosquitto/config/mosquitto.conf
diff --git a/configuration/postgresql/initdb/001-chirpstack_extensions.sh b/lora-gateway/configuration/postgresql/initdb/001-chirpstack_extensions.sh
similarity index 100%
rename from configuration/postgresql/initdb/001-chirpstack_extensions.sh
rename to lora-gateway/configuration/postgresql/initdb/001-chirpstack_extensions.sh
diff --git a/docker-compose.yml b/lora-gateway/docker-compose.yml
similarity index 90%
rename from docker-compose.yml
rename to lora-gateway/docker-compose.yml
index 9d72e8b..46bbbba 100644
--- a/docker-compose.yml
+++ b/lora-gateway/docker-compose.yml
@@ -51,11 +51,11 @@ services:
       - chirpstack
 
   postgres:
-    image: postgres:14-alpine
+    image: postgres:18-alpine
     restart: unless-stopped
     volumes:
       - ./configuration/postgresql/initdb:/docker-entrypoint-initdb.d
-      - postgresqldata:/var/lib/postgresql/data
+      - db:/var/lib/postgresql
     environment:
       - POSTGRES_USER=chirpstack
       - POSTGRES_PASSWORD=chirpstack
@@ -66,7 +66,7 @@ services:
     restart: unless-stopped
     command: redis-server --save 300 1 --save 60 100 --appendonly no
     volumes:
-      - redisdata:/data
+      - redis:/data
 
   mosquitto:
     image: eclipse-mosquitto:2
@@ -76,12 +76,6 @@ services:
     volumes: 
       - ./configuration/mosquitto/config/:/mosquitto/config/
 
-  application:
-    build: ./app
-    restart: unless-stopped
-    depends_on: 
-      - mosquitto
-
 volumes:
-  postgresqldata:
-  redisdata:
+  db:
+  redis: