diff --git a/homematic/CHANGELOG.md b/homematic/CHANGELOG.md
index fc09523..1532253 100644
--- a/homematic/CHANGELOG.md
+++ b/homematic/CHANGELOG.md
@@ -1,63 +1,83 @@
 # Changelog
 
+## 8.2
+
+- Update OCCU to 3.45.7
+
 ## 8.1
+
 - Update OCCU to 3.43.15
 - Migrate to new arch layering
 - Better handling for errors with Firmware updates
 
 ## 8.0
+
 - Update OCCU to 3.41.11
 - Fix write error when starting OCCU / HmIP
 - Redirect HMIPServer log to console
 
 ## 7.0
+
 - Update OCCU to 3.41.7
 
 ## 6.0
+
 - Allow customer firmware updates inside `/share`
 - Update Hardware on startup
 - Limit HmIP server to 64mb memory
 - Set `rf_enable` default to `false`
 
 ## 5.0
+
 - Save hmip_address.conf persistent
 
 ## 4.0
+
 - New ubuntu base images
 - Support firmware update of HM-MOD-RPI-PCB, HmIP-RFUSB
 - Add HmIP support with HmIP-RFUSB
 
 ## 3.0
+
 - Add periodically time sync
 
 ## 2.0
+
 - Fix wrong Timezone
 - Update OCCU to 3.37.8
 
 ## 1.0
+
 - Change version format to other core add-ons
 - Update OCCU to 2.35.16
 - Disable AppArmor to work on system like HassOS
 
 ## 2.31.25-p2
+
 - Bugfix with reset value on GPIO
 
 ## 2.31.25-p1
+
 - Add `reset` options for RF modules
 
 ## 2.31.25-p0
+
 - Update OCCU to 2.31.25
 
 ## 2.31.23-p0
+
 - Update OCCU to 2.31.23
 
 ## 2.29.22-1-p1
+
 - Fix bug in script
 - Add wired port into config
 
 ## 2.29.22-1-p1
+
 - Change config logic
 - Add support for wired
 
 ## 2.29.22-1-p0
+
 - Initial
diff --git a/homematic/Dockerfile b/homematic/Dockerfile
index fb067ac..777e69b 100644
--- a/homematic/Dockerfile
+++ b/homematic/Dockerfile
@@ -49,11 +49,11 @@ RUN curl -SL https://github.com/eq-3/occu/archive/${OCCU_VERSION}.tar.gz | tar x
 ENV HM_HOME=/opt/hm LD_LIBRARY_PATH=/opt/hm/lib:${LD_LIBRARY_PATH}
 
 # Update config files
-COPY rfd.conf hs485d.conf crRFD.conf log4j.xml /etc/config/
+COPY data/rfd.conf data/hs485d.conf data/crRFD.conf data/log4j.xml /etc/config/
 
 # Setup start script
-COPY run.sh /
-COPY hm-firmware.sh /usr/lib/
+COPY data/run.sh /
+COPY data/hm-firmware.sh /usr/lib/
 
 WORKDIR /data
 CMD [ "/run.sh" ]
diff --git a/homematic/build.json b/homematic/build.json
index 6d62f09..ca283f3 100644
--- a/homematic/build.json
+++ b/homematic/build.json
@@ -4,6 +4,6 @@
     "i386": "homeassistant/i386-base-ubuntu:18.04"
   },
   "args": {
-    "OCCU_VERSION": "3.43.15"
+    "OCCU_VERSION": "3.45.7"
   }
 }
diff --git a/homematic/config.json b/homematic/config.json
index 3b71b4c..6ccea4b 100644
--- a/homematic/config.json
+++ b/homematic/config.json
@@ -1,6 +1,6 @@
 {
   "name": "HomeMatic OCCU",
-  "version": "8.1",
+  "version": "8.2",
   "slug": "homematic",
   "description": "HomeMatic central based on OCCU",
   "url": "https://home-assistant.io/addons/homematic/",
diff --git a/homematic/crRFD.conf b/homematic/data/crRFD.conf
similarity index 100%
rename from homematic/crRFD.conf
rename to homematic/data/crRFD.conf
diff --git a/homematic/hm-firmware.sh b/homematic/data/hm-firmware.sh
old mode 100644
new mode 100755
similarity index 100%
rename from homematic/hm-firmware.sh
rename to homematic/data/hm-firmware.sh
diff --git a/homematic/hs485d.conf b/homematic/data/hs485d.conf
similarity index 100%
rename from homematic/hs485d.conf
rename to homematic/data/hs485d.conf
diff --git a/homematic/log4j.xml b/homematic/data/log4j.xml
similarity index 100%
rename from homematic/log4j.xml
rename to homematic/data/log4j.xml
diff --git a/homematic/rfd.conf b/homematic/data/rfd.conf
similarity index 100%
rename from homematic/rfd.conf
rename to homematic/data/rfd.conf
diff --git a/homematic/run.sh b/homematic/data/run.sh
similarity index 100%
rename from homematic/run.sh
rename to homematic/data/run.sh