diff --git a/source/_components/binary_sensor.bloomsky.markdown b/source/_components/binary_sensor.bloomsky.markdown
deleted file mode 100644
index 761682c6ca2..00000000000
--- a/source/_components/binary_sensor.bloomsky.markdown
+++ /dev/null
@@ -1,43 +0,0 @@
----
-layout: page
-title: "BloomSky Binary Sensor"
-description: "Instructions on how to set up BloomSky binary sensors within Home Assistant."
-date: 2016-02-22 07:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: bloomsky.png
-ha_category: Environment
-ha_release: 0.14
-ha_iot_class: "Cloud Polling"
----
-
-The `bloomsky` binary sensor platform allows you to get data from your BloomSky device.
-
-To get your BloomSky binary sensors working with Home Assistant, follow the instructions for the [BloomSky component](/components/bloomsky/) first.
-
-## {% linkable_title Configuration %}
-
-To use your BloomSky binary sensor in your installation, add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-binary_sensor:
-  - platform: bloomsky
-    monitored_conditions:
-      - Night
-      - Rain
-```
-
-{% configuration %}
-monitored_conditions:
-  description: "The sensors that you wish to monitor on all of your devices. Select from these options:"
-  required: true
-  type: list
-  keys:
-    night:
-      description: Night
-    rain:
-      description: Rain
-{% endconfiguration %}
diff --git a/source/_components/bloomsky.markdown b/source/_components/bloomsky.markdown
index 1139ee7a9ad..e1746bd89dc 100644
--- a/source/_components/bloomsky.markdown
+++ b/source/_components/bloomsky.markdown
@@ -8,12 +8,24 @@ comments: false
 sharing: true
 footer: true
 logo: bloomsky.png
-ha_category: Environment
+ha_category:
+  - Environment
+  - Binary Sensor
+  - Camera
+  - Sensor
 ha_release: 0.14
 ha_iot_class: "Cloud Polling"
+redirect_from:
+  - /components/binary_sensor.bloomsky/
 ---
 
-The `bloomsky` component allows you to access your [BloomSky](https://www.bloomsky.com/) weather station's [sensors](/components/sensor.bloomsky), [binary sensors](/components/binary_sensor.bloomsky), and [camera](/components/camera.bloomsky) from Home Assistant.
+The `bloomsky` component allows you to access your [BloomSky](https://www.bloomsky.com/) weather station's.
+
+There is currently support for the following device types within Home Assistant:
+
+- [Binary Sensor](#binary-sensor)
+- [Camera](#camera)
+- [Sensor](#sensor)
 
 ## {% linkable_title Setup %}
 
@@ -35,3 +47,91 @@ api_key:
   required: true
   type: string
 {% endconfiguration %}
+
+## {% linkable_title Binary Sensor %}
+
+The `bloomsky` binary sensor platform allows you to get data from your BloomSky device.
+
+To get your BloomSky binary sensors working with Home Assistant, follow the instructions above first.
+
+### {% linkable_title Configuration %}
+
+To use your BloomSky binary sensor in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+binary_sensor:
+  - platform: bloomsky
+    monitored_conditions:
+      - Night
+      - Rain
+```
+
+{% configuration %}
+monitored_conditions:
+  description: "The sensors that you wish to monitor on all of your devices. Select from these options:"
+  required: true
+  type: list
+  keys:
+    night:
+      description: Night
+    rain:
+      description: Rain
+{% endconfiguration %}
+
+## {% linkable_title Camera %}
+
+The `bloomsky` camera component allows you to view the current photo created by the camera in the [BloomSky](https://www.bloomsky.com) weather station. This can work in concert with [BloomSky sensors](#sensor).
+
+### {% linkable_title Configuration %}
+
+To enable this camera in your installation, set up the BloomSky component with your API key and add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+camera:
+  - platform: bloomsky
+```
+
+## {% linkable_title Sensor %}
+
+The `bloomsky` sensor component allows you to view the measurements made by sensors in the [BloomSky](https://www.bloomsky.com) weather station. This can work in concert with the [BloomSky camera](#camera).
+
+### {% linkable_title Configuration %}
+
+To enable these sensors in your installation, set up the BloomSky component with your API key add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  platform: bloomsky
+  monitored_conditions:
+    - Temperature
+    - Humidity
+    - Pressure
+    - UVIndex
+    - Luminance
+    - Voltage
+```
+
+{% configuration %}
+monitored_conditions:
+  description: "The sensors that you wish to monitor on all of your devices. Select from these options:"
+  required: true
+  type: list
+  keys:
+    humidity:
+      description: Humidity
+    luminance:
+      description: Luminance
+    pressure:
+      description: Pressure
+    temperature:
+      description: Temperature
+    uvindex:
+      description: UVIndex
+    voltage:
+      description: Voltage
+{% endconfiguration %}
+
+More conditions are available using the [BloomSky binary sensor](#binary-sensor) component.
\ No newline at end of file
diff --git a/source/_components/camera.bloomsky.markdown b/source/_components/camera.bloomsky.markdown
deleted file mode 100644
index aec143513a8..00000000000
--- a/source/_components/camera.bloomsky.markdown
+++ /dev/null
@@ -1,26 +0,0 @@
----
-layout: page
-title: "BloomSky Camera"
-description: "Instructions on how to integrate the BloomSky camera within Home Assistant."
-date: 2016-02-03 20:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: bloomsky.png
-ha_category: Camera
-ha_release: 0.13
-ha_iot_class: "Local Polling"
----
-
-The `bloomsky` camera component allows you to view the current photo created by the camera in the [BloomSky](https://www.bloomsky.com) weather station. This can work in concert with [BloomSky sensors](/components/sensor.bloomsky).
-
-## {% linkable_title Configuration %}
-
-To enable this camera in your installation, set up the [BloomSky component](/components/bloomsky) with your API key and add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-camera:
-  - platform: bloomsky
-```
diff --git a/source/_components/sensor.bloomsky.markdown b/source/_components/sensor.bloomsky.markdown
deleted file mode 100644
index 1c3ef6acfa7..00000000000
--- a/source/_components/sensor.bloomsky.markdown
+++ /dev/null
@@ -1,56 +0,0 @@
----
-layout: page
-title: "BloomSky Sensor"
-description: "Instructions on how to integrate the BloomSky sensors within Home Assistant."
-date: 2016-02-03 20:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: bloomsky.png
-ha_category: Sensor
-ha_release: 0.14
-ha_iot_class: "Cloud Polling"
----
-
-
-The `bloomsky` sensor component allows you to view the measurements made by sensors in the [BloomSky](https://www.bloomsky.com) weather station. This can work in concert with the [BloomSky camera](/components/camera.bloomsky).
-
-## {% linkable_title Configuration %}
-
-To enable these sensors in your installation, set up the [BloomSky component](/components/bloomsky) with your API key add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-sensor:
-  platform: bloomsky
-  monitored_conditions:
-    - Temperature
-    - Humidity
-    - Pressure
-    - UVIndex
-    - Luminance
-    - Voltage
-```
-
-{% configuration %}
-monitored_conditions:
-  description: "The sensors that you wish to monitor on all of your devices. Select from these options:"
-  required: true
-  type: list
-  keys:
-    humidity:
-      description: Humidity
-    luminance:
-      description: Luminance
-    pressure:
-      description: Pressure
-    temperature:
-      description: Temperature
-    uvindex:
-      description: UVIndex
-    voltage:
-      description: Voltage
-{% endconfiguration %}
-
-More conditions are available using the [BloomSky binary sensor](/components/binary_sensor.bloomsky) component.