diff --git a/source/_components/neato.markdown b/source/_components/neato.markdown
new file mode 100644
index 00000000000..24fc98b3c60
--- /dev/null
+++ b/source/_components/neato.markdown
@@ -0,0 +1,34 @@
+---
+layout: page
+title: "Neato Robotics"
+description: "Instructions how to integrate your Neato within Home Assistant."
+date: 2016-10-09 20:15
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: neato.png
+ha_category: Hub
+ha_release: 0.33
+featured: true
+---
+
+The `neato` component allows you to control your [Neato Botvac Connected](https://www.neatorobotics.com/robot-vacuum/botvac-connected-series/botvac-connected/).
+
+To enable `neato` in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+neato:
+  username: USERNAME
+  password: PASSWORD
+```
+
+Configuration variables:
+
+- **username** (*Required*): Username for the Neato account.
+- **password** (*Required*): Password for the Neato account.
+
+<p class='note'>
+The Home Assistant Neato platform has only be tested with a Botvac Connected. There is no support for the Botvac D3 Connected and Botvac D5 Connected robots at this time.
+</p>
diff --git a/source/_components/sensor.neato.markdown b/source/_components/sensor.neato.markdown
new file mode 100644
index 00000000000..c2f5e4a7a43
--- /dev/null
+++ b/source/_components/sensor.neato.markdown
@@ -0,0 +1,17 @@
+---
+layout: page
+title: "Neato Robotics Sensor"
+description: "Instructions how to integrate a Neato Botvac Connected sensors within Home Assistant."
+date: 2016-11-09 20:11
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: neato.png
+ha_category: Sensor
+ha_release: 0.33
+---
+
+The `neato` sensor platform allows you to watch status and battery of your [Neato Botvac Connected](https://www.neatorobotics.com/robot-vacuum/botvac-connected-series/botvac-connected/).
+
+To add `neato` sensors to your installation, follow instructions in [Neato component](/components/neato/).
diff --git a/source/_components/switch.neato.markdown b/source/_components/switch.neato.markdown
index bfba1029e39..cc11c8da023 100644
--- a/source/_components/switch.neato.markdown
+++ b/source/_components/switch.neato.markdown
@@ -14,23 +14,4 @@ ha_release: 0.31
 
 The `neato` switch platform allows you to control your [Neato Botvac Connected](https://www.neatorobotics.com/robot-vacuum/botvac-connected-series/botvac-connected/).
 
-This will automatically add a switch for each Botvac Connected that you have. The switch will start a full home cleaning when turned ON and return the robot to base when turned OFF.
-
-To enable this switch in your installation, add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-switch:
-  - platform: neato
-    username: USERNAME
-    password: PASSWORD
-```
-
-Configuration variables:
-
-- **username** (*Required*): Username for the Neato account.
-- **password** (*Required*): Password for the Neato account.
-
-<p class='note'>
-The Home Assistant Neato platform has only be tested with a Botvac Connected. There is no support for the Botvac D3 Connected and Botvac D5 Connected robots at this time.
-</p>
+To add `neato` switch to your installation, follow instructions in [Neato component](/components/neato/).