diff --git a/config/README.md b/README.md
similarity index 99%
rename from config/README.md
rename to README.md
index cbe5f249..8968ddcb 100755
--- a/config/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <h1 align="center">
-  <a name="logo" href="http://www.vmwareinfo.com/search/label/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
+  <a name="logo" href="http://www.vmwareinfo.com/search/label/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
   Bear Stone Smart Home Configuration
 </h1>
@@ -122,7 +122,7 @@ Lots of my gear comes from [BetaBound](https://goo.gl/0vxT8A) for Beta Testing a
 <tr><td align="center"><a href="https://www.amazon.com/APC-Back-UPS-Battery-Protector-BE425M/dp/B01HDC236Q/ref=as_li_ss_il?s=electronics&ie=UTF8&qid=1519445552&sr=1-2&keywords=apc+450&linkCode=li2&tag=vmw0a-20&linkId=efbdf7bdfad7bd607e099d34bd1f2688" target="_blank"><img border="0" src="https://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=B01HDC236Q&Format=_SL110_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=vmw0a-20" ></a><img src="https://ir-na.amazon-adsystem.com/e/ir?t=vmw0a-20&l=li2&o=1&a=B01HDC236Q" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
 </td><td align="center"><a href="https://www.amazon.com/gp/product/B00KH07WRC/ref=as_li_ss_il?ie=UTF8&psc=1&linkCode=li2&tag=vmw0a-20&linkId=52a63711f582d1ff83f4687137a6154b" target="_blank"><img border="0" src="https://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=B00KH07WRC&Format=_SL110_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=vmw0a-20" ></a><img src="https://ir-na.amazon-adsystem.com/e/ir?t=vmw0a-20&l=li2&o=1&a=B00KH07WRC" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
 </td><td align="center"><a href="http://www.vmwareinfo.com/2018/01/going-green-to-save-some-green-in-2018.html" target="_blank"><img border="0" src="https://lh3.googleusercontent.com/-V8NMHkiKFIY/Wkgpf7T-WDI/AAAAAAADihs/fp5yNzjrQ5sKgFkafXhllLYsD7yM3tGBgCHMYCw/image_thumb5?imgmax=200" ></a><img src="https://ir-na.amazon-adsystem.com/e/ir?t=vmw0a-20&l=li2&o=1&a=B01HDC236Q" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
-</td><td align="center"><a href="https://twitter.com/BearStoneHA" target="_blank"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/www/custom_ui/floorplan/images/branding/twitter_profile.png" width="125" height="125" border="0" alt="" style="border:none !important; margin:0px !important;"></a></td></tr>
+</td><td align="center"><a href="https://twitter.com/BearStoneHA" target="_blank"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" width="125" height="125" border="0" alt="" style="border:none !important; margin:0px !important;"></a></td></tr>
 
 <tr><td colspan="4">
 There aren't really automations for the Batteries yet.  Electricity is the life blood for the house and only really the Tesla Battery has smarts so maybe in the future, you'll see a Powerwall automation in this space.</td></tr>
diff --git a/config/automation/System/CucKoo_Clock.yaml b/config/automation/System/CucKoo_Clock.yaml
index 2f62fdbe..ea1e13cc 100755
--- a/config/automation/System/CucKoo_Clock.yaml
+++ b/config/automation/System/CucKoo_Clock.yaml
@@ -43,8 +43,8 @@
           {% endif %}
         media_content_id: >
           {% if now().strftime("%M")|int == 30 %}
-          https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/sounds/cuckoo-clock-01.wav
+          https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/sounds/cuckoo-clock-01.wav
           {% else %}
-          https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/sounds/cuckoo-clock-{{now().strftime("%I")}}.wav
+          https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/sounds/cuckoo-clock-{{now().strftime("%I")}}.wav
           {% endif %}
         media_content_type: audio/mp4
diff --git a/config/automation/System/door_chime.yaml b/config/automation/System/door_chime.yaml
index 4427ab76..66a12e6d 100755
--- a/config/automation/System/door_chime.yaml
+++ b/config/automation/System/door_chime.yaml
@@ -30,8 +30,8 @@
           {% endif %}
         media_content_id: >
           {% if trigger.to_state.state == 'on' %}
-          https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/sounds/one-tone-chime.mp3
+          https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/sounds/one-tone-chime.mp3
           {% else %}
-          https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/sounds/two-tone-chime.mp3
+          https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/sounds/two-tone-chime.mp3
           {% endif %}
         media_content_type: audio/mp4
diff --git a/config/packages/holiday.yaml b/config/packages/holiday.yaml
index 338a0f56..198d2af3 100755
--- a/config/packages/holiday.yaml
+++ b/config/packages/holiday.yaml
@@ -26,7 +26,7 @@ homeassistant:
 ###############################################################################
 sensor:
   - platform: rest
-    resource: https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/json_data/holidays.json
+    resource: https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/json_data/holidays.json
     name: Holiday
     scan_interval: 14400
     value_template: >
diff --git a/config/packages/triggers/self_destruct.yaml b/config/packages/triggers/self_destruct.yaml
index 7a5a9ac2..ca2eb16c 100755
--- a/config/packages/triggers/self_destruct.yaml
+++ b/config/packages/triggers/self_destruct.yaml
@@ -48,7 +48,7 @@ automation:
           - media_player.bedroom_alarm_panel
       data_template:
         media_content_id: >
-          "https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/sounds/speechcons/self_destruct.mp3"
+          "https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/sounds/speechcons/self_destruct.mp3"
         media_content_type: audio/mp4
     - service: light.turn_on
       entity_id:
diff --git a/config/packages/twitter.yaml b/config/packages/twitter.yaml
index 15fd51a6..f450e3ea 100755
--- a/config/packages/twitter.yaml
+++ b/config/packages/twitter.yaml
@@ -84,7 +84,7 @@ automation:
           entity_id:
             - media_player.livingroomCC
             - media_player.bedroom_alarm_panel
-          media_content_id: "https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/sounds/twitter-chirp.mp3"
+          media_content_id: "https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/sounds/twitter-chirp.mp3"
           media_content_type: audio/mp4
 
       - service: script.tweet_engine
diff --git a/config/script/dog_bark.yaml b/config/script/dog_bark.yaml
index 00119844..669fe483 100755
--- a/config/script/dog_bark.yaml
+++ b/config/script/dog_bark.yaml
@@ -47,5 +47,5 @@ dog_bark:
           - media_player.livingroomCC
           - media_player.entry_alarm_panel
           - media_player.bedroom_alarm_panel
-        media_content_id: "https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/sounds/dog-barking-2-bullmastiff.mp3"
+        media_content_id: "https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/sounds/dog-barking-2-bullmastiff.mp3"
         media_content_type: audio/mp4
diff --git a/config/script/speechcons.yaml.disabled b/config/script/speechcons.yaml.disabled
index 1922beb9..1fb2d1bf 100755
--- a/config/script/speechcons.yaml.disabled
+++ b/config/script/speechcons.yaml.disabled
@@ -44,5 +44,5 @@ speechcon:
         - media_player.LivingRoomCC
       data_template:
         media_content_id: >
-          "https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/sounds/speechcons/{{speechcon}}._TTH_.mp3"
+          "https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/sounds/speechcons/{{speechcon}}._TTH_.mp3"
         media_content_type: audio/mp4