diff --git a/source/_components/alarm_control_panel.spc.markdown b/source/_components/alarm_control_panel.spc.markdown
deleted file mode 100644
index de7bd83b4efe..000000000000
--- a/source/_components/alarm_control_panel.spc.markdown
+++ /dev/null
@@ -1,35 +0,0 @@
----
-layout: page
-title: "Vanderbilt SPC Alarm"
-description: "Instructions on how to setup the Vanderbilt SPC Alarm control panel within Home Assistant."
-date: 2017-05-18 22:01
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: vanderbilt_spc.png
-ha_category: Alarm
-ha_release: 0.47
-ha_iot_class: "Local Push"
----
-
-The `spc` alarm control panel platform allows you to control your [Vanderbilt SPC](https://www.spcsupportinfo.com/) alarms.
-
-The requirement is that you have setup your [SPC hub](/components/spc/).
-
-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.spc.markdown b/source/_components/binary_sensor.spc.markdown
deleted file mode 100644
index 86fe817f8ad5..000000000000
--- a/source/_components/binary_sensor.spc.markdown
+++ /dev/null
@@ -1,20 +0,0 @@
----
-layout: page
-title: "SPC Binary Sensor"
-description: "Instructions on how to integrate Vanderbilt SPC binary sensors into Home Assistant."
-date: 2017-05-18 22:05
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: vanderbilt_spc.png
-ha_release: 0.47
-ha_category: Binary Sensor
-ha_iot_class: "Local Push"
----
-
-The `spc` platform allows you to get data from your [Vanderbilt SPC](http://www.spc-intruder-detection.com/ssp-spc/) binary sensors from within Home Assistant.
-
-Check the [type/class](/components/binary_sensor/) list for a possible visualization of your zone. Currently motion, smoke and door sensors are supported.
-
-The requirement is that you have setup your [SPC hub](/components/spc/).
diff --git a/source/_components/spc.markdown b/source/_components/spc.markdown
index 1e5d707c860b..2b2de62dc00b 100644
--- a/source/_components/spc.markdown
+++ b/source/_components/spc.markdown
@@ -7,15 +7,27 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-ha_category: Hub
+ha_category:
+  - Hub
+  - Alarm
+  - Binary Sensor
 ha_release: 0.47
 logo: vanderbilt_spc.png
+ha_iot_class: "Local Push"
+redirect_from:
+  - /components/binary_sensor.spc/
+  - /components/alarm_control_panel.spc/
 ---
 
 Home Assistant has support to integrate your [Vanderbilt SPC](http://www.spc-intruder-detection.com/ssp-spc/) alarm panel and any connected motion, door and smoke sensors.
 
 Integration with SPC is done through a third-party API gateway called [SPC Web Gateway](http://www.lundix.se/smarta-losningar/) which must be installed and configured somewhere on your network.
 
+There is currently support for the following device types within Home Assistant:
+
+- [Alarm](#alarm)
+- [Binary Sensor](#binary-sensor)
+
 Home Assistant needs to know where to find the SPC Web Gateway API endpoints, to configure this add the following section to your `configuration.yaml` file:
 
 ```yaml
@@ -37,3 +49,30 @@ ws_url:
 {% endconfiguration %}
 
 Supported sensors will be automatically discovered and added, however they will be hidden by default.
+
+## {% linkable_title Alarm %}
+
+The `spc` alarm control panel platform allows you to control your [Vanderbilt SPC](https://www.spcsupportinfo.com/) alarms.
+
+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 %}
+```
+
+## {% linkable_title Binary Sensor %}
+
+The `spc` platform allows you to get data from your [Vanderbilt SPC](http://www.spc-intruder-detection.com/ssp-spc/) binary sensors from within Home Assistant.
+
+Check the [type/class](/components/binary_sensor/) list for a possible visualization of your zone. Currently motion, smoke and door sensors are supported.