diff --git a/Dockerfile b/Dockerfile
index 6343102..4811d4b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,4 +7,4 @@ WORKDIR /app
 COPY . /app
 RUN pip install -r requirements.txt
 
-CMD python main.py
+CMD python src/main.py
diff --git a/README.md b/README.md
index 1ab7246..306f987 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-# CVZone MQTT Tracker
+# Face Detect MQTT
+Face and Hand Gesture detector that emits MQTT events on detection
 
 ## Raspberry Pi Pre-requisites (using the RPi Camera Module)
 *Required*: Raspberry Pi OS 64-bit
@@ -26,8 +27,8 @@ docker run \
   -e MQTT_PORT="1883" \
   -e MQTT_CLIENT_ID="cvzone_tracker_01" \
   -e MIN_FACE_SCORE="0.5" \
-  --name=cvzone-mqtt-tracker \ 
-  selexin/cvzone-mqtt-tracker:latest
+  --name=face-detect-mqtt \ 
+  selexin/face-detect-mqtt:latest
 ```
 
 ## Manually install and run
@@ -36,5 +37,5 @@ sudo apt update
 sudo apt install pyhton3 python3-opencv
 sudo pip3 install -r requirements.txt
 
-python3 main.py
+python3 src/main.py
 ```
diff --git a/dockerbuild.sh b/dockerbuild.sh
index 3ac3ecc..9122176 100755
--- a/dockerbuild.sh
+++ b/dockerbuild.sh
@@ -9,5 +9,5 @@ docker buildx inspect --bootstrap
 docker buildx build \
   --push \
   --platform linux/arm64/v8,linux/amd64 \
-  --tag selexin/cvzone-mqtt-tracker:latest .
+  --tag selexin/face-detect-mqtt:latest .
 
diff --git a/debounce.py b/src/debounce.py
similarity index 100%
rename from debounce.py
rename to src/debounce.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/tracker.py b/src/tracker.py
similarity index 100%
rename from tracker.py
rename to src/tracker.py