diff --git a/source/_components/discoverable.markdown b/source/_components/discoverable.markdown
deleted file mode 100644
index 03e2880a408..00000000000
--- a/source/_components/discoverable.markdown
+++ /dev/null
@@ -1,37 +0,0 @@
----
-layout: page
-title: "Discoverable"
-description: "Instructions on how to setup the discoverable component with Home Assistant."
-date: 2016-03-01 07:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
----
-
-The Home Assistant discovery protocol is a lightweight feature that introduces support for Home Assistant servers to be discoverable. This will allow [Home Assistant instances](https://github.com/balloob/micropython-home-assistant) running with [MicroPython](https://micropython.org/) to get started without any required configuration (Example from the [MicroPython Home Assistant](https://github.com/balloob/micropython-home-assistant) documentation):
-
-```python
-from homeassistant.discovery import get_instance()
-
-hass = get_instance()
-
-for state in hass.states():
-    print(state)
-```
-
-To enable `discovery` in your installation, add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-discoverable:
-  expose_password: true
-```
-
-{% configuration %}
-expose_password:
-  description: It is up to the user to expose the password in the discovery response. If password not exposed, uHA instances will have to provide it (`get_instance('my password')`).
-  required: false
-  default: false
-  type: boolean
-{% endconfiguration %}
diff --git a/source/_components/sensor.nest_weather.markdown b/source/_components/sensor.nest_weather.markdown
deleted file mode 100644
index a8ab4c4c460..00000000000
--- a/source/_components/sensor.nest_weather.markdown
+++ /dev/null
@@ -1,50 +0,0 @@
----
-layout: page
-title: "Nest Weather Sensor"
-description: "Instructions on how to integrate Nest sensors within Home Assistant."
-date: 2016-01-13 19:59
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: nest.png
-ha_category: Weather
-ha_iot_class: "Cloud Polling"
----
-
-<p class='note warning'>
-**This platform is currently not available. It's possible that `nest_weather` will be removed in the future.**
-</p>
-
-The `nest` weather sensor platform let you monitor current weather conditions based on the location of your [Nest](https://nest.com) thermostat.
-
-<p class='note'>
-You must have the [Nest component](/components/nest/) configured to use those sensors.
-</p>
-
-To set it up, add the following information to your `configuration.yaml` file:
-
-```yaml
-sensor:
-  - platform: nest
-    monitored_conditions:
-      - 'weather_temperature'
-```
-
-{% configuration %}
-monitored_conditions:
-  description: States to monitor.
-  required: true
-  type: list
-  keys:
-    weather_temperature:
-      description: The current temperture
-    weather_humidity:
-      description: The current humidity
-    weather_condition:
-      description: The weather conditions
-    wind_speed:
-      description: The wind speed
-    wind_direction:
-      description: The wind direction
-{% endconfiguration %}
diff --git a/source/_components/ifttt.manything.markdown b/source/_cookbook/ifttt.manything.markdown
similarity index 97%
rename from source/_components/ifttt.manything.markdown
rename to source/_cookbook/ifttt.manything.markdown
index 84d0228bc15..7ebeb0631d7 100644
--- a/source/_components/ifttt.manything.markdown
+++ b/source/_cookbook/ifttt.manything.markdown
@@ -9,6 +9,8 @@ sharing: true
 footer: true
 logo: manything.png
 ha_category: Camera
+redirect_from:
+  /components/ifttt.manything/
 ---
 
 [Manything](https://manything.com) is a smart app that turns your Android device, iPhone, iPod, or iPad into a WiFi camera for monitoring your home, your pets, anything! Comes with live streaming, motion activated alerts, cloud video recording, and more.
@@ -55,7 +57,7 @@ automation:
 
 <p class='img'>
 <img src='/images/components/ifttt/IFTTT_manything_trigger.png' />
-You need to setup a unique trigger for each event you sent to IFTTT. 
+You need to setup a unique trigger for each event you sent to IFTTT.
 For ManyThing support, you need to set up an `on` and `off` event.
 </p>
 
diff --git a/source/_components/notify.mqtt.markdown b/source/_cookbook/notify.mqtt.markdown
similarity index 91%
rename from source/_components/notify.mqtt.markdown
rename to source/_cookbook/notify.mqtt.markdown
index 04a40d2a110..e4f1154b30c 100644
--- a/source/_components/notify.mqtt.markdown
+++ b/source/_cookbook/notify.mqtt.markdown
@@ -10,6 +10,8 @@ footer: true
 logo: mqtt.png
 ha_category: Notifications
 ha_iot_class: depends
+redirect_from:
+  /components/notify.mqtt/
 ---
 
 The MQTT notification support is different than the other [notification](/components/notify/) platforms. It is a service. This means that you don't have to create a configuration entry but you need to provide more details when calling the service.
@@ -52,16 +54,16 @@ Use as [`script`](/components/script/) in automations.
 {% raw %}
 ```yaml
 automation:
-  alias: Send me a message when I get home 
+  alias: Send me a message when I get home
   trigger:
-    platform: state 
-    entity_id: device_tracker.me 
-    to: 'home' 
+    platform: state
+    entity_id: device_tracker.me
+    to: 'home'
   action:
     service: script.notify_mqtt
     data:
-      target: "me" 
-      message: "I'm home" 
+      target: "me"
+      message: "I'm home"
 
 script:
   notify_mqtt: