diff --git a/config/packages/alexa_tts.yaml.DISABLED b/config/packages/alexa_tts.yaml.DISABLED
deleted file mode 100755
index 0c543967..00000000
--- a/config/packages/alexa_tts.yaml.DISABLED
+++ /dev/null
@@ -1,82 +0,0 @@
-#####################################################################
-#    @package          :     alexa_tts
-#    @description      :     alexa_tts settings
-#####################################################################
-homeassistant:
-  customize:
-    ################################################
-    ## Node Anchors
-    ################################################
-    package.node_anchors:
-      customize: &customize
-        package: 'alexa_tts'
-
-      hidden: &hidden
-        <<: *customize
-        hidden: true
-
-###################################################################
-##media_player
-###################################################################
-media_player:
-  - platform: alexa
-    email: !secret alexa_email
-    password: !secret alexa_password
-    url: amazon.com
-#################################################################
-##group
-#################################################################
-group:
-#
-  all_echoes:
-    view: no
-    
-    name: 'Alexa'
-    entities:
-      - media_player.living_room
-      - media_player.office
-      - media_player.kitchen
-      - media_player.justin_room
-      - media_player.tap
-      - media_player.upstairs
-#
-
-##################################################################
-#automation
-##################################################################
-# automation:
-#   ## Announce what is typed as input
-#   - alias: Alexa TTS
-#     trigger:
-#       platform: state
-#       entity_id: input_select.alexa
-#     action:
-#       - service: media_player.volume_set
-#         data_template:
-#           entity_id: >
-#             {% if is_state('input_select.alexa', 'Living Room') %}
-#               media_player.livingroom
-#             {% elif is_state('input_select.alexa', 'This device') %}
-#               media_player.this_device
-#             {% elif is_state('input_select.alexa', 'None') %}
-#               false
-#             {% endif %}
-#           volume_level: '{{ states.input_number.alexa_volume.state | float /10 }}'
-#       - service: media_player.alexa_tts
-#         data_template:
-#           entity_id: >
-#             {% if is_state('input_select.alexa', 'Living Room') %}
-#               media_player.livingroom
-#             {% elif is_state('input_select.alexa', 'This device') %}
-#               media_player.this_device
-#             {% elif is_state('input_select.alexa', 'None') %}
-#               false
-#             {% endif %}
-#           message: "{{  states.input_text.alexa_tts.state }}"
-#
-#       - delay: '00:00:02'
-#
-#       - service: input_select.select_option
-#         data:
-#           entity_id: input_select.alexa
-#           option: None
diff --git a/config/packages/aurahome.yaml.DISABLED b/config/packages/aurahome.yaml.DISABLED
deleted file mode 100755
index 569f4592..00000000
--- a/config/packages/aurahome.yaml.DISABLED
+++ /dev/null
@@ -1,100 +0,0 @@
-#-------------------------------------------
-# @CCOSTAN
-# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
-#-------------------------------------------
-# homeassistant:
-#   customize_glob:
-#     "sensor.carlo_6*":
-#
-#     "sensor.staceys_iphone_*":
-
-###################################
-##  Uses IFTTT to trigger scenes for Aura
-###################################
-automation:
-  - alias: Aura Scene Nighttime
-    
-    trigger:
-      - platform: state
-        entity_id: input_boolean.good_night
-        to: 'on'
-        from: 'off'
-      - platform: state
-        entity_id:
-          - binary_sensor.sleepnumber_carlo_carlo_is_in_bed
-          - binary_sensor.sleepnumber_carlo_stacey_is_in_bed
-        to: 'on'
-    condition:
-      - condition: state
-        entity_id: input_boolean.guest_mode
-        state: 'off'
-      - condition: or
-        conditions:
-          - condition: state
-            entity_id: binary_sensor.sleepnumber_carlo_carlo_is_in_bed
-            state: 'on'
-          - condition: state
-            entity_id: device_tracker.carlo
-            state: 'not_home'
-      - condition: or
-        conditions:
-          - condition: state
-            entity_id: binary_sensor.sleepnumber_carlo_stacey_is_in_bed
-            state: 'on'
-          - condition: state
-            entity_id: device_tracker.stacey
-            state: 'not_home'
-    action:
-      - service: ifttt.trigger
-        data_template: {"event":"aura_night_mode"}
-
-  - alias: Aura Scene away
-    
-    trigger:
-      - platform: state
-        entity_id:
-          - group.family
-        from: 'home'
-        to: 'not_home'
-        for: '00:03:00'
-    condition:
-      - condition: state
-        entity_id: input_boolean.guest_mode
-        state: 'off'
-    action:
-      - service: ifttt.trigger
-        data_template: {"event":"aura_pet_mode"}
-
-
-  - alias: Aura Scene Home
-    
-    trigger:
-      - platform: state
-        entity_id:
-          - binary_sensor.sleepnumber_carlo_carlo_is_in_bed
-          - binary_sensor.sleepnumber_carlo_stacey_is_in_bed
-        to: 'off'
-      - platform: state
-        entity_id:
-          - group.family
-        from: 'not_home'
-        to: 'home'
-
-    condition:
-      - condition: or
-        conditions:
-          - condition: state
-            entity_id: binary_sensor.sleepnumber_carlo_carlo_is_in_bed
-            state: 'off'
-          - condition: state
-            entity_id: binary_sensor.sleepnumber_carlo_stacey_is_in_bed
-            state: 'off'
-          - condition: state
-            entity_id: device_tracker.carlo
-            state: 'home'
-          - condition: state
-            entity_id: device_tracker.stacey
-            state: 'home'
-    action:
-      - service: ifttt.trigger
-        data_template: {"event":"aura_home_mode"}
diff --git a/config/packages/smart_life.yaml b/config/packages/smart_life.yaml
deleted file mode 100755
index 765d0eba..00000000
--- a/config/packages/smart_life.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-#-------------------------------------------
-# @CCOSTAN
-# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
-###################################
-## Tuya compatible Devices - https://www.vcloudinfo.com/2018/12/how-to-waterproof-your-outdoor-smart.html
-###################################
-tuya:
-  username: !secret tuya_username
-  password: !secret tuya_password
-  country_code: 1
-  platform: smart_life
-
-# homeassistant:
-#   customize_glob:
-#     "sensor.skybell_*":
-#       icon: mdi:camera-front
-#
-#       hidden: False
-#       homebridge_hidden: True
-
-# group:
-#   bolt:
-#     name: Chevy Bolt EV
-#     
-#     entities:
-#       - device_tracker.Carlo_Bolt
-#       - binary_sensor.mychevy_plugged_in
-#       - sensor.mychevy_charge_mode
-#       - sensor.mychevy_charging
-#       - sensor.mychevy_evcharge
-#       - sensor.mychevy_mileage
-#       - sensor.mychevy_range
-#       - sensor.mychevy_status
diff --git a/config/packages/synology.yaml b/config/packages/synology.yaml
deleted file mode 100755
index 35e2743b..00000000
--- a/config/packages/synology.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-#-------------------------------------------
-# @CCOSTAN
-# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
-#-------------------------------------------
-# homeassistant:
-#   customize_glob:
-#     "sensor.carlo_6*":
-#
-#     "sensor.staceys_iphone_*":
-
-# Moved to FOSCAM package