diff --git a/configuration.yaml b/configuration.yaml
index cbe8823..5954d1a 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -1,14 +1,11 @@
-
-# Configure a default setup of Home Assistant (frontend, api, etc)
-default_config:
-
-http:
-  use_x_forwarded_for: true
-  trusted_proxies: 100.103.57.96
-
-# Text to speech
-tts:
-  - platform: google_translate
+homeassistant:
+  name: nerdhaus
+  latitude: !secret home_latititude
+  longitude: !secret home_longitude
+  elevation: !secret home_elevation
+  unit_system: metric
+  time_zone: America/Toronto 
+  packages: !include_dir_named packages
 
 group: !include groups.yaml
 automation: !include automations.yaml
diff --git a/packages/default_config.yaml b/packages/default_config.yaml
new file mode 100644
index 0000000..4508ebc
--- /dev/null
+++ b/packages/default_config.yaml
@@ -0,0 +1,6 @@
+---
+# Configure a default setup of Home Assistant (frontend, api, etc)
+#
+# https://www.home-assistant.io/integrations/default_config
+#
+default_config:
diff --git a/packages/http.yaml b/packages/http.yaml
new file mode 100644
index 0000000..9ebfe95
--- /dev/null
+++ b/packages/http.yaml
@@ -0,0 +1,8 @@
+---
+# The http integration serves all files and data required for the Home Assistant frontend. 
+# 
+# https://www.home-assistant.io/integrations/http
+#
+http:
+  use_x_forwarded_for: true
+  trusted_proxies: 100.103.57.96
diff --git a/packages/tts.yaml b/packages/tts.yaml
new file mode 100644
index 0000000..da9b03d
--- /dev/null
+++ b/packages/tts.yaml
@@ -0,0 +1,8 @@
+---
+# Text-to-Speech (TTS) enables Home Assistant to speak to you.
+#
+# https://www.home-assistant.io/integrations/tts
+#
+tts:
+  - platform: google_translate
+