diff --git a/automation/Self_heal.yaml b/automation/System/Self_heal.yaml
similarity index 100%
rename from automation/Self_heal.yaml
rename to automation/System/Self_heal.yaml
diff --git a/automation/bad_logins.yaml b/automation/System/bad_logins.yaml
similarity index 96%
rename from automation/bad_logins.yaml
rename to automation/System/bad_logins.yaml
index 552a6a8a..015cd440 100755
--- a/automation/bad_logins.yaml
+++ b/automation/System/bad_logins.yaml
@@ -1,16 +1,16 @@
-###################################
-##  Uses IFTTT to notify me of bad logins.
-###################################
-
-- alias: Login Failure
-  hide_entity: True
-  trigger:
-    platform: template
-    value_template: "{{ states('persistent_notification.httplogin') != 'unknown' }}"
-
-  action:
-    service: script.ifttt_notify
-    data_template:
-      value1: 'Bad Login: '
-      value2: 'There was a Hack attempt!'
-      value3: 'Go Check the GUI for details.'
+###################################
+##  Uses IFTTT to notify me of bad logins.
+###################################
+
+- alias: Login Failure
+  hide_entity: True
+  trigger:
+    platform: template
+    value_template: "{{ states('persistent_notification.httplogin') != 'unknown' }}"
+
+  action:
+    service: script.ifttt_notify
+    data_template:
+      value1: 'Bad Login: '
+      value2: 'There was a Hack attempt!'
+      value3: 'Go Check the GUI for details.'
diff --git a/automation/detect_and_adjust_lights.yaml b/automation/System/detect_and_adjust_lights.yaml
similarity index 100%
rename from automation/detect_and_adjust_lights.yaml
rename to automation/System/detect_and_adjust_lights.yaml
diff --git a/automation/device_status.yaml b/automation/System/device_status.yaml
similarity index 100%
rename from automation/device_status.yaml
rename to automation/System/device_status.yaml
diff --git a/automation/startup_notification.yaml b/automation/System/startup_notification.yaml
similarity index 100%
rename from automation/startup_notification.yaml
rename to automation/System/startup_notification.yaml
diff --git a/automation/update_notification.yaml b/automation/System/update_notification.yaml
similarity index 97%
rename from automation/update_notification.yaml
rename to automation/System/update_notification.yaml
index 343055b7..84acfea5 100755
--- a/automation/update_notification.yaml
+++ b/automation/System/update_notification.yaml
@@ -1,29 +1,29 @@
-- alias: "Update Available Notification"
-  hide_entity: True
-  trigger:
-    platform: state
-    entity_id: updater.updater
-
-  condition:
-    - condition: template
-      value_template: "{{ states('updater.updater') != 'unknown' }}"
-
-  action:
-    - service: script.ifttt_notify
-      data_template:
-        value1: 'There is a new Version of Home-Assistant Available.'
-        value2: "{{ states('updater.updater') }}"
-        value3: ''
-    
-    - service: notify.html5
-      data_template:
-        title: "Update Available"
-        message: "Home Assistant {{ states('updater.updater') }} is available. - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }}"
-        data:
-          url: "https://home-assistant.io/getting-started/installation-raspberry-pi-all-in-one/#upgrading"
-    
-    - service: persistent_notification.create
-      data:
-        title: "Update Available"
-        message: "Home Assistant {{ states('updater.updater') }} is available. - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }}"
-        notification_id: "update_available"    
+- alias: "Update Available Notification"
+  hide_entity: True
+  trigger:
+    platform: state
+    entity_id: updater.updater
+
+  condition:
+    - condition: template
+      value_template: "{{ states('updater.updater') != 'unknown' }}"
+
+  action:
+    - service: script.ifttt_notify
+      data_template:
+        value1: 'There is a new Version of Home-Assistant Available.'
+        value2: "{{ states('updater.updater') }}"
+        value3: ''
+    
+    - service: notify.html5
+      data_template:
+        title: "Update Available"
+        message: "Home Assistant {{ states('updater.updater') }} is available. - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }}"
+        data:
+          url: "https://home-assistant.io/getting-started/installation-raspberry-pi-all-in-one/#upgrading"
+    
+    - service: persistent_notification.create
+      data:
+        title: "Update Available"
+        message: "Home Assistant {{ states('updater.updater') }} is available. - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }}"
+        notification_id: "update_available"    
diff --git a/automation/watchdog.yaml b/automation/System/watchdog.yaml
similarity index 100%
rename from automation/watchdog.yaml
rename to automation/System/watchdog.yaml