diff --git a/source/_components/binary_sensor.zha.markdown b/source/_components/binary_sensor.zha.markdown
deleted file mode 100644
index 94910f8892a..00000000000
--- a/source/_components/binary_sensor.zha.markdown
+++ /dev/null
@@ -1,15 +0,0 @@
----
-layout: page
-title: "Zigbee Home Automation Binary Sensor"
-description: "Instructions on how to setup Zigbee Home Automation binary sensors within Home Assistant."
-date: 2017-02-22 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: zigbee.png
-ha_category: Binary Sensor
-ha_iot_class: "Local Polling"
----
-
-To get your Zigbee binary sensors working with Home Assistant, follow the instructions for the general [Zigbee Home Automation component](/components/zha/).
diff --git a/source/_components/fan.zha.markdown b/source/_components/fan.zha.markdown
deleted file mode 100644
index 60d316e5926..00000000000
--- a/source/_components/fan.zha.markdown
+++ /dev/null
@@ -1,16 +0,0 @@
----
-layout: page
-title: "Zigbee Home Automation Fan"
-description: "Instructions how to setup Zigbee Home Automation fans within Home Assistant."
-date: 2018-02-10 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: zigbee.png
-ha_category: Fan
-ha_iot_class: "Local Polling"
-ha_release: 0.66
----
-
-To get your Zigbee fans working with Home Assistant, follow the instructions for the general [Zigbee Home Automation component](/components/zha/).
diff --git a/source/_components/light.zha.markdown b/source/_components/light.zha.markdown
deleted file mode 100644
index 0285626c619..00000000000
--- a/source/_components/light.zha.markdown
+++ /dev/null
@@ -1,15 +0,0 @@
----
-layout: page
-title: "Zigbee Home Automation Light"
-description: "Instructions on how to setup Zigbee Home Automation lights within Home Assistant."
-date: 2017-02-22 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: zigbee.png
-ha_category: Light
-ha_iot_class: "Local Polling"
----
-
-To get your Zigbee lights working with Home Assistant, follow the instructions for the general [Zigbee Home Automation component](/components/zha/).
diff --git a/source/_components/sensor.zha.markdown b/source/_components/sensor.zha.markdown
deleted file mode 100644
index 993031476f5..00000000000
--- a/source/_components/sensor.zha.markdown
+++ /dev/null
@@ -1,16 +0,0 @@
----
-layout: page
-title: "Zigbee Home Automation Sensor"
-description: "Instructions on how to setup Zigbee Home Automation sensors within Home Assistant."
-date: 2017-02-22 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: zigbee.png
-ha_category: Sensor
-ha_iot_class: "Local Polling"
----
-
-To get your Zigbee sensors working with Home Assistant, follow the instructions for the general [Zigbee Home Automation Component](/components/zha/).
-
diff --git a/source/_components/switch.zha.markdown b/source/_components/switch.zha.markdown
deleted file mode 100644
index e23f6751ff3..00000000000
--- a/source/_components/switch.zha.markdown
+++ /dev/null
@@ -1,15 +0,0 @@
----
-layout: page
-title: "Zigbee Home Automation Switch"
-description: "Instructions on how to setup Zigbee Home Automation switches within Home Assistant."
-date: 2017-02-22 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: zigbee.png
-ha_category: Switch
-ha_iot_class: "Local Polling"
----
-
-To get your Zigbee switches working with Home Assistant, follow the instructions for the general [Zigbee Home Automation component](/components/zha/).
diff --git a/source/_components/zha.markdown b/source/_components/zha.markdown
index a2921fe5c9d..da056f7a9c3 100644
--- a/source/_components/zha.markdown
+++ b/source/_components/zha.markdown
@@ -8,9 +8,20 @@ comments: false
 sharing: true
 footer: true
 logo: zigbee.png
-ha_category: Hub
+ha_category:
+  - Binary Sensor
+  - Fan
+  - Light
+  - Sensor
+  - Switch
 ha_release: 0.44
 ha_iot_class: "Local Polling"
+redirect_from:
+  - /components/binary_sensor.zha/
+  - /components/fan.zha/
+  - /components/light.zha/
+  - /components/sensor.zha/
+  - /components/switch.zha/
 ---
 
 [Zigbee Home Automation](http://www.zigbee.org/zigbee-for-developers/applicationstandards/zigbeehomeautomation/)
@@ -18,11 +29,11 @@ integration for Home Assistant allows you to connect many off-the-shelf Zigbee b
 
 There is currently support for the following device types within Home Assistant:
 
-- [Binary Sensor](../binary_sensor.zha) (e.g., motion and door sensors)
-- [Sensor](../sensor.zha) (e.g., temperature sensors)
-- [Light](../light.zha)
-- [Switch](../switch.zha)
-- [Fan](../fan.zha)
+- Binary Sensor
+- Sensor
+- Light
+- Switch
+- Fan
 
 Known working Zigbee radio modules: