diff --git a/devices/surface/TOC-old.md b/devices/surface/TOC-old.md
new file mode 100644
index 0000000000..c83a77a2bd
--- /dev/null
+++ b/devices/surface/TOC-old.md
@@ -0,0 +1,39 @@
+# [Surface](index.md)
+## [Deploy Surface devices](deploy.md)
+### [Windows Autopilot and Surface devices](windows-autopilot-and-surface-devices.md)
+### [Surface device compatibility with Windows 10 Long-Term Servicing Branch](surface-device-compatibility-with-windows-10-ltsc.md)
+#### [Long-Term Servicing Branch for Surface devices](ltsb-for-surface.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)
+### [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)
+### [Maintain optimal power settings on Surface devices](maintain-optimal-power-settings-on-Surface-devices.md)
+### [Battery Limit setting](battery-limit.md)
+### [Surface Brightness Control](microsoft-surface-brightness-control.md)
+### [Surface Asset Tag](assettag.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)
+### [Manage Surface driver and firmware updates](manage-surface-pro-3-firmware-updates.md)
+### [Surface Dock Updater](surface-dock-updater.md)
+### [Wake On LAN for Surface devices](wake-on-lan-for-surface-devices.md)
+## [Considerations for Surface and System Center Configuration Manager](considerations-for-surface-and-system-center-configuration-manager.md)
+## [Deploy Surface app with Microsoft 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 System SKU reference](surface-system-sku-reference.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)
+### [Use System Center Configuration Manager to manage devices with SEMM](use-system-center-configuration-manager-to-manage-devices-with-semm.md)
+## [Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-business.md)
+### [Use Surface Diagnostic Toolkit for Business in desktop mode](surface-diagnostic-toolkit-desktop-mode.md)
+### [Run Surface Diagnostic Toolkit for Business using commands](surface-diagnostic-toolkit-command-line.md)
+## [Surface Data Eraser](microsoft-surface-data-eraser.md)
+## [Top support solutions for Surface devices](support-solutions-surface.md)
+## [Change history for Surface documentation](change-history-for-surface.md)
+
+
diff --git a/devices/surface/TOC.md b/devices/surface/TOC.md
index c83a77a2bd..549ebaa1f2 100644
--- a/devices/surface/TOC.md
+++ b/devices/surface/TOC.md
@@ -1,39 +1,54 @@
# [Surface](index.md)
-## [Deploy Surface devices](deploy.md)
-### [Windows Autopilot and Surface devices](windows-autopilot-and-surface-devices.md)
-### [Surface device compatibility with Windows 10 Long-Term Servicing Branch](surface-device-compatibility-with-windows-10-ltsc.md)
-#### [Long-Term Servicing Branch for Surface devices](ltsb-for-surface.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)
-### [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)
-### [Maintain optimal power settings on Surface devices](maintain-optimal-power-settings-on-Surface-devices.md)
-### [Battery Limit setting](battery-limit.md)
-### [Surface Brightness Control](microsoft-surface-brightness-control.md)
-### [Surface Asset Tag](assettag.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)
-### [Manage Surface driver and firmware updates](manage-surface-pro-3-firmware-updates.md)
-### [Surface Dock Updater](surface-dock-updater.md)
-### [Wake On LAN for Surface devices](wake-on-lan-for-surface-devices.md)
-## [Considerations for Surface and System Center Configuration Manager](considerations-for-surface-and-system-center-configuration-manager.md)
-## [Deploy Surface app with Microsoft 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 System SKU reference](surface-system-sku-reference.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)
-### [Use System Center Configuration Manager to manage devices with SEMM](use-system-center-configuration-manager-to-manage-devices-with-semm.md)
-## [Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-business.md)
-### [Use Surface Diagnostic Toolkit for Business in desktop mode](surface-diagnostic-toolkit-desktop-mode.md)
-### [Run Surface Diagnostic Toolkit for Business using commands](surface-diagnostic-toolkit-command-line.md)
-## [Surface Data Eraser](microsoft-surface-data-eraser.md)
-## [Top support solutions for Surface devices](support-solutions-surface.md)
-## [Change history for Surface documentation](change-history-for-surface.md)
+## Overview
+### Surface Pro Tech specs
+### Surface Book Tech specs
+### Surface Studio Tech specs
+### Surface Go Tech specs
+### Surface Laptop 2 Tech specs
+## Plan
+### Windows Autopilot and Surface devices
+### Surface device compatibility with Windows 10 Long-Term Servicing Branch
+### Long-Term Servicing Branch for Surface devices
+### Wake On LAN for Surface devices
+### Considerations for Surface and System Center Configuration Manager
+### Deploy Surface app with Microsoft Store for Business
+### Enable PEAP, EAP-FAST, and Cisco LEAP on Surface devices
+### Ethernet adapters and Surface deployment
+
+## Deploy
+### Deploy Surface devices
+### Surface Deployment Accelerator
+### Step by step: Surface Deployment Accelerator
+### Deploy Windows 10 to Surface devices with MDT
+### Upgrade Surface devices to Windows 10 with MDT
+### Customize the OOBE for Surface deployments
+### Using the Surface Deployment Accelerator deployment share
+### Surface System SKU reference
+
+## Manage
+### Maintain optimal power settings on Surface devices
+### Battery Limit setting
+### Surface Brightness Control
+### Surface Asset Tag
+### Surface firmware and driver updates
+### Download the latest firmware and drivers for Surface devices
+### Manage Surface driver and firmware updates
+### Surface Dock Updater
+### Use System Center Configuration Manager to manage devices with SEMM
+
+## Secure
+### Manage Surface UEFI settings
+### Advanced UEFI security features for Surface Pro 3
+### Surface Enterprise Management Mode
+### Enroll and configure Surface devices with SEMM
+### Unenroll Surface devices from SEMM
+
+## Support
+### Surface Diagnostic Toolkit for Business
+### Use Surface Diagnostic Toolkit for Business in desktop mode
+### Run Surface Diagnostic Toolkit for Business using commands
+### Surface Data Eraser
+### Top support solutions for Surface devices
+### Change history for Surface documentation
\ No newline at end of file
diff --git a/devices/surface/index-draft.md b/devices/surface/index-draft.md
deleted file mode 100644
index 7fc6e200fe..0000000000
--- a/devices/surface/index-draft.md
+++ /dev/null
@@ -1,211 +0,0 @@
----
-layout: HubPage
-hide_bc: true
-description: Office documentation for admins & IT professionals
-ms.author: robmazz
-author: robmazz
-ms.topic: hub-page
-keywords: Microsoft 365, Microsoft 365 Enterprise, Microsoft 365 documentation, Office 365, Windows 10 Enterprise, EMS, Enterprise Mobility + Security, enterprise
-localization_priority: Normal
-audience: microsoft-business
-ms.prod: microsoft-365-enterprise
-title: Microsoft 365 Enterprise documentation and resources
-description: Learn about the product documentation and resources available for Microsoft 365 Enterprise IT admins, information workers, and partners.
----
-
-
-
Microsoft 365 Enterprise documentation and resources
-
Learn how to plan, deploy, and use Microsoft Office 365, Windows 10, and Enterprise Mobility + Security together in your organization. These services provide an integrated and secure infrastructure that enables teamwork and unlocks creativity.
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
-
-

-
-
-
-
-
-
-
- -
-
-
-
-
-
-

-
-
-
-
-
-
-
- -
-
-
-
-
-
-

-
-
-
-
-
-
-
- -
-
-
-
-
-
-

-
-
-
-
-
-
-
- -
-
-
-
-
-
-

-
-
-
-
-
-
-
- -
-
-
-
-
-
-

-
-
-
-
-
-
-
- -
-
-
-
- -
-
-
-
-
-
-

-
-
-
-
-
-
-
- -
-
-
-
-
-
-

-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/devices/surface/index-old.md b/devices/surface/index-old.md
new file mode 100644
index 0000000000..e559820d25
--- /dev/null
+++ b/devices/surface/index-old.md
@@ -0,0 +1,63 @@
+---
+title: Surface (Surface)
+description:
+ms.assetid: 2a6aec85-b8e2-4784-8dc1-194ed5126a04
+ms.localizationpriority: high
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.pagetype: surface, devices
+ms.sitesec: library
+author: heatherpoulsen
+ms.author: jdecker
+ms.topic: article
+ms.date: 10/16/2017
+---
+
+# Surface
+
+
+This library provides guidance to help you deploy Windows on Microsoft 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/windows/surface).
+
+## In this section
+
+| Topic | Description |
+| --- | --- |
+| [Deploy Surface devices](deploy.md) | Get deployment guidance for your Surface devices including information about MDT, OOBE customization, Ethernet adaptors, and Surface Deployment Accelerator. |
+| [Surface firmware and driver updates](update.md) | Find out how to download and manage the latest firmware and driver updates for your Surface device. |
+| [Considerations for Surface and System Center Configuration Manager](considerations-for-surface-and-system-center-configuration-manager.md) | Get guidance on how to deploy and manage Surface devices with System Center Configuration Manager. |
+| [Deploy Surface app with Microsoft Store for Business](deploy-surface-app-with-windows-store-for-business.md) | Find out how to add and download Surface app with Microsoft Store for Business, as well as install Surface app with PowerShell and MDT. |
+| [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. |
+| [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 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. |
+| [Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-business.md) | Learn how to investigate, troubleshoot, and resolve hardware, software, and firmware issues with Surface devices. |
+| [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. |
+| [Top support solutions for Surface devices](support-solutions-surface.md) | These are the top Microsoft Support solutions for common issues experienced using Surface devices in an enterprise. |
+| [Change history for Surface documentation](change-history-for-surface.md) | This topic lists new and updated topics in the Surface documentation library. |
+
+
+## Learn more
+
+[Certifying Surface Pro 4 and Surface Book as standard devices at Microsoft](https://www.microsoft.com/itshowcase/Article/Content/849/Certifying-Surface-Pro-4-and-Surface-Book-as-standard-devices-at-Microsoft)
+
+
+
+
+
+
+## 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/index.md b/devices/surface/index.md
index e559820d25..e1bca95c9d 100644
--- a/devices/surface/index.md
+++ b/devices/surface/index.md
@@ -1,63 +1,207 @@
+---
+layout: HubPage
+hide_bc: true
+description: Surface and Surface Hub documentation for admins & IT professionals
+ms.author: robmazz
+author: robmazz
+ms.topic: hub-page
+keywords: Microsoft Surface, Microsoft Surface Hub, Surface documentation
+localization_priority: Normal
+audience: microsoft-business
+ms.prod: microsoft-365-enterprise
+title: Microsoft Surface and Surface Hub documentation and resources
+description: Learn about Microsoft Surface and Surface Hub devices.
---
-title: Surface (Surface)
-description:
-ms.assetid: 2a6aec85-b8e2-4784-8dc1-194ed5126a04
-ms.localizationpriority: high
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: surface, devices
-ms.sitesec: library
-author: heatherpoulsen
-ms.author: jdecker
-ms.topic: article
-ms.date: 10/16/2017
----
-
-# Surface
-
-
-This library provides guidance to help you deploy Windows on Microsoft 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/windows/surface).
-
-## In this section
-
-| Topic | Description |
-| --- | --- |
-| [Deploy Surface devices](deploy.md) | Get deployment guidance for your Surface devices including information about MDT, OOBE customization, Ethernet adaptors, and Surface Deployment Accelerator. |
-| [Surface firmware and driver updates](update.md) | Find out how to download and manage the latest firmware and driver updates for your Surface device. |
-| [Considerations for Surface and System Center Configuration Manager](considerations-for-surface-and-system-center-configuration-manager.md) | Get guidance on how to deploy and manage Surface devices with System Center Configuration Manager. |
-| [Deploy Surface app with Microsoft Store for Business](deploy-surface-app-with-windows-store-for-business.md) | Find out how to add and download Surface app with Microsoft Store for Business, as well as install Surface app with PowerShell and MDT. |
-| [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. |
-| [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 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. |
-| [Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-business.md) | Learn how to investigate, troubleshoot, and resolve hardware, software, and firmware issues with Surface devices. |
-| [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. |
-| [Top support solutions for Surface devices](support-solutions-surface.md) | These are the top Microsoft Support solutions for common issues experienced using Surface devices in an enterprise. |
-| [Change history for Surface documentation](change-history-for-surface.md) | This topic lists new and updated topics in the Surface documentation library. |
-
-
-## Learn more
-
-[Certifying Surface Pro 4 and Surface Book as standard devices at Microsoft](https://www.microsoft.com/itshowcase/Article/Content/849/Certifying-Surface-Pro-4-and-Surface-Book-as-standard-devices-at-Microsoft)
-
-
-
-
-
-
-## Related topics
-
-
-[Surface TechCenter](https://technet.microsoft.com/windows/surface)
-
-[Surface for IT pros blog](http://blogs.technet.com/b/surface/)
-
-
-
-
-
-
-
-
-
+
+
+
Microsoft Surface and Surface Hub
+
Learn how to plan, deploy, and use Microsoft Surface and Surface Hub devices.
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+

+
+
+
+
+
+
+
+ -
+
+
+
+
+
+

+
+
+
+
+
+
+
+ -
+
+
+
+
+
+

+
+
+
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
+

+
+
+
+
+
+
+
+ -
+
+
+
+ -
+
+
+
+
+
+

+
+
+
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file