diff --git a/README.md b/README.md
index 85c35524..d2acfe24 100755
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 Home Assistant configuration files (YAMLs)
 
 This is my Home Assistant Configuration.  I update it pretty regularly. 
-Home Assistantruns on my Raspberry Pi 3 with Z Wave Stick. I've also added a 433Mhz Transmitter and receiver.
+Home Assistantruns on my Raspberry Pi 3 with Aeon Labs Z Wave Stick (GEN 5). I've also added a 433Mhz Transmitter and receiver.
 
 Software on the Pi : Home Assistant, Dasher, HomeBridge
 
@@ -18,7 +18,11 @@ Devices I have :
 * Rachio Sprinkler system
 * SkyBell HD
 * Rokus for all streaming
+* Samsung Smart TV
 * ChromeCast Audios
 * Etekcity Outlets
 * Amazon Dash Buttons
+* Door Sensors (AEON Labs)
+* Nintendo Wii
+
 
diff --git a/configuration.yaml b/configuration.yaml
index 0a1aa53c..bda7d50f 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -165,35 +165,8 @@ sensor Speedtest:
   
 # A comma separated list of states that have to be tracked as a single group
 # Grouped states should share the same type of states (ON/OFF or HOME/NOT_HOME)
-group: 
-  Family:
-    - device_tracker.carlo
-    - device_tracker.stacey
-    - device_tracker.franco
-    - device_tracker.yolanda
-    - device_tracker.joyce_ipad
-  Devices:
-    - sensor.since_last_boot_templated
-    - sensor.wii
-    - sensor.hue_hub
-    - sensor.tablotv
-    - sensor.alexa_echo
-    - sensor.circle
-    - sensor.rachio
-    - sensor.skybell
-    - sensor.samsungtv
-  Internet:
-    - sensor.speedtest_download
-    - sensor.speedtest_upload
-  Sensors:
-    - binary_sensor._sensor_2
-    - binary_sensor._sensor_3
-    - binary_sensor._sensor_5
-    - binary_sensor.aeotec_dsb04100_doorwindow_sensor_sensor_4
-    - binary_sensor.aeotec_dsb04100_doorwindow_sensor_sensor_6
-  Nest:
-    - climate.downstairs
-    - climate.upstairs
+group: !include_dir_merge_named group
+
 
 switch:
   platform: rpi_rf
diff --git a/group/devices.yaml b/group/devices.yaml
new file mode 100755
index 00000000..1fd962fc
--- /dev/null
+++ b/group/devices.yaml
@@ -0,0 +1,11 @@
+Devices:
+  entities:
+    - sensor.since_last_boot_templated
+    - sensor.wii
+    - sensor.hue_hub
+    - sensor.tablotv
+    - sensor.alexa_echo
+    - sensor.circle
+    - sensor.rachio
+    - sensor.skybell
+    - sensor.samsungtv
\ No newline at end of file
diff --git a/group/internet.yaml b/group/internet.yaml
new file mode 100755
index 00000000..3d99640a
--- /dev/null
+++ b/group/internet.yaml
@@ -0,0 +1,4 @@
+Internet:
+  entities:
+    - sensor.speedtest_download
+    - sensor.speedtest_upload
\ No newline at end of file
diff --git a/group/nest.yaml b/group/nest.yaml
new file mode 100755
index 00000000..c616aa20
--- /dev/null
+++ b/group/nest.yaml
@@ -0,0 +1,4 @@
+Nest:
+  entities:
+    - climate.downstairs
+    - climate.upstairs
\ No newline at end of file
diff --git a/group/people.yaml b/group/people.yaml
new file mode 100755
index 00000000..bd96638e
--- /dev/null
+++ b/group/people.yaml
@@ -0,0 +1,7 @@
+Family:
+  entities:
+    - device_tracker.carlo
+    - device_tracker.stacey
+    - device_tracker.franco
+    - device_tracker.yolanda
+    - device_tracker.joyce_ipad
\ No newline at end of file
diff --git a/group/sensors.yaml b/group/sensors.yaml
new file mode 100755
index 00000000..5ab02710
--- /dev/null
+++ b/group/sensors.yaml
@@ -0,0 +1,7 @@
+Sensors:
+  entities:
+    - binary_sensor._sensor_2
+    - binary_sensor._sensor_3
+    - binary_sensor._sensor_5
+    - binary_sensor.aeotec_dsb04100_doorwindow_sensor_sensor_4
+    - binary_sensor.aeotec_dsb04100_doorwindow_sensor_sensor_6
\ No newline at end of file