diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2fd8c78
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+secrets.yaml
+known_devices.yaml
diff --git a/configuration.yaml b/configuration.yaml
index a3a046e..f25d9d0 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -42,7 +42,7 @@ mqtt:
 
 notify: !include notify.yaml
 
-sensor: !include sensor.yaml
+sensor: !include_dir_merge_list sensors
 
 media_player:
   - platform: samsungtv
diff --git a/sensor.yaml b/sensor.yaml
deleted file mode 100644
index f8090b3..0000000
--- a/sensor.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Temp and Humidity Monitoring
-- platform: mqtt
-  state_topic: 'tortoise/sensor1'
-  name: 'Temperature'
-  unit_of_measurement: '°C'
-  value_template: '{{ value_json.temperature }}'
-- platform: mqtt
-  state_topic: 'tortoise/sensor1'
-  name: 'Humidity'
-  unit_of_measurement: '%'
-  value_template: '{{ value_json.humidity }}'
-
-# Plex Media Server
-- platform: plex
-  name: Plex Sensor
-  host: 192.168.1.3
-
-#### Pill Time Counters###
-
-#Current Time
-- platform: time_date
-  display_options:
-    - 'date_time'
-# Seconds since Pill Button Sensor changed
-- platform: template
-  sensors:
-    last_pill:
-      unit_of_measurement: Sec
-      friendly_name: Pill Last Taken
-      value_template: '{% if states.sensor.pill_button_sensor.last_updated is undefined %}{{"00:00:00"}}{% else %}{{ ((as_timestamp(states.sensor.date__time.last_updated)-as_timestamp(states.sensor.pill_button_sensor.last_updated))|int) }}{% endif %}'
-
-# Push Button Sensor 
-- platform: mqtt
-  name: Pill Button Sensor 
-  state_topic: 'dash/pill_reminder' 
-  hide: false   
diff --git a/sensors/pill_button.yaml b/sensors/pill_button.yaml
new file mode 100644
index 0000000..edc5658
--- /dev/null
+++ b/sensors/pill_button.yaml
@@ -0,0 +1,14 @@
+# Seconds since Pill Button Sensor changed
+- platform: template
+  sensors:
+    last_pill:
+      unit_of_measurement: Sec
+      friendly_name: Pill Last Taken
+      value_template: '{% if states.sensor.pill_button_sensor.last_updated is undefined %}{{"00:00:00"}}{% else %}{{ ((as_timestamp(states.sensor.time.last_updated)-as_timestamp(states.sensor.pill_button_sensor.last_updated))|int) }}{% endif %}'
+
+# Push Button Sensor 
+- platform: mqtt
+  name: Pill Button Sensor 
+  state_topic: 'dash/pill_reminder' 
+  hide: false   
+
diff --git a/sensors/plex.yaml b/sensors/plex.yaml
new file mode 100644
index 0000000..8e21eaf
--- /dev/null
+++ b/sensors/plex.yaml
@@ -0,0 +1,4 @@
+# Plex Media Server
+- platform: plex
+  name: Plex Sensor
+  host: 192.168.1.3
diff --git a/sensors/time.yaml b/sensors/time.yaml
new file mode 100644
index 0000000..7a519fc
--- /dev/null
+++ b/sensors/time.yaml
@@ -0,0 +1,5 @@
+#Current Time
+- platform: time_date
+  display_options:
+    - 'date_time'
+
diff --git a/sensors/tortoise.yaml b/sensors/tortoise.yaml
new file mode 100644
index 0000000..e468c0a
--- /dev/null
+++ b/sensors/tortoise.yaml
@@ -0,0 +1,11 @@
+# Temp and Humidity Monitoring
+- platform: mqtt
+  state_topic: 'tortoise/sensor1'
+  name: 'Temperature'
+  unit_of_measurement: '°C'
+  value_template: '{{ value_json.temperature }}'
+- platform: mqtt
+  state_topic: 'tortoise/sensor1'
+  name: 'Humidity'
+  unit_of_measurement: '%'
+  value_template: '{{ value_json.humidity }}'