diff --git a/diyhue-flask/CHANGELOG.md b/diyhue-beta/CHANGELOG.md
similarity index 100%
rename from diyhue-flask/CHANGELOG.md
rename to diyhue-beta/CHANGELOG.md
diff --git a/diyhue-flask/DOCS.md b/diyhue-beta/DOCS.md
similarity index 100%
rename from diyhue-flask/DOCS.md
rename to diyhue-beta/DOCS.md
diff --git a/diyhue-flask/Dockerfile b/diyhue-beta/Dockerfile
old mode 100755
new mode 100644
similarity index 85%
rename from diyhue-flask/Dockerfile
rename to diyhue-beta/Dockerfile
index 5c08a3e..d7466bc
--- a/diyhue-flask/Dockerfile
+++ b/diyhue-beta/Dockerfile
@@ -22,7 +22,7 @@ RUN mkdir diyhue config ${WORKING_DIR}
 RUN apk add -q -u python3 openssl nmap psmisc iproute2 alpine-sdk build-base
 
 # Download diyhue and untar it
-RUN curl -J -L -o $diyhue.tar.gz "https://github.com/diyhue/diyHue/archive/refs/heads/flask.tar.gz" \
+RUN curl -J -L -o $diyhue.tar.gz "https://github.com/diyhue/diyHue/archive/refs/heads/beta.tar.gz" \
 	&& tar xzvf $diyhue.tar.gz --strip-components=1 -C diyhue \
 	&& rm -rf $diyhue.tar.gz \
 	&& pip3 install -r /diyhue/requirements.txt --no-cache-dir
@@ -31,9 +31,14 @@ RUN curl -J -L -o $diyhue.tar.gz "https://github.com/diyhue/diyHue/archive/refs/
 WORKDIR /opt/hue-emulator
 
 # Install diyHue
+RUN mv /diyhue/BridgeEmulator/HueObjects/										./HueObjects/
+RUN mv /diyhue/BridgeEmulator/configManager/ 									./configManager/
 RUN mv /diyhue/BridgeEmulator/flaskUI/ 											./flaskUI/
 RUN mv /diyhue/BridgeEmulator/functions/ 										./functions/
-RUN mv /diyhue/BridgeEmulator/protocols/ 										./protocols/
+RUN mv /diyhue/BridgeEmulator/lights/ 											./lights/
+RUN mv /diyhue/BridgeEmulator/logManager/ 										./logManager/
+RUN mv /diyhue/BridgeEmulator/sensors/ 											./sensors/
+RUN mv /diyhue/BridgeEmulator/services/ 										./services/
 RUN mv /diyhue/BridgeEmulator/HueEmulator3.py /diyhue/BridgeEmulator/debug/clip.html 	./
 RUN mv /diyhue/BridgeEmulator/genCert.sh /diyhue/BridgeEmulator/openssl.conf 			./
 
diff --git a/diyhue-flask/LICENSE.md b/diyhue-beta/LICENSE.md
old mode 100755
new mode 100644
similarity index 100%
rename from diyhue-flask/LICENSE.md
rename to diyhue-beta/LICENSE.md
diff --git a/diyhue-flask/README.md b/diyhue-beta/README.md
similarity index 100%
rename from diyhue-flask/README.md
rename to diyhue-beta/README.md
diff --git a/diyhue-flask/build.json b/diyhue-beta/build.json
old mode 100755
new mode 100644
similarity index 100%
rename from diyhue-flask/build.json
rename to diyhue-beta/build.json
diff --git a/diyhue-flask/config.json b/diyhue-beta/config.json
old mode 100755
new mode 100644
similarity index 85%
rename from diyhue-flask/config.json
rename to diyhue-beta/config.json
index f6758fb..0de664a
--- a/diyhue-flask/config.json
+++ b/diyhue-beta/config.json
@@ -1,8 +1,8 @@
 {
-	"name": "diyHue FLASK",
+	"name": "diyHue BETA",
 	"version": "1.4.1",
-	"slug": "diyhue-beta-flask",
-	"description": "Philips Hue Bridge Emulator FLASK",
+	"slug": "diyhue-beta",
+	"description": "Philips Hue Bridge Emulator BETA",
 	"webui": "http://[HOST]:[PORT:80]",
 	"panel_icon": "mdi:home-lightbulb",
 	"arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
@@ -26,7 +26,6 @@
 	"map": ["config:rw", "share:rw"],
 	"options": {
 		"config_path": "/config/diyhue",
-		"mac": "XX:XX:XX:XX:XX",
 		"debug": false,
 		"deconz_ip": "",
 		"no_serve_https": false
diff --git a/diyhue-flask/icon.png b/diyhue-beta/icon.png
similarity index 100%
rename from diyhue-flask/icon.png
rename to diyhue-beta/icon.png
diff --git a/diyhue-flask/logo.png b/diyhue-beta/logo.png
similarity index 100%
rename from diyhue-flask/logo.png
rename to diyhue-beta/logo.png
diff --git a/diyhue-flask/rootfs/run.sh b/diyhue-beta/rootfs/run.sh
old mode 100755
new mode 100644
similarity index 100%
rename from diyhue-flask/rootfs/run.sh
rename to diyhue-beta/rootfs/run.sh
diff --git a/diyhue-flask/rootfs/select.sh b/diyhue-beta/rootfs/select.sh
old mode 100755
new mode 100644
similarity index 100%
rename from diyhue-flask/rootfs/select.sh
rename to diyhue-beta/rootfs/select.sh