diff --git a/source/_components/rainbird.markdown b/source/_components/rainbird.markdown
index 187173c1f78..f58d7a1d9a9 100644
--- a/source/_components/rainbird.markdown
+++ b/source/_components/rainbird.markdown
@@ -8,13 +8,24 @@ comments: false
 sharing: true
 footer: true
 logo: rainbird.png
-ha_category: Irrigation
+ha_category:
+  - Irrigation
+  - Sensor
+  - Switch
 ha_release: 0.61
 ha_iot_class: "Local Polling"
+redirect_from:
+  - /components/sensor.rainbird/
+  - /components/switch.rainbird/
 ---
 
 This `rainbird` component allows interacting with [LNK WiFi](http://www.rainbird.com/landscape/products/controllers/LNK-WiFi.htm) module of the Rain Bird Irrigation system in Home Assistant.
 
+There is currently support for the following device types within Home Assistant:
+
+- [Sensor](#sensor)
+- [Switch](#switch)
+
 ## {% linkable_title Configuration %}
 
 To enable it, add the following to your `configuration.yaml` file:
@@ -37,6 +48,69 @@ password:
   type: string
 {% endconfiguration %}
 
-Finish its configuration by visiting the [Rain Bird sensor](/components/sensor.rainbird/) and [Rain Bird switch](/components/switch.rainbird/) documentation.
-
+<p class='note'>
 Please note that due to the implementation of the API within the LNK Module, there is a concurrency issue. For example, the Rain Bird app will give connection issues (like already a connection active).
+</p>
+
+## {% linkable_title Sensor %}
+
+This `rainbird` sensor allows interacting with [LNK WiFi](http://www.rainbird.com/landscape/products/controllers/LNK-WiFi.htm) module of the Rain Bird Irrigation system in Home Assistant.
+
+Add the following to your `configuration.yaml` file to enable the rain sensor:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: rainbird
+    monitored_conditions:
+      - rainsensor
+```
+
+{% configuration %}
+monitored_conditions:
+  description: Conditions to be monitored. 
+  keys:
+    rainsensor:
+      description: Returns the sensor level.
+{% endconfiguration %}
+
+## {% linkable_title Switch %}
+
+This `rainbird` switch platform allows interacting with [LNK WiFi](http://www.rainbird.com/landscape/products/controllers/LNK-WiFi.htm) module of the Rain Bird Irrigation system in Home Assistant.
+
+Add the following to your `configuration.yaml` file to use the switch platform:
+
+```yaml
+switch:
+  - platform: rainbird
+    switches:
+      sprinkler_1:
+        zone: 1
+        friendly_name: "Front sprinklers"
+        trigger_time: 10
+        scan_interval: 10
+      sprinkler_2:
+        friendly_name: "Back sprinklers"
+        zone: 2
+        trigger_time: 20
+        scan_interval: 10
+```
+
+{% configuration %}
+zone:
+  description: Station zone identifier.
+  required: true
+  type: string
+friendly_name:
+  description: Just a friendly name for the station.
+  required: false
+  type: string
+trigger_time:
+  description: The default duration to sprinkle the zone.
+  required: true
+  type: integer
+scan_interval:
+  description: How fast to refresh the switch.
+  required: false
+  type: integer
+{% endconfiguration %}
\ No newline at end of file
diff --git a/source/_components/sensor.rainbird.markdown b/source/_components/sensor.rainbird.markdown
deleted file mode 100644
index 18bd7d944cf..00000000000
--- a/source/_components/sensor.rainbird.markdown
+++ /dev/null
@@ -1,38 +0,0 @@
----
-layout: page
-title: "Rain Bird Sensor"
-description: "Instructions on how to integrate your Rain Bird LNK WiFi Module rain sensor within Home Assistant."
-date: 2017-08-25 12:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: rainbird.png
-ha_category: Irrigation
-ha_release: 0.61
-ha_iot_class: "Local Polling"
----
-
-This `rainbird` sensor allows interacting with [LNK WiFi](http://www.rainbird.com/landscape/products/controllers/LNK-WiFi.htm) module of the Rain Bird Irrigation system in Home Assistant.
-
-## {% linkable_title Configuration %}
-
-Once you have enabled the [Rain Bird component](/components/rainbird), add the following to your `configuration.yaml` file to enable the rain sensor:
-
-```yaml
-# Example configuration.yaml entry
-sensor:
-  - platform: rainbird
-    monitored_conditions:
-      - rainsensor
-```
-
-{% configuration %}
-monitored_conditions:
-  description: Conditions to be monitored. 
-  keys:
-    rainsensor:
-      description: Returns the sensor level.
-{% endconfiguration %}
-
-Please note that due to the implementation of the API within the LNK Module, there is a concurrency issue. For example, the Rain Bird app will give connection issues (like already a connection active).
diff --git a/source/_components/switch.rainbird.markdown b/source/_components/switch.rainbird.markdown
deleted file mode 100644
index c29241f80a8..00000000000
--- a/source/_components/switch.rainbird.markdown
+++ /dev/null
@@ -1,57 +0,0 @@
----
-layout: page
-title: "Rain Bird Switch"
-description: "Instructions on how to integrate your Rain Bird LNK WiFi Module as Switches within Home Assistant."
-date: 2017-08-25 12:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: rainbird.png
-ha_category: Irrigation
-ha_release: 0.57
-ha_iot_class: "Local Polling"
----
-
-This `rainbird` switch platform allows interacting with [LNK WiFi](http://www.rainbird.com/landscape/products/controllers/LNK-WiFi.htm) module of the Rain Bird Irrigation system in Home Assistant.
-
-## {% linkable_title Configuration %}
-
-Once you have enabled the [Rain Bird component](/components/rainbird), add the following to your `configuration.yaml` file:
-
-```yaml
-switch:
-  - platform: rainbird
-    switches:
-      sprinkler_1:
-        zone: 1
-        friendly_name: "Front sprinklers"
-        trigger_time: 10
-        scan_interval: 10
-      sprinkler_2:
-        friendly_name: "Back sprinklers"
-        zone: 2
-        trigger_time: 20
-        scan_interval: 10
-```
-
-{% configuration %}
-zone:
-  description: Station zone identifier.
-  required: true
-  type: string
-friendly_name:
-  description: Just a friendly name for the station.
-  required: false
-  type: string
-trigger_time:
-  description: The default duration to sprinkle the zone.
-  required: true
-  type: integer
-scan_interval:
-  description: How fast to refresh the switch.
-  required: false
-  type: integer
-{% endconfiguration %}
-
-Please note that due to the implementation of the API within the LNK Module, there is a concurrency issue. For example, the Rain Bird app will give connection issues (like already a connection active).