diff --git a/config/configuration.yaml b/config/configuration.yaml
index 79a46a10..c018e0f9 100755
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -21,7 +21,11 @@ homeassistant:
   auth_providers:
    - type: homeassistant
    - type: legacy_api_password
+     api_password: !secret http_password
    - type: trusted_networks
+     trusted_networks:
+       - 192.168.10.0/24
+       - !secret external_ip
 
 #Note: The influxdb runs along side the HA DB.  It does not replace it.  influxdb is used to grab data for Grafana.
 influxdb:
@@ -73,12 +77,8 @@ cloud:
 http:
   base_url: !secret http_base_url
   # server_port: !secret http_port
-  api_password: !secret http_api_password
   ssl_certificate: !secret ssl_certificate
   ssl_key: !secret ssl_key
-  trusted_networks:
-    - 192.168.10.0/24
-    - !secret external_ip
   ip_ban_enabled: True
   login_attempts_threshold: 3
 
diff --git a/config/packages/foscam.yaml b/config/packages/foscam.yaml
index 19c3388f..bc7249fe 100755
--- a/config/packages/foscam.yaml
+++ b/config/packages/foscam.yaml
@@ -10,6 +10,16 @@
 #
 #       hidden: False
 #-------------------------------------------
+
+camera:
+  - platform: synology
+    url: !secret synology_url
+    username: !secret synology_username
+    password: !secret synology_password
+    timeout: 15
+    verify_ssl: False
+
+
 binary_sensor:
   - platform: rest
     name: "CAMERA1 Motion Sensor"
@@ -46,43 +56,4 @@ binary_sensor:
       {%- endif -%}
 #-------------------------------------------
 # Motion Sensors added to other motion sensors in group yaml
-
-##############################################################################
-###  Automations - Detect when things are not right. Like any Good Watchdog.
-##############################################################################
-#automation:
-#Tweets pushed out to twitter.
-# automation:
-#   - alias: Someone on the MC server!
-#     trigger:
-#       - platform: state
-#         entity_id: sensor.bear_stone
-#
-#     action:
-#       - service: light.turn_on
-#         entity_id: light.justin_go
-#         data_template:
-#           color_name: >
-#             {% if states.sensor.bear_stone.state|int == 1 %}
-#               gold
-#             {% elif states.sensor.bear_stone.state|int == 2 %}
-#               green
-#             {% elif states.sensor.bear_stone.state|int == 3 %}
-#               blue
-#             {% else %}
-#               red
-#             {% endif %}
-#
-#       - service_template: >
-#             {% if states.sensor.bear_stone.state|int > 0 %}
-#               light.turn_on
-#             {% else %}
-#               light.turn_off
-#             {% endif %}
-#         entity_id: light.justin_go
-#
-#       - service: light.turn_on
-#         entity_id:
-#           - light.justin_go
-#         data:
-#           flash: short
+#-------------------------------------------
diff --git a/config/packages/synology.yaml b/config/packages/synology.yaml
index 9acd3f98..35e2743b 100755
--- a/config/packages/synology.yaml
+++ b/config/packages/synology.yaml
@@ -8,10 +8,4 @@
 #
 #     "sensor.staceys_iphone_*":
 
-camera:
-  - platform: synology
-    url: !secret synology_url
-    username: !secret synology_username
-    password: !secret synology_password
-    timeout: 15
-    verify_ssl: False
+# Moved to FOSCAM package
diff --git a/config/travis_secrets.yaml b/config/travis_secrets.yaml
index 60c3b447..5c48633a 100755
--- a/config/travis_secrets.yaml
+++ b/config/travis_secrets.yaml
@@ -1,7 +1,7 @@
 homeassistant_latitude: 000.0000000
 homeassistant_longitude: 000.0000000
 homeassistant_elevation: 00
-http_api_password: password
+http_password: password
 http_port: 80
 external_ip: 10.10.10.10
 server_port: 8123