diff --git a/devices/surface/TOC.md b/devices/surface/TOC.md
index 0c7cfa1edd..eff3b9bb69 100644
--- a/devices/surface/TOC.md
+++ b/devices/surface/TOC.md
@@ -1,26 +1,25 @@
 # [Surface](index.md)
 ## [Deploy Surface devices](deploy.md)
-### [Customize the OOBE for Surface deployments](customize-the-oobe-for-surface-deployments.md)
-### [Deploy Surface app with Windows Store for Business](deploy-surface-app-with-windows-store-for-business.md)
 ### [Deploy Windows 10 to Surface devices with MDT](deploy-windows-10-to-surface-devices-with-mdt.md)
 ### [Upgrade Surface devices to Windows 10 with MDT](upgrade-surface-devices-to-windows-10-with-mdt.md)
-### [Surface Deployment Accelerator](microsoft-surface-deployment-accelerator.md)
+### [Customize the OOBE for Surface deployments](customize-the-oobe-for-surface-deployments.md)
 ### [Ethernet adapters and Surface deployment](ethernet-adapters-and-surface-device-deployment.md)
+### [Surface Deployment Accelerator](microsoft-surface-deployment-accelerator.md)
 #### [Step by step: Surface Deployment Accelerator](step-by-step-surface-deployment-accelerator.md)
 #### [Using the Surface Deployment Accelerator deployment share](using-the-sda-deployment-share.md)
-## [Keep Surface devices up-to-date](update.md)
+## [Surface firmware and driver updates](update.md)
 ### [Download the latest firmware and drivers for Surface devices](deploy-the-latest-firmware-and-drivers-for-surface-devices.md)
-### [Surface Dock Updater](surface-dock-updater.md)
-### [Manage Surface Dock firmware updates](manage-surface-dock-firmware-updates.md)
 ### [Manage Surface driver and firmware updates](manage-surface-pro-3-firmware-updates.md)
-## [Keep Surface devices secure](keep-secure.md)
-### [Enable PEAP, EAP-FAST, and Cisco LEAP on Surface devices](enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md)
-### [Manage Surface UEFI settings](manage-surface-uefi-settings.md)
+### [Manage Surface Dock firmware updates](manage-surface-dock-firmware-updates.md)
+### [Surface Dock Updater](surface-dock-updater.md)
+## [Deploy Surface app with Windows Store for Business](deploy-surface-app-with-windows-store-for-business.md)
+## [Enable PEAP, EAP-FAST, and Cisco LEAP on Surface devices](enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md)
+## [Manage Surface UEFI settings](manage-surface-uefi-settings.md)
 ### [Advanced UEFI security features for Surface Pro 3](advanced-uefi-security-features-for-surface-pro-3.md)
-### [Surface Enterprise Management Mode](surface-enterprise-management-mode.md)
-### [Surface Data Eraser](microsoft-surface-data-eraser.md)
-## [Surface Diagnostic Toolkit](surface-diagnostic-toolkit.md)
+## [Surface Enterprise Management Mode](surface-enterprise-management-mode.md)
 ### [Enroll and configure Surface devices with SEMM](enroll-and-configure-surface-devices-with-semm.md)
 ### [Unenroll Surface devices from SEMM](unenroll-surface-devices-from-semm.md)
+## [Surface Diagnostic Toolkit](surface-diagnostic-toolkit.md)
+## [Surface Data Eraser](microsoft-surface-data-eraser.md)
 
 
diff --git a/devices/surface/deploy.md b/devices/surface/deploy.md
index 5c299ff83e..7fe0c9a38e 100644
--- a/devices/surface/deploy.md
+++ b/devices/surface/deploy.md
@@ -1,5 +1,5 @@
 ---
-title: Surface (Surface)
+title: Deploy Surface devices (Surface)
 description: 
 ms.prod: w10
 ms.mktglfcycl: manage
@@ -8,100 +8,11 @@ ms.sitesec: library
 author: heatherpoulsen
 ---
 
-# Surface
+# Deploy Surface devices
 
 
-## Purpose
 
 
-This library provides guidance to help you deploy Windows on Surface devices, keep those devices up to date, and easily manage and support Surface devices in your organization.
-
-For more information on planning for, deploying, and managing Surface devices in your organization, see the [Surface TechCenter](https://technet.microsoft.com/en-us/windows/surface).
-
-## In this section
-
-
-<table>
-<colgroup>
-<col width="50%" />
-<col width="50%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>Topic</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td><p>[Advanced UEFI security features for Surface Pro 3](advanced-uefi-security-features-for-surface-pro-3.md)</p></td>
-<td><p>Find out how to install and configure the v3.11.760.0 UEFI update to enable additional security options for Surface Pro 3 devices.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Customize the OOBE for Surface deployments](customize-the-oobe-for-surface-deployments.md)</p></td>
-<td><p>Walk through the process of customizing the Surface out-of-box experience for end users in your organization.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Deploy Surface app with Windows Store for Business](deploy-surface-app-with-windows-store-for-business.md)</p></td>
-<td><p>Find out how to add and download Surface app with Windows Store for Business, as well as install Surface app with PowerShell and MDT.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Deploy Windows 10 to Surface devices with MDT](deploy-windows-10-to-surface-devices-with-mdt.md)</p></td>
-<td><p>Walk through the recommended process of how to deploy Windows 10 to your Surface devices with the Microsoft Deployment Toolkit.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Download the latest firmware and drivers for Surface devices](deploy-the-latest-firmware-and-drivers-for-surface-devices.md)</p></td>
-<td><p>Get a list of the available downloads for Surface devices and links to download the drivers and firmware for your device.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Enable PEAP, EAP-FAST, and Cisco LEAP on Surface devices](enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md)</p></td>
-<td><p>Find out how to enable support for PEAP, EAP-FAST, or Cisco LEAP protocols on your Surface device.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Ethernet adapters and Surface deployment](ethernet-adapters-and-surface-device-deployment.md)</p></td>
-<td><p>Get guidance and answers to help you perform a network deployment to Surface devices.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Manage Surface Dock firmware updates](manage-surface-dock-firmware-updates.md)</p></td>
-<td><p>Read about the different methods you can use to manage the process of Surface Dock firmware updates.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Manage Surface driver and firmware updates](manage-surface-pro-3-firmware-updates.md)</p></td>
-<td><p>Explore the available options to manage firmware and driver updates for Surface devices.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Manage Surface UEFI settings](manage-surface-uefi-settings.md)<p></td>
-<td><p>Use Surface UEFI settings to enable or disable devices, configure security settings, and adjust Surface device boot settings.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Surface Data Eraser](microsoft-surface-data-eraser.md)</p></td>
-<td><p>Find out how the Microsoft Surface Data Eraser tool can help you securely wipe data from your Surface devices.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Surface Deployment Accelerator](microsoft-surface-deployment-accelerator.md)</p></td>
-<td><p>See how Microsoft Surface Deployment Accelerator provides a quick and simple deployment mechanism for organizations to reimage Surface devices.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Surface Diagnostic Toolkit](surface-diagnostic-toolkit.md)</p></td>
-<td><p>Find out how you can use the Microsoft Surface Diagnostic Toolkit to test the hardware of your Surface device.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Surface Dock Updater](surface-dock-updater.md)</p></td>
-<td><p>Get a detailed walkthrough of Microsoft Surface Dock Updater.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Surface Enterprise Management Mode](surface-enterprise-management-mode.md)</p></td>
-<td><p>See how this feature of Surface devices with Surface UEFI allows you to secure and manage firmware settings within your organization.
-</p></td>
-</tr>
-<tr class="even">
-<td><p>[Upgrade Surface devices to Windows 10 with MDT](upgrade-surface-devices-to-windows-10-with-mdt.md)</p></td>
-<td><p>Find out how to perform a Windows 10 upgrade deployment to your Surface devices.</p></td>
-</tr>
-
-</tbody>
-</table>
-
  
 
 ## Related topics
diff --git a/devices/surface/keep-secure.md b/devices/surface/keep-secure.md
deleted file mode 100644
index 5c299ff83e..0000000000
--- a/devices/surface/keep-secure.md
+++ /dev/null
@@ -1,121 +0,0 @@
----
-title: Surface (Surface)
-description: 
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: surface, devices
-ms.sitesec: library
-author: heatherpoulsen
----
-
-# Surface
-
-
-## Purpose
-
-
-This library provides guidance to help you deploy Windows on Surface devices, keep those devices up to date, and easily manage and support Surface devices in your organization.
-
-For more information on planning for, deploying, and managing Surface devices in your organization, see the [Surface TechCenter](https://technet.microsoft.com/en-us/windows/surface).
-
-## In this section
-
-
-<table>
-<colgroup>
-<col width="50%" />
-<col width="50%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>Topic</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td><p>[Advanced UEFI security features for Surface Pro 3](advanced-uefi-security-features-for-surface-pro-3.md)</p></td>
-<td><p>Find out how to install and configure the v3.11.760.0 UEFI update to enable additional security options for Surface Pro 3 devices.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Customize the OOBE for Surface deployments](customize-the-oobe-for-surface-deployments.md)</p></td>
-<td><p>Walk through the process of customizing the Surface out-of-box experience for end users in your organization.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Deploy Surface app with Windows Store for Business](deploy-surface-app-with-windows-store-for-business.md)</p></td>
-<td><p>Find out how to add and download Surface app with Windows Store for Business, as well as install Surface app with PowerShell and MDT.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Deploy Windows 10 to Surface devices with MDT](deploy-windows-10-to-surface-devices-with-mdt.md)</p></td>
-<td><p>Walk through the recommended process of how to deploy Windows 10 to your Surface devices with the Microsoft Deployment Toolkit.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Download the latest firmware and drivers for Surface devices](deploy-the-latest-firmware-and-drivers-for-surface-devices.md)</p></td>
-<td><p>Get a list of the available downloads for Surface devices and links to download the drivers and firmware for your device.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Enable PEAP, EAP-FAST, and Cisco LEAP on Surface devices](enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md)</p></td>
-<td><p>Find out how to enable support for PEAP, EAP-FAST, or Cisco LEAP protocols on your Surface device.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Ethernet adapters and Surface deployment](ethernet-adapters-and-surface-device-deployment.md)</p></td>
-<td><p>Get guidance and answers to help you perform a network deployment to Surface devices.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Manage Surface Dock firmware updates](manage-surface-dock-firmware-updates.md)</p></td>
-<td><p>Read about the different methods you can use to manage the process of Surface Dock firmware updates.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Manage Surface driver and firmware updates](manage-surface-pro-3-firmware-updates.md)</p></td>
-<td><p>Explore the available options to manage firmware and driver updates for Surface devices.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Manage Surface UEFI settings](manage-surface-uefi-settings.md)<p></td>
-<td><p>Use Surface UEFI settings to enable or disable devices, configure security settings, and adjust Surface device boot settings.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Surface Data Eraser](microsoft-surface-data-eraser.md)</p></td>
-<td><p>Find out how the Microsoft Surface Data Eraser tool can help you securely wipe data from your Surface devices.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Surface Deployment Accelerator](microsoft-surface-deployment-accelerator.md)</p></td>
-<td><p>See how Microsoft Surface Deployment Accelerator provides a quick and simple deployment mechanism for organizations to reimage Surface devices.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Surface Diagnostic Toolkit](surface-diagnostic-toolkit.md)</p></td>
-<td><p>Find out how you can use the Microsoft Surface Diagnostic Toolkit to test the hardware of your Surface device.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Surface Dock Updater](surface-dock-updater.md)</p></td>
-<td><p>Get a detailed walkthrough of Microsoft Surface Dock Updater.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Surface Enterprise Management Mode](surface-enterprise-management-mode.md)</p></td>
-<td><p>See how this feature of Surface devices with Surface UEFI allows you to secure and manage firmware settings within your organization.
-</p></td>
-</tr>
-<tr class="even">
-<td><p>[Upgrade Surface devices to Windows 10 with MDT](upgrade-surface-devices-to-windows-10-with-mdt.md)</p></td>
-<td><p>Find out how to perform a Windows 10 upgrade deployment to your Surface devices.</p></td>
-</tr>
-
-</tbody>
-</table>
-
- 
-
-## Related topics
-
-
-[Surface TechCenter](https://technet.microsoft.com/windows/surface)
-
-[Surface for IT pros blog](http://blogs.technet.com/b/surface/)
-
- 
-
- 
-
-
-
-
-
diff --git a/devices/surface/update.md b/devices/surface/update.md
index 5c299ff83e..1852692c3e 100644
--- a/devices/surface/update.md
+++ b/devices/surface/update.md
@@ -1,5 +1,5 @@
 ---
-title: Surface (Surface)
+title: Surface firmware and driver updates (Surface)
 description: 
 ms.prod: w10
 ms.mktglfcycl: manage
@@ -8,100 +8,11 @@ ms.sitesec: library
 author: heatherpoulsen
 ---
 
-# Surface
+# Surface firmware and driver updates
 
 
-## Purpose
 
 
-This library provides guidance to help you deploy Windows on Surface devices, keep those devices up to date, and easily manage and support Surface devices in your organization.
-
-For more information on planning for, deploying, and managing Surface devices in your organization, see the [Surface TechCenter](https://technet.microsoft.com/en-us/windows/surface).
-
-## In this section
-
-
-<table>
-<colgroup>
-<col width="50%" />
-<col width="50%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>Topic</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td><p>[Advanced UEFI security features for Surface Pro 3](advanced-uefi-security-features-for-surface-pro-3.md)</p></td>
-<td><p>Find out how to install and configure the v3.11.760.0 UEFI update to enable additional security options for Surface Pro 3 devices.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Customize the OOBE for Surface deployments](customize-the-oobe-for-surface-deployments.md)</p></td>
-<td><p>Walk through the process of customizing the Surface out-of-box experience for end users in your organization.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Deploy Surface app with Windows Store for Business](deploy-surface-app-with-windows-store-for-business.md)</p></td>
-<td><p>Find out how to add and download Surface app with Windows Store for Business, as well as install Surface app with PowerShell and MDT.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Deploy Windows 10 to Surface devices with MDT](deploy-windows-10-to-surface-devices-with-mdt.md)</p></td>
-<td><p>Walk through the recommended process of how to deploy Windows 10 to your Surface devices with the Microsoft Deployment Toolkit.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Download the latest firmware and drivers for Surface devices](deploy-the-latest-firmware-and-drivers-for-surface-devices.md)</p></td>
-<td><p>Get a list of the available downloads for Surface devices and links to download the drivers and firmware for your device.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Enable PEAP, EAP-FAST, and Cisco LEAP on Surface devices](enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md)</p></td>
-<td><p>Find out how to enable support for PEAP, EAP-FAST, or Cisco LEAP protocols on your Surface device.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Ethernet adapters and Surface deployment](ethernet-adapters-and-surface-device-deployment.md)</p></td>
-<td><p>Get guidance and answers to help you perform a network deployment to Surface devices.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Manage Surface Dock firmware updates](manage-surface-dock-firmware-updates.md)</p></td>
-<td><p>Read about the different methods you can use to manage the process of Surface Dock firmware updates.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Manage Surface driver and firmware updates](manage-surface-pro-3-firmware-updates.md)</p></td>
-<td><p>Explore the available options to manage firmware and driver updates for Surface devices.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Manage Surface UEFI settings](manage-surface-uefi-settings.md)<p></td>
-<td><p>Use Surface UEFI settings to enable or disable devices, configure security settings, and adjust Surface device boot settings.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Surface Data Eraser](microsoft-surface-data-eraser.md)</p></td>
-<td><p>Find out how the Microsoft Surface Data Eraser tool can help you securely wipe data from your Surface devices.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Surface Deployment Accelerator](microsoft-surface-deployment-accelerator.md)</p></td>
-<td><p>See how Microsoft Surface Deployment Accelerator provides a quick and simple deployment mechanism for organizations to reimage Surface devices.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Surface Diagnostic Toolkit](surface-diagnostic-toolkit.md)</p></td>
-<td><p>Find out how you can use the Microsoft Surface Diagnostic Toolkit to test the hardware of your Surface device.</p></td>
-</tr>
-<tr class="even">
-<td><p>[Surface Dock Updater](surface-dock-updater.md)</p></td>
-<td><p>Get a detailed walkthrough of Microsoft Surface Dock Updater.</p></td>
-</tr>
-<tr class="odd">
-<td><p>[Surface Enterprise Management Mode](surface-enterprise-management-mode.md)</p></td>
-<td><p>See how this feature of Surface devices with Surface UEFI allows you to secure and manage firmware settings within your organization.
-</p></td>
-</tr>
-<tr class="even">
-<td><p>[Upgrade Surface devices to Windows 10 with MDT](upgrade-surface-devices-to-windows-10-with-mdt.md)</p></td>
-<td><p>Find out how to perform a Windows 10 upgrade deployment to your Surface devices.</p></td>
-</tr>
-
-</tbody>
-</table>
-
  
 
 ## Related topics

Topic	Description
[Advanced UEFI security features for Surface Pro 3](advanced-uefi-security-features-for-surface-pro-3.md)	Find out how to install and configure the v3.11.760.0 UEFI update to enable additional security options for Surface Pro 3 devices.
[Customize the OOBE for Surface deployments](customize-the-oobe-for-surface-deployments.md)	Walk through the process of customizing the Surface out-of-box experience for end users in your organization.
[Deploy Surface app with Windows Store for Business](deploy-surface-app-with-windows-store-for-business.md)	Find out how to add and download Surface app with Windows Store for Business, as well as install Surface app with PowerShell and MDT.
[Deploy Windows 10 to Surface devices with MDT](deploy-windows-10-to-surface-devices-with-mdt.md)	Walk through the recommended process of how to deploy Windows 10 to your Surface devices with the Microsoft Deployment Toolkit.
[Download the latest firmware and drivers for Surface devices](deploy-the-latest-firmware-and-drivers-for-surface-devices.md)	Get a list of the available downloads for Surface devices and links to download the drivers and firmware for your device.
[Enable PEAP, EAP-FAST, and Cisco LEAP on Surface devices](enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md)	Find out how to enable support for PEAP, EAP-FAST, or Cisco LEAP protocols on your Surface device.
[Ethernet adapters and Surface deployment](ethernet-adapters-and-surface-device-deployment.md)	Get guidance and answers to help you perform a network deployment to Surface devices.
[Manage Surface Dock firmware updates](manage-surface-dock-firmware-updates.md)	Read about the different methods you can use to manage the process of Surface Dock firmware updates.
[Manage Surface driver and firmware updates](manage-surface-pro-3-firmware-updates.md)	Explore the available options to manage firmware and driver updates for Surface devices.
[Manage Surface UEFI settings](manage-surface-uefi-settings.md)	Use Surface UEFI settings to enable or disable devices, configure security settings, and adjust Surface device boot settings.
[Surface Data Eraser](microsoft-surface-data-eraser.md)	Find out how the Microsoft Surface Data Eraser tool can help you securely wipe data from your Surface devices.
[Surface Deployment Accelerator](microsoft-surface-deployment-accelerator.md)	See how Microsoft Surface Deployment Accelerator provides a quick and simple deployment mechanism for organizations to reimage Surface devices.
[Surface Diagnostic Toolkit](surface-diagnostic-toolkit.md)	Find out how you can use the Microsoft Surface Diagnostic Toolkit to test the hardware of your Surface device.
[Surface Dock Updater](surface-dock-updater.md)	Get a detailed walkthrough of Microsoft Surface Dock Updater.
[Surface Enterprise Management Mode](surface-enterprise-management-mode.md)	See how this feature of Surface devices with Surface UEFI allows you to secure and manage firmware settings within your organization. -
[Upgrade Surface devices to Windows 10 with MDT](upgrade-surface-devices-to-windows-10-with-mdt.md)	Find out how to perform a Windows 10 upgrade deployment to your Surface devices.