diff --git a/.gitignore b/automations/.gitignore
similarity index 80%
rename from .gitignore
rename to automations/.gitignore
index 114965c..6e27099 100644
--- a/.gitignore
+++ b/automations/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 .HA_VERSION
 .cloud
 .storage
diff --git a/configuration.yaml b/configuration.yaml
index dc40b42..57d07e1 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -10,10 +10,7 @@ mobile_app:
 
 sensor: !include_dir_merge_list sensors
 switch: !include_dir_merge_list switches
-group: !include groups.yaml
-automation: !include automations.yaml
-script: !include scripts.yaml
-scene: !include scenes.yaml
+automation: !include_dir_merge_list automations
 
 hacs:
   sidepanel_title: Hacs Store
diff --git a/groups.yaml b/groups.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/scenes.yaml b/scenes.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/scripts.yaml b/scripts.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/secrets.yaml b/secrets.yaml
index d0e011b..e69de29 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -1,4 +0,0 @@
-
-# Use this file to store secrets like usernames and passwords.
-# Learn more at https://home-assistant.io/docs/configuration/secrets/
-some_password: welcome