diff --git a/Dockerfile b/Dockerfile
index 9e58b07..06ad1c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,4 +14,4 @@ RUN pip install -r requirements.txt
 COPY / .
 
 # command to run on container start
-CMD [ "python", "-u", "./main.py" ]
\ No newline at end of file
+CMD [ "python", "-u", "./src/main.py" ]
\ No newline at end of file
diff --git a/container_config.json b/container_config.json
deleted file mode 100644
index 1319fa2..0000000
--- a/container_config.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"name": "volvoaaos2mqtt",
-  	"ports": {},
-    "env": {"TZ": "Europe/Amsterdam"},
-	"volumes": [
-		"/home/dockerhost/volvoAAOS2mqtt/settings.json:/volvoAAOS2mqtt/settings.json"
-	]
-}
\ No newline at end of file
diff --git a/config.py b/src/config.py
similarity index 100%
rename from config.py
rename to src/config.py
diff --git a/const.py b/src/const.py
similarity index 100%
rename from const.py
rename to src/const.py
diff --git a/main.py b/src/main.py
similarity index 100%
rename from main.py
rename to src/main.py
diff --git a/mqtt.py b/src/mqtt.py
similarity index 100%
rename from mqtt.py
rename to src/mqtt.py
diff --git a/settings.json b/src/settings.json
similarity index 100%
rename from settings.json
rename to src/settings.json
diff --git a/volvo.py b/src/volvo.py
similarity index 100%
rename from volvo.py
rename to src/volvo.py