diff --git a/HA/README.md b/homeassistant/README.md
similarity index 100%
rename from HA/README.md
rename to homeassistant/README.md
diff --git a/homeassistant/esphome/bme680.yaml b/homeassistant/esphome/bme680.yaml
new file mode 100644
index 0000000..4f380a4
--- /dev/null
+++ b/homeassistant/esphome/bme680.yaml
@@ -0,0 +1,145 @@
+esphome:
+  name: bme680
+  board: d1_mini
+  platform: esp8266
+
+
+
+# Enable logging
+logger:
+
+# Enable Home Assistant API
+#api:
+
+ota:
+  password: !secret ota
+
+wifi:
+  networks:
+  - ssid: !secret wifi_ssid
+    password: !secret wifi_password
+  - ssid: !secret wifi_ssid2
+    password: !secret wifi_password2
+ 
+
+
+  # Enable fallback hotspot (captive portal) in case wifi connection fails
+
+web_server:
+   port: 80
+
+#status_led:
+#  pin:
+#    number: GPIO2
+#    inverted: True
+
+
+time:
+  - platform: sntp
+    id: homeassistant_time
+    timezone: Europe/Amsterdam
+
+mdns:
+ disabled: false
+
+captive_portal:
+
+mqtt:
+  broker: mqtt.lan
+  discovery: true 
+
+#dallas:
+#  - pin: D1
+
+i2c:
+  sda: D3
+  scl: D2
+  scan: true
+
+bme680_bsec:
+    # Default: 0x76
+    address: 0x77
+    temperature_offset: 0
+    # Default: static
+    iaq_mode: static
+
+    sample_rate: lp
+    # Interval at which to save BSEC state
+    # ------------------------------------
+    # Default: 6h
+    state_save_interval: 6h
+
+sensor:
+  - platform: bme680_bsec
+    temperature:
+      # Temperature in °C
+      name: "Z1 BME680 T"
+      sample_rate: lp
+      filters:
+        - median
+      accuracy_decimals: 2
+    pressure:
+      # Pressure in hPa
+      name: "Z1 BME680 Pres"
+      sample_rate: lp
+      filters:
+        - median
+      accuracy_decimals: 2
+    humidity:
+      # Relative humidity %
+      name: "Z1 BME680 Hum"
+      sample_rate: lp
+      filters:
+        - median
+      accuracy_decimals: 1
+    gas_resistance:
+      # Gas resistance in Ω
+      name: "Z1 BME680 Gas Resistance"
+      filters:
+        - median
+    iaq:
+      # Indoor air quality value
+      name: "Z1 BME680 IAQ"
+      filters:
+        - median
+    iaq_accuracy:
+      # IAQ accuracy as a numeric value of 0, 1, 2, 3
+      name: "Z1 BME680 Numeric IAQ Accuracy"
+    co2_equivalent:
+      # CO2 equivalent estimate in ppm
+      name: "Z1 BME680 CO2 Equivalent"
+      filters:
+        - median
+    breath_voc_equivalent:
+      # Volatile organic compounds equivalent estimate in ppm
+      name: "Z1 BME680 Breath VOC Equivalent"
+      filters:
+        - median
+
+  - platform: htu21d
+    temperature:
+      name: "Z1 HTU21 Temp"
+      accuracy_decimals: 2
+    humidity:
+      name: "Z1 HTU21 Hum"
+      accuracy_decimals: 1
+    update_interval: 60s
+
+
+
+
+text_sensor:
+  - platform: bme680_bsec
+    iaq_accuracy:
+      # IAQ accuracy as a text value of Stabilizing, Uncertain, Calibrating, Calibrated
+      name: "Z1 BME680 IAQ Accuracy"
+
+
+  
+# RCWL-0516 Microwave Radar Motion Sensor
+#binary_sensor:
+#  - platform: gpio
+#    pin: D5
+#    name: "Z1 Motion"
+#    device_class: motion
+    
diff --git a/homeassistant/esphome/fonts/BebasNeue-Regular.ttf b/homeassistant/esphome/fonts/BebasNeue-Regular.ttf
new file mode 100644
index 0000000..c328c6e
Binary files /dev/null and b/homeassistant/esphome/fonts/BebasNeue-Regular.ttf differ
diff --git a/homeassistant/esphome/fonts/Comic_Sans_MS.ttf b/homeassistant/esphome/fonts/Comic_Sans_MS.ttf
new file mode 100644
index 0000000..d17e1be
Binary files /dev/null and b/homeassistant/esphome/fonts/Comic_Sans_MS.ttf differ
diff --git a/homeassistant/esphome/fonts/arial.ttf b/homeassistant/esphome/fonts/arial.ttf
new file mode 100644
index 0000000..7ff88f2
Binary files /dev/null and b/homeassistant/esphome/fonts/arial.ttf differ
diff --git a/homeassistant/esphome/fonts/digital-7-italic.ttf b/homeassistant/esphome/fonts/digital-7-italic.ttf
new file mode 100644
index 0000000..5a98d7a
Binary files /dev/null and b/homeassistant/esphome/fonts/digital-7-italic.ttf differ
diff --git a/homeassistant/esphome/fonts/digital-7-mono-italic.ttf b/homeassistant/esphome/fonts/digital-7-mono-italic.ttf
new file mode 100644
index 0000000..a01db8a
Binary files /dev/null and b/homeassistant/esphome/fonts/digital-7-mono-italic.ttf differ
diff --git a/homeassistant/esphome/fonts/digital-7-mono.ttf b/homeassistant/esphome/fonts/digital-7-mono.ttf
new file mode 100644
index 0000000..a481b97
Binary files /dev/null and b/homeassistant/esphome/fonts/digital-7-mono.ttf differ
diff --git a/homeassistant/esphome/fonts/digital-7.ttf b/homeassistant/esphome/fonts/digital-7.ttf
new file mode 100644
index 0000000..5dbe6f9
Binary files /dev/null and b/homeassistant/esphome/fonts/digital-7.ttf differ
diff --git a/homeassistant/esphome/fonts/slkscr.ttf b/homeassistant/esphome/fonts/slkscr.ttf
new file mode 100644
index 0000000..e2dd974
Binary files /dev/null and b/homeassistant/esphome/fonts/slkscr.ttf differ
diff --git a/homeassistant/esphome/fonts/ubuntu-r.ttf b/homeassistant/esphome/fonts/ubuntu-r.ttf
new file mode 100644
index 0000000..d748728
Binary files /dev/null and b/homeassistant/esphome/fonts/ubuntu-r.ttf differ
diff --git a/homeassistant/esphome/p1smartmeter.yaml b/homeassistant/esphome/p1smartmeter.yaml
new file mode 100644
index 0000000..7a250d3
--- /dev/null
+++ b/homeassistant/esphome/p1smartmeter.yaml
@@ -0,0 +1,76 @@
+esphome:
+  name: p1
+  platform: ESP8266
+  board: d1_mini
+
+# Enable logging
+logger:
+ baud_rate: 0
+ 
+# Enable Home Assistant API
+api:
+  reboot_timeout: 0s
+
+ota:
+  password: !secret ota
+
+wifi:
+  networks:
+  - ssid: !secret wifi_ssid
+    password: !secret wifi_password
+  - ssid: !secret wifi_ssid2
+    password: !secret wifi_password2
+
+  domain: .lan
+  # Enable fallback hotspot (captive portal) in case wifi connection fails
+  ap:
+    ssid: !secret ap_ssid
+    password: !secret ap_password
+
+web_server:
+  port: 80
+  
+captive_portal:
+
+time:
+ - platform: sntp
+   id: time1
+   timezone: Europe/Amsterdam
+
+
+status_led:
+  pin:
+    number: GPIO2
+    inverted: True
+
+
+   
+mqtt:
+  broker: mqtt.lan
+  discovery: true
+  
+dsmr:
+  id: dsmr_instance
+
+uart:
+  - rx_pin: RX
+    baud_rate: 115200
+
+sensor:
+  - platform: dsmr
+    energy_delivered_tariff1:
+      name: Energy Tarief 1
+    energy_delivered_tariff2:
+      name: Energy Tarief 2
+    power_delivered: 
+      name: Power
+    gas_delivered:
+      name: Gas
+# tarief 1 is dal tarief!!! 
+
+text_sensor:
+  - platform: dsmr
+    identification:
+      name: "DSMR Identification"
+    p1_version:
+      name: "DSMR Version"
diff --git a/HA/ha-nginx.conf b/homeassistant/ha-nginx.conf
similarity index 100%
rename from HA/ha-nginx.conf
rename to homeassistant/ha-nginx.conf