diff --git a/source/_components/alarm_control_panel.verisure.markdown b/source/_components/alarm_control_panel.verisure.markdown
deleted file mode 100644
index 8067027004e..00000000000
--- a/source/_components/alarm_control_panel.verisure.markdown
+++ /dev/null
@@ -1,35 +0,0 @@
----
-layout: page
-title: "Verisure Alarm"
-description: "Instructions on how to setup the Verisure Alarm control panel within Home Assistant."
-date: 2016-02-15 22:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: verisure.png
-ha_category: Alarm
-ha_release: 0.7.3
-ha_iot_class: "Cloud Polling"
----
-
-The Verisure alarm control panel platform allows you to control your [Verisure](https://www.verisure.com/) Alarms.
-
-The requirement is that you have setup your [Verisure hub](/components/verisure/).
-
-The `changed_by` attribute enables one to be able to take different actions depending on who armed/disarmed the alarm in [automation](/getting-started/automation/).
-
-```yaml
-automation:
-  - alias: Alarm status changed
-    trigger:
-      - platform: state
-        entity_id: alarm_control_panel.alarm_1
-    action:
-      - service: notify.notify
-        data_template:
-          message: >
-            {% raw %}Alarm changed from {{ trigger.from_state.state }}
-            to {{ trigger.to_state.state }}
-            by {{ trigger.to_state.attributes.changed_by }}{% endraw %}
-```
diff --git a/source/_components/binary_sensor.verisure.markdown b/source/_components/binary_sensor.verisure.markdown
deleted file mode 100644
index 370dff6e88e..00000000000
--- a/source/_components/binary_sensor.verisure.markdown
+++ /dev/null
@@ -1,19 +0,0 @@
----
-layout: page
-title: "Verisure Binary Sensor"
-description: "Instructions on how to integrate Verisure binary sensors into Home Assistant."
-date: 2016-02-23 21:31 +0100
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: verisure.png
-ha_category: Binary Sensor
-ha_iot_class: "Cloud Polling"
----
-
-Integrates Verisure binary sensors into Home Assistant. See the [main component](/components/verisure/) for configuration instructions.
-
-The following binary sensor types are supported:
-
-- Door & Window
diff --git a/source/_components/camera.verisure.markdown b/source/_components/camera.verisure.markdown
deleted file mode 100644
index e3980f71748..00000000000
--- a/source/_components/camera.verisure.markdown
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: page
-title: "Verisure Camera"
-description: "Instructions on how to setup the Verisure cameras within Home Assistant."
-date: 2016-10-22 09:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: verisure.png
-ha_category: Camera
-ha_release: 0.31
-ha_iot_class: "Local Polling"
----
-
-The `verisure` camera platform allows you to control your [Verisure](https://www.verisure.com/) cameras.
-
-The requirement is that you have setup your [Verisure hub](/components/verisure/).
diff --git a/source/_components/lock.verisure.markdown b/source/_components/lock.verisure.markdown
deleted file mode 100644
index e3c2d31e850..00000000000
--- a/source/_components/lock.verisure.markdown
+++ /dev/null
@@ -1,20 +0,0 @@
----
-layout: page
-title: "Verisure Lock"
-description: "Instructions on how to setup the Verisure locks within Home Assistant."
-date: 2016-02-12 06:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: verisure.png
-ha_category: Lock
-ha_release: 0.13
-ha_iot_class: "Cloud Polling"
----
-
-
-The Verisure lock platform allows you to control your [Verisure](https://www.verisure.com/) locks.
-
-The requirement is that you have setup your [Verisure hub](/components/verisure/).
-
diff --git a/source/_components/sensor.verisure.markdown b/source/_components/sensor.verisure.markdown
deleted file mode 100644
index 8ee60938a92..00000000000
--- a/source/_components/sensor.verisure.markdown
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: page
-title: "Verisure Sensor"
-description: "Instructions on how to integrate Verisure sensors into Home Assistant."
-date: 2016-02-23 21:31 +0100
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: verisure.png
-ha_category: Sensor
-ha_iot_class: "Cloud Polling"
----
-
-Integrates Verisure sensors into Home Assistant. See the [main component](/components/verisure/) for configuration instructions.
-
-The following sensor types are supported:
-
- * Thermometers
- * Hygrometers
- * Mouse detectors
- 
diff --git a/source/_components/switch.verisure.markdown b/source/_components/switch.verisure.markdown
deleted file mode 100644
index ec0a5bd14ed..00000000000
--- a/source/_components/switch.verisure.markdown
+++ /dev/null
@@ -1,17 +0,0 @@
----
-layout: page
-title: "Verisure SmartPlug"
-description: "Instructions on how to setup the Verisure SmartPlug within Home Assistant."
-date: 2016-02-15 22:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: verisure.png
-ha_category: Switch
-ha_iot_class: "Cloud Polling"
----
-
-The Verisure switch platform allows you to control your [Verisure](https://www.verisure.com/) SmartPlugs.
-
-The requirement is that you have set up your [Verisure hub](/components/verisure/).
diff --git a/source/_components/verisure.markdown b/source/_components/verisure.markdown
index e9bcafc7184..0deb2c115e4 100644
--- a/source/_components/verisure.markdown
+++ b/source/_components/verisure.markdown
@@ -8,21 +8,35 @@ comments: false
 sharing: true
 footer: true
 logo: verisure.png
-ha_category: Hub
+ha_category:
+  - Hub
+  - Alarm
+  - Binary Sensor
+  - Camera
+  - Lock
+  - Sensor
+  - Switch
 ha_release: pre 0.7
 ha_iot_class: "Cloud Polling"
+redirect_from:
+  - /components/alarm_control_panel.verisure/
+  - /components/binary_sensor.verisure/
+  - /components/camera.verisure/
+  - /components/lock.verisure/
+  - /components/sensor.verisure/
+  - /components/switch.verisure/
 ---
 
 Home Assistant has support to integrate your [Verisure](https://www.verisure.com/) devices.
 
-We support:
+There is currently support for the following device types within Home Assistant:
 
-- [Alarm](/components/alarm_control_panel.verisure/)
-- [Smartplugs](/components/switch.verisure/)
-- Reading from thermometers and hygrometers integrated in various [devices](/components/sensor.verisure/)
-- Mouse Detector
-- [Locks](/components/lock.verisure/)
-- [Door & Window](/components/binary_sensor.verisure/)
+- Alarm
+- Camera
+- Switch (Smartplug)
+- Sensor (Thermometers, Hygrometers and Mouse detectors)
+- Lock
+- Binary Sensor (Door & Window)
 
 ## {% linkable_title Configuration %}
 
@@ -93,3 +107,26 @@ giid:
   required: false
   type: string
 {% endconfiguration %}
+
+## {% linkable_title Alarm Control Panel %}
+
+The Verisure alarm control panel platform allows you to control your [Verisure](https://www.verisure.com/) Alarms.
+
+The requirement is that you have setup your Verisure hub first, with the instruction above.
+
+The `changed_by` attribute enables one to be able to take different actions depending on who armed/disarmed the alarm in [automation](/getting-started/automation/).
+
+```yaml
+automation:
+  - alias: Alarm status changed
+    trigger:
+      - platform: state
+        entity_id: alarm_control_panel.alarm_1
+    action:
+      - service: notify.notify
+        data_template:
+          message: >
+            {% raw %}Alarm changed from {{ trigger.from_state.state }}
+            to {{ trigger.to_state.state }}
+            by {{ trigger.to_state.attributes.changed_by }}{% endraw %}
+```
\ No newline at end of file