diff --git a/source/_components/android_ip_webcam.markdown b/source/_components/android_ip_webcam.markdown
index 20bb942bc20..dcead93b80d 100644
--- a/source/_components/android_ip_webcam.markdown
+++ b/source/_components/android_ip_webcam.markdown
@@ -8,15 +8,32 @@ comments: false
 sharing: true
 footer: true
 logo: android_ip_webcam.png
-ha_category: Hub
+ha_category:
+  - Hub
+  - Binary Sensor
+  - Camera
+  - Sensor
+  - Switch
 ha_release: "0.40"
 ha_iot_class: "Local Polling"
+redirect_from:
+  - /components/binary_sensor.android_ip_webcam/
+  - /components/camera.android_ip_webcam/
+  - /components/sensor.android_ip_webcam/
+  - /components/switch.android_ip_webcam/
 ---
 
 The `android_ip_webcam` component turns any Android phone or tablet into a network camera with multiple viewing options.
 
 It's setup as an MJPEG camera and all settings as switches inside of Home Assistant. You can also expose the sensors. If you have multiple phones, you can use all options inside a list.
 
+There is currently support for the following device types within Home Assistant:
+
+- Binary Sensor
+- Camera
+- Sensor
+- Switch
+
 ## {% linkable_title Setup %}
 
 Download [the IP Webcam app](https://play.google.com/store/apps/details?id=com.pas.webcam) and launch the app. When you press 'Start Server', it will start streaming video from your phone and the IP address of the device will be shown on screen.
@@ -153,3 +170,44 @@ android_ip_webcam:
       - torch
 ```
 
+## {% linkable_title Binary Sensor %}
+
+The `android_ip_webcam` binary sensor platform lets you observe the motion state of [Android IP webcam](https://play.google.com/store/apps/details?id=com.pas.webcam) sensors through Home Assistant. Devices will be configured automatically.
+
+## {% linkable_title Examples %}
+
+You can also setup the binary motion sensor with the following script:
+
+{% raw %}
+
+```yaml
+binary_sensor:
+  - platform: rest
+    name: Kitchen Motion
+    sensor_class: motion
+    resource: http://IP:8080/sensors.json?sense=motion_active
+    value_template: '{{ value_json.motion_active.data[0][1][0] | round(0) }}'
+```
+
+{% endraw %}
+
+## {% linkable_title Camera %}
+
+The `android_ip_webcam` component adds a camera by default if you choose not to use the component but still want to see the video feed then the [`mjpeg` camera](/components/camera.mjpeg/) platform can be used.
+
+## {% linkable_title Configuration %}
+
+To enable only the camera in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+camera:
+  - platform: mjpeg
+    mjpeg_url: http://IP_ADDRESS:8080/video
+```
+
+## {% linkable_title Sensor %}
+
+The `android_ip_webcam` sensor platform lets you observe states of [Android IP webcam](https://play.google.com/store/apps/details?id=com.pas.webcam) sensors through Home Assistant. Devices will be configured automatically.
+
+You can setup your own sensors by examining the JSON file from the webcam server: http://IP:8080/sensors.json
\ No newline at end of file
diff --git a/source/_components/binary_sensor.android_ip_webcam.markdown b/source/_components/binary_sensor.android_ip_webcam.markdown
deleted file mode 100644
index 7e3e0131947..00000000000
--- a/source/_components/binary_sensor.android_ip_webcam.markdown
+++ /dev/null
@@ -1,33 +0,0 @@
----
-layout: page
-title: "Android IP Webcam Binary Sensor"
-description: "Instructions on how to integrate binary motion sensors for Android IP webcam within Home Assistant."
-date: 2017-03-10 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: android_ip_webcam.png
-ha_category: Binary Sensor
-ha_release: "0.40"
-ha_iot_class: "Local Polling"
----
-
-The `android_ip_webcam` binary sensor platform lets you observe the motion state of [Android IP webcam](https://play.google.com/store/apps/details?id=com.pas.webcam) sensors through Home Assistant.
-
-Devices will be configured automatically. Please refer to the [Android IP webcam](/components/android_ip_webcam/) configuration on how to setup.
-
-## {% linkable_title Examples %}
-
-You can also setup the binary motion sensor with the following script:
-
-{% raw %}
-```yaml
-binary_sensor:
-  - platform: rest
-    name: Kitchen Motion
-    sensor_class: motion
-    resource: http://IP:8080/sensors.json?sense=motion_active
-    value_template: '{{ value_json.motion_active.data[0][1][0] | round(0) }}'
-```
-{% endraw %}
diff --git a/source/_components/camera.android_ip_webcam.markdown b/source/_components/camera.android_ip_webcam.markdown
deleted file mode 100644
index 0084fcebdb1..00000000000
--- a/source/_components/camera.android_ip_webcam.markdown
+++ /dev/null
@@ -1,27 +0,0 @@
----
-layout: page
-title: "Android IP Webcam Camera"
-description: "Instructions on how to integrate Android IP Webcam cameras within Home Assistant."
-date: 2015-07-11 0:36
-sidebar: true
-comments: false
-sharing: true
-footer: true
-ha_category: Camera
-logo: android_ip_webcam.png
-ha_release: "0.40"
-ha_iot_class: "Local Polling"
----
-
-The `android_ip_webcam` component adds a camera by default if you choose not to use the component but still want to see the video feed then the [`mjpeg` camera](/components/camera.mjpeg/) platform can be used.
-
-## {% linkable_title Configuration %}
-
-To enable only the camera in your installation, add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-camera:
-  - platform: mjpeg
-    mjpeg_url: http://IP_ADDRESS:8080/video
-```
diff --git a/source/_components/sensor.android_ip_webcam.markdown b/source/_components/sensor.android_ip_webcam.markdown
deleted file mode 100644
index 35d4eefb7aa..00000000000
--- a/source/_components/sensor.android_ip_webcam.markdown
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: page
-title: "Android IP Webcam Sensor"
-description: "Instructions on how to integrate sensors for Android IP webcam within Home Assistant."
-date: 2017-03-10 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: android_ip_webcam.png
-ha_category: Sensor
-ha_release: "0.40"
-ha_iot_class: "Local Polling"
----
-
-
-The `android_ip_webcam` sensor platform lets you observe states of [Android IP webcam](https://play.google.com/store/apps/details?id=com.pas.webcam) sensors through Home Assistant.
-
-Devices will be configured automatically. Please refer to the [component](/components/android_ip_webcam/) configuration on how to setup.
-
-You can setup your own sensors by examining the JSON file from the webcam server: http://IP:8080/sensors.json
diff --git a/source/_components/switch.android_ip_webcam.markdown b/source/_components/switch.android_ip_webcam.markdown
deleted file mode 100644
index bb32b0c9f5d..00000000000
--- a/source/_components/switch.android_ip_webcam.markdown
+++ /dev/null
@@ -1,19 +0,0 @@
----
-layout: page
-title: "Android IP Webcam Settings"
-description: "Instructions on how to integrate settings for Android IP webcam as switch within Home Assistant."
-date: 2017-03-10 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: android_ip_webcam.png
-ha_category: Switch
-ha_release: "0.40"
-ha_iot_class: "Local Polling"
----
-
-
-The `android_ip_webcam` switch platform lets you control settings of [Android IP webcam](https://play.google.com/store/apps/details?id=com.pas.webcam) through Home Assistant.
-
-Devices will be configured automatically. Please refer to the [component](/components/android_ip_webcam/) configuration on how to setup.