diff --git a/.storage/lovelace b/.storage/lovelace
index 6b3ab3b..d810b98 100644
--- a/.storage/lovelace
+++ b/.storage/lovelace
@@ -841,7 +841,22 @@
                         {
                             "entities": [
                                 {
-                                    "entity": "automation.persianas"
+                                    "entity": "automation.cerrar_persiana_estudio"
+                                },
+                                {
+                                    "entity": "automation.cerrar_persiana_fase_dos"
+                                },
+                                {
+                                    "entity": "automation.cerrar_persiana_mia"
+                                },
+                                {
+                                    "entity": "automation.cerrar_persiana_noha"
+                                },
+                                {
+                                    "entity": "automation.cerrar_persiana_principal"
+                                },
+                                {
+                                    "entity": "automation.cerrar_persiana_salon_piscina"
                                 }
                             ],
                             "show_header_toggle": false,
@@ -851,7 +866,7 @@
                         {
                             "entities": [
                                 {
-                                    "entity": "automation.test_notificaciones"
+                                    "entity": "automation.test"
                                 }
                             ],
                             "show_header_toggle": false,
diff --git a/automations.yaml b/automations.yaml
deleted file mode 100644
index 647aa49..0000000
--- a/automations.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-- id: 'asi'
-  alias: Actualización de Shelly al inicio
-  trigger:
-    - platform: homeassistant
-      event: start
-  action:
-    - service: mqtt.publish
-      data:
-        topic: 'shellies/command'
-        payload: 'update'
-- id: '1548745063240'
-  alias: Persianas
-  trigger:
-#  - event: sunrise
-#    offset: 01:00:00
-#    platform: sun
-  - event: sunset
-    offset: 00:15:00
-    platform: sun
-  condition: []
-  action:
-  - data:
-      entity_id: 
-        - cover.persina_habitacion_principal
-        - cover.persina_habitacion_noha
-        - cover.persina_habitacion_mia
-        - cover.persina_habitacion_estudio
-        - cover.persina_salon_fase_dos
-        - cover.persina_salon_piscina
-    service: cover.close_cover
-  initial_state: 'on'
-- id: '1550093153747'
-  alias: TEST - Notificaciones
-  trigger:
-  - entity_id: binary_sensor.movimiento_habitacion_estudio
-    from: 'off'
-    platform: state
-    to: 'on'
-  condition: []
-  action:
-  - data:
-      message: saliendo de casa
-    service: notify.telegram_diego
-- id: '1550094029238'
-  alias: Notificación a Isabel saliendo de casa al trabajo
-  initial_state: 'on'
-  trigger:
-  - entity_id: binary_sensor.puerta_entrada
-    from: 'off'
-    platform: state
-    to: 'on'
-  condition:
-  - after: 06:00
-    condition: time
-  - before: 06:25
-    condition: time
-  - condition: state
-    entity_id: binary_sensor.workday_sensor
-    state: 'on'
-  action:
-  - data:
-      message: Diego esta saliendo de casa
-    service: notify.telegram_isabel
-- id: '1551289584925'
-  alias: Luz del Tendedero Encender
-  trigger:
-  - entity_id: binary_sensor.puerta_tendedero
-    from: 'off'
-    platform: state
-    to: 'on'
-  condition:
-    condition: or
-    conditions:
-    - condition: sun
-      after: sunset
-    - condition: sun
-      before: sunrise
-  action:
-  - service: homeassistant.turn_on
-    data:
-      entity_id:
-      - light.luz_tendedero
-    data_template:
-      brightness_pct: "{% if 7 < now().strftime('%H')|int and now().strftime('%H')|int\
-        \ < 23 -%}\n   40\n{%- else -%}\n   80\n{%- endif %}\n"
-  initial_state: 'on'
-- id: '1551289639270'
-  alias: Luz del Tendedero Apagar
-  initial_state: 'on'
-  trigger:
-  - entity_id: binary_sensor.puerta_tendedero
-    from: 'on'
-    platform: state
-    to: 'off'
-  condition:
-  - condition: state
-    entity_id: light.luz_tendedero
-    state: 'on'
-  action:
-  - data:
-      entity_id: light.luz_tendedero
-    service: light.turn_off
diff --git a/configuration.yaml b/configuration.yaml
index 50197b6..17564d3 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -15,5 +15,5 @@ homeassistant:
   packages: !include_dir_named packages
 
 group: !include groups.yaml
-automation: !include automations.yaml
+automation: !include_dir_merge_list automation
 script: !include scripts.yaml