diff --git a/packages/announcements.yaml b/packages/announcements.yaml
index 5ebda78..545ac0b 100644
--- a/packages/announcements.yaml
+++ b/packages/announcements.yaml
@@ -83,6 +83,15 @@ input_boolean:
     name: Kallen Nightly Briefing Ran
     icon: mdi:home-analytics
 
+intent_script:
+  PlayAnnouncement:
+    action:
+      service: "script.{{announcement}}"
+      data:
+        who: "{{ who|default('everywhere') }}"
+    speech:
+      text: "Okay"
+
 ################################
 # Announcment Automation - fires at the time of the above input_datetimes
 ################################
diff --git a/packages/assist/announcements.yaml b/packages/assist/announcements.yaml
deleted file mode 100644
index 4e43de6..0000000
--- a/packages/assist/announcements.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-intent_script:
-  PlayAnnouncement:
-    action:
-      service: "script.{{announcement}}"
-      data:
-        who: "{{ who|default('everywhere') }}"
-    speech:
-      text: "Okay"
\ No newline at end of file
diff --git a/packages/assist/climate.yaml b/packages/assist/climate.yaml
deleted file mode 100644
index 0026394..0000000
--- a/packages/assist/climate.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-intent_script:
-  MasterBedroomModes:
-    action:
-      service: "button.press"
-      data:
-        entity_id: "{{ mode }}"
-    speech:
-      text: "Master bedroom set to {{ mode }}"
\ No newline at end of file
diff --git a/packages/assist/media.yaml b/packages/assist/media.yaml
deleted file mode 100644
index e1de06b..0000000
--- a/packages/assist/media.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-intent_script:
-  SetVolume:
-    action:
-      service: "media_player.volume_set"
-      data:
-        entity_id: "{{ media_player }}"
-        volume_level: "{{ volume / 100.0 }}"
-    speech:
-      text: "Volume changed to {{ volume }}"
diff --git a/packages/assist/sports.yaml b/packages/assist/sports.yaml
deleted file mode 100644
index 34cf53c..0000000
--- a/packages/assist/sports.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-intent_script:
-  SportsScore:
-    speech:
-      text: >
-        {% from 'sports.jinja' import sports_pregame, sports_main %}
-        {% set inhibit = "binary_sensor." + team + "_inhibit" %}
-        {% set sensor = "sensor." + team %}
-        {% if is_state(inhibit,'on') %}
-          I do not have any information about the {{ state_attr(team,'friendly_name') }} at this time.
-        {% elif states(sensor) in ["NOT_FOUND"] %}
-          They do not appear to have a game scheduled for today.
-        {% else %}
-          {{ sports_pregame(sensor) }}
-          {{ sports_main(sensor) }}
-        {% endif %}
diff --git a/packages/climate.yaml b/packages/climate.yaml
index c4e40f9..91ec67a 100644
--- a/packages/climate.yaml
+++ b/packages/climate.yaml
@@ -255,4 +255,13 @@ input_number:
     max: 100
     step: 1
     unit_of_measurement: °F
-    icon: mdi:thermometer
\ No newline at end of file
+    icon: mdi:thermometer
+
+intent_script:
+  MasterBedroomModes:
+    action:
+      service: "button.press"
+      data:
+        entity_id: "{{ mode }}"
+    speech:
+      text: "Master bedroom set to {{ mode }}"
\ No newline at end of file
diff --git a/packages/assist/computers.yaml b/packages/computers.yaml
similarity index 100%
rename from packages/assist/computers.yaml
rename to packages/computers.yaml
diff --git a/packages/multimedia.yaml b/packages/multimedia.yaml
index 9f78f39..404f383 100644
--- a/packages/multimedia.yaml
+++ b/packages/multimedia.yaml
@@ -3,6 +3,16 @@ input_boolean:
     name: Spotify Idle or Paused
     icon: mdi:spotify
 
+intent_script:
+  SetVolume:
+    action:
+      service: "media_player.volume_set"
+      data:
+        entity_id: "{{ media_player }}"
+        volume_level: "{{ volume / 100.0 }}"
+    speech:
+      text: "Volume changed to {{ volume }}"
+
 automation:
   - id: beac4fed-5326-49ef-951e-6615d0cf1a7c
     alias: 'Spotify Page  - Everywhere Media Player idle or paused '
diff --git a/packages/scheduling.yaml b/packages/scheduling.yaml
index 5417135..dafe1b8 100644
--- a/packages/scheduling.yaml
+++ b/packages/scheduling.yaml
@@ -417,13 +417,12 @@ script:
           entity_id: input_datetime.daily_briefing
           data:
             time: >
+              {% from 'time.jinja' import time_from_calendar %}
               {% if is_state('input_boolean.kallen_school_today','on') %}
                 {% if is_state('input_boolean.kallen_alternate_pickup','on') %}
                   15:00
-                {% elif is_state('input_boolean.kallen_school_early_release','on') %}
-                  12:30
                 {% else %}
-                  14:15
+                  {{ time_from_calendar('calendar.kallen_school_days','end_time','set','subtract',1) }}
                 {% endif %}
               {% elif is_state('input_boolean.kallen_school_today','off') and is_state('input_boolean.work_today','off') %}
                 15:00
@@ -568,7 +567,7 @@ script:
                 {% elif is_state('input_boolean.kallen_school_early_release','on') %}
                   12:00
                 {% else %}
-                  13:30
+                  13:00
                 {% endif %}
               {% else %}
                 14:00
diff --git a/packages/school.yaml b/packages/school.yaml
index 60f76ad..7bdd8ea 100644
--- a/packages/school.yaml
+++ b/packages/school.yaml
@@ -407,7 +407,11 @@ script:
         data:
           time: >
             {% from 'time.jinja' import time_from_calendar %}
-            {{ time_from_calendar('calendar.kallen_school_days','start_time','set') }}
+            {% if is_state('input_boolean.two_hour_delay','on') %}
+              {{ time_from_calendar('calendar.kallen_school_days','start_time','set','add',2) }}
+            {% else %}
+              {{ time_from_calendar('calendar.kallen_school_days','start_time','set') }}
+            {% endif %}
       - service: input_boolean.turn_on
         entity_id: 
           - input_boolean.kallen_school_today
diff --git a/packages/sports.yaml b/packages/sports.yaml
index 659768a..ea5901c 100644
--- a/packages/sports.yaml
+++ b/packages/sports.yaml
@@ -47,4 +47,20 @@ template:
       unique_id: 2c6aae6e-eff6-46e5-bee9-311f9bbc0c0e
       state: >
         {% from 'sports.jinja' import sports_inhibit %}
-        {{ state_attr('sensor.los_angeles_dodgers','opponent_abbr') in ['CLE'] or sports_inhibit('sensor.los_angeles_dodgers') }}
\ No newline at end of file
+        {{ state_attr('sensor.los_angeles_dodgers','opponent_abbr') in ['CLE'] or sports_inhibit('sensor.los_angeles_dodgers') }}
+
+intent_script:
+  SportsScore:
+    speech:
+      text: >
+        {% from 'sports.jinja' import sports_pregame, sports_main %}
+        {% set inhibit = "binary_sensor." + team + "_inhibit" %}
+        {% set sensor = "sensor." + team %}
+        {% if is_state(inhibit,'on') %}
+          I do not have any information about the {{ state_attr(team,'friendly_name') }} at this time.
+        {% elif states(sensor) in ["NOT_FOUND"] %}
+          They do not appear to have a game scheduled for today.
+        {% else %}
+          {{ sports_pregame(sensor) }}
+          {{ sports_main(sensor) }}
+        {% endif %}