diff --git a/config/packages/floorplan.yaml.DISABLED b/config/packages/floorplan.yaml.DISABLED
index 10e5a74b..4b558a33 100755
--- a/config/packages/floorplan.yaml.DISABLED
+++ b/config/packages/floorplan.yaml.DISABLED
@@ -46,3 +46,40 @@ binary_sensor:
     name: Bedroom Plugged
     retain: true
     
+#---Sensor for Time and Date.-----------------------------
+sensor:
+  - platform: template
+    scan_interval: 30000
+    sensors:
+      floorplan_date:
+        friendly_name: 'Date'
+        value_template: >-
+          {{now().strftime("%A")}}, {{now().strftime("%B")}} {{now().strftime("%d")}}
+
+  - platform: template
+    scan_interval: 60
+    sensors:
+      floorplan_time:
+        friendly_name: 'Time'
+        value_template: >-
+          {{now().strftime("%-I")}}:{{now().strftime("%M")}} {{now().strftime("%p")}}
+      clock_time:
+        friendly_name: 'Clock Time'
+        value_template: >-
+          {{now().strftime("%-I")}}:{{now().strftime("%M")}}
+
+  - platform: template
+    scan_interval: 30000
+    sensors:
+      clock_am_pm:
+        friendly_name: 'AM/PM'
+        value_template: >-
+          {{now().strftime("%p")}}
+      clock_day:
+        friendly_name: 'Day'
+        value_template: >-
+          {{now().strftime("%A")}}
+      clock_date:
+        friendly_name: 'Clock Date'
+        value_template: >-
+          {{now().strftime("%B")}} {{now().strftime("%d")}} {{now().year}}
diff --git a/config/packages/ios.yaml b/config/packages/ios.yaml
index b69de748..8373eea9 100755
--- a/config/packages/ios.yaml
+++ b/config/packages/ios.yaml
@@ -22,80 +22,3 @@ notify:
 
 mobile_app:
 
-## - Reminders to take my medicine
-input_boolean:
-  medicine:
-    name: Medicine Reminder
-    initial: off
-    icon: mdi:tablet
-
-automation:
-  - alias: Medicine Reminder
-    id: 78c47087-8242-470c-97d1-3dc5747ed576
-    initial_state: true
-    trigger:
-      - platform: time_pattern
-        minutes: '/45'
-      - platform: time
-        at: '21:30:00'
-      - platform: state
-        entity_id: person.carlo
-        to: 'home'
-
-    condition:
-      - condition: time
-        after: '21:30:00'
-      - condition: state
-        entity_id: person.carlo
-        state: 'home'
-      - condition: state
-        entity_id: input_boolean.medicine
-        state: 'off'
-
-    action:
-      - service: script.notify_engine_two_button
-        data:
-          title: 'Medicine Alert!'
-          value1: 'Please take your Medicine!'
-          title1: 'Took Medicine'
-          action1: 'TABLET_TAKEN'
-          icon1: 'sfsymbols:arrow.up.circle'
-          who: "carlo"
-          group: 'Medicine'
-
-  - alias: Tablet Already taken
-    id: 1f295bb8-8925-4b22-8f75-9fe079b295a8
-    trigger:
-      platform: event
-      event_type: mobile_app_notification_action
-      event_data:
-        action: TABLET_TAKEN
-    action:
-      - service: input_boolean.turn_on
-        entity_id: input_boolean.medicine
-
-  # - alias: Remind Me Later
-  #   id: 79b49c85-f832-47d7-b02d-bff099ef6fbc
-  #   trigger:
-  #     platform: event
-  #     event_type: mobile_app_notification_action
-  #     event_data:
-  #       action: NOT_HOME
-  #   action:
-  #     - service: script.notify_engine_two_button
-  #       data:
-  #         title: 'Medicine Reminder'
-  #         value1: 'Ok. I will remind you when you get home.'
-  #         who: 'carlo'
-  #         group: 'Medicine'
-  #     - wait_template: >-
-  #         {{ states.person.carlo.state == 'home' }}
-  #     - service: script.notify_engine_two_button
-  #       data:
-  #         title: 'Medicine Reminder'
-  #         value1: 'Now that your home, please take your medicine!'
-  #         who: 'carlo'
-  #         group: 'Medicine'
-
-
-## Reminders to take my Medicine! - End.
diff --git a/config/packages/medicine.yaml b/config/packages/medicine.yaml
new file mode 100755
index 00000000..eaf4dbe9
--- /dev/null
+++ b/config/packages/medicine.yaml
@@ -0,0 +1,85 @@
+######################################################################
+#-------------------------------------------
+# @CCOSTAN
+# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
+# ## - Reminders to take my medicine
+#-------------------------------------------
+######################################################################
+
+
+input_boolean:
+  medicine:
+    name: Medicine Reminder
+    initial: off
+    icon: mdi:tablet
+
+automation:
+  - alias: Medicine Reminder
+    id: 78c47087-8242-470c-97d1-3dc5747ed576
+    initial_state: true
+    trigger:
+      - platform: time_pattern
+        minutes: '/45'
+      - platform: time
+        at: '21:30:00'
+      - platform: state
+        entity_id: person.carlo
+        to: 'home'
+
+    condition:
+      - condition: time
+        after: '21:30:00'
+      - condition: state
+        entity_id: person.carlo
+        state: 'home'
+      - condition: state
+        entity_id: input_boolean.medicine
+        state: 'off'
+
+    action:
+      - service: script.notify_engine_two_button
+        data:
+          title: 'Medicine Alert!'
+          value1: 'Please take your Medicine!'
+          title1: 'Took Medicine'
+          action1: 'TABLET_TAKEN'
+          icon1: 'sfsymbols:arrow.up.circle'
+          who: "carlo"
+          group: 'Medicine'
+
+  - alias: Tablet Already taken
+    id: 1f295bb8-8925-4b22-8f75-9fe079b295a8
+    trigger:
+      platform: event
+      event_type: mobile_app_notification_action
+      event_data:
+        action: TABLET_TAKEN
+    action:
+      - service: input_boolean.turn_on
+        entity_id: input_boolean.medicine
+
+  # - alias: Remind Me Later
+  #   id: 79b49c85-f832-47d7-b02d-bff099ef6fbc
+  #   trigger:
+  #     platform: event
+  #     event_type: mobile_app_notification_action
+  #     event_data:
+  #       action: NOT_HOME
+  #   action:
+  #     - service: script.notify_engine_two_button
+  #       data:
+  #         title: 'Medicine Reminder'
+  #         value1: 'Ok. I will remind you when you get home.'
+  #         who: 'carlo'
+  #         group: 'Medicine'
+  #     - wait_template: >-
+  #         {{ states.person.carlo.state == 'home' }}
+  #     - service: script.notify_engine_two_button
+  #       data:
+  #         title: 'Medicine Reminder'
+  #         value1: 'Now that your home, please take your medicine!'
+  #         who: 'carlo'
+  #         group: 'Medicine'
+
+
+## Reminders to take my Medicine! - End.
diff --git a/config/packages/time_date_sensors.yaml b/config/packages/time_date_sensors.yaml
deleted file mode 100755
index e8e73eee..00000000
--- a/config/packages/time_date_sensors.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-#-------------------------------------------
-# @CCOSTAN
-# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
-# More Info : https://www.vcloudinfo.com/
-#-------------------------------------------
-#-------------------------------------------
-#  Clean data for the Floorplan UI.
-#-------------------------------------------
-
-#---Sensor for Time and Date.-----------------------------
-sensor:
-  - platform: template
-    scan_interval: 30000
-    sensors:
-      floorplan_date:
-        friendly_name: 'Date'
-        value_template: >-
-          {{now().strftime("%A")}}, {{now().strftime("%B")}} {{now().strftime("%d")}}
-
-  - platform: template
-    scan_interval: 60
-    sensors:
-      floorplan_time:
-        friendly_name: 'Time'
-        value_template: >-
-          {{now().strftime("%-I")}}:{{now().strftime("%M")}} {{now().strftime("%p")}}
-      clock_time:
-        friendly_name: 'Clock Time'
-        value_template: >-
-          {{now().strftime("%-I")}}:{{now().strftime("%M")}}
-
-  - platform: template
-    scan_interval: 30000
-    sensors:
-      clock_am_pm:
-        friendly_name: 'AM/PM'
-        value_template: >-
-          {{now().strftime("%p")}}
-      clock_day:
-        friendly_name: 'Day'
-        value_template: >-
-          {{now().strftime("%A")}}
-      clock_date:
-        friendly_name: 'Clock Date'
-        value_template: >-
-          {{now().strftime("%B")}} {{now().strftime("%d")}} {{now().year}}