diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
index 505a82596b..7c1508564b 100644
--- a/.openpublishing.redirection.json
+++ b/.openpublishing.redirection.json
@@ -1,6 +1,11 @@
{
"redirections": [
{
+"source_path": "windows/keep-secure/add-apps-to-protected-list-using-custom-uri.md",
+"redirect_url": "/itpro/windows/keep-secure/create-wip-policy-using-intune",
+"redirect_document_id": false
+},
+{
"source_path": "windows/keep-secure/configure-windows-defender-in-windows-10.md",
"redirect_url": "/itpro/windows/keep-secure/deploy-manage-report-windows-defender-antivirus",
"redirect_document_id": true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e360930f75..74f2c0d7a4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,12 +1,12 @@
-# Contributing to Windows IT professional documentation
+# Editing Windows IT professional documentation
Thank you for your interest in the Windows IT professional documentation! We appreciate your feedback, edits, and additions to our docs.
-This page covers the basic steps for contributing to our technical documentation.
+This page covers the basic steps for editing our technical documentation.
## Sign a CLA
-All contributors who are ***not*** a Microsoft employee must [sign a Microsoft Contribution Licensing Agreement (CLA)](https://cla.microsoft.com/) before contributing to any Microsoft repositories.
-If you've already contributed to Microsoft repositories in the past, congratulations!
+All contributors who are ***not*** a Microsoft employee must [sign a Microsoft Contribution Licensing Agreement (CLA)](https://cla.microsoft.com/) before editing any Microsoft repositories.
+If you've already edited within Microsoft repositories in the past, congratulations!
You've already completed this step.
## Editing topics
@@ -18,7 +18,7 @@ We've tried to make editing an existing, public file as simple as possible.
**To edit a topic**
-1. Go to the page on TechNet that you want to update, and then click **Contribute**.
+1. Go to the page on TechNet that you want to update, and then click **Edit**.

@@ -61,13 +61,17 @@ We've tried to make editing an existing, public file as simple as possible.
The pull request is sent to the writer of the topic and your edits are reviewed. If your request is accepted, updates are published to one of the following places:
- - [Windows 10](https://technet.microsoft.com/itpro/windows)
- - [Internet Explorer 11](https://technet.microsoft.com/itpro/internet-explorer)
- - [Microsoft Edge](https://technet.microsoft.com/itpro/microsoft-edge)
- - [Surface](https://technet.microsoft.com/itpro/surface)
- - [Surface Hub](https://technet.microsoft.com/itpro/surface-hub)
- - [Windows 10 for Education](https://technet.microsoft.com/edu/windows)
- - [Microsoft Desktop Optimization Pack](https://technet.microsoft.com/itpro/mdop)
+ - [Windows 10](https://docs.microsoft.com/windows/windows-10)
+ - [Microsoft Edge](https://docs.microsoft.com/microsoft-edge/deploy)
+ - [Surface](https://docs.microsoft.com/surface)
+ - [Surface Hub](https://docs.microsoft.com/surface-hub)
+ - [HoloLens](https://docs.microsoft.com/hololens)
+ - [Microsoft Store](https://docs.microsoft.com/microsoft-store)
+ - [Windows 10 for Education](https://docs.microsoft.com/education/windows)
+ - [Windows 10 for SMB](https://docs.microsoft.com/windows/smb)
+ - [Internet Explorer 11](https://docs.microsoft.com/internet-explorer)
+ - [Microsoft Desktop Optimization Pack](https://docs.microsoft.com/microsoft-desktop-optimization-pack)
+
## Making more substantial changes
diff --git a/browsers/edge/docfx.json b/browsers/edge/docfx.json
index bc72c31b48..c9ff0a06a4 100644
--- a/browsers/edge/docfx.json
+++ b/browsers/edge/docfx.json
@@ -14,7 +14,10 @@
}
],
"globalMetadata": {
- "ROBOTS": "INDEX, FOLLOW"
+ "ROBOTS": "INDEX, FOLLOW",
+ "ms.technology": "microsoft-edge",
+ "ms.topic": "article",
+ "ms.author": "lizross"
},
"externalReference": [
],
diff --git a/browsers/internet-explorer/docfx.json b/browsers/internet-explorer/docfx.json
index a8dde5aafb..05006a703e 100644
--- a/browsers/internet-explorer/docfx.json
+++ b/browsers/internet-explorer/docfx.json
@@ -14,7 +14,10 @@
}
],
"globalMetadata": {
- "ROBOTS": "INDEX, FOLLOW"
+ "ROBOTS": "INDEX, FOLLOW",
+ "author": "lizross",
+ "ms.technology": "internet-explorer",
+ "ms.topic": "article"
},
"externalReference": [
],
diff --git a/browsers/internet-explorer/ie11-deploy-guide/change-history-for-internet-explorer-11.md b/browsers/internet-explorer/ie11-deploy-guide/change-history-for-internet-explorer-11.md
index 1717c9f622..4ec6a7cc70 100644
--- a/browsers/internet-explorer/ie11-deploy-guide/change-history-for-internet-explorer-11.md
+++ b/browsers/internet-explorer/ie11-deploy-guide/change-history-for-internet-explorer-11.md
@@ -5,6 +5,7 @@ description: This topic lists new and updated topics in the Internet Explorer 11
ms.mktglfcycl: deploy
ms.prod: ie11
ms.sitesec: library
+author: eross-msft
---
diff --git a/browsers/internet-explorer/ie11-deploy-guide/img-ie11-docmode-lg.md b/browsers/internet-explorer/ie11-deploy-guide/img-ie11-docmode-lg.md
index 77b1ad1227..7550de81b9 100644
--- a/browsers/internet-explorer/ie11-deploy-guide/img-ie11-docmode-lg.md
+++ b/browsers/internet-explorer/ie11-deploy-guide/img-ie11-docmode-lg.md
@@ -1,6 +1,7 @@
---
description: A full-sized view of how document modes are chosen in IE11.
title: Full-sized flowchart detailing how document modes are chosen in IE11
+author: eross-msft
---
Return to: [Deprecated document modes and Internet Explorer 11](deprecated-document-modes.md)
diff --git a/devices/hololens/docfx.json b/devices/hololens/docfx.json
index c6dc9e418d..71e4c3c8d8 100644
--- a/devices/hololens/docfx.json
+++ b/devices/hololens/docfx.json
@@ -27,7 +27,11 @@
],
"overwrite": [],
"externalReference": [],
- "globalMetadata": {},
+ "globalMetadata": {
+ "ms.technology": "windows",
+ "ms.topic": "article",
+ "ms.author": "jdecker"
+ },
"fileMetadata": {},
"template": [
null
diff --git a/devices/surface-hub/docfx.json b/devices/surface-hub/docfx.json
index 11bc1cdc40..0e363e061e 100644
--- a/devices/surface-hub/docfx.json
+++ b/devices/surface-hub/docfx.json
@@ -14,7 +14,13 @@
}
],
"globalMetadata": {
- "ROBOTS": "INDEX, FOLLOW"
+ "ROBOTS": "INDEX, FOLLOW",
+ "ms.technology": "windows",
+ "ms.topic": "article",
+ "ms.mktglfcycl": "manage",
+ "author": "jdeckerms",
+ "ms.sitesec": "library",
+ "ms.author": "jdecker"
},
"externalReference": [
],
diff --git a/devices/surface-hub/use-fully-qualified-domain-name-surface-hub.md b/devices/surface-hub/use-fully-qualified-domain-name-surface-hub.md
index bf630cda9e..3347918660 100644
--- a/devices/surface-hub/use-fully-qualified-domain-name-surface-hub.md
+++ b/devices/surface-hub/use-fully-qualified-domain-name-surface-hub.md
@@ -4,6 +4,10 @@ description: Troubleshoot common problems, including setup issues, Exchange Acti
keywords: ["Troubleshoot common problems", "setup issues", "Exchange ActiveSync errors"]
author: TrudyHa
localizationpriority: medium
+ms.prod: w10
+ms.mktglfcycl: support
+ms.sitesec: library
+ms.pagetype: surfacehub
---
# Configure domain name for Skype for Business
diff --git a/devices/surface/docfx.json b/devices/surface/docfx.json
index 7d2f4404d8..2c09ed9878 100644
--- a/devices/surface/docfx.json
+++ b/devices/surface/docfx.json
@@ -14,7 +14,10 @@
}
],
"globalMetadata": {
- "ROBOTS": "INDEX, FOLLOW"
+ "ROBOTS": "INDEX, FOLLOW",
+ "ms.technology": "windows",
+ "ms.topic": "article",
+ "ms.author": "jdecker"
},
"externalReference": [
],
diff --git a/education/docfx.json b/education/docfx.json
index cc09ff86a7..bcc294ba6f 100644
--- a/education/docfx.json
+++ b/education/docfx.json
@@ -14,7 +14,10 @@
}
],
"globalMetadata": {
- "ROBOTS": "INDEX, FOLLOW"
+ "ROBOTS": "INDEX, FOLLOW",
+ "ms.author": "celested",
+ "audience": "windows-education",
+ "ms.topic": "article"
},
"externalReference": [
],
diff --git a/education/windows/edu-deployment-recommendations.md b/education/windows/edu-deployment-recommendations.md
index 71b7b4829f..ceecbfb175 100644
--- a/education/windows/edu-deployment-recommendations.md
+++ b/education/windows/edu-deployment-recommendations.md
@@ -6,6 +6,7 @@ ms.mktglfcycl: plan
ms.sitesec: library
localizationpriority: high
author: CelesteDG
+ms.prod: W10
---
# Deployment recommendations for school IT administrators
diff --git a/images/contribute-link.png b/images/contribute-link.png
index 6b17e6dd56..4cf685e54e 100644
Binary files a/images/contribute-link.png and b/images/contribute-link.png differ
diff --git a/images/preview-changes.png b/images/preview-changes.png
index f98b2c6443..cb4ecab594 100644
Binary files a/images/preview-changes.png and b/images/preview-changes.png differ
diff --git a/mdop/appv-v5/deploying-microsoft-office-2016-by-using-app-v.md b/mdop/appv-v5/deploying-microsoft-office-2016-by-using-app-v.md
index 4dba1a2a53..20edf8efe4 100644
--- a/mdop/appv-v5/deploying-microsoft-office-2016-by-using-app-v.md
+++ b/mdop/appv-v5/deploying-microsoft-office-2016-by-using-app-v.md
@@ -85,7 +85,7 @@ Before you deploy Office by using App-V, review the following requirements.
All of the Office applications that you want to deploy to users must be in a single package.
In App-V 5.0 and later, you must use the Office Deployment Tool to create packages. You cannot use the Sequencer.
-
If you are deploying Microsoft Visio 2016 and Microsoft Project 2016 along with Office, you must include them in the same package with Office. For more information, see [Deploying Visio 2016 and Project 2016 with Office](#deploying-visio-2016-and-project-2016-with-office).
+
If you are deploying Microsoft Visio 2016 and Microsoft Project 2016 along with Office, you must include them in the same package with Office. For more information, see [Deploying Visio 2016 and Project 2016 with Office](#bkmk-deploy-visio-project).
diff --git a/mdop/appv-v5/deploying-microsoft-office-2016-by-using-app-v51.md b/mdop/appv-v5/deploying-microsoft-office-2016-by-using-app-v51.md
index bd506092d0..dbad00b772 100644
--- a/mdop/appv-v5/deploying-microsoft-office-2016-by-using-app-v51.md
+++ b/mdop/appv-v5/deploying-microsoft-office-2016-by-using-app-v51.md
@@ -85,7 +85,7 @@ Before you deploy Office by using App-V, review the following requirements.
All of the Office applications that you want to deploy to users must be in a single package.
In App-V 5.1 and later, you must use the Office Deployment Tool to create packages. You cannot use the Sequencer.
-
If you are deploying Microsoft Visio 2016 and Microsoft Project 2016 along with Office, you must include them in the same package with Office. For more information, see [Deploying Visio 2016 and Project 2016 with Office](#deploying-visio-2016-and-project-2016-with-office).
+
If you are deploying Microsoft Visio 2016 and Microsoft Project 2016 along with Office, you must include them in the same package with Office. For more information, see [Deploying Visio 2016 and Project 2016 with Office](#bkmk-deploy-visio-project).
diff --git a/mdop/appv-v5/index.md b/mdop/appv-v5/index.md
index 32649ad47e..b481245f67 100644
--- a/mdop/appv-v5/index.md
+++ b/mdop/appv-v5/index.md
@@ -41,7 +41,7 @@ View updated product information and known issues for App-V 5.0.
Learn about the latest MDOP information and resources.
[MDOP Information Experience](https://go.microsoft.com/fwlink/p/?LinkId=236032)
-Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com%29 or learn about updates by following us on [Facebook]%28https://go.microsoft.com/fwlink/p/?LinkId=242445%29 or [Twitter]%28https://go.microsoft.com/fwlink/p/?LinkId=242447).
+Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com) or learn about updates by following us on [Facebook](https://go.microsoft.com/fwlink/p/?LinkId=242445) or [Twitter](https://go.microsoft.com/fwlink/p/?LinkId=242447).
## Got a suggestion for App-V?
diff --git a/mdop/dart-v10/index.md b/mdop/dart-v10/index.md
index 403e85d410..cb6a5f3b9e 100644
--- a/mdop/dart-v10/index.md
+++ b/mdop/dart-v10/index.md
@@ -49,7 +49,7 @@ View updated product information and known issues for DaRT 10.
Learn about the latest MDOP information and resources.
[MDOP Information Experience](https://go.microsoft.com/fwlink/p/?LinkId=236032)
-Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com%29 or learn about updates by following us on [Facebook]%28https://go.microsoft.com/fwlink/p/?LinkId=242445%29 or [Twitter]%28https://go.microsoft.com/fwlink/p/?LinkId=242447).
+Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com) or learn about updates by following us on [Facebook](https://go.microsoft.com/fwlink/p/?LinkId=242445) or [Twitter](https://go.microsoft.com/fwlink/p/?LinkId=242447).
diff --git a/mdop/dart-v65.md b/mdop/dart-v65.md
index 335e945881..02c3b02f9b 100644
--- a/mdop/dart-v65.md
+++ b/mdop/dart-v65.md
@@ -2,6 +2,10 @@
title: Diagnostics and Recovery Toolset 6.5
description: Diagnostics and Recovery Toolset 6.5
author: jamiejdt
+ms.pagetype: mdop
+ms.mktglfcycl: manage
+ms.sitesec: library
+ms.prod: w10
---
# Diagnostics and Recovery Toolset 6.5
diff --git a/mdop/dart-v7/index.md b/mdop/dart-v7/index.md
index 4a73455bd5..b65a749ad2 100644
--- a/mdop/dart-v7/index.md
+++ b/mdop/dart-v7/index.md
@@ -46,7 +46,7 @@ View updated product information and known issues for DaRT 7.
Learn about the latest MDOP information and resources.
[MDOP Information Experience](https://go.microsoft.com/fwlink/p/?LinkId=236032)
-Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com%29 or learn about updates by following us on [Facebook]%28https://go.microsoft.com/fwlink/p/?LinkId=242445%29 or [Twitter]%28https://go.microsoft.com/fwlink/p/?LinkId=242447).
+Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com) or learn about updates by following us on [Facebook](https://go.microsoft.com/fwlink/p/?LinkId=242445) or [Twitter](https://go.microsoft.com/fwlink/p/?LinkId=242447).
diff --git a/mdop/dart-v8/index.md b/mdop/dart-v8/index.md
index aa7739f75f..f521934a32 100644
--- a/mdop/dart-v8/index.md
+++ b/mdop/dart-v8/index.md
@@ -53,7 +53,7 @@ View updated product information and known issues for DaRT 8.0.
Learn about the latest MDOP information and resources.
[MDOP Information Experience](https://go.microsoft.com/fwlink/p/?LinkId=236032)
-Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com%29 or learn about updates by following us on [Facebook]%28https://go.microsoft.com/fwlink/p/?LinkId=242445%29 or [Twitter]%28https://go.microsoft.com/fwlink/p/?LinkId=242447).
+Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com) or learn about updates by following us on [Facebook](https://go.microsoft.com/fwlink/p/?LinkId=242445) or [Twitter](https://go.microsoft.com/fwlink/p/?LinkId=242447).
diff --git a/mdop/docfx.json b/mdop/docfx.json
index 85c859a765..3f46635347 100644
--- a/mdop/docfx.json
+++ b/mdop/docfx.json
@@ -14,7 +14,10 @@
}
],
"globalMetadata": {
- "ROBOTS": "INDEX, FOLLOW"
+ "ROBOTS": "INDEX, FOLLOW",
+ "ms.technology": "mdop",
+ "ms.topic": "article",
+ "ms.author": "jamiet"
},
"externalReference": [
],
diff --git a/mdop/index.md b/mdop/index.md
index 0863054ac2..2453bf950e 100644
--- a/mdop/index.md
+++ b/mdop/index.md
@@ -3,6 +3,10 @@ title: MDOP Information Experience
description: MDOP Information Experience
ms.assetid: 12b8ab56-3267-450d-bb22-1c7e44cb8e52
author: jamiejdt
+ms.pagetype: mdop
+ms.mktglfcycl: manage
+ms.sitesec: library
+ms.prod: w10
---
# MDOP Information Experience
diff --git a/mdop/mbam-v1/index.md b/mdop/mbam-v1/index.md
index e1d4cafd4f..69f6a9bb70 100644
--- a/mdop/mbam-v1/index.md
+++ b/mdop/mbam-v1/index.md
@@ -42,7 +42,7 @@ View updated product information and known issues for MBAM 1.0.
Learn about the latest MDOP information and resources.
[MDOP Information Experience](https://go.microsoft.com/fwlink/p/?LinkId=236032)
-Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com%29 or learn about updates by following us on [Facebook]%28https://go.microsoft.com/fwlink/p/?LinkId=242445%29 or [Twitter]%28https://go.microsoft.com/fwlink/p/?LinkId=242447).
+Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com) or learn about updates by following us on [Facebook](https://go.microsoft.com/fwlink/p/?LinkId=242445) or [Twitter](https://go.microsoft.com/fwlink/p/?LinkId=242447).
diff --git a/mdop/mbam-v2/index.md b/mdop/mbam-v2/index.md
index 6bb7ed3791..3da1392117 100644
--- a/mdop/mbam-v2/index.md
+++ b/mdop/mbam-v2/index.md
@@ -45,7 +45,7 @@ Microsoft BitLocker Administration and Monitoring (MBAM) 2.0 provides a simpl
- [MDOP Information Experience](https://go.microsoft.com/fwlink/p/?LinkId=236032)
- Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com%29 or learn about updates by following us on [Facebook]%28https://go.microsoft.com/fwlink/p/?LinkId=242445%29 or [Twitter]%28https://go.microsoft.com/fwlink/p/?LinkId=242447).
+ Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com) or learn about updates by following us on [Facebook](https://go.microsoft.com/fwlink/p/?LinkId=242445) or [Twitter](https://go.microsoft.com/fwlink/p/?LinkId=242447).
diff --git a/mdop/mbam-v25/index.md b/mdop/mbam-v25/index.md
index fd60429382..f5b0d8670e 100644
--- a/mdop/mbam-v25/index.md
+++ b/mdop/mbam-v25/index.md
@@ -51,7 +51,7 @@ To get the MBAM software, see [How Do I Get MDOP](https://go.microsoft.com/fwlin
- [MDOP Information Experience](https://go.microsoft.com/fwlink/p/?LinkId=236032)
- Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com%29 or learn about updates by following us on [Facebook]%28https://go.microsoft.com/fwlink/p/?LinkId=242445%29 or [Twitter]%28https://go.microsoft.com/fwlink/p/?LinkId=242447).
+ Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com) or learn about updates by following us on [Facebook](https://go.microsoft.com/fwlink/p/?LinkId=242445) or [Twitter](https://go.microsoft.com/fwlink/p/?LinkId=242447).
- [MBAM Deployment Guide](http://www.microsoft.com/download/details.aspx?id=38398)
diff --git a/mdop/softgrid-application-virtualization.md b/mdop/softgrid-application-virtualization.md
index fd762e0136..cb5773b982 100644
--- a/mdop/softgrid-application-virtualization.md
+++ b/mdop/softgrid-application-virtualization.md
@@ -2,6 +2,10 @@
title: SoftGrid Application Virtualization
description: SoftGrid Application Virtualization
author: jamiejdt
+ms.pagetype: mdop
+ms.mktglfcycl: manage
+ms.sitesec: library
+ms.prod: w10
---
# SoftGrid Application Virtualization
diff --git a/mdop/uev-v1/index.md b/mdop/uev-v1/index.md
index ce46b1dc0d..22361e39d3 100644
--- a/mdop/uev-v1/index.md
+++ b/mdop/uev-v1/index.md
@@ -42,7 +42,7 @@ View updated product information and known issues for UE-V 1.0.
Learn about the latest MDOP information and resources.
[MDOP Information Experience](https://go.microsoft.com/fwlink/p/?LinkId=236032)
-Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com%29 or learn about updates by following us on [Facebook]%28https://go.microsoft.com/fwlink/p/?LinkId=242445%29 or [Twitter]%28https://go.microsoft.com/fwlink/p/?LinkId=242447).
+Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com) or learn about updates by following us on [Facebook](https://go.microsoft.com/fwlink/p/?LinkId=242445) or [Twitter](https://go.microsoft.com/fwlink/p/?LinkId=242447).
diff --git a/mdop/uev-v2/index.md b/mdop/uev-v2/index.md
index 6eeef89ebe..4873df96b5 100644
--- a/mdop/uev-v2/index.md
+++ b/mdop/uev-v2/index.md
@@ -304,7 +304,7 @@ For more information, and for late-breaking news that did not make it into the d
Learn about the latest MDOP information and resources.
[MDOP Information Experience](https://go.microsoft.com/fwlink/p/?LinkId=236032)
-Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com%29 or learn about updates by following us on [Facebook]%28https://go.microsoft.com/fwlink/p/?LinkId=242445%29 or [Twitter]%28https://go.microsoft.com/fwlink/p/?LinkId=242447).
+Find documentation, videos, and other resources for MDOP technologies. You can also [send us feedback](mailto:MDOPDocs@microsoft.com) or learn about updates by following us on [Facebook](https://go.microsoft.com/fwlink/p/?LinkId=242445) or [Twitter](https://go.microsoft.com/fwlink/p/?LinkId=242447).
## Got a suggestion for UE-V?
diff --git a/mdop/uev-v2/prepare-a-ue-v-2x-deployment-new-uevv2.md b/mdop/uev-v2/prepare-a-ue-v-2x-deployment-new-uevv2.md
index c1ae38e981..dce11abb18 100644
--- a/mdop/uev-v2/prepare-a-ue-v-2x-deployment-new-uevv2.md
+++ b/mdop/uev-v2/prepare-a-ue-v-2x-deployment-new-uevv2.md
@@ -17,7 +17,7 @@ There is some planning and preparation to do before you deploy Microsoft User Ex
First, let’s look at the tasks you’ll do to deploy UE-V:
-- [Plan your UE-V Deployment](#planning)
+- Plan your UE-V Deployment
Before you deploy anything, a good first step is to do a little bit of planning so that you can determine which UE-V features you’ll deploy. So if you leave this page, make sure you come back and read through the planning information below.
diff --git a/store-for-business/TOC.md b/store-for-business/TOC.md
new file mode 100644
index 0000000000..81657682cf
--- /dev/null
+++ b/store-for-business/TOC.md
@@ -0,0 +1,30 @@
+# [Windows Store for Business](index.md)
+## [Sign up and get started](sign-up-windows-store-for-business-overview.md)
+###[Windows Store for Business overview](windows-store-for-business-overview.md)
+### [Prerequisites for Windows Store for Business](prerequisites-windows-store-for-business.md)
+### [Sign up for Windows Store for Business](sign-up-windows-store-for-business.md)
+### [Roles and permissions in the Windows Store for Business](roles-and-permissions-windows-store-for-business.md)
+### [Settings reference: Windows Store for Business](settings-reference-windows-store-for-business.md)
+## [Find and acquire apps](find-and-acquire-apps-overview.md)
+### [Apps in the Windows Store for Business](apps-in-windows-store-for-business.md)
+### [Acquire apps in the Windows Store for Business](acquire-apps-windows-store-for-business.md)
+### [Working with line-of-business apps](working-with-line-of-business-apps.md)
+## [Distribute apps to your employees from the Windows Store for Business](distribute-apps-to-your-employees-windows-store-for-business.md)
+### [Distribute apps using your private store](distribute-apps-from-your-private-store.md)
+### [Assign apps to employees](assign-apps-to-employees.md)
+### [Distribute apps with a management tool](distribute-apps-with-management-tool.md)
+### [Distribute offline apps](distribute-offline-apps.md)
+## [Manage apps](manage-apps-windows-store-for-business-overview.md)
+### [App inventory managemement for Windows Store for Business](app-inventory-management-windows-store-for-business.md)
+### [Manage app orders in Windows Store for Business](manage-orders-windows-store-for-business.md)
+### [Manage access to private store](manage-access-to-private-store.md)
+### [Manage private store settings](manage-private-store-settings.md)
+### [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md)
+## [Device Guard signing portal](device-guard-signing-portal.md)
+### [Add unsigned app to code integrity policy](add-unsigned-app-to-code-integrity-policy.md)
+### [Sign code integrity policy with Device Guard signing](sign-code-integrity-policy-with-device-guard-signing.md)
+## [Manage settings in the Windows Store for Business](manage-settings-windows-store-for-business.md)
+### [Update Windows Store for Business account settings](update-windows-store-for-business-account-settings.md)
+### [Manage user accounts in Windows Store for Business](manage-users-and-groups-windows-store-for-business.md)
+## [Troubleshoot Windows Store for Business](troubleshoot-windows-store-for-business.md)
+
diff --git a/windows/manage/acquire-apps-windows-store-for-business.md b/store-for-business/acquire-apps-windows-store-for-business.md
similarity index 100%
rename from windows/manage/acquire-apps-windows-store-for-business.md
rename to store-for-business/acquire-apps-windows-store-for-business.md
diff --git a/windows/manage/add-unsigned-app-to-code-integrity-policy.md b/store-for-business/add-unsigned-app-to-code-integrity-policy.md
similarity index 100%
rename from windows/manage/add-unsigned-app-to-code-integrity-policy.md
rename to store-for-business/add-unsigned-app-to-code-integrity-policy.md
diff --git a/windows/manage/app-inventory-management-windows-store-for-business.md b/store-for-business/app-inventory-management-windows-store-for-business.md
similarity index 100%
rename from windows/manage/app-inventory-management-windows-store-for-business.md
rename to store-for-business/app-inventory-management-windows-store-for-business.md
diff --git a/windows/manage/apps-in-windows-store-for-business.md b/store-for-business/apps-in-windows-store-for-business.md
similarity index 100%
rename from windows/manage/apps-in-windows-store-for-business.md
rename to store-for-business/apps-in-windows-store-for-business.md
diff --git a/windows/manage/assign-apps-to-employees.md b/store-for-business/assign-apps-to-employees.md
similarity index 100%
rename from windows/manage/assign-apps-to-employees.md
rename to store-for-business/assign-apps-to-employees.md
diff --git a/windows/manage/configure-mdm-provider-windows-store-for-business.md b/store-for-business/configure-mdm-provider-windows-store-for-business.md
similarity index 100%
rename from windows/manage/configure-mdm-provider-windows-store-for-business.md
rename to store-for-business/configure-mdm-provider-windows-store-for-business.md
diff --git a/windows/manage/device-guard-signing-portal.md b/store-for-business/device-guard-signing-portal.md
similarity index 100%
rename from windows/manage/device-guard-signing-portal.md
rename to store-for-business/device-guard-signing-portal.md
diff --git a/windows/manage/distribute-apps-from-your-private-store.md b/store-for-business/distribute-apps-from-your-private-store.md
similarity index 100%
rename from windows/manage/distribute-apps-from-your-private-store.md
rename to store-for-business/distribute-apps-from-your-private-store.md
diff --git a/windows/manage/distribute-apps-to-your-employees-windows-store-for-business.md b/store-for-business/distribute-apps-to-your-employees-windows-store-for-business.md
similarity index 100%
rename from windows/manage/distribute-apps-to-your-employees-windows-store-for-business.md
rename to store-for-business/distribute-apps-to-your-employees-windows-store-for-business.md
diff --git a/windows/manage/distribute-apps-with-management-tool.md b/store-for-business/distribute-apps-with-management-tool.md
similarity index 100%
rename from windows/manage/distribute-apps-with-management-tool.md
rename to store-for-business/distribute-apps-with-management-tool.md
diff --git a/windows/manage/distribute-offline-apps.md b/store-for-business/distribute-offline-apps.md
similarity index 100%
rename from windows/manage/distribute-offline-apps.md
rename to store-for-business/distribute-offline-apps.md
diff --git a/windows/manage/find-and-acquire-apps-overview.md b/store-for-business/find-and-acquire-apps-overview.md
similarity index 100%
rename from windows/manage/find-and-acquire-apps-overview.md
rename to store-for-business/find-and-acquire-apps-overview.md
diff --git a/windows/manage/windows-store-for-business.md b/store-for-business/index.md
similarity index 100%
rename from windows/manage/windows-store-for-business.md
rename to store-for-business/index.md
diff --git a/windows/manage/manage-access-to-private-store.md b/store-for-business/manage-access-to-private-store.md
similarity index 100%
rename from windows/manage/manage-access-to-private-store.md
rename to store-for-business/manage-access-to-private-store.md
diff --git a/windows/manage/manage-apps-windows-store-for-business-overview.md b/store-for-business/manage-apps-windows-store-for-business-overview.md
similarity index 100%
rename from windows/manage/manage-apps-windows-store-for-business-overview.md
rename to store-for-business/manage-apps-windows-store-for-business-overview.md
diff --git a/windows/manage/manage-orders-windows-store-for-business.md b/store-for-business/manage-orders-windows-store-for-business.md
similarity index 100%
rename from windows/manage/manage-orders-windows-store-for-business.md
rename to store-for-business/manage-orders-windows-store-for-business.md
diff --git a/windows/manage/manage-private-store-settings.md b/store-for-business/manage-private-store-settings.md
similarity index 100%
rename from windows/manage/manage-private-store-settings.md
rename to store-for-business/manage-private-store-settings.md
diff --git a/windows/manage/manage-settings-windows-store-for-business.md b/store-for-business/manage-settings-windows-store-for-business.md
similarity index 100%
rename from windows/manage/manage-settings-windows-store-for-business.md
rename to store-for-business/manage-settings-windows-store-for-business.md
diff --git a/windows/manage/manage-users-and-groups-windows-store-for-business.md b/store-for-business/manage-users-and-groups-windows-store-for-business.md
similarity index 100%
rename from windows/manage/manage-users-and-groups-windows-store-for-business.md
rename to store-for-business/manage-users-and-groups-windows-store-for-business.md
diff --git a/windows/manage/prerequisites-windows-store-for-business.md b/store-for-business/prerequisites-windows-store-for-business.md
similarity index 100%
rename from windows/manage/prerequisites-windows-store-for-business.md
rename to store-for-business/prerequisites-windows-store-for-business.md
diff --git a/windows/manage/roles-and-permissions-windows-store-for-business.md b/store-for-business/roles-and-permissions-windows-store-for-business.md
similarity index 100%
rename from windows/manage/roles-and-permissions-windows-store-for-business.md
rename to store-for-business/roles-and-permissions-windows-store-for-business.md
diff --git a/windows/manage/settings-reference-windows-store-for-business.md b/store-for-business/settings-reference-windows-store-for-business.md
similarity index 100%
rename from windows/manage/settings-reference-windows-store-for-business.md
rename to store-for-business/settings-reference-windows-store-for-business.md
diff --git a/windows/manage/sign-code-integrity-policy-with-device-guard-signing.md b/store-for-business/sign-code-integrity-policy-with-device-guard-signing.md
similarity index 100%
rename from windows/manage/sign-code-integrity-policy-with-device-guard-signing.md
rename to store-for-business/sign-code-integrity-policy-with-device-guard-signing.md
diff --git a/windows/manage/sign-up-windows-store-for-business-overview.md b/store-for-business/sign-up-windows-store-for-business-overview.md
similarity index 100%
rename from windows/manage/sign-up-windows-store-for-business-overview.md
rename to store-for-business/sign-up-windows-store-for-business-overview.md
diff --git a/windows/manage/sign-up-windows-store-for-business.md b/store-for-business/sign-up-windows-store-for-business.md
similarity index 100%
rename from windows/manage/sign-up-windows-store-for-business.md
rename to store-for-business/sign-up-windows-store-for-business.md
diff --git a/windows/manage/troubleshoot-windows-store-for-business.md b/store-for-business/troubleshoot-windows-store-for-business.md
similarity index 100%
rename from windows/manage/troubleshoot-windows-store-for-business.md
rename to store-for-business/troubleshoot-windows-store-for-business.md
diff --git a/windows/manage/update-windows-store-for-business-account-settings.md b/store-for-business/update-windows-store-for-business-account-settings.md
similarity index 100%
rename from windows/manage/update-windows-store-for-business-account-settings.md
rename to store-for-business/update-windows-store-for-business-account-settings.md
diff --git a/windows/manage/windows-store-for-business-overview.md b/store-for-business/windows-store-for-business-overview.md
similarity index 100%
rename from windows/manage/windows-store-for-business-overview.md
rename to store-for-business/windows-store-for-business-overview.md
diff --git a/windows/manage/working-with-line-of-business-apps.md b/store-for-business/working-with-line-of-business-apps.md
similarity index 100%
rename from windows/manage/working-with-line-of-business-apps.md
rename to store-for-business/working-with-line-of-business-apps.md
diff --git a/windows/TOC.md b/windows/TOC.md
deleted file mode 100644
index 7167858dab..0000000000
--- a/windows/TOC.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# [Windows 10 and Windows 10 Mobile](index.md)
-## [What's new in Windows 10](whats-new/index.md)
-## [Plan for Windows 10 deployment](plan/index.md)
-## [Deploy Windows 10](deploy/index.md)
-## [Configure Windows 10](configure/index.md)
-## [Update Windows 10](update/index.md)
-## [Keep Windows 10 secure](keep-secure/index.md)
-## [Manage Windows 10](manage/index.md)
\ No newline at end of file
diff --git a/windows/access-protection/TOC.md b/windows/access-protection/TOC.md
new file mode 100644
index 0000000000..47adc1005f
--- /dev/null
+++ b/windows/access-protection/TOC.md
@@ -0,0 +1,190 @@
+# [Access protection](access-control/access-control.md)
+
+## [Access Control Overview](access-control/access-control.md)
+### [Dynamic Access Control Overview](access-control/dynamic-access-control.md)
+### [Security identifiers](access-control/security-identifiers.md)
+### [Security Principals](access-control/security-principals.md)
+### [Local Accounts](access-control/local-accounts.md)
+### [Active Directory Accounts](access-control/active-directory-accounts.md)
+### [Microsoft Accounts](access-control/microsoft-accounts.md)
+### [Service Accounts](access-control/service-accounts.md)
+### [Active Directory Security Groups](access-control/active-directory-security-groups.md)
+### [Special Identities](access-control/special-identities.md)
+
+## [Configure S/MIME for Windows 10 and Windows 10 Mobile](configure-s-mime.md)
+
+## [Enterprise Certificate Pinning](enterprise-certificate-pinning.md)
+
+## [Install digital certificates on Windows 10 Mobile](installing-digital-certificates-on-windows-10-mobile.md)
+
+## [Protect derived domain credentials with Credential Guard](credential-guard/credential-guard.md)
+### [How Credential Guard works](credential-guard/credential-guard-how-it-works.md)
+### [Credential Guard Requirements](credential-guard/credential-guard-requirements.md)
+### [Manage Credential Guard](credential-guard/credential-guard-manage.md)
+### [Credential Guard protection limits](credential-guard/credential-guard-protection-limits.md)
+### [Considerations when using Credential Guard](credential-guard/credential-guard-considerations.md)
+### [Credential Guard: Additional mitigations](credential-guard/additional-mitigations.md)
+
+
+
+## [Protect Remote Desktop credentials with Remote Credential Guard](remote-credential-guard.md)
+
+## [Smart Cards](smart-cards/smart-card-windows-smart-card-technical-reference.md)
+### [How Smart Card Sign-in Works in Windows](smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md)
+#### [Smart Card Architecture](smart-cards/smart-card-architecture.md)
+#### [Certificate Requirements and Enumeration](smart-cards/smart-card-certificate-requirements-and-enumeration.md)
+#### [Smart Card and Remote Desktop Services](smart-cards/smart-card-and-remote-desktop-services.md)
+#### [Smart Cards for Windows Service](smart-cards/smart-card-smart-cards-for-windows-service.md)
+#### [Certificate Propagation Service](smart-cards/smart-card-certificate-propagation-service.md)
+#### [Smart Card Removal Policy Service](smart-cards/smart-card-removal-policy-service.md)
+### [Smart Card Tools and Settings](smart-cards/smart-card-tools-and-settings.md)
+#### [Smart Cards Debugging Information](smart-cards/smart-card-debugging-information.md)
+#### [Smart Card Group Policy and Registry Settings](smart-cards/smart-card-group-policy-and-registry-settings.md)
+#### [Smart Card Events](smart-cards/smart-card-events.md)
+
+### [User Account Control](user-account-control\user-account-control-overview.md)
+#### [How User Account Control works](user-account-control\how-user-account-control-works.md)
+#### [User Account Control security policy settings](user-account-control\user-account-control-security-policy-settings.md)
+#### [User Account Control Group Policy and registry key settings](user-account-control\user-account-control-group-policy-and-registry-key-settings.md)
+
+### [Virtual Smart Cards](virtual-smart-cards\virtual-smart-card-overview.md)
+### [Virtual Smart Cards](virtual-smart-cards\virtual-smart-card-overview.md)
+#### [Understanding and Evaluating Virtual Smart Cards](virtual-smart-cards\virtual-smart-card-understanding-and-evaluating.md)
+##### [Get Started with Virtual Smart Cards: Walkthrough Guide](virtual-smart-cards\virtual-smart-card-get-started.md)
+##### [Use Virtual Smart Cards](virtual-smart-cards\virtual-smart-card-use-virtual-smart-cards.md)
+##### [Deploy Virtual Smart Cards](virtual-smart-cards\virtual-smart-card-deploy-virtual-smart-cards.md)
+##### [Evaluate Virtual Smart Card Security](virtual-smart-cards\virtual-smart-card-evaluate-security.md)
+#### [Tpmvscmgr](virtual-smart-cards\virtual-smart-card-tpmvscmgr.md)
+
+
+## [VPN technical guide](vpn\vpn-guide.md)
+### [VPN connection types](vpn\vpn-connection-type.md)
+### [VPN routing decisions](vpn\vpn-routing.md)
+### [VPN authentication options](vpn\vpn-authentication.md)
+### [VPN and conditional access](vpn\vpn-conditional-access.md)
+### [VPN name resolution](vpn\vpn-name-resolution.md)
+### [VPN auto-triggered profile options](vpn\vpn-auto-trigger-profile.md)
+### [VPN security features](vpn\vpn-security-features.md)
+### [VPN profile options](vpn\vpn-profile-options.md)
+### [How to use single sign-on (SSO) over VPN and Wi-Fi connections](vpn\how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md)
+### [Windows 10 credential theft mitigation guide abstract](windows-credential-theft-mitigation-guide-abstract.md)
+
+## [Windows Firewall with Advanced Security](windows-firewall/windows-firewall-with-advanced-security.md)
+### [Isolating Windows Store Apps on Your Network](windows-firewall/isolating-apps-on-your-network.md)
+### [Securing End-to-End IPsec Connections by Using IKEv2 in Windows Server 2012](windows-firewall/securing-end-to-end-ipsec-connections-by-using-ikev2.md)
+### [Windows Firewall with Advanced Security Administration with Windows PowerShell](windows-firewall/windows-firewall-with-advanced-security-administration-with-windows-powershell.md)
+### [Windows Firewall with Advanced Security Design Guide](windows-firewall/windows-firewall-with-advanced-security-design-guide.md)
+#### [Understanding the Windows Firewall with Advanced Security Design Process](windows-firewall/understanding-the-windows-firewall-with-advanced-security-design-process.md)
+#### [Identifying Your Windows Firewall with Advanced Security Deployment Goals](windows-firewall/identifying-your-windows-firewall-with-advanced-security-deployment-goals.md)
+##### [Protect Devices from Unwanted Network Traffic](windows-firewall/protect-devices-from-unwanted-network-traffic.md)
+##### [Restrict Access to Only Trusted Devices](windows-firewall/restrict-access-to-only-trusted-devices.md)
+##### [Require Encryption When Accessing Sensitive Network Resources](windows-firewall/require-encryption-when-accessing-sensitive-network-resources.md)
+##### [Restrict Access to Only Specified Users or Computers](windows-firewall/restrict-access-to-only-specified-users-or-devices.md)
+#### [Mapping Your Deployment Goals to a Windows Firewall with Advanced Security Design](windows-firewall/mapping-your-deployment-goals-to-a-windows-firewall-with-advanced-security-design.md)
+##### [Basic Firewall Policy Design](windows-firewall/basic-firewall-policy-design.md)
+##### [Domain Isolation Policy Design](windows-firewall/domain-isolation-policy-design.md)
+##### [Server Isolation Policy Design](windows-firewall/server-isolation-policy-design.md)
+##### [Certificate-based Isolation Policy Design](windows-firewall/certificate-based-isolation-policy-design.md)
+#### [Evaluating Windows Firewall with Advanced Security Design Examples](windows-firewall/evaluating-windows-firewall-with-advanced-security-design-examples.md)
+##### [Firewall Policy Design Example](windows-firewall/firewall-policy-design-example.md)
+##### [Domain Isolation Policy Design Example](windows-firewall/domain-isolation-policy-design-example.md)
+##### [Server Isolation Policy Design Example](windows-firewall/server-isolation-policy-design-example.md)
+##### [Certificate-based Isolation Policy Design Example](windows-firewall/certificate-based-isolation-policy-design-example.md)
+#### [Designing a Windows Firewall with Advanced Security Strategy](windows-firewall/designing-a-windows-firewall-with-advanced-security-strategy.md)
+##### [Gathering the Information You Need](windows-firewall/gathering-the-information-you-need.md)
+###### [Gathering Information about Your Current Network Infrastructure](windows-firewall/gathering-information-about-your-current-network-infrastructure.md)
+###### [Gathering Information about Your Active Directory Deployment](windows-firewall/gathering-information-about-your-active-directory-deployment.md)
+###### [Gathering Information about Your Computers](windows-firewall/gathering-information-about-your-devices.md)
+###### [Gathering Other Relevant Information](windows-firewall/gathering-other-relevant-information.md)
+##### [Determining the Trusted State of Your Computers](windows-firewall/determining-the-trusted-state-of-your-devices.md)
+#### [Planning Your Windows Firewall with Advanced Security Design](windows-firewall/planning-your-windows-firewall-with-advanced-security-design.md)
+##### [Planning Settings for a Basic Firewall Policy](windows-firewall/planning-settings-for-a-basic-firewall-policy.md)
+##### [Planning Domain Isolation Zones](windows-firewall/planning-domain-isolation-zones.md)
+###### [Exemption List](windows-firewall/exemption-list.md)
+###### [Isolated Domain](windows-firewall/isolated-domain.md)
+###### [Boundary Zone](windows-firewall/boundary-zone.md)
+###### [Encryption Zone](windows-firewall/encryption-zone.md)
+##### [Planning Server Isolation Zones](windows-firewall/planning-server-isolation-zones.md)
+##### [Planning Certificate-based Authentication](windows-firewall/planning-certificate-based-authentication.md)
+###### [Documenting the Zones](windows-firewall/documenting-the-zones.md)
+###### [Planning Group Policy Deployment for Your Isolation Zones](windows-firewall/planning-group-policy-deployment-for-your-isolation-zones.md)
+####### [Planning Isolation Groups for the Zones](windows-firewall/planning-isolation-groups-for-the-zones.md)
+####### [Planning Network Access Groups](windows-firewall/planning-network-access-groups.md)
+####### [Planning the GPOs](windows-firewall/planning-the-gpos.md)
+######## [Firewall GPOs](windows-firewall/firewall-gpos.md)
+######### [GPO_DOMISO_Firewall](windows-firewall/gpo-domiso-firewall.md)
+######## [Isolated Domain GPOs](windows-firewall/isolated-domain-gpos.md)
+######### [GPO_DOMISO_IsolatedDomain_Clients](windows-firewall/gpo-domiso-isolateddomain-clients.md)
+######### [GPO_DOMISO_IsolatedDomain_Servers](windows-firewall/gpo-domiso-isolateddomain-servers.md)
+######## [Boundary Zone GPOs](windows-firewall/boundary-zone-gpos.md)
+######### [GPO_DOMISO_Boundary](windows-firewall/gpo-domiso-boundary.md)
+######## [Encryption Zone GPOs](windows-firewall/encryption-zone-gpos.md)
+######### [GPO_DOMISO_Encryption](windows-firewall/gpo-domiso-encryption.md)
+######## [Server Isolation GPOs](windows-firewall/server-isolation-gpos.md)
+####### [Planning GPO Deployment](windows-firewall/planning-gpo-deployment.md)
+#### [Appendix A: Sample GPO Template Files for Settings Used in this Guide](windows-firewall/appendix-a-sample-gpo-template-files-for-settings-used-in-this-guide.md)
+### [Windows Firewall with Advanced Security Deployment Guide](windows-firewall/windows-firewall-with-advanced-security-deployment-guide.md)
+#### [Planning to Deploy Windows Firewall with Advanced Security](windows-firewall/planning-to-deploy-windows-firewall-with-advanced-security.md)
+#### [Implementing Your Windows Firewall with Advanced Security Design Plan](windows-firewall/implementing-your-windows-firewall-with-advanced-security-design-plan.md)
+#### [Checklist: Creating Group Policy Objects](windows-firewall/checklist-creating-group-policy-objects.md)
+#### [Checklist: Implementing a Basic Firewall Policy Design](windows-firewall/checklist-implementing-a-basic-firewall-policy-design.md)
+#### [Checklist: Configuring Basic Firewall Settings](windows-firewall/checklist-configuring-basic-firewall-settings.md)
+#### [Checklist: Creating Inbound Firewall Rules](windows-firewall/checklist-creating-inbound-firewall-rules.md)
+#### [Checklist: Creating Outbound Firewall Rules](windows-firewall/checklist-creating-outbound-firewall-rules.md)
+#### [Checklist: Implementing a Domain Isolation Policy Design](windows-firewall/checklist-implementing-a-domain-isolation-policy-design.md)
+##### [Checklist: Configuring Rules for the Isolated Domain](windows-firewall/checklist-configuring-rules-for-the-isolated-domain.md)
+##### [Checklist: Configuring Rules for the Boundary Zone](windows-firewall/checklist-configuring-rules-for-the-boundary-zone.md)
+##### [Checklist: Configuring Rules for the Encryption Zone](windows-firewall/checklist-configuring-rules-for-the-encryption-zone.md)
+##### [Checklist: Configuring Rules for an Isolated Server Zone](windows-firewall/checklist-configuring-rules-for-an-isolated-server-zone.md)
+#### [Checklist: Implementing a Standalone Server Isolation Policy Design](windows-firewall/checklist-implementing-a-standalone-server-isolation-policy-design.md)
+##### [Checklist: Configuring Rules for Servers in a Standalone Isolated Server Zone](windows-firewall/checklist-configuring-rules-for-servers-in-a-standalone-isolated-server-zone.md)
+##### [Checklist: Creating Rules for Clients of a Standalone Isolated Server Zone](windows-firewall/checklist-creating-rules-for-clients-of-a-standalone-isolated-server-zone.md)
+#### [Checklist: Implementing a Certificate-based Isolation Policy Design](windows-firewall/checklist-implementing-a-certificate-based-isolation-policy-design.md)
+#### [Procedures Used in This Guide](windows-firewall/procedures-used-in-this-guide.md)
+##### [Add Production Devices to the Membership Group for a Zone](windows-firewall/add-production-devices-to-the-membership-group-for-a-zone.md)
+##### [Add Test Devices to the Membership Group for a Zone](windows-firewall/add-test-devices-to-the-membership-group-for-a-zone.md)
+##### [Assign Security Group Filters to the GPO](windows-firewall/assign-security-group-filters-to-the-gpo.md)
+##### [Change Rules from Request to Require Mode](windows-firewall/change-rules-from-request-to-require-mode.md)
+##### [Configure Authentication Methods](windows-firewall/configure-authentication-methods.md)
+##### [Configure Data Protection (Quick Mode) Settings](windows-firewall/configure-data-protection-quick-mode-settings.md)
+##### [Configure Group Policy to Autoenroll and Deploy Certificates](windows-firewall/configure-group-policy-to-autoenroll-and-deploy-certificates.md)
+##### [Configure Key Exchange (Main Mode) Settings](windows-firewall/configure-key-exchange-main-mode-settings.md)
+##### [Configure the Rules to Require Encryption](windows-firewall/configure-the-rules-to-require-encryption.md)
+##### [Configure the Windows Firewall Log](windows-firewall/configure-the-windows-firewall-log.md)
+##### [Configure the Workstation Authentication Certificate Template](windows-firewall/configure-the-workstation-authentication-certificate-template.md)
+##### [Configure Windows Firewall to Suppress Notifications When a Program Is Blocked](windows-firewall/configure-windows-firewall-to-suppress-notifications-when-a-program-is-blocked.md)
+##### [Confirm That Certificates Are Deployed Correctly](windows-firewall/confirm-that-certificates-are-deployed-correctly.md)
+##### [Copy a GPO to Create a New GPO](windows-firewall/copy-a-gpo-to-create-a-new-gpo.md)
+##### [Create a Group Account in Active Directory](windows-firewall/create-a-group-account-in-active-directory.md)
+##### [Create a Group Policy Object](windows-firewall/create-a-group-policy-object.md)
+##### [Create an Authentication Exemption List Rule](windows-firewall/create-an-authentication-exemption-list-rule.md)
+##### [Create an Authentication Request Rule](windows-firewall/create-an-authentication-request-rule.md)
+##### [Create an Inbound ICMP Rule](windows-firewall/create-an-inbound-icmp-rule.md)
+##### [Create an Inbound Port Rule](windows-firewall/create-an-inbound-port-rule.md)
+##### [Create an Inbound Program or Service Rule](windows-firewall/create-an-inbound-program-or-service-rule.md)
+##### [Create an Outbound Port Rule](windows-firewall/create-an-outbound-port-rule.md)
+##### [Create an Outbound Program or Service Rule](windows-firewall/create-an-outbound-program-or-service-rule.md)
+##### [Create Inbound Rules to Support RPC](windows-firewall/create-inbound-rules-to-support-rpc.md)
+##### [Create WMI Filters for the GPO](windows-firewall/create-wmi-filters-for-the-gpo.md)
+##### [Enable Predefined Inbound Rules](windows-firewall/enable-predefined-inbound-rules.md)
+##### [Enable Predefined Outbound Rules](windows-firewall/enable-predefined-outbound-rules.md)
+##### [Exempt ICMP from Authentication](windows-firewall/exempt-icmp-from-authentication.md)
+##### [Link the GPO to the Domain](windows-firewall/link-the-gpo-to-the-domain.md)
+##### [Modify GPO Filters to Apply to a Different Zone or Version of Windows](windows-firewall/modify-gpo-filters-to-apply-to-a-different-zone-or-version-of-windows.md)
+##### [Open the Group Policy Management Console to IP Security Policies](windows-firewall/open-the-group-policy-management-console-to-ip-security-policies.md)
+##### [Open the Group Policy Management Console to Windows Firewall](windows-firewall/open-the-group-policy-management-console-to-windows-firewall.md)
+##### [Open the Group Policy Management Console to Windows Firewall with Advanced Security](windows-firewall/open-the-group-policy-management-console-to-windows-firewall-with-advanced-security.md)
+##### [Open Windows Firewall with Advanced Security](windows-firewall/open-windows-firewall-with-advanced-security.md)
+##### [Restrict Server Access to Members of a Group Only](windows-firewall/restrict-server-access-to-members-of-a-group-only.md)
+##### [Turn on Windows Firewall and Configure Default Behavior](windows-firewall/turn-on-windows-firewall-and-configure-default-behavior.md)
+##### [Verify That Network Traffic Is Authenticated](windows-firewall/verify-that-network-traffic-is-authenticated.md)
+
+## [Windows Hello for Business](hello-for-business/hello-identity-verification.md)
+### [How Windows Hello for Business works](hello-for-business/hello-how-it-works.md)
+### [Manage Windows Hello for Business in your organization](hello-for-business/hello-manage-in-organization.md)
+### [Why a PIN is better than a password](hello-for-business/hello-why-pin-is-better-than-password.md)
+### [Prepare people to use Windows Hello](hello-for-business/hello-prepare-people-to-use.md)
+### [Windows Hello and password changes](hello-for-business/hello-and-password-changes.md)
+### [Windows Hello errors during PIN creation](hello-for-business/hello-errors-during-pin-creation.md)
+### [Event ID 300 - Windows Hello successfully created](hello-for-business/hello-event-300.md)
+### [Windows Hello biometrics in the enterprise](hello-for-business/hello-biometrics-in-enterprise.md)
diff --git a/windows/keep-secure/access-control.md b/windows/access-protection/access-control/access-control.md
similarity index 98%
rename from windows/keep-secure/access-control.md
rename to windows/access-protection/access-control/access-control.md
index 969bd01684..006ffb29ab 100644
--- a/windows/keep-secure/access-control.md
+++ b/windows/access-protection/access-control/access-control.md
@@ -114,14 +114,14 @@ User rights grant specific privileges and sign-in rights to users and groups in
User rights are different from permissions because user rights apply to user accounts, and permissions are associated with objects. Although user rights can apply to individual user accounts, user rights are best administered on a group account basis. There is no support in the access control user interface to grant user rights. However, user rights assignment can be administered through **Local Security Settings**.
-For more information about user rights, see [User Rights Assignment](user-rights-assignment.md).
+For more information about user rights, see [User Rights Assignment](/windows/device-security/security-policy-settings/access-user-rights-assignment).
## Object auditing
With administrator's rights, you can audit users' successful or failed access to objects. You can select which object access to audit by using the access control user interface, but first you must enable the audit policy by selecting **Audit object access** under **Local Policies** in **Local Security Settings**. You can then view these security-related events in the Security log in Event Viewer.
-For more information about auditing, see [Security Auditing Overview](security-auditing-overview.md).
+For more information about auditing, see [Security Auditing Overview](/windows/device-security/auditing/security-auditing-overview).
## See also
diff --git a/windows/keep-secure/active-directory-accounts.md b/windows/access-protection/access-control/active-directory-accounts.md
similarity index 99%
rename from windows/keep-secure/active-directory-accounts.md
rename to windows/access-protection/access-control/active-directory-accounts.md
index 3b4ee0e979..1791e02a32 100644
--- a/windows/keep-secure/active-directory-accounts.md
+++ b/windows/access-protection/access-control/active-directory-accounts.md
@@ -176,7 +176,7 @@ Because the Guest account can provide anonymous access, it is a security risk. I
When the Guest account is required, an Administrator on the domain controller is required to enable the Guest account. The Guest account can be enabled without requiring a password, or it can be enabled with a strong password. The Administrator also grants restricted rights and permissions for the Guest account. To help prevent unauthorized access:
-- Do not grant the Guest account the [Shut down the system](shut-down-the-system.md) user right. When a computer is shutting down or starting up, it is possible that a Guest user or anyone with local access, such as a malicious user, could gain unauthorized access to the computer.
+- Do not grant the Guest account the [Shut down the system](/windows/device-security/security-policy-settings/shut-down-the-system) user right. When a computer is shutting down or starting up, it is possible that a Guest user or anyone with local access, such as a malicious user, could gain unauthorized access to the computer.
- Do not provide the Guest account with the ability to view the event logs. After the Guest account is enabled, it is a best practice to monitor this account frequently to ensure that other users cannot use services and other resources, such as resources that were unintentionally left available by a previous user.
@@ -571,7 +571,7 @@ If the administrators in your environment can sign in locally to managed servers
- **Better**. Do not grant administrators membership in the local Administrator group on the computer in order to restrict the administrator from bypassing these protections.
-- **Ideal**. Restrict workstations from having any network connectivity, except for the domain controllers and servers that the administrator accounts are used to manage. Alternately, use AppLocker application control policies to restrict all applications from running, except for the operating system and approved administrative tools and applications. For more information about AppLocker, see [AppLocker](applocker-overview.md).
+- **Ideal**. Restrict workstations from having any network connectivity, except for the domain controllers and servers that the administrator accounts are used to manage. Alternately, use AppLocker application control policies to restrict all applications from running, except for the operating system and approved administrative tools and applications. For more information about AppLocker, see [AppLocker](/windows/device-security/applocker/applocker-overview).
The following procedure describes how to block Internet access by creating a Group Policy Object (GPO) that configures an invalid proxy address on administrative workstations. These instructions apply only to computers running Internet Explorer and other Windows components that use these proxy settings.
diff --git a/windows/keep-secure/active-directory-security-groups.md b/windows/access-protection/access-control/active-directory-security-groups.md
similarity index 94%
rename from windows/keep-secure/active-directory-security-groups.md
rename to windows/access-protection/access-control/active-directory-security-groups.md
index 552c86b75a..772a0ebb67 100644
--- a/windows/keep-secure/active-directory-security-groups.md
+++ b/windows/access-protection/access-control/active-directory-security-groups.md
@@ -50,7 +50,7 @@ Security groups can provide an efficient way to assign access to resources on yo
For example, a user who is added to the Backup Operators group in Active Directory has the ability to back up and restore files and directories that are located on each domain controller in the domain. This is possible because, by default, the user rights **Backup files and directories** and **Restore files and directories** are automatically assigned to the Backup Operators group. Therefore, members of this group inherit the user rights that are assigned to that group.
- You can use Group Policy to assign user rights to security groups to delegate specific tasks. For more information about using Group Policy, see [User Rights Assignment](user-rights-assignment.md).
+ You can use Group Policy to assign user rights to security groups to delegate specific tasks. For more information about using Group Policy, see [User Rights Assignment](/windows/device-security/security-policy-settings/user-rights-assignment).
- Assign permissions to security groups for resources.
@@ -650,7 +650,7 @@ This security group has not changed since Windows Server 2008.
Default User Rights
-
[Allow log on locally](allow-log-on-locally.md): SeInteractiveLogonRight
+
[Allow log on locally](/windows/device-security/security-policy-settings/allow-log-on-locally): SeInteractiveLogonRight
@@ -672,9 +672,9 @@ Membership can be modified by members of the following groups: the default servi
This security group includes the following changes since Windows Server 2008:
-- Default user rights changes: **Allow log on through Terminal Services** existed in Windows Server 2008, and it was replaced by [Allow log on through Remote Desktop Services](allow-log-on-through-remote-desktop-services.md).
+- Default user rights changes: **Allow log on through Terminal Services** existed in Windows Server 2008, and it was replaced by [Allow log on through Remote Desktop Services](/windows/device-security/security-policy-settings/allow-log-on-through-remote-desktop-services).
-- [Remove computer from docking station](remove-computer-from-docking-station.md) was removed in Windows Server 2012 R2.
+- [Remove computer from docking station](/windows/device-security/security-policy-settings/remove-computer-from-docking-station) was removed in Windows Server 2012 R2.
@@ -722,33 +722,33 @@ This security group includes the following changes since Windows Server 2008:
Default User Rights
-
[Adjust memory quotas for a process](adjust-memory-quotas-for-a-process.md): SeIncreaseQuotaPrivilege
-
[Access this computer from the network](access-this-computer-from-the-network.md): SeNetworkLogonRight
-
[Allow log on locally](allow-log-on-locally.md): SeInteractiveLogonRight
-
[Allow log on through Remote Desktop Services](allow-log-on-through-remote-desktop-services.md): SeRemoteInteractiveLogonRight
-
[Back up files and directories](back-up-files-and-directories.md): SeBackupPrivilege
[Enable computer and user accounts to be trusted for delegation](enable-computer-and-user-accounts-to-be-trusted-for-delegation.md): SeEnableDelegationPrivilege
-
[Force shutdown from a remote system](force-shutdown-from-a-remote-system.md): SeRemoteShutdownPrivilege
-
[Impersonate a client after authentication](impersonate-a-client-after-authentication.md): SeImpersonatePrivilege
[Profile system performance](profile-system-performance.md): SeSystemProfilePrivilege
-
[Profile single process](profile-single-process.md): SeProfileSingleProcessPrivilege
-
[Remove computer from docking station](remove-computer-from-docking-station.md): SeUndockPrivilege
-
[Restore files and directories](restore-files-and-directories.md): SeRestorePrivilege
-
[Shut down the system](shut-down-the-system.md): SeShutdownPrivilege
-
[Take ownership of files or other objects](take-ownership-of-files-or-other-objects.md): SeTakeOwnershipPrivilege
+
[Adjust memory quotas for a process](/windows/device-security/security-policy-settings/adjust-memory-quotas-for-a-process): SeIncreaseQuotaPrivilege
+
[Access this computer from the network](/windows/device-security/security-policy-settings/access-this-computer-from-the-network): SeNetworkLogonRight
+
[Allow log on locally](/windows/device-security/security-policy-settings/allow-log-on-locally): SeInteractiveLogonRight
+
[Allow log on through Remote Desktop Services](/windows/device-security/security-policy-settings/allow-log-on-through-remote-desktop-services): SeRemoteInteractiveLogonRight
+
[Back up files and directories](/windows/device-security/security-policy-settings/back-up-files-and-directories): SeBackupPrivilege
[Enable computer and user accounts to be trusted for delegation](/windows/device-security/security-policy-settings/enable-computer-and-user-accounts-to-be-trusted-for-delegation): SeEnableDelegationPrivilege
+
[Force shutdown from a remote system](/windows/device-security/security-policy-settings/force-shutdown-from-a-remote-system): SeRemoteShutdownPrivilege
+
[Impersonate a client after authentication](/windows/device-security/security-policy-settings/impersonate-a-client-after-authentication): SeImpersonatePrivilege
[Profile system performance](/windows/device-security/security-policy-settings/profile-system-performance): SeSystemProfilePrivilege
+
[Profile single process](/windows/device-security/security-policy-settings/profile-single-process): SeProfileSingleProcessPrivilege
+
[Remove computer from docking station](/windows/device-security/security-policy-settings/remove-computer-from-docking-station): SeUndockPrivilege
+
[Restore files and directories](/windows/device-security/security-policy-settings/restore-files-and-directories): SeRestorePrivilege
+
[Shut down the system](/windows/device-security/security-policy-settings/shut-down-the-system): SeShutdownPrivilege
+
[Take ownership of files or other objects](/windows/device-security/security-policy-settings/take-ownership-of-files-or-other-objects): SeTakeOwnershipPrivilege
@@ -870,11 +870,11 @@ This security group has not changed since Windows Server 2008.
Default User Rights
-
[Allow log on locally](allow-log-on-locally.md): SeInteractiveLogonRight
-
[Back up files and directories](back-up-files-and-directories.md): SeBackupPrivilege
-
[Log on as a batch job](log-on-as-a-batch-job.md): SeBatchLogonRight
-
[Restore files and directories](restore-files-and-directories.md): SeRestorePrivilege
-
[Shut down the system](shut-down-the-system.md): SeShutdownPrivilege
+
[Allow log on locally](/windows/device-security/security-policy-settings/allow-log-on-locally): SeInteractiveLogonRight
+
[Back up files and directories](/windows/device-security/security-policy-settings/back-up-files-and-directories): SeBackupPrivilege
+
[Log on as a batch job](/windows/device-security/security-policy-settings/log-on-as-a-batch-job): SeBatchLogonRight
+
[Restore files and directories](/windows/device-security/security-policy-settings/restore-files-and-directories): SeRestorePrivilege
+
[Shut down the system](/windows/device-security/security-policy-settings/shut-down-the-system): SeShutdownPrivilege
@@ -2330,7 +2330,7 @@ Members of the Performance Log Users group can manage performance counters, logs
- Can use all the features that are available to the Performance Monitor Users group.
-- Can create and modify Data Collector Sets after the group is assigned the [Log on as a batch job](log-on-as-a-batch-job.md) user right.
+- Can create and modify Data Collector Sets after the group is assigned the [Log on as a batch job](/windows/device-security/security-policy-settings/log-on-as-a-batch-job) user right.
**Warning**
If you are a member of the Performance Log Users group, you must configure Data Collector Sets that you create to run under your credentials.
@@ -2339,7 +2339,7 @@ Members of the Performance Log Users group can manage performance counters, logs
- Cannot use the Windows Kernel Trace event provider in Data Collector Sets.
-For members of the Performance Log Users group to initiate data logging or modify Data Collector Sets, the group must first be assigned the [Log on as a batch job](log-on-as-a-batch-job.md) user right. To assign this user right, use the Local Security Policy snap-in in Microsoft Management Console.
+For members of the Performance Log Users group to initiate data logging or modify Data Collector Sets, the group must first be assigned the [Log on as a batch job](/windows/device-security/security-policy-settings/log-on-as-a-batch-job) user right. To assign this user right, use the Local Security Policy snap-in in Microsoft Management Console.
**Note**
This group appears as a SID until the domain controller is made the primary domain controller and it holds the operations master role (also known as flexible single master operations or FSMO).
@@ -2401,7 +2401,7 @@ This security group has not changed since Windows Server 2008.
Default User Rights
-
[Log on as a batch job](log-on-as-a-batch-job.md): SeBatchLogonRight
+
[Log on as a batch job](/windows/device-security/security-policy-settings/log-on-as-a-batch-job): SeBatchLogonRight
@@ -2548,8 +2548,8 @@ This security group has not changed since Windows Server 2008.
Default User Rights
-
[Access this computer from the network](access-this-computer-from-the-network.md): SeNetworkLogonRight
@@ -2612,9 +2612,9 @@ This security group has not changed since Windows Server 2008. However, in Windo
Default User Rights
-
[Allow log on locally](allow-log-on-locally.md): SeInteractiveLogonRight
-
[Load and unload device drivers](load-and-unload-device-drivers.md): SeLoadDriverPrivilege
-
[Shut down the system](shut-down-the-system.md): SeShutdownPrivilege
+
[Allow log on locally](/windows/device-security/security-policy-settings/allow-log-on-locally): SeInteractiveLogonRight
+
[Load and unload device drivers](/windows/device-security/security-policy-settings/load-and-unload-device-drivers): SeLoadDriverPrivilege
+
[Shut down the system](/windows/device-security/security-policy-settings/shut-down-the-system): SeShutdownPrivilege
@@ -3327,13 +3327,13 @@ This security group has not changed since Windows Server 2008.
Default User Rights
-
[Allow log on locally](allow-log-on-locally.md): SeInteractiveLogonRight
-
[Back up files and directories](back-up-files-and-directories.md): SeBackupPrivilege
-
[Change the system time](change-the-system-time.md): SeSystemTimePrivilege
-
[Change the time zone](change-the-time-zone.md): SeTimeZonePrivilege
-
[Force shutdown from a remote system](force-shutdown-from-a-remote-system.md): SeRemoteShutdownPrivilege
-
[Restore files and directories](restore-files-and-directories.md): Restore files and directories SeRestorePrivilege
-
[Shut down the system](shut-down-the-system.md): SeShutdownPrivilege
+
[Allow log on locally](/windows/device-security/security-policy-settings/allow-log-on-locally): SeInteractiveLogonRight
+
[Back up files and directories](/windows/device-security/security-policy-settings/back-up-files-and-directories): SeBackupPrivilege
+
[Change the system time](/windows/device-security/security-policy-settings/change-the-system-time): SeSystemTimePrivilege
+
[Change the time zone](/windows/device-security/security-policy-settings/change-the-time-zone): SeTimeZonePrivilege
+
[Force shutdown from a remote system](/windows/device-security/security-policy-settings/force-shutdown-from-a-remote-system): SeRemoteShutdownPrivilege
+
[Restore files and directories](/windows/device-security/security-policy-settings/restore-files-and-directories): Restore files and directories SeRestorePrivilege
+
[Shut down the system](/windows/device-security/security-policy-settings/shut-down-the-system): SeShutdownPrivilege
diff --git a/windows/keep-secure/dynamic-access-control.md b/windows/access-protection/access-control/dynamic-access-control.md
similarity index 100%
rename from windows/keep-secure/dynamic-access-control.md
rename to windows/access-protection/access-control/dynamic-access-control.md
diff --git a/windows/keep-secure/images/adlocalaccounts-proc1-sample1.gif b/windows/access-protection/access-control/images/adlocalaccounts-proc1-sample1.gif
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc1-sample1.gif
rename to windows/access-protection/access-control/images/adlocalaccounts-proc1-sample1.gif
diff --git a/windows/keep-secure/images/adlocalaccounts-proc1-sample2.png b/windows/access-protection/access-control/images/adlocalaccounts-proc1-sample2.png
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc1-sample2.png
rename to windows/access-protection/access-control/images/adlocalaccounts-proc1-sample2.png
diff --git a/windows/keep-secure/images/adlocalaccounts-proc1-sample3.png b/windows/access-protection/access-control/images/adlocalaccounts-proc1-sample3.png
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc1-sample3.png
rename to windows/access-protection/access-control/images/adlocalaccounts-proc1-sample3.png
diff --git a/windows/keep-secure/images/adlocalaccounts-proc1-sample4.png b/windows/access-protection/access-control/images/adlocalaccounts-proc1-sample4.png
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc1-sample4.png
rename to windows/access-protection/access-control/images/adlocalaccounts-proc1-sample4.png
diff --git a/windows/keep-secure/images/adlocalaccounts-proc1-sample5.png b/windows/access-protection/access-control/images/adlocalaccounts-proc1-sample5.png
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc1-sample5.png
rename to windows/access-protection/access-control/images/adlocalaccounts-proc1-sample5.png
diff --git a/windows/keep-secure/images/adlocalaccounts-proc1-sample6.png b/windows/access-protection/access-control/images/adlocalaccounts-proc1-sample6.png
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc1-sample6.png
rename to windows/access-protection/access-control/images/adlocalaccounts-proc1-sample6.png
diff --git a/windows/keep-secure/images/adlocalaccounts-proc1-sample7.png b/windows/access-protection/access-control/images/adlocalaccounts-proc1-sample7.png
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc1-sample7.png
rename to windows/access-protection/access-control/images/adlocalaccounts-proc1-sample7.png
diff --git a/windows/keep-secure/images/adlocalaccounts-proc2-sample1.png b/windows/access-protection/access-control/images/adlocalaccounts-proc2-sample1.png
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc2-sample1.png
rename to windows/access-protection/access-control/images/adlocalaccounts-proc2-sample1.png
diff --git a/windows/keep-secure/images/adlocalaccounts-proc2-sample2.png b/windows/access-protection/access-control/images/adlocalaccounts-proc2-sample2.png
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc2-sample2.png
rename to windows/access-protection/access-control/images/adlocalaccounts-proc2-sample2.png
diff --git a/windows/keep-secure/images/adlocalaccounts-proc2-sample3.png b/windows/access-protection/access-control/images/adlocalaccounts-proc2-sample3.png
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc2-sample3.png
rename to windows/access-protection/access-control/images/adlocalaccounts-proc2-sample3.png
diff --git a/windows/keep-secure/images/adlocalaccounts-proc2-sample4.png b/windows/access-protection/access-control/images/adlocalaccounts-proc2-sample4.png
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc2-sample4.png
rename to windows/access-protection/access-control/images/adlocalaccounts-proc2-sample4.png
diff --git a/windows/keep-secure/images/adlocalaccounts-proc2-sample5.png b/windows/access-protection/access-control/images/adlocalaccounts-proc2-sample5.png
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc2-sample5.png
rename to windows/access-protection/access-control/images/adlocalaccounts-proc2-sample5.png
diff --git a/windows/keep-secure/images/adlocalaccounts-proc2-sample6.png b/windows/access-protection/access-control/images/adlocalaccounts-proc2-sample6.png
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc2-sample6.png
rename to windows/access-protection/access-control/images/adlocalaccounts-proc2-sample6.png
diff --git a/windows/keep-secure/images/adlocalaccounts-proc2-sample7.png b/windows/access-protection/access-control/images/adlocalaccounts-proc2-sample7.png
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc2-sample7.png
rename to windows/access-protection/access-control/images/adlocalaccounts-proc2-sample7.png
diff --git a/windows/keep-secure/images/adlocalaccounts-proc3-sample1.png b/windows/access-protection/access-control/images/adlocalaccounts-proc3-sample1.png
similarity index 100%
rename from windows/keep-secure/images/adlocalaccounts-proc3-sample1.png
rename to windows/access-protection/access-control/images/adlocalaccounts-proc3-sample1.png
diff --git a/windows/keep-secure/images/authorizationandaccesscontrolprocess.gif b/windows/access-protection/access-control/images/authorizationandaccesscontrolprocess.gif
similarity index 100%
rename from windows/keep-secure/images/authorizationandaccesscontrolprocess.gif
rename to windows/access-protection/access-control/images/authorizationandaccesscontrolprocess.gif
diff --git a/windows/keep-secure/images/corpnet.gif b/windows/access-protection/access-control/images/corpnet.gif
similarity index 100%
rename from windows/keep-secure/images/corpnet.gif
rename to windows/access-protection/access-control/images/corpnet.gif
diff --git a/windows/keep-secure/images/localaccounts-proc1-sample1.png b/windows/access-protection/access-control/images/localaccounts-proc1-sample1.png
similarity index 100%
rename from windows/keep-secure/images/localaccounts-proc1-sample1.png
rename to windows/access-protection/access-control/images/localaccounts-proc1-sample1.png
diff --git a/windows/keep-secure/images/localaccounts-proc1-sample2.png b/windows/access-protection/access-control/images/localaccounts-proc1-sample2.png
similarity index 100%
rename from windows/keep-secure/images/localaccounts-proc1-sample2.png
rename to windows/access-protection/access-control/images/localaccounts-proc1-sample2.png
diff --git a/windows/keep-secure/images/localaccounts-proc1-sample3.png b/windows/access-protection/access-control/images/localaccounts-proc1-sample3.png
similarity index 100%
rename from windows/keep-secure/images/localaccounts-proc1-sample3.png
rename to windows/access-protection/access-control/images/localaccounts-proc1-sample3.png
diff --git a/windows/keep-secure/images/localaccounts-proc1-sample4.png b/windows/access-protection/access-control/images/localaccounts-proc1-sample4.png
similarity index 100%
rename from windows/keep-secure/images/localaccounts-proc1-sample4.png
rename to windows/access-protection/access-control/images/localaccounts-proc1-sample4.png
diff --git a/windows/keep-secure/images/localaccounts-proc1-sample5.png b/windows/access-protection/access-control/images/localaccounts-proc1-sample5.png
similarity index 100%
rename from windows/keep-secure/images/localaccounts-proc1-sample5.png
rename to windows/access-protection/access-control/images/localaccounts-proc1-sample5.png
diff --git a/windows/keep-secure/images/localaccounts-proc1-sample6.png b/windows/access-protection/access-control/images/localaccounts-proc1-sample6.png
similarity index 100%
rename from windows/keep-secure/images/localaccounts-proc1-sample6.png
rename to windows/access-protection/access-control/images/localaccounts-proc1-sample6.png
diff --git a/windows/keep-secure/images/localaccounts-proc2-sample1.png b/windows/access-protection/access-control/images/localaccounts-proc2-sample1.png
similarity index 100%
rename from windows/keep-secure/images/localaccounts-proc2-sample1.png
rename to windows/access-protection/access-control/images/localaccounts-proc2-sample1.png
diff --git a/windows/keep-secure/images/localaccounts-proc2-sample2.png b/windows/access-protection/access-control/images/localaccounts-proc2-sample2.png
similarity index 100%
rename from windows/keep-secure/images/localaccounts-proc2-sample2.png
rename to windows/access-protection/access-control/images/localaccounts-proc2-sample2.png
diff --git a/windows/keep-secure/images/localaccounts-proc2-sample3.png b/windows/access-protection/access-control/images/localaccounts-proc2-sample3.png
similarity index 100%
rename from windows/keep-secure/images/localaccounts-proc2-sample3.png
rename to windows/access-protection/access-control/images/localaccounts-proc2-sample3.png
diff --git a/windows/keep-secure/images/security-identifider-architecture.jpg b/windows/access-protection/access-control/images/security-identifider-architecture.jpg
similarity index 100%
rename from windows/keep-secure/images/security-identifider-architecture.jpg
rename to windows/access-protection/access-control/images/security-identifider-architecture.jpg
diff --git a/windows/keep-secure/local-accounts.md b/windows/access-protection/access-control/local-accounts.md
similarity index 97%
rename from windows/keep-secure/local-accounts.md
rename to windows/access-protection/access-control/local-accounts.md
index 3e50de5cc8..d0998ff99e 100644
--- a/windows/keep-secure/local-accounts.md
+++ b/windows/access-protection/access-control/local-accounts.md
@@ -123,7 +123,7 @@ By default, the Guest account is the only member of the default Guests group, wh
When an administrator enables the Guest account, it is a best practice to create a strong password for this account. In addition, the administrator on the computer should also grant only limited rights and permissions for the Guest account. For security reasons, the Guest account should not be used over the network and made accessible to other computers.
-When a computer is shutting down or starting up, it is possible that a guest user or anyone with local access could gain unauthorized access to the computer. To help prevent this risk, do not grant the Guest account the [Shut down the system](shut-down-the-system.md) user right.
+When a computer is shutting down or starting up, it is possible that a guest user or anyone with local access could gain unauthorized access to the computer. To help prevent this risk, do not grant the Guest account the [Shut down the system](/windows/device-security/security-policy-settings/shut-down-the-system) user right.
In addition, the guest user in the Guest account should not be able to view the event logs. After the Guest account is enabled, it is a best practice to monitor the Guest account frequently to ensure that other users cannot use services and other resources, such as resources that were unintentionally left available by a previous user.
@@ -200,7 +200,7 @@ In addition, UAC can require administrators to specifically approve applications
For example, a default feature of UAC is shown when a local account signs in from a remote computer by using Network logon (for example, by using NET.EXE USE). In this instance, it is issued a standard user token with no administrative rights, but with the ability to request or receive elevation. Consequently, local accounts that sign in by using Network logon cannot access administrative shares such as C$, or ADMIN$, or perform any remote administration.
-For more information about UAC, see [User Account Control](user-account-control-overview.md).
+For more information about UAC, see [User Account Control](/windows/access-protection/user-account-control/user-account-control-overview).
The following table shows the Group Policy and registry settings that are used to enforce local account restrictions for remote access.
@@ -224,7 +224,7 @@ The following table shows the Group Policy and registry settings that are used t
1
Policy name
-
[User Account Control: Run all administrators in Admin Approval Mode](user-account-control-run-all-administrators-in-admin-approval-mode.md)
+
[User Account Control: Run all administrators in Admin Approval Mode](/windows/device-security/security-policy-settings/user-account-control-run-all-administrators-in-admin-approval-mode)
@@ -239,7 +239,7 @@ The following table shows the Group Policy and registry settings that are used t
Policy name
-
[User Account Control: Run all administrators in Admin Approval Mode](user-account-control-run-all-administrators-in-admin-approval-mode.md)
+
[User Account Control: Run all administrators in Admin Approval Mode](/windows/device-security/security-policy-settings/user-account-control-run-all-administrators-in-admin-approval-mode)
@@ -368,7 +368,7 @@ The following table shows the Group Policy settings that are used to deny networ
1
Policy name
-
[Deny access to this computer from the network](deny-access-to-this-computer-from-the-network.md)
+
[Deny access to this computer from the network](/windows/device-security/security-policy-settings/deny-access-to-this-computer-from-the-network)
@@ -384,7 +384,7 @@ The following table shows the Group Policy settings that are used to deny networ
Policy name
-
[Deny log on through Remote Desktop Services](deny-log-on-through-remote-desktop-services.md)
+
[Deny log on through Remote Desktop Services](/windows/device-security/security-policy-settings/deny-log-on-through-remote-desktop-services)
diff --git a/windows/keep-secure/microsoft-accounts.md b/windows/access-protection/access-control/microsoft-accounts.md
similarity index 95%
rename from windows/keep-secure/microsoft-accounts.md
rename to windows/access-protection/access-control/microsoft-accounts.md
index 6bea7ac9aa..4b54894c21 100644
--- a/windows/keep-secure/microsoft-accounts.md
+++ b/windows/access-protection/access-control/microsoft-accounts.md
@@ -118,7 +118,7 @@ Depending on your IT and business models, introducing Microsoft accounts into yo
### Restrict the use of the Microsoft account
-If employees are allowed to join the domain with their personal devices, they might expect to connect to enterprise resources by using their Microsoft accounts. If you want to prevent any use of Microsoft accounts within your enterprise, you can configure the local security policy setting [Accounts: Block Microsoft accounts](accounts-block-microsoft-accounts.md). However, this setting can prevent the users from signing in to their Windows devices with their Microsoft accounts (if they had set them up to do so) when they are joined to the domain.
+If employees are allowed to join the domain with their personal devices, they might expect to connect to enterprise resources by using their Microsoft accounts. If you want to prevent any use of Microsoft accounts within your enterprise, you can configure the local security policy setting [Accounts: Block Microsoft accounts](/windows/device-security/security-policy-settings/accounts-block-microsoft-accounts). However, this setting can prevent the users from signing in to their Windows devices with their Microsoft accounts (if they had set them up to do so) when they are joined to the domain.
The default for this setting is **Disabled**, which enables users to use their Microsoft accounts on devices that are joined to your domain. Other options in the setting can:
@@ -151,7 +151,7 @@ Only the owner of the Microsoft account can change the password. Passwords can b
### Restrict app installation and usage
-Within your organization, you can set application control policies to regulate app installation and usage for Microsoft accounts. For more information, see [AppLocker](applocker-overview.md) and [Packaged Apps and Packaged App Installer Rules in AppLocker](packaged-apps-and-packaged-app-installer-rules-in-applocker.md).
+Within your organization, you can set application control policies to regulate app installation and usage for Microsoft accounts. For more information, see [AppLocker](/windows/device-security/applocker/applocker-overview) and [Packaged Apps and Packaged App Installer Rules in AppLocker](/windows/device-security/applocker/packaged-apps-and-packaged-app-installer-rules-in-applocker).
## See also
diff --git a/windows/keep-secure/security-identifiers.md b/windows/access-protection/access-control/security-identifiers.md
similarity index 100%
rename from windows/keep-secure/security-identifiers.md
rename to windows/access-protection/access-control/security-identifiers.md
diff --git a/windows/keep-secure/security-principals.md b/windows/access-protection/access-control/security-principals.md
similarity index 98%
rename from windows/keep-secure/security-principals.md
rename to windows/access-protection/access-control/security-principals.md
index 8bf4f7abd7..0efda2d6b6 100644
--- a/windows/keep-secure/security-principals.md
+++ b/windows/access-protection/access-control/security-principals.md
@@ -83,7 +83,7 @@ Permissions are different from user rights in that permissions are attached to o
On computers, user rights enable administrators to control who has the authority to perform operations that affect an entire computer, rather than a particular object. Administrators assign user rights to individual users or groups as part of the security settings for the computer. Although user rights can be managed centrally through Group Policy, they are applied locally. Users can (and usually do) have different user rights on different computers.
-For information about which user rights are available and how they can be implemented, see [User Rights Assignment](user-rights-assignment.md).
+For information about which user rights are available and how they can be implemented, see [User Rights Assignment](/windows/device-security/security-policy-settings/user-rights-assignment).
### Security context in authentication
diff --git a/windows/keep-secure/service-accounts.md b/windows/access-protection/access-control/service-accounts.md
similarity index 100%
rename from windows/keep-secure/service-accounts.md
rename to windows/access-protection/access-control/service-accounts.md
diff --git a/windows/keep-secure/special-identities.md b/windows/access-protection/access-control/special-identities.md
similarity index 86%
rename from windows/keep-secure/special-identities.md
rename to windows/access-protection/access-control/special-identities.md
index 2e3aa71e3e..dde80b2a45 100644
--- a/windows/keep-secure/special-identities.md
+++ b/windows/access-protection/access-control/special-identities.md
@@ -145,9 +145,9 @@ Any user who accesses the system through a sign-in process has the Authenticated
Default User Rights
-
[Access this computer from the network](access-this-computer-from-the-network.md): SeNetworkLogonRight
-
[Add workstations to domain](add-workstations-to-domain.md): SeMachineAccountPrivilege
[Impersonate a client after authentication](/windows/device-security/security-policy-settings/impersonate-a-client-after-authentication): SeImpersonatePrivilege
+
[Replace a process level token](/windows/device-security/security-policy-settings/replace-a-process-level-token): SeAssignPrimaryTokenPrivilege
@@ -617,13 +617,13 @@ The Network Service account is similar to an Authenticated User account. The Net
Default User Rights
-
[Adjust memory quotas for a process](adjust-memory-quotas-for-a-process.md): SeIncreaseQuotaPrivilege
[Impersonate a client after authentication](/windows/device-security/security-policy-settings/impersonate-a-client-after-authentication): SeImpersonatePrivilege
+
[Restore files and directories](/windows/device-security/security-policy-settings/restore-files-and-directories): SeRestorePrivilege
+
[Replace a process level token](/windows/device-security/security-policy-settings/replace-a-process-level-token): SeAssignPrimaryTokenPrivilege
@@ -885,8 +885,8 @@ Any service that accesses the system has the Service identity. This identity gro
Default User Rights
-
[Create global objects](create-global-objects.md): SeCreateGlobalPrivilege
-
[Impersonate a client after authentication](impersonate-a-client-after-authentication.md): SeImpersonatePrivilege
+
[Create global objects](/windows/device-security/security-policy-settings/create-global-objects): SeCreateGlobalPrivilege
+
[Impersonate a client after authentication](/windows/device-security/security-policy-settings/impersonate-a-client-after-authentication): SeImpersonatePrivilege
@@ -996,8 +996,8 @@ Any user accessing the system through Terminal Services has the Terminal Server
[Increase a process working set](/windows/device-security/security-policy-settings/increase-a-process-working-set): SeIncreaseWorkingSetPrivilege
diff --git a/windows/access-protection/change-history-for-access-protection.md b/windows/access-protection/change-history-for-access-protection.md
new file mode 100644
index 0000000000..84f9f86663
--- /dev/null
+++ b/windows/access-protection/change-history-for-access-protection.md
@@ -0,0 +1,17 @@
+---
+title: Change history for access protection (Windows 10)
+description: This topic lists new and updated topics in the Windows 10 access protection documentation for Windows 10 and Windows 10 Mobile.
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: security
+author: brianlic-msft
+---
+
+# Change history for access protection
+This topic lists new and updated topics in the [Access protection](index.md) documentation.
+
+## March 2017
+|New or changed topic |Description |
+|---------------------|------------|
+|[Protect derived domain credentials with Credential Guard](credential-guard/credential-guard.md) |Updated to include additional security qualifications starting with Window 10, version 1703.|
diff --git a/windows/keep-secure/configure-s-mime.md b/windows/access-protection/configure-s-mime.md
similarity index 100%
rename from windows/keep-secure/configure-s-mime.md
rename to windows/access-protection/configure-s-mime.md
diff --git a/windows/keep-secure/additional-mitigations.md b/windows/access-protection/credential-guard/additional-mitigations.md
similarity index 100%
rename from windows/keep-secure/additional-mitigations.md
rename to windows/access-protection/credential-guard/additional-mitigations.md
diff --git a/windows/keep-secure/credential-guard-considerations.md b/windows/access-protection/credential-guard/credential-guard-considerations.md
similarity index 100%
rename from windows/keep-secure/credential-guard-considerations.md
rename to windows/access-protection/credential-guard/credential-guard-considerations.md
diff --git a/windows/keep-secure/credential-guard-how-it-works.md b/windows/access-protection/credential-guard/credential-guard-how-it-works.md
similarity index 100%
rename from windows/keep-secure/credential-guard-how-it-works.md
rename to windows/access-protection/credential-guard/credential-guard-how-it-works.md
diff --git a/windows/keep-secure/credential-guard-manage.md b/windows/access-protection/credential-guard/credential-guard-manage.md
similarity index 96%
rename from windows/keep-secure/credential-guard-manage.md
rename to windows/access-protection/credential-guard/credential-guard-manage.md
index e4081028d7..44be2404c6 100644
--- a/windows/keep-secure/credential-guard-manage.md
+++ b/windows/access-protection/credential-guard/credential-guard-manage.md
@@ -19,7 +19,7 @@ Prefer video? See [Protecting privileged users with Credential Guard](https://mv
in the Deep Dive into Credential Guard video series.
## Enable Credential Guard
-Credential Guard can be enabled either by using [Group Policy](#turn-on-credential-guard-by-using-group-policy), the [registry](#turn-on-credential-guard-by-using-the-registry), or the Device Guard and Credential Guard [hardware readiness tool](#hardware-readiness-tool). Credential Guard can also protect secrets in a Hyper-V virtual machine, just as it would on a physical machine.
+Credential Guard can be enabled either by using [Group Policy](#enable-credential-guard-by-using-group-policy), the [registry](#enable-credential-guard-by-using-the-registry), or the Device Guard and Credential Guard [hardware readiness tool](#hardware-readiness-tool). Credential Guard can also protect secrets in a Hyper-V virtual machine, just as it would on a physical machine.
The same set of procedures used to enable Credential Guard on physical machines applies also to virtual machines.
@@ -187,7 +187,7 @@ If you have to disable Credential Guard on a PC, you can use the following set o
> [!NOTE]
> The PC must have one-time access to a domain controller to decrypt content, such as files that were encrypted with EFS. If you want to turn off both Credential Guard and virtualization-based security, run the following bcdedit command after turning off all virtualization-based security Group Policy and registry settings: bcdedit /set {0cb3b571-2f2e-4343-a879-d86a476d7215} loadoptions DISABLE-LSA-ISO,DISABLE-VBS
-For more info on virtualization-based security and Device Guard, see [Device Guard deployment guide](device-guard-deployment-guide.md).
+For more info on virtualization-based security and Device Guard, see [Device Guard deployment guide](/windows/device-security/device-guard/device-guard-deployment-guide).
#### Disable Credential Guard by using the Device Guard and Credential Guard hardware readiness tool
diff --git a/windows/keep-secure/credential-guard-not-protected-scenarios.md b/windows/access-protection/credential-guard/credential-guard-not-protected-scenarios.md
similarity index 100%
rename from windows/keep-secure/credential-guard-not-protected-scenarios.md
rename to windows/access-protection/credential-guard/credential-guard-not-protected-scenarios.md
diff --git a/windows/keep-secure/credential-guard-protection-limits.md b/windows/access-protection/credential-guard/credential-guard-protection-limits.md
similarity index 100%
rename from windows/keep-secure/credential-guard-protection-limits.md
rename to windows/access-protection/credential-guard/credential-guard-protection-limits.md
diff --git a/windows/keep-secure/credential-guard-requirements.md b/windows/access-protection/credential-guard/credential-guard-requirements.md
similarity index 100%
rename from windows/keep-secure/credential-guard-requirements.md
rename to windows/access-protection/credential-guard/credential-guard-requirements.md
diff --git a/windows/keep-secure/credential-guard-scripts.md b/windows/access-protection/credential-guard/credential-guard-scripts.md
similarity index 100%
rename from windows/keep-secure/credential-guard-scripts.md
rename to windows/access-protection/credential-guard/credential-guard-scripts.md
diff --git a/windows/keep-secure/credential-guard.md b/windows/access-protection/credential-guard/credential-guard.md
similarity index 97%
rename from windows/keep-secure/credential-guard.md
rename to windows/access-protection/credential-guard/credential-guard.md
index b36d3a7301..82c1f6b546 100644
--- a/windows/keep-secure/credential-guard.md
+++ b/windows/access-protection/credential-guard/credential-guard.md
@@ -37,7 +37,7 @@ By enabling Credential Guard, the following features and solutions are provided:
- [Enabling Strict KDC Validation in Windows Kerberos](http://www.microsoft.com/download/details.aspx?id=6382)
- [What's New in Kerberos Authentication for Windows Server 2012](http://technet.microsoft.com/library/hh831747.aspx)
- [Authentication Mechanism Assurance for AD DS in Windows Server 2008 R2 Step-by-Step Guide](http://technet.microsoft.com/library/dd378897.aspx)
-- [Trusted Platform Module](trusted-platform-module-overview.md)
+- [Trusted Platform Module](/windows/device-security/tpm/trusted-platform-module-overview)
## See also
diff --git a/windows/keep-secure/images/credguard-gp.png b/windows/access-protection/credential-guard/images/credguard-gp.png
similarity index 100%
rename from windows/keep-secure/images/credguard-gp.png
rename to windows/access-protection/credential-guard/images/credguard-gp.png
diff --git a/windows/keep-secure/images/credguard-msinfo32.png b/windows/access-protection/credential-guard/images/credguard-msinfo32.png
similarity index 100%
rename from windows/keep-secure/images/credguard-msinfo32.png
rename to windows/access-protection/credential-guard/images/credguard-msinfo32.png
diff --git a/windows/keep-secure/images/credguard.png b/windows/access-protection/credential-guard/images/credguard.png
similarity index 100%
rename from windows/keep-secure/images/credguard.png
rename to windows/access-protection/credential-guard/images/credguard.png
diff --git a/windows/keep-secure/enterprise-certificate-pinning.md b/windows/access-protection/enterprise-certificate-pinning.md
similarity index 99%
rename from windows/keep-secure/enterprise-certificate-pinning.md
rename to windows/access-protection/enterprise-certificate-pinning.md
index b6b15f7df9..26876a7fac 100644
--- a/windows/keep-secure/enterprise-certificate-pinning.md
+++ b/windows/access-protection/enterprise-certificate-pinning.md
@@ -5,7 +5,6 @@ ms.author: mstephens
author: MikeStephens-MS
description: Enterprise certificate pinning is a Windows feature for remembering, or “pinning” a root, issuing certificate authority, or end entity certificate to a given domain name.
manager: alanth
-ms.date: 2016-12-27
ms.prod: w10
ms.technology: security
ms.sitesec: library
diff --git a/windows/keep-secure/hello-and-password-changes.md b/windows/access-protection/hello-for-business/hello-and-password-changes.md
similarity index 96%
rename from windows/keep-secure/hello-and-password-changes.md
rename to windows/access-protection/hello-for-business/hello-and-password-changes.md
index 336c82005d..33bc609550 100644
--- a/windows/keep-secure/hello-and-password-changes.md
+++ b/windows/access-protection/hello-for-business/hello-and-password-changes.md
@@ -25,7 +25,7 @@ Because you were using **Device A** when you changed your password, the PIN on *
Suppose instead that you sign in on **Device B** and change your password for your Microsoft account. The next time that you try to sign in on **Device A** using your PIN, sign-in will fail because the account credentials that Hello on **Device A** knows will be outdated.
>[!NOTE]
->This example also applies to an Active Directory account when [Windows Hello for Business is not implemented](implement-microsoft-passport-in-your-organization.md).
+>This example also applies to an Active Directory account when [Windows Hello for Business is not implemented](hello-manage-in-organization.md).
## How to update Hello after you change your password on another device
diff --git a/windows/keep-secure/hello-biometrics-in-enterprise.md b/windows/access-protection/hello-for-business/hello-biometrics-in-enterprise.md
similarity index 98%
rename from windows/keep-secure/hello-biometrics-in-enterprise.md
rename to windows/access-protection/hello-for-business/hello-biometrics-in-enterprise.md
index c57043af82..cb9bfb63dd 100644
--- a/windows/keep-secure/hello-biometrics-in-enterprise.md
+++ b/windows/access-protection/hello-for-business/hello-biometrics-in-enterprise.md
@@ -35,7 +35,7 @@ Windows Hello provides many benefits, including:
- Employees get a simple authentication method (backed up with a PIN) that’s always with them, so there’s nothing to lose. No more forgetting passwords!
-- Support for Windows Hello is built into the operating system so you can add additional biometric devices and polices as part of a coordinated rollout or to individual employees or groups using Group Policy or Mobile Device Management (MDM) configurations service provider (CSP) policies. For more info about the available Group Policies and MDM CSPs, see the [Implement Windows Hello for Business in your organization](implement-microsoft-passport-in-your-organization.md) topic.
+- Support for Windows Hello is built into the operating system so you can add additional biometric devices and polices as part of a coordinated rollout or to individual employees or groups using Group Policy or Mobile Device Management (MDM) configurations service provider (CSP) policies. For more info about the available Group Policies and MDM CSPs, see the [Implement Windows Hello for Business in your organization](hello-manage-in-organization.md) topic.
## Where is Microsoft Hello data stored?
The biometric data used to support Windows Hello is stored on the local device only. It doesn’t roam and is never sent to external devices or servers. This separation helps to stop potential attackers by providing no single collection point that an attacker could potentially compromise to steal biometric data. Additionally, even if an attacker was actually able to get the biometric data, it still can’t be easily converted to a form that could be recognized by the biometric sensor.
diff --git a/windows/keep-secure/hello-errors-during-pin-creation.md b/windows/access-protection/hello-for-business/hello-errors-during-pin-creation.md
similarity index 100%
rename from windows/keep-secure/hello-errors-during-pin-creation.md
rename to windows/access-protection/hello-for-business/hello-errors-during-pin-creation.md
diff --git a/windows/keep-secure/hello-event-300.md b/windows/access-protection/hello-for-business/hello-event-300.md
similarity index 100%
rename from windows/keep-secure/hello-event-300.md
rename to windows/access-protection/hello-for-business/hello-event-300.md
diff --git a/windows/keep-secure/hello-how-it-works.md b/windows/access-protection/hello-for-business/hello-how-it-works.md
similarity index 100%
rename from windows/keep-secure/hello-how-it-works.md
rename to windows/access-protection/hello-for-business/hello-how-it-works.md
diff --git a/windows/keep-secure/hello-identity-verification.md b/windows/access-protection/hello-for-business/hello-identity-verification.md
similarity index 100%
rename from windows/keep-secure/hello-identity-verification.md
rename to windows/access-protection/hello-for-business/hello-identity-verification.md
diff --git a/windows/keep-secure/hello-manage-in-organization.md b/windows/access-protection/hello-for-business/hello-manage-in-organization.md
similarity index 100%
rename from windows/keep-secure/hello-manage-in-organization.md
rename to windows/access-protection/hello-for-business/hello-manage-in-organization.md
diff --git a/windows/keep-secure/hello-prepare-people-to-use.md b/windows/access-protection/hello-for-business/hello-prepare-people-to-use.md
similarity index 100%
rename from windows/keep-secure/hello-prepare-people-to-use.md
rename to windows/access-protection/hello-for-business/hello-prepare-people-to-use.md
diff --git a/windows/keep-secure/hello-why-pin-is-better-than-password.md b/windows/access-protection/hello-for-business/hello-why-pin-is-better-than-password.md
similarity index 96%
rename from windows/keep-secure/hello-why-pin-is-better-than-password.md
rename to windows/access-protection/hello-for-business/hello-why-pin-is-better-than-password.md
index 516d264bef..00ead3c640 100644
--- a/windows/keep-secure/hello-why-pin-is-better-than-password.md
+++ b/windows/access-protection/hello-for-business/hello-why-pin-is-better-than-password.md
@@ -44,7 +44,7 @@ The TPM protects against a variety of known and potential attacks, including PIN
## PIN can be complex
-The Windows Hello for Business PIN is subject to the same set of IT management policies as a password, such as complexity, length, expiration, and history. Although we generally think of a PIN as a simple four-digit code, administrators can set [policies](implement-microsoft-passport-in-your-organization.md) for managed devices to require a PIN complexity similar to a password. You can require or block: special characters, uppercase characters, lowercase characters, and digits.
+The Windows Hello for Business PIN is subject to the same set of IT management policies as a password, such as complexity, length, expiration, and history. Although we generally think of a PIN as a simple four-digit code, administrators can set [policies](hello-manage-in-organization.md) for managed devices to require a PIN complexity similar to a password. You can require or block: special characters, uppercase characters, lowercase characters, and digits.
## What if someone steals the laptop or phone?
diff --git a/windows/keep-secure/images/authflow.png b/windows/access-protection/hello-for-business/images/authflow.png
similarity index 100%
rename from windows/keep-secure/images/authflow.png
rename to windows/access-protection/hello-for-business/images/authflow.png
diff --git a/windows/keep-secure/images/connect.png b/windows/access-protection/hello-for-business/images/connect.png
similarity index 100%
rename from windows/keep-secure/images/connect.png
rename to windows/access-protection/hello-for-business/images/connect.png
diff --git a/windows/keep-secure/images/corpown.png b/windows/access-protection/hello-for-business/images/corpown.png
similarity index 100%
rename from windows/keep-secure/images/corpown.png
rename to windows/access-protection/hello-for-business/images/corpown.png
diff --git a/windows/keep-secure/images/hellosettings.png b/windows/access-protection/hello-for-business/images/hellosettings.png
similarity index 100%
rename from windows/keep-secure/images/hellosettings.png
rename to windows/access-protection/hello-for-business/images/hellosettings.png
diff --git a/windows/keep-secure/images/passport-fig3-logicalcontainer.png b/windows/access-protection/hello-for-business/images/passport-fig3-logicalcontainer.png
similarity index 100%
rename from windows/keep-secure/images/passport-fig3-logicalcontainer.png
rename to windows/access-protection/hello-for-business/images/passport-fig3-logicalcontainer.png
diff --git a/windows/keep-secure/images/pinerror.png b/windows/access-protection/hello-for-business/images/pinerror.png
similarity index 100%
rename from windows/keep-secure/images/pinerror.png
rename to windows/access-protection/hello-for-business/images/pinerror.png
diff --git a/windows/keep-secure/images/whfb-intune-reset-pin.jpg b/windows/access-protection/hello-for-business/images/whfb-intune-reset-pin.jpg
similarity index 100%
rename from windows/keep-secure/images/whfb-intune-reset-pin.jpg
rename to windows/access-protection/hello-for-business/images/whfb-intune-reset-pin.jpg
diff --git a/windows/keep-secure/images/whfb-pin-reset-phone-notification.png b/windows/access-protection/hello-for-business/images/whfb-pin-reset-phone-notification.png
similarity index 100%
rename from windows/keep-secure/images/whfb-pin-reset-phone-notification.png
rename to windows/access-protection/hello-for-business/images/whfb-pin-reset-phone-notification.png
diff --git a/windows/keep-secure/images/whfb-reset-pin-prompt.jpg b/windows/access-protection/hello-for-business/images/whfb-reset-pin-prompt.jpg
similarity index 100%
rename from windows/keep-secure/images/whfb-reset-pin-prompt.jpg
rename to windows/access-protection/hello-for-business/images/whfb-reset-pin-prompt.jpg
diff --git a/windows/keep-secure/images/whfb-reset-pin-settings.jpg b/windows/access-protection/hello-for-business/images/whfb-reset-pin-settings.jpg
similarity index 100%
rename from windows/keep-secure/images/whfb-reset-pin-settings.jpg
rename to windows/access-protection/hello-for-business/images/whfb-reset-pin-settings.jpg
diff --git a/windows/keep-secure/images/emailsecurity.png b/windows/access-protection/images/emailsecurity.png
similarity index 100%
rename from windows/keep-secure/images/emailsecurity.png
rename to windows/access-protection/images/emailsecurity.png
diff --git a/windows/keep-secure/images/enterprise-certificate-pinning-converting-a-duration.png b/windows/access-protection/images/enterprise-certificate-pinning-converting-a-duration.png
similarity index 100%
rename from windows/keep-secure/images/enterprise-certificate-pinning-converting-a-duration.png
rename to windows/access-protection/images/enterprise-certificate-pinning-converting-a-duration.png
diff --git a/windows/keep-secure/images/enterprise-certificate-pinning-converting-an-xml-date.png b/windows/access-protection/images/enterprise-certificate-pinning-converting-an-xml-date.png
similarity index 100%
rename from windows/keep-secure/images/enterprise-certificate-pinning-converting-an-xml-date.png
rename to windows/access-protection/images/enterprise-certificate-pinning-converting-an-xml-date.png
diff --git a/windows/keep-secure/images/enterprise-certificate-pinning-pinrules-properties.png b/windows/access-protection/images/enterprise-certificate-pinning-pinrules-properties.png
similarity index 100%
rename from windows/keep-secure/images/enterprise-certificate-pinning-pinrules-properties.png
rename to windows/access-protection/images/enterprise-certificate-pinning-pinrules-properties.png
diff --git a/windows/keep-secure/images/enterprise-certificate-pinning-representing-a-date.png b/windows/access-protection/images/enterprise-certificate-pinning-representing-a-date.png
similarity index 100%
rename from windows/keep-secure/images/enterprise-certificate-pinning-representing-a-date.png
rename to windows/access-protection/images/enterprise-certificate-pinning-representing-a-date.png
diff --git a/windows/keep-secure/images/enterprise-certificate-pinning-representing-a-duration.png b/windows/access-protection/images/enterprise-certificate-pinning-representing-a-duration.png
similarity index 100%
rename from windows/keep-secure/images/enterprise-certificate-pinning-representing-a-duration.png
rename to windows/access-protection/images/enterprise-certificate-pinning-representing-a-duration.png
diff --git a/windows/keep-secure/images/enterprise-pinning-registry-binary-information.png b/windows/access-protection/images/enterprise-pinning-registry-binary-information.png
similarity index 100%
rename from windows/keep-secure/images/enterprise-pinning-registry-binary-information.png
rename to windows/access-protection/images/enterprise-pinning-registry-binary-information.png
diff --git a/windows/keep-secure/images/installcert.png b/windows/access-protection/images/installcert.png
similarity index 100%
rename from windows/keep-secure/images/installcert.png
rename to windows/access-protection/images/installcert.png
diff --git a/windows/keep-secure/images/mailsettings.png b/windows/access-protection/images/mailsettings.png
similarity index 100%
rename from windows/keep-secure/images/mailsettings.png
rename to windows/access-protection/images/mailsettings.png
diff --git a/windows/keep-secure/images/remote-credential-guard-gp.png b/windows/access-protection/images/remote-credential-guard-gp.png
similarity index 100%
rename from windows/keep-secure/images/remote-credential-guard-gp.png
rename to windows/access-protection/images/remote-credential-guard-gp.png
diff --git a/windows/keep-secure/images/remote-credential-guard.png b/windows/access-protection/images/remote-credential-guard.png
similarity index 100%
rename from windows/keep-secure/images/remote-credential-guard.png
rename to windows/access-protection/images/remote-credential-guard.png
diff --git a/windows/keep-secure/images/security-stages.png b/windows/access-protection/images/security-stages.png
similarity index 100%
rename from windows/keep-secure/images/security-stages.png
rename to windows/access-protection/images/security-stages.png
diff --git a/windows/keep-secure/images/signencrypt.png b/windows/access-protection/images/signencrypt.png
similarity index 100%
rename from windows/keep-secure/images/signencrypt.png
rename to windows/access-protection/images/signencrypt.png
diff --git a/windows/access-protection/index.md b/windows/access-protection/index.md
new file mode 100644
index 0000000000..7bb298b7a0
--- /dev/null
+++ b/windows/access-protection/index.md
@@ -0,0 +1,28 @@
+---
+title: Access protection (Windows 10)
+description: Learn more about access protection technologies in Windows 10 and Windows 10 Mobile.
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: security
+author: brianlic-msft
+---
+
+# Access protection
+
+Learn more about access protection technologies in Windows 10 and Windows 10 Mobile.
+
+| Section | Description |
+|-|-|
+| [Access control](access-control/access-control.md) | Describes access control in Windows, which is the process of authorizing users, groups, and computers to access objects on the network or computer. Key concepts that make up access control are permissions, ownership of objects, inheritance of permissions, user rights, and object auditing. |
+| [Configure S/MIME for Windows 10 and Windows 10 Mobile](configure-s-mime.md) | In Windows 10, S/MIME lets users encrypt outgoing messages and attachments so that only intended recipients who have a digital identification (ID), also known as a certificate, can read them. Users can digitally sign a message, which provides the recipients with a way to verify the identity of the sender and that the message hasn't been tampered with. |
+| [Install digital certificates on Windows 10 Mobile](installing-digital-certificates-on-windows-10-mobile.md) | Digital certificates bind the identity of a user or computer to a pair of keys that can be used to encrypt and sign digital information. Certificates are issued by a certification authority (CA) that vouches for the identity of the certificate holder, and they enable secure client communications with websites and services. |
+| [Protect derived domain credentials with Credential Guard](credential-guard/credential-guard.md) | Introduced in Windows 10 Enterprise, Credential Guard uses virtualization-based security to isolate secrets so that only privileged system software can access them. Unauthorized access to these secrets can lead to credential theft attacks, such as Pass-the-Hash or Pass-The-Ticket. Credential Guard helps prevent these attacks by protecting NTLM password hashes and Kerberos Ticket Granting Tickets. |
+| [Protect Remote Desktop credentials with Remote Credential Guard](remote-credential-guard.md) | Remote Credential Guard helps you protect your credentials over a Remote Desktop connection by redirecting the Kerberos requests back to the device that's requesting the connection. |
+| [User Account Control](user-account-control/user-account-control-overview.md)| Provides information about User Account Control (UAC), which helps prevent malware from damaging a PC and helps organizations deploy a better-managed desktop. UAC can help block the automatic installation of unauthorized apps and prevent inadvertent changes to system settings.|
+| [Virtual Smart Cards](virtual-smart-cards/virtual-smart-card-overview.md) | Provides information about deploying and managing virtual smart cards, which are functionally similar to physical smart cards and appear in Windows as smart cards that are always-inserted. Virtual smart cards use the Trusted Platform Module (TPM) chip that is available on computers in many organizations, rather than requiring the use of a separate physical smart card and reader. |
+| [VPN technical guide](vpn/vpn-guide.md) | Virtual private networks (VPN) let you give your users secure remote access to your company network. Windows 10 adds useful new VPN profile options to help you manage how users connect. |
+| [Smart Cards](smart-cards/smart-card-windows-smart-card-technical-reference.md) | Provides a collection of references topics about smart cards, which are tamper-resistant portable storage devices that can enhance the security of tasks such as authenticating clients, signing code, securing e-mail, and signing in with a Windows domain account. |
+| [Windows Hello for Business](hello-for-business/hello-identity-verification.md) | In Windows 10, Windows Hello replaces passwords with strong two-factor authentication on PCs and mobile devices. This authentication consists of a new type of user credential that is tied to a device and a biometric or PIN. |
+| [Windows Firewall with Advanced Security](windows-firewall/windows-firewall-with-advanced-security.md) | Provides information about Windows Firewall with Advanced Security, which is an important part of a layered security model. By providing host-based, two-way network traffic filtering for a device, Windows Firewall with Advanced Security blocks unauthorized network traffic flowing into or out of the local device. |
+| [Windows 10 Credential Theft Mitigation Guide Abstract](windows-credential-theft-mitigation-guide-abstract.md) | Learn more about credential theft mitigation in Windows 10. |
\ No newline at end of file
diff --git a/windows/keep-secure/installing-digital-certificates-on-windows-10-mobile.md b/windows/access-protection/installing-digital-certificates-on-windows-10-mobile.md
similarity index 100%
rename from windows/keep-secure/installing-digital-certificates-on-windows-10-mobile.md
rename to windows/access-protection/installing-digital-certificates-on-windows-10-mobile.md
diff --git a/windows/keep-secure/remote-credential-guard.md b/windows/access-protection/remote-credential-guard.md
similarity index 100%
rename from windows/keep-secure/remote-credential-guard.md
rename to windows/access-protection/remote-credential-guard.md
diff --git a/windows/keep-secure/images/sc-image101.png b/windows/access-protection/smart-cards/images/sc-image101.png
similarity index 100%
rename from windows/keep-secure/images/sc-image101.png
rename to windows/access-protection/smart-cards/images/sc-image101.png
diff --git a/windows/keep-secure/images/sc-image201.gif b/windows/access-protection/smart-cards/images/sc-image201.gif
similarity index 100%
rename from windows/keep-secure/images/sc-image201.gif
rename to windows/access-protection/smart-cards/images/sc-image201.gif
diff --git a/windows/keep-secure/images/sc-image203.gif b/windows/access-protection/smart-cards/images/sc-image203.gif
similarity index 100%
rename from windows/keep-secure/images/sc-image203.gif
rename to windows/access-protection/smart-cards/images/sc-image203.gif
diff --git a/windows/keep-secure/images/sc-image205.png b/windows/access-protection/smart-cards/images/sc-image205.png
similarity index 100%
rename from windows/keep-secure/images/sc-image205.png
rename to windows/access-protection/smart-cards/images/sc-image205.png
diff --git a/windows/keep-secure/images/sc-image206.gif b/windows/access-protection/smart-cards/images/sc-image206.gif
similarity index 100%
rename from windows/keep-secure/images/sc-image206.gif
rename to windows/access-protection/smart-cards/images/sc-image206.gif
diff --git a/windows/keep-secure/images/sc-image302.gif b/windows/access-protection/smart-cards/images/sc-image302.gif
similarity index 100%
rename from windows/keep-secure/images/sc-image302.gif
rename to windows/access-protection/smart-cards/images/sc-image302.gif
diff --git a/windows/keep-secure/images/sc-image402.png b/windows/access-protection/smart-cards/images/sc-image402.png
similarity index 100%
rename from windows/keep-secure/images/sc-image402.png
rename to windows/access-protection/smart-cards/images/sc-image402.png
diff --git a/windows/keep-secure/images/sc-image403.png b/windows/access-protection/smart-cards/images/sc-image403.png
similarity index 100%
rename from windows/keep-secure/images/sc-image403.png
rename to windows/access-protection/smart-cards/images/sc-image403.png
diff --git a/windows/keep-secure/images/sc-image404.png b/windows/access-protection/smart-cards/images/sc-image404.png
similarity index 100%
rename from windows/keep-secure/images/sc-image404.png
rename to windows/access-protection/smart-cards/images/sc-image404.png
diff --git a/windows/keep-secure/images/sc-image405.png b/windows/access-protection/smart-cards/images/sc-image405.png
similarity index 100%
rename from windows/keep-secure/images/sc-image405.png
rename to windows/access-protection/smart-cards/images/sc-image405.png
diff --git a/windows/keep-secure/images/sc-image406.png b/windows/access-protection/smart-cards/images/sc-image406.png
similarity index 100%
rename from windows/keep-secure/images/sc-image406.png
rename to windows/access-protection/smart-cards/images/sc-image406.png
diff --git a/windows/keep-secure/images/sc-image407.png b/windows/access-protection/smart-cards/images/sc-image407.png
similarity index 100%
rename from windows/keep-secure/images/sc-image407.png
rename to windows/access-protection/smart-cards/images/sc-image407.png
diff --git a/windows/keep-secure/images/sc-image501.gif b/windows/access-protection/smart-cards/images/sc-image501.gif
similarity index 100%
rename from windows/keep-secure/images/sc-image501.gif
rename to windows/access-protection/smart-cards/images/sc-image501.gif
diff --git a/windows/keep-secure/smart-card-and-remote-desktop-services.md b/windows/access-protection/smart-cards/smart-card-and-remote-desktop-services.md
similarity index 100%
rename from windows/keep-secure/smart-card-and-remote-desktop-services.md
rename to windows/access-protection/smart-cards/smart-card-and-remote-desktop-services.md
diff --git a/windows/keep-secure/smart-card-architecture.md b/windows/access-protection/smart-cards/smart-card-architecture.md
similarity index 100%
rename from windows/keep-secure/smart-card-architecture.md
rename to windows/access-protection/smart-cards/smart-card-architecture.md
diff --git a/windows/keep-secure/smart-card-certificate-propagation-service.md b/windows/access-protection/smart-cards/smart-card-certificate-propagation-service.md
similarity index 100%
rename from windows/keep-secure/smart-card-certificate-propagation-service.md
rename to windows/access-protection/smart-cards/smart-card-certificate-propagation-service.md
diff --git a/windows/keep-secure/smart-card-certificate-requirements-and-enumeration.md b/windows/access-protection/smart-cards/smart-card-certificate-requirements-and-enumeration.md
similarity index 100%
rename from windows/keep-secure/smart-card-certificate-requirements-and-enumeration.md
rename to windows/access-protection/smart-cards/smart-card-certificate-requirements-and-enumeration.md
diff --git a/windows/keep-secure/smart-card-debugging-information.md b/windows/access-protection/smart-cards/smart-card-debugging-information.md
similarity index 100%
rename from windows/keep-secure/smart-card-debugging-information.md
rename to windows/access-protection/smart-cards/smart-card-debugging-information.md
diff --git a/windows/keep-secure/smart-card-events.md b/windows/access-protection/smart-cards/smart-card-events.md
similarity index 100%
rename from windows/keep-secure/smart-card-events.md
rename to windows/access-protection/smart-cards/smart-card-events.md
diff --git a/windows/keep-secure/smart-card-group-policy-and-registry-settings.md b/windows/access-protection/smart-cards/smart-card-group-policy-and-registry-settings.md
similarity index 100%
rename from windows/keep-secure/smart-card-group-policy-and-registry-settings.md
rename to windows/access-protection/smart-cards/smart-card-group-policy-and-registry-settings.md
diff --git a/windows/keep-secure/smart-card-how-smart-card-sign-in-works-in-windows.md b/windows/access-protection/smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md
similarity index 100%
rename from windows/keep-secure/smart-card-how-smart-card-sign-in-works-in-windows.md
rename to windows/access-protection/smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md
diff --git a/windows/keep-secure/smart-card-removal-policy-service.md b/windows/access-protection/smart-cards/smart-card-removal-policy-service.md
similarity index 100%
rename from windows/keep-secure/smart-card-removal-policy-service.md
rename to windows/access-protection/smart-cards/smart-card-removal-policy-service.md
diff --git a/windows/keep-secure/smart-card-smart-cards-for-windows-service.md b/windows/access-protection/smart-cards/smart-card-smart-cards-for-windows-service.md
similarity index 100%
rename from windows/keep-secure/smart-card-smart-cards-for-windows-service.md
rename to windows/access-protection/smart-cards/smart-card-smart-cards-for-windows-service.md
diff --git a/windows/keep-secure/smart-card-tools-and-settings.md b/windows/access-protection/smart-cards/smart-card-tools-and-settings.md
similarity index 100%
rename from windows/keep-secure/smart-card-tools-and-settings.md
rename to windows/access-protection/smart-cards/smart-card-tools-and-settings.md
diff --git a/windows/keep-secure/smart-card-windows-smart-card-technical-reference.md b/windows/access-protection/smart-cards/smart-card-windows-smart-card-technical-reference.md
similarity index 97%
rename from windows/keep-secure/smart-card-windows-smart-card-technical-reference.md
rename to windows/access-protection/smart-cards/smart-card-windows-smart-card-technical-reference.md
index bb376178cb..ce2419f808 100644
--- a/windows/keep-secure/smart-card-windows-smart-card-technical-reference.md
+++ b/windows/access-protection/smart-cards/smart-card-windows-smart-card-technical-reference.md
@@ -36,7 +36,7 @@ Smart cards provide:
Smart cards can be used to sign in to domain accounts only, not local accounts. When you use a password to sign in interactively to a domain account, Windows uses the Kerberos version 5 (v5) protocol for authentication. If you use a smart card, the operating system uses Kerberos v5 authentication with X.509 v3 certificates.
-**Virtual smart cards** were introduced in Windows Server 2012 and Windows 8 to alleviate the need for a physical smart card, the smart card reader, and the associated administration of that hardware. For information about virtual smart card technology, see [Virtual Smart Card Overview](virtual-smart-card-overview.md).
+**Virtual smart cards** were introduced in Windows Server 2012 and Windows 8 to alleviate the need for a physical smart card, the smart card reader, and the associated administration of that hardware. For information about virtual smart card technology, see [Virtual Smart Card Overview](../virtual-smart-cards/virtual-smart-card-overview.md).
## In this technical reference
diff --git a/windows/keep-secure/how-user-account-control-works.md b/windows/access-protection/user-account-control/how-user-account-control-works.md
similarity index 100%
rename from windows/keep-secure/how-user-account-control-works.md
rename to windows/access-protection/user-account-control/how-user-account-control-works.md
diff --git a/windows/keep-secure/images/uacarchitecture.gif b/windows/access-protection/user-account-control/images/uacarchitecture.gif
similarity index 100%
rename from windows/keep-secure/images/uacarchitecture.gif
rename to windows/access-protection/user-account-control/images/uacarchitecture.gif
diff --git a/windows/keep-secure/images/uacconsentprompt.gif b/windows/access-protection/user-account-control/images/uacconsentprompt.gif
similarity index 100%
rename from windows/keep-secure/images/uacconsentprompt.gif
rename to windows/access-protection/user-account-control/images/uacconsentprompt.gif
diff --git a/windows/keep-secure/images/uaccredentialprompt.gif b/windows/access-protection/user-account-control/images/uaccredentialprompt.gif
similarity index 100%
rename from windows/keep-secure/images/uaccredentialprompt.gif
rename to windows/access-protection/user-account-control/images/uaccredentialprompt.gif
diff --git a/windows/keep-secure/images/uacshieldicon.png b/windows/access-protection/user-account-control/images/uacshieldicon.png
similarity index 100%
rename from windows/keep-secure/images/uacshieldicon.png
rename to windows/access-protection/user-account-control/images/uacshieldicon.png
diff --git a/windows/keep-secure/images/uacwindowslogonprocess.gif b/windows/access-protection/user-account-control/images/uacwindowslogonprocess.gif
similarity index 100%
rename from windows/keep-secure/images/uacwindowslogonprocess.gif
rename to windows/access-protection/user-account-control/images/uacwindowslogonprocess.gif
diff --git a/windows/keep-secure/user-account-control-group-policy-and-registry-key-settings.md b/windows/access-protection/user-account-control/user-account-control-group-policy-and-registry-key-settings.md
similarity index 99%
rename from windows/keep-secure/user-account-control-group-policy-and-registry-key-settings.md
rename to windows/access-protection/user-account-control/user-account-control-group-policy-and-registry-key-settings.md
index 2aa91da1a1..6ee117c85f 100644
--- a/windows/keep-secure/user-account-control-group-policy-and-registry-key-settings.md
+++ b/windows/access-protection/user-account-control/user-account-control-group-policy-and-registry-key-settings.md
@@ -22,7 +22,7 @@ There are 10 Group Policy settings that can be configured for User Account Contr
| Group Policy setting | Registry key | Default |
| - | - | - | - |
| [User Account Control: Admin Approval Mode for the built-in Administrator account](#user-account-control-admin-approval-mode-for-the-built-in-administrator-account) | FilterAdministratorToken | Disabled |
-| [User Account Control: Allow UIAccess applications to prompt for elevation without using the secure desktop](#user-account-control-allow-uiaccess-applications-to prompt-for-elevation-without-using-the-secure-desktop) | EnableUIADesktopToggle | Disabled |
+| [User Account Control: Allow UIAccess applications to prompt for elevation without using the secure desktop](#user-account-control-allow-uiaccess-applications-to-prompt-for-elevation-without-using-the-secure-desktop) | EnableUIADesktopToggle | Disabled |
| [User Account Control: Behavior of the elevation prompt for administrators in Admin Approval Mode](#user-account-control-behavior-of-the-elevation-prompt-for-administrators-in-admin-approval-mode) | ConsentPromptBehaviorAdmin | Prompt for consent for non-Windows binaries |
| [User Account Control: Behavior of the elevation prompt for standard users](#user-account-control-behavior-of-the-elevation-prompt-for-standard-users) | ConsentPromptBehaviorUser | Prompt for credentials on the secure desktop |
| [User Account Control: Detect application installations and prompt for elevation](#user-account-control-detect-application-installations-and-prompt-for-elevation) | EnableInstallerDetection | Enabled (default for home) Disabled (default for enterprise) |
diff --git a/windows/keep-secure/user-account-control-overview.md b/windows/access-protection/user-account-control/user-account-control-overview.md
similarity index 95%
rename from windows/keep-secure/user-account-control-overview.md
rename to windows/access-protection/user-account-control/user-account-control-overview.md
index 66f1abdc16..a273e12688 100644
--- a/windows/keep-secure/user-account-control-overview.md
+++ b/windows/access-protection/user-account-control/user-account-control-overview.md
@@ -28,9 +28,6 @@ When an app needs to run with more than standard user rights, UAC can restore ad
Admin Approval Mode in UAC helps prevent malware from silently installing without an administrator's knowledge. It also helps protect from inadvertent system-wide changes. Lastly, it can be used to enforce a higher level of compliance where administrators must actively consent or provide credentials for each administrative process.
-## New and changed functionality
-
-To find out what's new in UAC for Windows 10, see [User Account Control](../whats-new/user-account-control.md).
## In this section
| Topic | Description |
diff --git a/windows/keep-secure/user-account-control-security-policy-settings.md b/windows/access-protection/user-account-control/user-account-control-security-policy-settings.md
similarity index 100%
rename from windows/keep-secure/user-account-control-security-policy-settings.md
rename to windows/access-protection/user-account-control/user-account-control-security-policy-settings.md
diff --git a/windows/keep-secure/images/vsc-02-mmc-add-snap-in.png b/windows/access-protection/virtual-smart-cards/images/vsc-02-mmc-add-snap-in.png
similarity index 100%
rename from windows/keep-secure/images/vsc-02-mmc-add-snap-in.png
rename to windows/access-protection/virtual-smart-cards/images/vsc-02-mmc-add-snap-in.png
diff --git a/windows/keep-secure/images/vsc-03-add-certificate-templates-snap-in.png b/windows/access-protection/virtual-smart-cards/images/vsc-03-add-certificate-templates-snap-in.png
similarity index 100%
rename from windows/keep-secure/images/vsc-03-add-certificate-templates-snap-in.png
rename to windows/access-protection/virtual-smart-cards/images/vsc-03-add-certificate-templates-snap-in.png
diff --git a/windows/keep-secure/images/vsc-04-right-click-smartcard-logon-template.png b/windows/access-protection/virtual-smart-cards/images/vsc-04-right-click-smartcard-logon-template.png
similarity index 100%
rename from windows/keep-secure/images/vsc-04-right-click-smartcard-logon-template.png
rename to windows/access-protection/virtual-smart-cards/images/vsc-04-right-click-smartcard-logon-template.png
diff --git a/windows/keep-secure/images/vsc-05-certificate-template-compatibility.png b/windows/access-protection/virtual-smart-cards/images/vsc-05-certificate-template-compatibility.png
similarity index 100%
rename from windows/keep-secure/images/vsc-05-certificate-template-compatibility.png
rename to windows/access-protection/virtual-smart-cards/images/vsc-05-certificate-template-compatibility.png
diff --git a/windows/keep-secure/images/vsc-06-add-certification-authority-snap-in.png b/windows/access-protection/virtual-smart-cards/images/vsc-06-add-certification-authority-snap-in.png
similarity index 100%
rename from windows/keep-secure/images/vsc-06-add-certification-authority-snap-in.png
rename to windows/access-protection/virtual-smart-cards/images/vsc-06-add-certification-authority-snap-in.png
diff --git a/windows/keep-secure/images/vsc-07-right-click-certificate-templates.png b/windows/access-protection/virtual-smart-cards/images/vsc-07-right-click-certificate-templates.png
similarity index 100%
rename from windows/keep-secure/images/vsc-07-right-click-certificate-templates.png
rename to windows/access-protection/virtual-smart-cards/images/vsc-07-right-click-certificate-templates.png
diff --git a/windows/keep-secure/images/vsc-08-enable-certificate-template.png b/windows/access-protection/virtual-smart-cards/images/vsc-08-enable-certificate-template.png
similarity index 100%
rename from windows/keep-secure/images/vsc-08-enable-certificate-template.png
rename to windows/access-protection/virtual-smart-cards/images/vsc-08-enable-certificate-template.png
diff --git a/windows/keep-secure/images/vsc-09-stop-service-start-service.png b/windows/access-protection/virtual-smart-cards/images/vsc-09-stop-service-start-service.png
similarity index 100%
rename from windows/keep-secure/images/vsc-09-stop-service-start-service.png
rename to windows/access-protection/virtual-smart-cards/images/vsc-09-stop-service-start-service.png
diff --git a/windows/keep-secure/images/vsc-10-cmd-run-as-administrator.png b/windows/access-protection/virtual-smart-cards/images/vsc-10-cmd-run-as-administrator.png
similarity index 100%
rename from windows/keep-secure/images/vsc-10-cmd-run-as-administrator.png
rename to windows/access-protection/virtual-smart-cards/images/vsc-10-cmd-run-as-administrator.png
diff --git a/windows/keep-secure/images/vsc-11-certificates-request-new-certificate.png b/windows/access-protection/virtual-smart-cards/images/vsc-11-certificates-request-new-certificate.png
similarity index 100%
rename from windows/keep-secure/images/vsc-11-certificates-request-new-certificate.png
rename to windows/access-protection/virtual-smart-cards/images/vsc-11-certificates-request-new-certificate.png
diff --git a/windows/keep-secure/images/vsc-12-certificate-enrollment-select-certificate.png b/windows/access-protection/virtual-smart-cards/images/vsc-12-certificate-enrollment-select-certificate.png
similarity index 100%
rename from windows/keep-secure/images/vsc-12-certificate-enrollment-select-certificate.png
rename to windows/access-protection/virtual-smart-cards/images/vsc-12-certificate-enrollment-select-certificate.png
diff --git a/windows/keep-secure/images/vsc-physical-smart-card-lifecycle.png b/windows/access-protection/virtual-smart-cards/images/vsc-physical-smart-card-lifecycle.png
similarity index 100%
rename from windows/keep-secure/images/vsc-physical-smart-card-lifecycle.png
rename to windows/access-protection/virtual-smart-cards/images/vsc-physical-smart-card-lifecycle.png
diff --git a/windows/keep-secure/images/vsc-process-of-accessing-user-key.png b/windows/access-protection/virtual-smart-cards/images/vsc-process-of-accessing-user-key.png
similarity index 100%
rename from windows/keep-secure/images/vsc-process-of-accessing-user-key.png
rename to windows/access-protection/virtual-smart-cards/images/vsc-process-of-accessing-user-key.png
diff --git a/windows/keep-secure/images/vsc-virtual-smart-card-icon.png b/windows/access-protection/virtual-smart-cards/images/vsc-virtual-smart-card-icon.png
similarity index 100%
rename from windows/keep-secure/images/vsc-virtual-smart-card-icon.png
rename to windows/access-protection/virtual-smart-cards/images/vsc-virtual-smart-card-icon.png
diff --git a/windows/keep-secure/virtual-smart-card-deploy-virtual-smart-cards.md b/windows/access-protection/virtual-smart-cards/virtual-smart-card-deploy-virtual-smart-cards.md
similarity index 100%
rename from windows/keep-secure/virtual-smart-card-deploy-virtual-smart-cards.md
rename to windows/access-protection/virtual-smart-cards/virtual-smart-card-deploy-virtual-smart-cards.md
diff --git a/windows/keep-secure/virtual-smart-card-evaluate-security.md b/windows/access-protection/virtual-smart-cards/virtual-smart-card-evaluate-security.md
similarity index 100%
rename from windows/keep-secure/virtual-smart-card-evaluate-security.md
rename to windows/access-protection/virtual-smart-cards/virtual-smart-card-evaluate-security.md
diff --git a/windows/keep-secure/virtual-smart-card-get-started.md b/windows/access-protection/virtual-smart-cards/virtual-smart-card-get-started.md
similarity index 100%
rename from windows/keep-secure/virtual-smart-card-get-started.md
rename to windows/access-protection/virtual-smart-cards/virtual-smart-card-get-started.md
diff --git a/windows/keep-secure/virtual-smart-card-overview.md b/windows/access-protection/virtual-smart-cards/virtual-smart-card-overview.md
similarity index 99%
rename from windows/keep-secure/virtual-smart-card-overview.md
rename to windows/access-protection/virtual-smart-cards/virtual-smart-card-overview.md
index 54e8c6f4d2..4ff1788ca5 100644
--- a/windows/keep-secure/virtual-smart-card-overview.md
+++ b/windows/access-protection/virtual-smart-cards/virtual-smart-card-overview.md
@@ -16,7 +16,7 @@ This topic for IT professional provides an overview of the virtual smart card te
**Did you mean…**
-- [Smart Cards](smart-card-windows-smart-card-technical-reference.md)
+- [Smart Cards](../smart-cards/smart-card-windows-smart-card-technical-reference.md)
## Feature description
diff --git a/windows/keep-secure/virtual-smart-card-tpmvscmgr.md b/windows/access-protection/virtual-smart-cards/virtual-smart-card-tpmvscmgr.md
similarity index 100%
rename from windows/keep-secure/virtual-smart-card-tpmvscmgr.md
rename to windows/access-protection/virtual-smart-cards/virtual-smart-card-tpmvscmgr.md
diff --git a/windows/keep-secure/virtual-smart-card-understanding-and-evaluating.md b/windows/access-protection/virtual-smart-cards/virtual-smart-card-understanding-and-evaluating.md
similarity index 100%
rename from windows/keep-secure/virtual-smart-card-understanding-and-evaluating.md
rename to windows/access-protection/virtual-smart-cards/virtual-smart-card-understanding-and-evaluating.md
diff --git a/windows/keep-secure/virtual-smart-card-use-virtual-smart-cards.md b/windows/access-protection/virtual-smart-cards/virtual-smart-card-use-virtual-smart-cards.md
similarity index 100%
rename from windows/keep-secure/virtual-smart-card-use-virtual-smart-cards.md
rename to windows/access-protection/virtual-smart-cards/virtual-smart-card-use-virtual-smart-cards.md
diff --git a/windows/keep-secure/how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md b/windows/access-protection/vpn/how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md
similarity index 100%
rename from windows/keep-secure/how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md
rename to windows/access-protection/vpn/how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md
diff --git a/windows/keep-secure/images/vpn-app-rules.png b/windows/access-protection/vpn/images/vpn-app-rules.png
similarity index 100%
rename from windows/keep-secure/images/vpn-app-rules.png
rename to windows/access-protection/vpn/images/vpn-app-rules.png
diff --git a/windows/keep-secure/images/vpn-app-trigger.PNG b/windows/access-protection/vpn/images/vpn-app-trigger.PNG
similarity index 100%
rename from windows/keep-secure/images/vpn-app-trigger.PNG
rename to windows/access-protection/vpn/images/vpn-app-trigger.PNG
diff --git a/windows/keep-secure/images/vpn-conditional-access-intune.png b/windows/access-protection/vpn/images/vpn-conditional-access-intune.png
similarity index 100%
rename from windows/keep-secure/images/vpn-conditional-access-intune.png
rename to windows/access-protection/vpn/images/vpn-conditional-access-intune.png
diff --git a/windows/keep-secure/images/vpn-connection-intune.png b/windows/access-protection/vpn/images/vpn-connection-intune.png
similarity index 100%
rename from windows/keep-secure/images/vpn-connection-intune.png
rename to windows/access-protection/vpn/images/vpn-connection-intune.png
diff --git a/windows/keep-secure/images/vpn-connection.png b/windows/access-protection/vpn/images/vpn-connection.png
similarity index 100%
rename from windows/keep-secure/images/vpn-connection.png
rename to windows/access-protection/vpn/images/vpn-connection.png
diff --git a/windows/keep-secure/images/vpn-custom-xml-intune.png b/windows/access-protection/vpn/images/vpn-custom-xml-intune.png
similarity index 100%
rename from windows/keep-secure/images/vpn-custom-xml-intune.png
rename to windows/access-protection/vpn/images/vpn-custom-xml-intune.png
diff --git a/windows/keep-secure/images/vpn-device-compliance.png b/windows/access-protection/vpn/images/vpn-device-compliance.png
similarity index 100%
rename from windows/keep-secure/images/vpn-device-compliance.png
rename to windows/access-protection/vpn/images/vpn-device-compliance.png
diff --git a/windows/keep-secure/images/vpn-eap-xml.png b/windows/access-protection/vpn/images/vpn-eap-xml.png
similarity index 100%
rename from windows/keep-secure/images/vpn-eap-xml.png
rename to windows/access-protection/vpn/images/vpn-eap-xml.png
diff --git a/windows/keep-secure/images/vpn-intune-policy.png b/windows/access-protection/vpn/images/vpn-intune-policy.png
similarity index 100%
rename from windows/keep-secure/images/vpn-intune-policy.png
rename to windows/access-protection/vpn/images/vpn-intune-policy.png
diff --git a/windows/keep-secure/images/vpn-name-intune.png b/windows/access-protection/vpn/images/vpn-name-intune.png
similarity index 100%
rename from windows/keep-secure/images/vpn-name-intune.png
rename to windows/access-protection/vpn/images/vpn-name-intune.png
diff --git a/windows/keep-secure/images/vpn-profilexml-intune.png b/windows/access-protection/vpn/images/vpn-profilexml-intune.png
similarity index 100%
rename from windows/keep-secure/images/vpn-profilexml-intune.png
rename to windows/access-protection/vpn/images/vpn-profilexml-intune.png
diff --git a/windows/keep-secure/images/vpn-split-route.png b/windows/access-protection/vpn/images/vpn-split-route.png
similarity index 100%
rename from windows/keep-secure/images/vpn-split-route.png
rename to windows/access-protection/vpn/images/vpn-split-route.png
diff --git a/windows/keep-secure/images/vpn-split.png b/windows/access-protection/vpn/images/vpn-split.png
similarity index 100%
rename from windows/keep-secure/images/vpn-split.png
rename to windows/access-protection/vpn/images/vpn-split.png
diff --git a/windows/keep-secure/images/vpn-traffic-rules.png b/windows/access-protection/vpn/images/vpn-traffic-rules.png
similarity index 100%
rename from windows/keep-secure/images/vpn-traffic-rules.png
rename to windows/access-protection/vpn/images/vpn-traffic-rules.png
diff --git a/windows/keep-secure/vpn-authentication.md b/windows/access-protection/vpn/vpn-authentication.md
similarity index 100%
rename from windows/keep-secure/vpn-authentication.md
rename to windows/access-protection/vpn/vpn-authentication.md
diff --git a/windows/keep-secure/vpn-auto-trigger-profile.md b/windows/access-protection/vpn/vpn-auto-trigger-profile.md
similarity index 100%
rename from windows/keep-secure/vpn-auto-trigger-profile.md
rename to windows/access-protection/vpn/vpn-auto-trigger-profile.md
diff --git a/windows/keep-secure/vpn-conditional-access.md b/windows/access-protection/vpn/vpn-conditional-access.md
similarity index 100%
rename from windows/keep-secure/vpn-conditional-access.md
rename to windows/access-protection/vpn/vpn-conditional-access.md
diff --git a/windows/keep-secure/vpn-connection-type.md b/windows/access-protection/vpn/vpn-connection-type.md
similarity index 100%
rename from windows/keep-secure/vpn-connection-type.md
rename to windows/access-protection/vpn/vpn-connection-type.md
diff --git a/windows/keep-secure/vpn-guide.md b/windows/access-protection/vpn/vpn-guide.md
similarity index 100%
rename from windows/keep-secure/vpn-guide.md
rename to windows/access-protection/vpn/vpn-guide.md
diff --git a/windows/keep-secure/vpn-name-resolution.md b/windows/access-protection/vpn/vpn-name-resolution.md
similarity index 100%
rename from windows/keep-secure/vpn-name-resolution.md
rename to windows/access-protection/vpn/vpn-name-resolution.md
diff --git a/windows/keep-secure/vpn-profile-options.md b/windows/access-protection/vpn/vpn-profile-options.md
similarity index 100%
rename from windows/keep-secure/vpn-profile-options.md
rename to windows/access-protection/vpn/vpn-profile-options.md
diff --git a/windows/keep-secure/vpn-routing.md b/windows/access-protection/vpn/vpn-routing.md
similarity index 100%
rename from windows/keep-secure/vpn-routing.md
rename to windows/access-protection/vpn/vpn-routing.md
diff --git a/windows/keep-secure/vpn-security-features.md b/windows/access-protection/vpn/vpn-security-features.md
similarity index 96%
rename from windows/keep-secure/vpn-security-features.md
rename to windows/access-protection/vpn/vpn-security-features.md
index 93238fc9ca..5fd8b19932 100644
--- a/windows/keep-secure/vpn-security-features.md
+++ b/windows/access-protection/vpn/vpn-security-features.md
@@ -49,7 +49,7 @@ The value of the **EdpModeId** is an Enterprise ID. The networking stack will lo
Additionally, when connecting with WIP, the admin does not have to specify AppTriggerList and TrafficFilterList rules separately in this profile (unless more advanced configuration is needed) because the WIP policies and App lists automatically take effect.
-[Learn more about Windows Information Protection](protect-enterprise-data-using-wip.md)
+[Learn more about Windows Information Protection](/windows/threat-protection/windows-information-protection/protect-enterprise-data-using-wip)
## Traffic filters
diff --git a/windows/keep-secure/windows-credential-theft-mitigation-guide-abstract.md b/windows/access-protection/windows-credential-theft-mitigation-guide-abstract.md
similarity index 100%
rename from windows/keep-secure/windows-credential-theft-mitigation-guide-abstract.md
rename to windows/access-protection/windows-credential-theft-mitigation-guide-abstract.md
diff --git a/windows/keep-secure/add-production-devices-to-the-membership-group-for-a-zone.md b/windows/access-protection/windows-firewall/add-production-devices-to-the-membership-group-for-a-zone.md
similarity index 100%
rename from windows/keep-secure/add-production-devices-to-the-membership-group-for-a-zone.md
rename to windows/access-protection/windows-firewall/add-production-devices-to-the-membership-group-for-a-zone.md
diff --git a/windows/keep-secure/add-test-devices-to-the-membership-group-for-a-zone.md b/windows/access-protection/windows-firewall/add-test-devices-to-the-membership-group-for-a-zone.md
similarity index 100%
rename from windows/keep-secure/add-test-devices-to-the-membership-group-for-a-zone.md
rename to windows/access-protection/windows-firewall/add-test-devices-to-the-membership-group-for-a-zone.md
diff --git a/windows/keep-secure/appendix-a-sample-gpo-template-files-for-settings-used-in-this-guide.md b/windows/access-protection/windows-firewall/appendix-a-sample-gpo-template-files-for-settings-used-in-this-guide.md
similarity index 100%
rename from windows/keep-secure/appendix-a-sample-gpo-template-files-for-settings-used-in-this-guide.md
rename to windows/access-protection/windows-firewall/appendix-a-sample-gpo-template-files-for-settings-used-in-this-guide.md
diff --git a/windows/keep-secure/assign-security-group-filters-to-the-gpo.md b/windows/access-protection/windows-firewall/assign-security-group-filters-to-the-gpo.md
similarity index 100%
rename from windows/keep-secure/assign-security-group-filters-to-the-gpo.md
rename to windows/access-protection/windows-firewall/assign-security-group-filters-to-the-gpo.md
diff --git a/windows/keep-secure/basic-firewall-policy-design.md b/windows/access-protection/windows-firewall/basic-firewall-policy-design.md
similarity index 100%
rename from windows/keep-secure/basic-firewall-policy-design.md
rename to windows/access-protection/windows-firewall/basic-firewall-policy-design.md
diff --git a/windows/keep-secure/boundary-zone-gpos.md b/windows/access-protection/windows-firewall/boundary-zone-gpos.md
similarity index 100%
rename from windows/keep-secure/boundary-zone-gpos.md
rename to windows/access-protection/windows-firewall/boundary-zone-gpos.md
diff --git a/windows/keep-secure/boundary-zone.md b/windows/access-protection/windows-firewall/boundary-zone.md
similarity index 100%
rename from windows/keep-secure/boundary-zone.md
rename to windows/access-protection/windows-firewall/boundary-zone.md
diff --git a/windows/keep-secure/certificate-based-isolation-policy-design-example.md b/windows/access-protection/windows-firewall/certificate-based-isolation-policy-design-example.md
similarity index 100%
rename from windows/keep-secure/certificate-based-isolation-policy-design-example.md
rename to windows/access-protection/windows-firewall/certificate-based-isolation-policy-design-example.md
diff --git a/windows/keep-secure/certificate-based-isolation-policy-design.md b/windows/access-protection/windows-firewall/certificate-based-isolation-policy-design.md
similarity index 100%
rename from windows/keep-secure/certificate-based-isolation-policy-design.md
rename to windows/access-protection/windows-firewall/certificate-based-isolation-policy-design.md
diff --git a/windows/keep-secure/change-rules-from-request-to-require-mode.md b/windows/access-protection/windows-firewall/change-rules-from-request-to-require-mode.md
similarity index 100%
rename from windows/keep-secure/change-rules-from-request-to-require-mode.md
rename to windows/access-protection/windows-firewall/change-rules-from-request-to-require-mode.md
diff --git a/windows/keep-secure/checklist-configuring-basic-firewall-settings.md b/windows/access-protection/windows-firewall/checklist-configuring-basic-firewall-settings.md
similarity index 100%
rename from windows/keep-secure/checklist-configuring-basic-firewall-settings.md
rename to windows/access-protection/windows-firewall/checklist-configuring-basic-firewall-settings.md
diff --git a/windows/keep-secure/checklist-configuring-rules-for-an-isolated-server-zone.md b/windows/access-protection/windows-firewall/checklist-configuring-rules-for-an-isolated-server-zone.md
similarity index 100%
rename from windows/keep-secure/checklist-configuring-rules-for-an-isolated-server-zone.md
rename to windows/access-protection/windows-firewall/checklist-configuring-rules-for-an-isolated-server-zone.md
diff --git a/windows/keep-secure/checklist-configuring-rules-for-servers-in-a-standalone-isolated-server-zone.md b/windows/access-protection/windows-firewall/checklist-configuring-rules-for-servers-in-a-standalone-isolated-server-zone.md
similarity index 100%
rename from windows/keep-secure/checklist-configuring-rules-for-servers-in-a-standalone-isolated-server-zone.md
rename to windows/access-protection/windows-firewall/checklist-configuring-rules-for-servers-in-a-standalone-isolated-server-zone.md
diff --git a/windows/keep-secure/checklist-configuring-rules-for-the-boundary-zone.md b/windows/access-protection/windows-firewall/checklist-configuring-rules-for-the-boundary-zone.md
similarity index 100%
rename from windows/keep-secure/checklist-configuring-rules-for-the-boundary-zone.md
rename to windows/access-protection/windows-firewall/checklist-configuring-rules-for-the-boundary-zone.md
diff --git a/windows/keep-secure/checklist-configuring-rules-for-the-encryption-zone.md b/windows/access-protection/windows-firewall/checklist-configuring-rules-for-the-encryption-zone.md
similarity index 100%
rename from windows/keep-secure/checklist-configuring-rules-for-the-encryption-zone.md
rename to windows/access-protection/windows-firewall/checklist-configuring-rules-for-the-encryption-zone.md
diff --git a/windows/keep-secure/checklist-configuring-rules-for-the-isolated-domain.md b/windows/access-protection/windows-firewall/checklist-configuring-rules-for-the-isolated-domain.md
similarity index 100%
rename from windows/keep-secure/checklist-configuring-rules-for-the-isolated-domain.md
rename to windows/access-protection/windows-firewall/checklist-configuring-rules-for-the-isolated-domain.md
diff --git a/windows/keep-secure/checklist-creating-group-policy-objects.md b/windows/access-protection/windows-firewall/checklist-creating-group-policy-objects.md
similarity index 100%
rename from windows/keep-secure/checklist-creating-group-policy-objects.md
rename to windows/access-protection/windows-firewall/checklist-creating-group-policy-objects.md
diff --git a/windows/keep-secure/checklist-creating-inbound-firewall-rules.md b/windows/access-protection/windows-firewall/checklist-creating-inbound-firewall-rules.md
similarity index 100%
rename from windows/keep-secure/checklist-creating-inbound-firewall-rules.md
rename to windows/access-protection/windows-firewall/checklist-creating-inbound-firewall-rules.md
diff --git a/windows/keep-secure/checklist-creating-outbound-firewall-rules.md b/windows/access-protection/windows-firewall/checklist-creating-outbound-firewall-rules.md
similarity index 100%
rename from windows/keep-secure/checklist-creating-outbound-firewall-rules.md
rename to windows/access-protection/windows-firewall/checklist-creating-outbound-firewall-rules.md
diff --git a/windows/keep-secure/checklist-creating-rules-for-clients-of-a-standalone-isolated-server-zone.md b/windows/access-protection/windows-firewall/checklist-creating-rules-for-clients-of-a-standalone-isolated-server-zone.md
similarity index 100%
rename from windows/keep-secure/checklist-creating-rules-for-clients-of-a-standalone-isolated-server-zone.md
rename to windows/access-protection/windows-firewall/checklist-creating-rules-for-clients-of-a-standalone-isolated-server-zone.md
diff --git a/windows/keep-secure/checklist-implementing-a-basic-firewall-policy-design.md b/windows/access-protection/windows-firewall/checklist-implementing-a-basic-firewall-policy-design.md
similarity index 100%
rename from windows/keep-secure/checklist-implementing-a-basic-firewall-policy-design.md
rename to windows/access-protection/windows-firewall/checklist-implementing-a-basic-firewall-policy-design.md
diff --git a/windows/keep-secure/checklist-implementing-a-certificate-based-isolation-policy-design.md b/windows/access-protection/windows-firewall/checklist-implementing-a-certificate-based-isolation-policy-design.md
similarity index 100%
rename from windows/keep-secure/checklist-implementing-a-certificate-based-isolation-policy-design.md
rename to windows/access-protection/windows-firewall/checklist-implementing-a-certificate-based-isolation-policy-design.md
diff --git a/windows/keep-secure/checklist-implementing-a-domain-isolation-policy-design.md b/windows/access-protection/windows-firewall/checklist-implementing-a-domain-isolation-policy-design.md
similarity index 100%
rename from windows/keep-secure/checklist-implementing-a-domain-isolation-policy-design.md
rename to windows/access-protection/windows-firewall/checklist-implementing-a-domain-isolation-policy-design.md
diff --git a/windows/keep-secure/checklist-implementing-a-standalone-server-isolation-policy-design.md b/windows/access-protection/windows-firewall/checklist-implementing-a-standalone-server-isolation-policy-design.md
similarity index 100%
rename from windows/keep-secure/checklist-implementing-a-standalone-server-isolation-policy-design.md
rename to windows/access-protection/windows-firewall/checklist-implementing-a-standalone-server-isolation-policy-design.md
diff --git a/windows/keep-secure/configure-authentication-methods.md b/windows/access-protection/windows-firewall/configure-authentication-methods.md
similarity index 100%
rename from windows/keep-secure/configure-authentication-methods.md
rename to windows/access-protection/windows-firewall/configure-authentication-methods.md
diff --git a/windows/keep-secure/configure-data-protection-quick-mode-settings.md b/windows/access-protection/windows-firewall/configure-data-protection-quick-mode-settings.md
similarity index 100%
rename from windows/keep-secure/configure-data-protection-quick-mode-settings.md
rename to windows/access-protection/windows-firewall/configure-data-protection-quick-mode-settings.md
diff --git a/windows/keep-secure/configure-group-policy-to-autoenroll-and-deploy-certificates.md b/windows/access-protection/windows-firewall/configure-group-policy-to-autoenroll-and-deploy-certificates.md
similarity index 100%
rename from windows/keep-secure/configure-group-policy-to-autoenroll-and-deploy-certificates.md
rename to windows/access-protection/windows-firewall/configure-group-policy-to-autoenroll-and-deploy-certificates.md
diff --git a/windows/keep-secure/configure-key-exchange-main-mode-settings.md b/windows/access-protection/windows-firewall/configure-key-exchange-main-mode-settings.md
similarity index 100%
rename from windows/keep-secure/configure-key-exchange-main-mode-settings.md
rename to windows/access-protection/windows-firewall/configure-key-exchange-main-mode-settings.md
diff --git a/windows/keep-secure/configure-the-rules-to-require-encryption.md b/windows/access-protection/windows-firewall/configure-the-rules-to-require-encryption.md
similarity index 100%
rename from windows/keep-secure/configure-the-rules-to-require-encryption.md
rename to windows/access-protection/windows-firewall/configure-the-rules-to-require-encryption.md
diff --git a/windows/keep-secure/configure-the-windows-firewall-log.md b/windows/access-protection/windows-firewall/configure-the-windows-firewall-log.md
similarity index 100%
rename from windows/keep-secure/configure-the-windows-firewall-log.md
rename to windows/access-protection/windows-firewall/configure-the-windows-firewall-log.md
diff --git a/windows/keep-secure/configure-the-workstation-authentication-certificate-template.md b/windows/access-protection/windows-firewall/configure-the-workstation-authentication-certificate-template.md
similarity index 100%
rename from windows/keep-secure/configure-the-workstation-authentication-certificate-template.md
rename to windows/access-protection/windows-firewall/configure-the-workstation-authentication-certificate-template.md
diff --git a/windows/keep-secure/configure-windows-firewall-to-suppress-notifications-when-a-program-is-blocked.md b/windows/access-protection/windows-firewall/configure-windows-firewall-to-suppress-notifications-when-a-program-is-blocked.md
similarity index 100%
rename from windows/keep-secure/configure-windows-firewall-to-suppress-notifications-when-a-program-is-blocked.md
rename to windows/access-protection/windows-firewall/configure-windows-firewall-to-suppress-notifications-when-a-program-is-blocked.md
diff --git a/windows/keep-secure/confirm-that-certificates-are-deployed-correctly.md b/windows/access-protection/windows-firewall/confirm-that-certificates-are-deployed-correctly.md
similarity index 100%
rename from windows/keep-secure/confirm-that-certificates-are-deployed-correctly.md
rename to windows/access-protection/windows-firewall/confirm-that-certificates-are-deployed-correctly.md
diff --git a/windows/keep-secure/copy-a-gpo-to-create-a-new-gpo.md b/windows/access-protection/windows-firewall/copy-a-gpo-to-create-a-new-gpo.md
similarity index 100%
rename from windows/keep-secure/copy-a-gpo-to-create-a-new-gpo.md
rename to windows/access-protection/windows-firewall/copy-a-gpo-to-create-a-new-gpo.md
diff --git a/windows/keep-secure/create-a-group-account-in-active-directory.md b/windows/access-protection/windows-firewall/create-a-group-account-in-active-directory.md
similarity index 100%
rename from windows/keep-secure/create-a-group-account-in-active-directory.md
rename to windows/access-protection/windows-firewall/create-a-group-account-in-active-directory.md
diff --git a/windows/keep-secure/create-a-group-policy-object.md b/windows/access-protection/windows-firewall/create-a-group-policy-object.md
similarity index 100%
rename from windows/keep-secure/create-a-group-policy-object.md
rename to windows/access-protection/windows-firewall/create-a-group-policy-object.md
diff --git a/windows/keep-secure/create-an-authentication-exemption-list-rule.md b/windows/access-protection/windows-firewall/create-an-authentication-exemption-list-rule.md
similarity index 100%
rename from windows/keep-secure/create-an-authentication-exemption-list-rule.md
rename to windows/access-protection/windows-firewall/create-an-authentication-exemption-list-rule.md
diff --git a/windows/keep-secure/create-an-authentication-request-rule.md b/windows/access-protection/windows-firewall/create-an-authentication-request-rule.md
similarity index 100%
rename from windows/keep-secure/create-an-authentication-request-rule.md
rename to windows/access-protection/windows-firewall/create-an-authentication-request-rule.md
diff --git a/windows/keep-secure/create-an-inbound-icmp-rule.md b/windows/access-protection/windows-firewall/create-an-inbound-icmp-rule.md
similarity index 100%
rename from windows/keep-secure/create-an-inbound-icmp-rule.md
rename to windows/access-protection/windows-firewall/create-an-inbound-icmp-rule.md
diff --git a/windows/keep-secure/create-an-inbound-port-rule.md b/windows/access-protection/windows-firewall/create-an-inbound-port-rule.md
similarity index 100%
rename from windows/keep-secure/create-an-inbound-port-rule.md
rename to windows/access-protection/windows-firewall/create-an-inbound-port-rule.md
diff --git a/windows/keep-secure/create-an-inbound-program-or-service-rule.md b/windows/access-protection/windows-firewall/create-an-inbound-program-or-service-rule.md
similarity index 100%
rename from windows/keep-secure/create-an-inbound-program-or-service-rule.md
rename to windows/access-protection/windows-firewall/create-an-inbound-program-or-service-rule.md
diff --git a/windows/keep-secure/create-an-outbound-port-rule.md b/windows/access-protection/windows-firewall/create-an-outbound-port-rule.md
similarity index 100%
rename from windows/keep-secure/create-an-outbound-port-rule.md
rename to windows/access-protection/windows-firewall/create-an-outbound-port-rule.md
diff --git a/windows/keep-secure/create-an-outbound-program-or-service-rule.md b/windows/access-protection/windows-firewall/create-an-outbound-program-or-service-rule.md
similarity index 100%
rename from windows/keep-secure/create-an-outbound-program-or-service-rule.md
rename to windows/access-protection/windows-firewall/create-an-outbound-program-or-service-rule.md
diff --git a/windows/keep-secure/create-inbound-rules-to-support-rpc.md b/windows/access-protection/windows-firewall/create-inbound-rules-to-support-rpc.md
similarity index 100%
rename from windows/keep-secure/create-inbound-rules-to-support-rpc.md
rename to windows/access-protection/windows-firewall/create-inbound-rules-to-support-rpc.md
diff --git a/windows/keep-secure/create-wmi-filters-for-the-gpo.md b/windows/access-protection/windows-firewall/create-wmi-filters-for-the-gpo.md
similarity index 100%
rename from windows/keep-secure/create-wmi-filters-for-the-gpo.md
rename to windows/access-protection/windows-firewall/create-wmi-filters-for-the-gpo.md
diff --git a/windows/keep-secure/designing-a-windows-firewall-with-advanced-security-strategy.md b/windows/access-protection/windows-firewall/designing-a-windows-firewall-with-advanced-security-strategy.md
similarity index 100%
rename from windows/keep-secure/designing-a-windows-firewall-with-advanced-security-strategy.md
rename to windows/access-protection/windows-firewall/designing-a-windows-firewall-with-advanced-security-strategy.md
diff --git a/windows/keep-secure/determining-the-trusted-state-of-your-devices.md b/windows/access-protection/windows-firewall/determining-the-trusted-state-of-your-devices.md
similarity index 100%
rename from windows/keep-secure/determining-the-trusted-state-of-your-devices.md
rename to windows/access-protection/windows-firewall/determining-the-trusted-state-of-your-devices.md
diff --git a/windows/keep-secure/documenting-the-zones.md b/windows/access-protection/windows-firewall/documenting-the-zones.md
similarity index 100%
rename from windows/keep-secure/documenting-the-zones.md
rename to windows/access-protection/windows-firewall/documenting-the-zones.md
diff --git a/windows/keep-secure/domain-isolation-policy-design-example.md b/windows/access-protection/windows-firewall/domain-isolation-policy-design-example.md
similarity index 100%
rename from windows/keep-secure/domain-isolation-policy-design-example.md
rename to windows/access-protection/windows-firewall/domain-isolation-policy-design-example.md
diff --git a/windows/keep-secure/domain-isolation-policy-design.md b/windows/access-protection/windows-firewall/domain-isolation-policy-design.md
similarity index 100%
rename from windows/keep-secure/domain-isolation-policy-design.md
rename to windows/access-protection/windows-firewall/domain-isolation-policy-design.md
diff --git a/windows/keep-secure/enable-predefined-inbound-rules.md b/windows/access-protection/windows-firewall/enable-predefined-inbound-rules.md
similarity index 100%
rename from windows/keep-secure/enable-predefined-inbound-rules.md
rename to windows/access-protection/windows-firewall/enable-predefined-inbound-rules.md
diff --git a/windows/keep-secure/enable-predefined-outbound-rules.md b/windows/access-protection/windows-firewall/enable-predefined-outbound-rules.md
similarity index 100%
rename from windows/keep-secure/enable-predefined-outbound-rules.md
rename to windows/access-protection/windows-firewall/enable-predefined-outbound-rules.md
diff --git a/windows/keep-secure/encryption-zone-gpos.md b/windows/access-protection/windows-firewall/encryption-zone-gpos.md
similarity index 100%
rename from windows/keep-secure/encryption-zone-gpos.md
rename to windows/access-protection/windows-firewall/encryption-zone-gpos.md
diff --git a/windows/keep-secure/encryption-zone.md b/windows/access-protection/windows-firewall/encryption-zone.md
similarity index 100%
rename from windows/keep-secure/encryption-zone.md
rename to windows/access-protection/windows-firewall/encryption-zone.md
diff --git a/windows/keep-secure/evaluating-windows-firewall-with-advanced-security-design-examples.md b/windows/access-protection/windows-firewall/evaluating-windows-firewall-with-advanced-security-design-examples.md
similarity index 100%
rename from windows/keep-secure/evaluating-windows-firewall-with-advanced-security-design-examples.md
rename to windows/access-protection/windows-firewall/evaluating-windows-firewall-with-advanced-security-design-examples.md
diff --git a/windows/keep-secure/exempt-icmp-from-authentication.md b/windows/access-protection/windows-firewall/exempt-icmp-from-authentication.md
similarity index 100%
rename from windows/keep-secure/exempt-icmp-from-authentication.md
rename to windows/access-protection/windows-firewall/exempt-icmp-from-authentication.md
diff --git a/windows/keep-secure/exemption-list.md b/windows/access-protection/windows-firewall/exemption-list.md
similarity index 100%
rename from windows/keep-secure/exemption-list.md
rename to windows/access-protection/windows-firewall/exemption-list.md
diff --git a/windows/keep-secure/firewall-gpos.md b/windows/access-protection/windows-firewall/firewall-gpos.md
similarity index 100%
rename from windows/keep-secure/firewall-gpos.md
rename to windows/access-protection/windows-firewall/firewall-gpos.md
diff --git a/windows/keep-secure/firewall-policy-design-example.md b/windows/access-protection/windows-firewall/firewall-policy-design-example.md
similarity index 100%
rename from windows/keep-secure/firewall-policy-design-example.md
rename to windows/access-protection/windows-firewall/firewall-policy-design-example.md
diff --git a/windows/keep-secure/gathering-information-about-your-active-directory-deployment.md b/windows/access-protection/windows-firewall/gathering-information-about-your-active-directory-deployment.md
similarity index 100%
rename from windows/keep-secure/gathering-information-about-your-active-directory-deployment.md
rename to windows/access-protection/windows-firewall/gathering-information-about-your-active-directory-deployment.md
diff --git a/windows/keep-secure/gathering-information-about-your-current-network-infrastructure.md b/windows/access-protection/windows-firewall/gathering-information-about-your-current-network-infrastructure.md
similarity index 100%
rename from windows/keep-secure/gathering-information-about-your-current-network-infrastructure.md
rename to windows/access-protection/windows-firewall/gathering-information-about-your-current-network-infrastructure.md
diff --git a/windows/keep-secure/gathering-information-about-your-devices.md b/windows/access-protection/windows-firewall/gathering-information-about-your-devices.md
similarity index 100%
rename from windows/keep-secure/gathering-information-about-your-devices.md
rename to windows/access-protection/windows-firewall/gathering-information-about-your-devices.md
diff --git a/windows/keep-secure/gathering-other-relevant-information.md b/windows/access-protection/windows-firewall/gathering-other-relevant-information.md
similarity index 100%
rename from windows/keep-secure/gathering-other-relevant-information.md
rename to windows/access-protection/windows-firewall/gathering-other-relevant-information.md
diff --git a/windows/keep-secure/gathering-the-information-you-need.md b/windows/access-protection/windows-firewall/gathering-the-information-you-need.md
similarity index 100%
rename from windows/keep-secure/gathering-the-information-you-need.md
rename to windows/access-protection/windows-firewall/gathering-the-information-you-need.md
diff --git a/windows/keep-secure/gpo-domiso-boundary.md b/windows/access-protection/windows-firewall/gpo-domiso-boundary.md
similarity index 100%
rename from windows/keep-secure/gpo-domiso-boundary.md
rename to windows/access-protection/windows-firewall/gpo-domiso-boundary.md
diff --git a/windows/keep-secure/gpo-domiso-encryption.md b/windows/access-protection/windows-firewall/gpo-domiso-encryption.md
similarity index 97%
rename from windows/keep-secure/gpo-domiso-encryption.md
rename to windows/access-protection/windows-firewall/gpo-domiso-encryption.md
index dac33f72d4..b5d3c6801e 100644
--- a/windows/keep-secure/gpo-domiso-encryption.md
+++ b/windows/access-protection/windows-firewall/gpo-domiso-encryption.md
@@ -3,6 +3,10 @@ title: GPO\_DOMISO\_Encryption\_WS2008 (Windows 10)
description: GPO\_DOMISO\_Encryption\_WS2008
ms.assetid: 84375480-af6a-4c79-aafe-0a37115a7446
author: brianlic-msft
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: security
---
# GPO\_DOMISO\_Encryption\_WS2008
diff --git a/windows/keep-secure/gpo-domiso-firewall.md b/windows/access-protection/windows-firewall/gpo-domiso-firewall.md
similarity index 100%
rename from windows/keep-secure/gpo-domiso-firewall.md
rename to windows/access-protection/windows-firewall/gpo-domiso-firewall.md
diff --git a/windows/keep-secure/gpo-domiso-isolateddomain-clients.md b/windows/access-protection/windows-firewall/gpo-domiso-isolateddomain-clients.md
similarity index 100%
rename from windows/keep-secure/gpo-domiso-isolateddomain-clients.md
rename to windows/access-protection/windows-firewall/gpo-domiso-isolateddomain-clients.md
diff --git a/windows/keep-secure/gpo-domiso-isolateddomain-servers.md b/windows/access-protection/windows-firewall/gpo-domiso-isolateddomain-servers.md
similarity index 100%
rename from windows/keep-secure/gpo-domiso-isolateddomain-servers.md
rename to windows/access-protection/windows-firewall/gpo-domiso-isolateddomain-servers.md
diff --git a/windows/keep-secure/identifying-your-windows-firewall-with-advanced-security-deployment-goals.md b/windows/access-protection/windows-firewall/identifying-your-windows-firewall-with-advanced-security-deployment-goals.md
similarity index 100%
rename from windows/keep-secure/identifying-your-windows-firewall-with-advanced-security-deployment-goals.md
rename to windows/access-protection/windows-firewall/identifying-your-windows-firewall-with-advanced-security-deployment-goals.md
diff --git a/windows/access-protection/windows-firewall/images/corpnet.gif b/windows/access-protection/windows-firewall/images/corpnet.gif
new file mode 100644
index 0000000000..f76182ee25
Binary files /dev/null and b/windows/access-protection/windows-firewall/images/corpnet.gif differ
diff --git a/windows/keep-secure/images/createipsecrule.gif b/windows/access-protection/windows-firewall/images/createipsecrule.gif
similarity index 100%
rename from windows/keep-secure/images/createipsecrule.gif
rename to windows/access-protection/windows-firewall/images/createipsecrule.gif
diff --git a/windows/keep-secure/images/powershelllogosmall.gif b/windows/access-protection/windows-firewall/images/powershelllogosmall.gif
similarity index 100%
rename from windows/keep-secure/images/powershelllogosmall.gif
rename to windows/access-protection/windows-firewall/images/powershelllogosmall.gif
diff --git a/windows/keep-secure/images/qmcryptoset.gif b/windows/access-protection/windows-firewall/images/qmcryptoset.gif
similarity index 100%
rename from windows/keep-secure/images/qmcryptoset.gif
rename to windows/access-protection/windows-firewall/images/qmcryptoset.gif
diff --git a/windows/keep-secure/images/wfas-design2example1.gif b/windows/access-protection/windows-firewall/images/wfas-design2example1.gif
similarity index 100%
rename from windows/keep-secure/images/wfas-design2example1.gif
rename to windows/access-protection/windows-firewall/images/wfas-design2example1.gif
diff --git a/windows/keep-secure/images/wfas-design3example1.gif b/windows/access-protection/windows-firewall/images/wfas-design3example1.gif
similarity index 100%
rename from windows/keep-secure/images/wfas-design3example1.gif
rename to windows/access-protection/windows-firewall/images/wfas-design3example1.gif
diff --git a/windows/keep-secure/images/wfas-designexample1.gif b/windows/access-protection/windows-firewall/images/wfas-designexample1.gif
similarity index 100%
rename from windows/keep-secure/images/wfas-designexample1.gif
rename to windows/access-protection/windows-firewall/images/wfas-designexample1.gif
diff --git a/windows/keep-secure/images/wfas-designflowchart1.gif b/windows/access-protection/windows-firewall/images/wfas-designflowchart1.gif
similarity index 100%
rename from windows/keep-secure/images/wfas-designflowchart1.gif
rename to windows/access-protection/windows-firewall/images/wfas-designflowchart1.gif
diff --git a/windows/keep-secure/images/wfas-domainiso.gif b/windows/access-protection/windows-firewall/images/wfas-domainiso.gif
similarity index 100%
rename from windows/keep-secure/images/wfas-domainiso.gif
rename to windows/access-protection/windows-firewall/images/wfas-domainiso.gif
diff --git a/windows/keep-secure/images/wfas-domainisoencrypt.gif b/windows/access-protection/windows-firewall/images/wfas-domainisoencrypt.gif
similarity index 100%
rename from windows/keep-secure/images/wfas-domainisoencrypt.gif
rename to windows/access-protection/windows-firewall/images/wfas-domainisoencrypt.gif
diff --git a/windows/keep-secure/images/wfas-domainisohighsec.gif b/windows/access-protection/windows-firewall/images/wfas-domainisohighsec.gif
similarity index 100%
rename from windows/keep-secure/images/wfas-domainisohighsec.gif
rename to windows/access-protection/windows-firewall/images/wfas-domainisohighsec.gif
diff --git a/windows/keep-secure/images/wfas-domainnag.gif b/windows/access-protection/windows-firewall/images/wfas-domainnag.gif
similarity index 100%
rename from windows/keep-secure/images/wfas-domainnag.gif
rename to windows/access-protection/windows-firewall/images/wfas-domainnag.gif
diff --git a/windows/keep-secure/images/wfas-icon-checkbox.gif b/windows/access-protection/windows-firewall/images/wfas-icon-checkbox.gif
similarity index 100%
rename from windows/keep-secure/images/wfas-icon-checkbox.gif
rename to windows/access-protection/windows-firewall/images/wfas-icon-checkbox.gif
diff --git a/windows/keep-secure/images/wfas-implement.gif b/windows/access-protection/windows-firewall/images/wfas-implement.gif
similarity index 100%
rename from windows/keep-secure/images/wfas-implement.gif
rename to windows/access-protection/windows-firewall/images/wfas-implement.gif
diff --git a/windows/keep-secure/images/wfasdomainisoboundary.gif b/windows/access-protection/windows-firewall/images/wfasdomainisoboundary.gif
similarity index 100%
rename from windows/keep-secure/images/wfasdomainisoboundary.gif
rename to windows/access-protection/windows-firewall/images/wfasdomainisoboundary.gif
diff --git a/windows/keep-secure/implementing-your-windows-firewall-with-advanced-security-design-plan.md b/windows/access-protection/windows-firewall/implementing-your-windows-firewall-with-advanced-security-design-plan.md
similarity index 100%
rename from windows/keep-secure/implementing-your-windows-firewall-with-advanced-security-design-plan.md
rename to windows/access-protection/windows-firewall/implementing-your-windows-firewall-with-advanced-security-design-plan.md
diff --git a/windows/keep-secure/isolated-domain-gpos.md b/windows/access-protection/windows-firewall/isolated-domain-gpos.md
similarity index 100%
rename from windows/keep-secure/isolated-domain-gpos.md
rename to windows/access-protection/windows-firewall/isolated-domain-gpos.md
diff --git a/windows/keep-secure/isolated-domain.md b/windows/access-protection/windows-firewall/isolated-domain.md
similarity index 100%
rename from windows/keep-secure/isolated-domain.md
rename to windows/access-protection/windows-firewall/isolated-domain.md
diff --git a/windows/keep-secure/isolating-apps-on-your-network.md b/windows/access-protection/windows-firewall/isolating-apps-on-your-network.md
similarity index 100%
rename from windows/keep-secure/isolating-apps-on-your-network.md
rename to windows/access-protection/windows-firewall/isolating-apps-on-your-network.md
diff --git a/windows/keep-secure/link-the-gpo-to-the-domain.md b/windows/access-protection/windows-firewall/link-the-gpo-to-the-domain.md
similarity index 100%
rename from windows/keep-secure/link-the-gpo-to-the-domain.md
rename to windows/access-protection/windows-firewall/link-the-gpo-to-the-domain.md
diff --git a/windows/keep-secure/mapping-your-deployment-goals-to-a-windows-firewall-with-advanced-security-design.md b/windows/access-protection/windows-firewall/mapping-your-deployment-goals-to-a-windows-firewall-with-advanced-security-design.md
similarity index 100%
rename from windows/keep-secure/mapping-your-deployment-goals-to-a-windows-firewall-with-advanced-security-design.md
rename to windows/access-protection/windows-firewall/mapping-your-deployment-goals-to-a-windows-firewall-with-advanced-security-design.md
diff --git a/windows/keep-secure/modify-gpo-filters-to-apply-to-a-different-zone-or-version-of-windows.md b/windows/access-protection/windows-firewall/modify-gpo-filters-to-apply-to-a-different-zone-or-version-of-windows.md
similarity index 100%
rename from windows/keep-secure/modify-gpo-filters-to-apply-to-a-different-zone-or-version-of-windows.md
rename to windows/access-protection/windows-firewall/modify-gpo-filters-to-apply-to-a-different-zone-or-version-of-windows.md
diff --git a/windows/keep-secure/open-the-group-policy-management-console-to-ip-security-policies.md b/windows/access-protection/windows-firewall/open-the-group-policy-management-console-to-ip-security-policies.md
similarity index 100%
rename from windows/keep-secure/open-the-group-policy-management-console-to-ip-security-policies.md
rename to windows/access-protection/windows-firewall/open-the-group-policy-management-console-to-ip-security-policies.md
diff --git a/windows/keep-secure/open-the-group-policy-management-console-to-windows-firewall-with-advanced-security.md b/windows/access-protection/windows-firewall/open-the-group-policy-management-console-to-windows-firewall-with-advanced-security.md
similarity index 100%
rename from windows/keep-secure/open-the-group-policy-management-console-to-windows-firewall-with-advanced-security.md
rename to windows/access-protection/windows-firewall/open-the-group-policy-management-console-to-windows-firewall-with-advanced-security.md
diff --git a/windows/keep-secure/open-the-group-policy-management-console-to-windows-firewall.md b/windows/access-protection/windows-firewall/open-the-group-policy-management-console-to-windows-firewall.md
similarity index 100%
rename from windows/keep-secure/open-the-group-policy-management-console-to-windows-firewall.md
rename to windows/access-protection/windows-firewall/open-the-group-policy-management-console-to-windows-firewall.md
diff --git a/windows/keep-secure/open-windows-firewall-with-advanced-security.md b/windows/access-protection/windows-firewall/open-windows-firewall-with-advanced-security.md
similarity index 100%
rename from windows/keep-secure/open-windows-firewall-with-advanced-security.md
rename to windows/access-protection/windows-firewall/open-windows-firewall-with-advanced-security.md
diff --git a/windows/keep-secure/planning-certificate-based-authentication.md b/windows/access-protection/windows-firewall/planning-certificate-based-authentication.md
similarity index 100%
rename from windows/keep-secure/planning-certificate-based-authentication.md
rename to windows/access-protection/windows-firewall/planning-certificate-based-authentication.md
diff --git a/windows/keep-secure/planning-domain-isolation-zones.md b/windows/access-protection/windows-firewall/planning-domain-isolation-zones.md
similarity index 100%
rename from windows/keep-secure/planning-domain-isolation-zones.md
rename to windows/access-protection/windows-firewall/planning-domain-isolation-zones.md
diff --git a/windows/keep-secure/planning-gpo-deployment.md b/windows/access-protection/windows-firewall/planning-gpo-deployment.md
similarity index 100%
rename from windows/keep-secure/planning-gpo-deployment.md
rename to windows/access-protection/windows-firewall/planning-gpo-deployment.md
diff --git a/windows/keep-secure/planning-group-policy-deployment-for-your-isolation-zones.md b/windows/access-protection/windows-firewall/planning-group-policy-deployment-for-your-isolation-zones.md
similarity index 100%
rename from windows/keep-secure/planning-group-policy-deployment-for-your-isolation-zones.md
rename to windows/access-protection/windows-firewall/planning-group-policy-deployment-for-your-isolation-zones.md
diff --git a/windows/keep-secure/planning-isolation-groups-for-the-zones.md b/windows/access-protection/windows-firewall/planning-isolation-groups-for-the-zones.md
similarity index 100%
rename from windows/keep-secure/planning-isolation-groups-for-the-zones.md
rename to windows/access-protection/windows-firewall/planning-isolation-groups-for-the-zones.md
diff --git a/windows/keep-secure/planning-network-access-groups.md b/windows/access-protection/windows-firewall/planning-network-access-groups.md
similarity index 100%
rename from windows/keep-secure/planning-network-access-groups.md
rename to windows/access-protection/windows-firewall/planning-network-access-groups.md
diff --git a/windows/keep-secure/planning-server-isolation-zones.md b/windows/access-protection/windows-firewall/planning-server-isolation-zones.md
similarity index 100%
rename from windows/keep-secure/planning-server-isolation-zones.md
rename to windows/access-protection/windows-firewall/planning-server-isolation-zones.md
diff --git a/windows/keep-secure/planning-settings-for-a-basic-firewall-policy.md b/windows/access-protection/windows-firewall/planning-settings-for-a-basic-firewall-policy.md
similarity index 100%
rename from windows/keep-secure/planning-settings-for-a-basic-firewall-policy.md
rename to windows/access-protection/windows-firewall/planning-settings-for-a-basic-firewall-policy.md
diff --git a/windows/keep-secure/planning-the-gpos.md b/windows/access-protection/windows-firewall/planning-the-gpos.md
similarity index 100%
rename from windows/keep-secure/planning-the-gpos.md
rename to windows/access-protection/windows-firewall/planning-the-gpos.md
diff --git a/windows/keep-secure/planning-to-deploy-windows-firewall-with-advanced-security.md b/windows/access-protection/windows-firewall/planning-to-deploy-windows-firewall-with-advanced-security.md
similarity index 100%
rename from windows/keep-secure/planning-to-deploy-windows-firewall-with-advanced-security.md
rename to windows/access-protection/windows-firewall/planning-to-deploy-windows-firewall-with-advanced-security.md
diff --git a/windows/keep-secure/planning-your-windows-firewall-with-advanced-security-design.md b/windows/access-protection/windows-firewall/planning-your-windows-firewall-with-advanced-security-design.md
similarity index 100%
rename from windows/keep-secure/planning-your-windows-firewall-with-advanced-security-design.md
rename to windows/access-protection/windows-firewall/planning-your-windows-firewall-with-advanced-security-design.md
diff --git a/windows/keep-secure/procedures-used-in-this-guide.md b/windows/access-protection/windows-firewall/procedures-used-in-this-guide.md
similarity index 100%
rename from windows/keep-secure/procedures-used-in-this-guide.md
rename to windows/access-protection/windows-firewall/procedures-used-in-this-guide.md
diff --git a/windows/keep-secure/protect-devices-from-unwanted-network-traffic.md b/windows/access-protection/windows-firewall/protect-devices-from-unwanted-network-traffic.md
similarity index 100%
rename from windows/keep-secure/protect-devices-from-unwanted-network-traffic.md
rename to windows/access-protection/windows-firewall/protect-devices-from-unwanted-network-traffic.md
diff --git a/windows/keep-secure/require-encryption-when-accessing-sensitive-network-resources.md b/windows/access-protection/windows-firewall/require-encryption-when-accessing-sensitive-network-resources.md
similarity index 100%
rename from windows/keep-secure/require-encryption-when-accessing-sensitive-network-resources.md
rename to windows/access-protection/windows-firewall/require-encryption-when-accessing-sensitive-network-resources.md
diff --git a/windows/keep-secure/restrict-access-to-only-specified-users-or-devices.md b/windows/access-protection/windows-firewall/restrict-access-to-only-specified-users-or-devices.md
similarity index 100%
rename from windows/keep-secure/restrict-access-to-only-specified-users-or-devices.md
rename to windows/access-protection/windows-firewall/restrict-access-to-only-specified-users-or-devices.md
diff --git a/windows/keep-secure/restrict-access-to-only-trusted-devices.md b/windows/access-protection/windows-firewall/restrict-access-to-only-trusted-devices.md
similarity index 100%
rename from windows/keep-secure/restrict-access-to-only-trusted-devices.md
rename to windows/access-protection/windows-firewall/restrict-access-to-only-trusted-devices.md
diff --git a/windows/keep-secure/restrict-server-access-to-members-of-a-group-only.md b/windows/access-protection/windows-firewall/restrict-server-access-to-members-of-a-group-only.md
similarity index 100%
rename from windows/keep-secure/restrict-server-access-to-members-of-a-group-only.md
rename to windows/access-protection/windows-firewall/restrict-server-access-to-members-of-a-group-only.md
diff --git a/windows/keep-secure/securing-end-to-end-ipsec-connections-by-using-ikev2.md b/windows/access-protection/windows-firewall/securing-end-to-end-ipsec-connections-by-using-ikev2.md
similarity index 100%
rename from windows/keep-secure/securing-end-to-end-ipsec-connections-by-using-ikev2.md
rename to windows/access-protection/windows-firewall/securing-end-to-end-ipsec-connections-by-using-ikev2.md
diff --git a/windows/keep-secure/server-isolation-gpos.md b/windows/access-protection/windows-firewall/server-isolation-gpos.md
similarity index 100%
rename from windows/keep-secure/server-isolation-gpos.md
rename to windows/access-protection/windows-firewall/server-isolation-gpos.md
diff --git a/windows/keep-secure/server-isolation-policy-design-example.md b/windows/access-protection/windows-firewall/server-isolation-policy-design-example.md
similarity index 100%
rename from windows/keep-secure/server-isolation-policy-design-example.md
rename to windows/access-protection/windows-firewall/server-isolation-policy-design-example.md
diff --git a/windows/keep-secure/server-isolation-policy-design.md b/windows/access-protection/windows-firewall/server-isolation-policy-design.md
similarity index 100%
rename from windows/keep-secure/server-isolation-policy-design.md
rename to windows/access-protection/windows-firewall/server-isolation-policy-design.md
diff --git a/windows/keep-secure/turn-on-windows-firewall-and-configure-default-behavior.md b/windows/access-protection/windows-firewall/turn-on-windows-firewall-and-configure-default-behavior.md
similarity index 100%
rename from windows/keep-secure/turn-on-windows-firewall-and-configure-default-behavior.md
rename to windows/access-protection/windows-firewall/turn-on-windows-firewall-and-configure-default-behavior.md
diff --git a/windows/keep-secure/understanding-the-windows-firewall-with-advanced-security-design-process.md b/windows/access-protection/windows-firewall/understanding-the-windows-firewall-with-advanced-security-design-process.md
similarity index 100%
rename from windows/keep-secure/understanding-the-windows-firewall-with-advanced-security-design-process.md
rename to windows/access-protection/windows-firewall/understanding-the-windows-firewall-with-advanced-security-design-process.md
diff --git a/windows/keep-secure/verify-that-network-traffic-is-authenticated.md b/windows/access-protection/windows-firewall/verify-that-network-traffic-is-authenticated.md
similarity index 100%
rename from windows/keep-secure/verify-that-network-traffic-is-authenticated.md
rename to windows/access-protection/windows-firewall/verify-that-network-traffic-is-authenticated.md
diff --git a/windows/keep-secure/windows-firewall-with-advanced-security-administration-with-windows-powershell.md b/windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-administration-with-windows-powershell.md
similarity index 100%
rename from windows/keep-secure/windows-firewall-with-advanced-security-administration-with-windows-powershell.md
rename to windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-administration-with-windows-powershell.md
diff --git a/windows/keep-secure/windows-firewall-with-advanced-security-deployment-guide.md b/windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-deployment-guide.md
similarity index 100%
rename from windows/keep-secure/windows-firewall-with-advanced-security-deployment-guide.md
rename to windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-deployment-guide.md
diff --git a/windows/keep-secure/windows-firewall-with-advanced-security-design-guide.md b/windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-design-guide.md
similarity index 100%
rename from windows/keep-secure/windows-firewall-with-advanced-security-design-guide.md
rename to windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-design-guide.md
diff --git a/windows/keep-secure/windows-firewall-with-advanced-security.md b/windows/access-protection/windows-firewall/windows-firewall-with-advanced-security.md
similarity index 100%
rename from windows/keep-secure/windows-firewall-with-advanced-security.md
rename to windows/access-protection/windows-firewall/windows-firewall-with-advanced-security.md
diff --git a/windows/application-management/TOC.md b/windows/application-management/TOC.md
new file mode 100644
index 0000000000..7f815bfe0e
--- /dev/null
+++ b/windows/application-management/TOC.md
@@ -0,0 +1,101 @@
+# [Manage applications in Windows 10](index.md)
+## [Sideload apps](sideload-apps-in-windows-10.md)
+## [Application Virtualization (App-V) for Windows](app-v/appv-for-windows.md)
+### [Getting Started with App-V](app-v/appv-getting-started.md)
+#### [What's new in App-V for Windows 10, version 1703 and earlier](app-v/appv-about-appv.md)
+##### [Release Notes for App-V for Windows 10, version 1607](app-v/appv-release-notes-for-appv-for-windows.md)
+##### [Release Notes for App-V for Windows 10, version 1703](app-v/appv-release-notes-for-appv-for-windows-1703.md)
+#### [Evaluating App-V](app-v/appv-evaluating-appv.md)
+#### [High Level Architecture for App-V](app-v/appv-high-level-architecture.md)
+### [Planning for App-V](app-v/appv-planning-for-appv.md)
+#### [Preparing Your Environment for App-V](app-v/appv-preparing-your-environment.md)
+##### [App-V Prerequisites](app-v/appv-prerequisites.md)
+##### [App-V Security Considerations](app-v/appv-security-considerations.md)
+#### [Planning to Deploy App-V](app-v/appv-planning-to-deploy-appv.md)
+##### [App-V Supported Configurations](app-v/appv-supported-configurations.md)
+##### [App-V Capacity Planning](app-v/appv-capacity-planning.md)
+##### [Planning for High Availability with App-V](app-v/appv-planning-for-high-availability-with-appv.md)
+##### [Planning to Deploy App-V with an Electronic Software Distribution System](app-v/appv-planning-to-deploy-appv-with-electronic-software-distribution-solutions.md)
+##### [Planning for the App-V Server Deployment](app-v/appv-planning-for-appv-server-deployment.md)
+##### [Planning for the App-V Sequencer and Client Deployment](app-v/appv-planning-for-sequencer-and-client-deployment.md)
+##### [Planning for Using App-V with Office](app-v/appv-planning-for-using-appv-with-office.md)
+##### [Planning to Use Folder Redirection with App-V](app-v/appv-planning-folder-redirection-with-appv.md)
+#### [App-V Planning Checklist](app-v/appv-planning-checklist.md)
+### [Deploying App-V](app-v/appv-deploying-appv.md)
+#### [Deploying the App-V Sequencer and Configuring the Client](app-v/appv-deploying-the-appv-sequencer-and-client.md)
+##### [About Client Configuration Settings](app-v/appv-client-configuration-settings.md)
+##### [Enable the App-V desktop client](app-v/appv-enable-the-app-v-desktop-client.md)
+##### [How to Install the Sequencer](app-v/appv-install-the-sequencer.md)
+#### [Deploying the App-V Server](app-v/appv-deploying-the-appv-server.md)
+##### [How to Deploy the App-V Server](app-v/appv-deploy-the-appv-server.md)
+##### [How to Deploy the App-V Server Using a Script](app-v/appv-deploy-the-appv-server-with-a-script.md)
+##### [How to Deploy the App-V Databases by Using SQL Scripts](app-v/appv-deploy-appv-databases-with-sql-scripts.md)
+##### [How to Install the Publishing Server on a Remote Computer](app-v/appv-install-the-publishing-server-on-a-remote-computer.md)
+##### [How to Install the Management and Reporting Databases on Separate Computers from the Management and Reporting Services](app-v/appv-install-the-management-and-reporting-databases-on-separate-computers.md)
+##### [How to install the Management Server on a Standalone Computer and Connect it to the Database ](app-v/appv-install-the-management-server-on-a-standalone-computer.md)
+##### [About App-V Reporting](app-v/appv-reporting.md)
+##### [How to install the Reporting Server on a Standalone Computer and Connect it to the Database](app-v/appv-install-the-reporting-server-on-a-standalone-computer.md)
+#### [App-V Deployment Checklist](app-v/appv-deployment-checklist.md)
+#### [Deploying Microsoft Office 2016 by Using App-V](app-v/appv-deploying-microsoft-office-2016-with-appv.md)
+#### [Deploying Microsoft Office 2013 by Using App-V](app-v/appv-deploying-microsoft-office-2013-with-appv.md)
+#### [Deploying Microsoft Office 2010 by Using App-V](app-v/appv-deploying-microsoft-office-2010-wth-appv.md)
+### [Operations for App-V](app-v/appv-operations.md)
+#### [Creating and Managing App-V Virtualized Applications](app-v/appv-creating-and-managing-virtualized-applications.md)
+##### [Automatically provision your sequencing environment using Microsoft Application Virtualization Sequencer (App-V Sequencer)](app-v/appv-auto-provision-a-vm.md)
+##### [Automatically sequence multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)](app-v/appv-auto-batch-sequencing.md)
+##### [Automatically update multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)](app-v/appv-auto-batch-updating.md)
+##### [Manually sequence a new app using Microsoft Application Virtualization Sequencer (App-V Sequencer)](app-v/appv-sequence-a-new-application.md)
+##### [How to Modify an Existing Virtual Application Package](app-v/appv-modify-an-existing-virtual-application-package.md)
+##### [How to Create and Use a Project Template](app-v/appv-create-and-use-a-project-template.md)
+##### [How to Create a Package Accelerator](app-v/appv-create-a-package-accelerator.md)
+##### [How to Create a Virtual Application Package Using an App-V Package Accelerator](app-v/appv-create-a-virtual-application-package-package-accelerator.md)
+#### [Administering App-V Virtual Applications by Using the Management Console](app-v/appv-administering-virtual-applications-with-the-management-console.md)
+##### [About App-V Dynamic Configuration](app-v/appv-dynamic-configuration.md)
+##### [How to Connect to the Management Console ](app-v/appv-connect-to-the-management-console.md)
+##### [How to Add or Upgrade Packages by Using the Management Console](app-v/appv-add-or-upgrade-packages-with-the-management-console.md)
+##### [How to Configure Access to Packages by Using the Management Console ](app-v/appv-configure-access-to-packages-with-the-management-console.md)
+##### [How to Publish a Package by Using the Management Console ](app-v/appv-publish-a-packages-with-the-management-console.md)
+##### [How to Delete a Package in the Management Console ](app-v/appv-delete-a-package-with-the-management-console.md)
+##### [How to Add or Remove an Administrator by Using the Management Console](app-v/appv-add-or-remove-an-administrator-with-the-management-console.md)
+##### [How to Register and Unregister a Publishing Server by Using the Management Console](app-v/appv-register-and-unregister-a-publishing-server-with-the-management-console.md)
+##### [How to Create a Custom Configuration File by Using the App-V Management Console](app-v/appv-create-a-custom-configuration-file-with-the-management-console.md)
+##### [How to Transfer Access and Configurations to Another Version of a Package by Using the Management Console](app-v/appv-transfer-access-and-configurations-to-another-version-of-a-package-with-the-management-console.md)
+##### [How to Customize Virtual Applications Extensions for a Specific AD Group by Using the Management Console](app-v/appv-customize-virtual-application-extensions-with-the-management-console.md)
+##### [How to View and Configure Applications and Default Virtual Application Extensions by Using the Management Console ](app-v/appv-view-and-configure-applications-and-default-virtual-application-extensions-with-the-management-console.md)
+#### [Managing Connection Groups](app-v/appv-managing-connection-groups.md)
+##### [About the Connection Group Virtual Environment](app-v/appv-connection-group-virtual-environment.md)
+##### [About the Connection Group File](app-v/appv-connection-group-file.md)
+##### [How to Create a Connection Group](app-v/appv-create-a-connection-group.md)
+##### [How to Create a Connection Group with User-Published and Globally Published Packages](app-v/appv-create-a-connection-group-with-user-published-and-globally-published-packages.md)
+##### [How to Delete a Connection Group](app-v/appv-delete-a-connection-group.md)
+##### [How to Publish a Connection Group](app-v/appv-publish-a-connection-group.md)
+##### [How to Make a Connection Group Ignore the Package Version](app-v/appv-configure-connection-groups-to-ignore-the-package-version.md)
+##### [How to Allow Only Administrators to Enable Connection Groups](app-v/appv-allow-administrators-to-enable-connection-groups.md)
+#### [Deploying App-V Packages by Using Electronic Software Distribution (ESD)](app-v/appv-deploying-packages-with-electronic-software-distribution-solutions.md)
+##### [How to deploy App-V Packages Using Electronic Software Distribution](app-v/appv-deploy-appv-packages-with-electronic-software-distribution-solutions.md)
+##### [How to Enable Only Administrators to Publish Packages by Using an ESD](app-v/appv-enable-administrators-to-publish-packages-with-electronic-software-distribution-solutions.md)
+#### [Using the App-V Client Management Console](app-v/appv-using-the-client-management-console.md)
+##### [Automatically clean-up unpublished packages on the App-V client](app-v/appv-auto-clean-unpublished-packages.md)
+#### [Migrating to App-V from a Previous Version](app-v/appv-migrating-to-appv-from-a-previous-version.md)
+##### [How to Convert a Package Created in a Previous Version of App-V](app-v/appv-convert-a-package-created-in-a-previous-version-of-appv.md)
+#### [Maintaining App-V](app-v/appv-maintaining-appv.md)
+##### [How to Move the App-V Server to Another Computer](app-v/appv-move-the-appv-server-to-another-computer.md)
+#### [Administering App-V by Using Windows PowerShell](app-v/appv-administering-appv-with-powershell.md)
+##### [How to Load the Windows PowerShell Cmdlets for App-V and Get Cmdlet Help ](app-v/appv-load-the-powershell-cmdlets-and-get-cmdlet-help.md)
+##### [How to Manage App-V Packages Running on a Stand-Alone Computer by Using Windows PowerShell](app-v/appv-manage-appv-packages-running-on-a-stand-alone-computer-with-powershell.md)
+##### [How to Manage Connection Groups on a Stand-alone Computer by Using Windows PowerShell](app-v/appv-manage-connection-groups-on-a-stand-alone-computer-with-powershell.md)
+##### [How to Modify Client Configuration by Using Windows PowerShell](app-v/appv-modify-client-configuration-with-powershell.md)
+##### [How to Configure the Client to Receive Package and Connection Groups Updates From the Publishing Server](app-v/appv-configure-the-client-to-receive-updates-from-the-publishing-server.md)
+##### [How to Apply the User Configuration File by Using Windows PowerShell](app-v/appv-apply-the-user-configuration-file-with-powershell.md)
+##### [How to Apply the Deployment Configuration File by Using Windows PowerShell](app-v/appv-apply-the-deployment-configuration-file-with-powershell.md)
+##### [How to Sequence a Package by Using Windows PowerShell ](app-v/appv-sequence-a-package-with-powershell.md)
+##### [How to Create a Package Accelerator by Using Windows PowerShell](app-v/appv-create-a-package-accelerator-with-powershell.md)
+##### [How to Enable Reporting on the App-V Client by Using Windows PowerShell](app-v/appv-enable-reporting-on-the-appv-client-with-powershell.md)
+##### [How to Install the App-V Databases and Convert the Associated Security Identifiers by Using Windows PowerShell](app-v/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md)
+### [Troubleshooting App-V](app-v/appv-troubleshooting.md)
+### [Technical Reference for App-V](app-v/appv-technical-reference.md)
+#### [Available Mobile Device Management (MDM) settings for App-V](app-v/appv-available-mdm-settings.md)
+#### [Performance Guidance for Application Virtualization](app-v/appv-performance-guidance.md)
+#### [Application Publishing and Client Interaction](app-v/appv-application-publishing-and-client-interaction.md)
+#### [Viewing App-V Server Publishing Metadata](app-v/appv-viewing-appv-server-publishing-metadata.md)
+#### [Running a Locally Installed Application Inside a Virtual Environment with Virtualized Applications](app-v/appv-running-locally-installed-applications-inside-a-virtual-environment.md)
diff --git a/windows/manage/appv-about-appv.md b/windows/application-management/app-v/appv-about-appv.md
similarity index 100%
rename from windows/manage/appv-about-appv.md
rename to windows/application-management/app-v/appv-about-appv.md
diff --git a/windows/manage/appv-add-or-remove-an-administrator-with-the-management-console.md b/windows/application-management/app-v/appv-add-or-remove-an-administrator-with-the-management-console.md
similarity index 100%
rename from windows/manage/appv-add-or-remove-an-administrator-with-the-management-console.md
rename to windows/application-management/app-v/appv-add-or-remove-an-administrator-with-the-management-console.md
diff --git a/windows/manage/appv-add-or-upgrade-packages-with-the-management-console.md b/windows/application-management/app-v/appv-add-or-upgrade-packages-with-the-management-console.md
similarity index 100%
rename from windows/manage/appv-add-or-upgrade-packages-with-the-management-console.md
rename to windows/application-management/app-v/appv-add-or-upgrade-packages-with-the-management-console.md
diff --git a/windows/manage/appv-administering-appv-with-powershell.md b/windows/application-management/app-v/appv-administering-appv-with-powershell.md
similarity index 100%
rename from windows/manage/appv-administering-appv-with-powershell.md
rename to windows/application-management/app-v/appv-administering-appv-with-powershell.md
diff --git a/windows/manage/appv-administering-virtual-applications-with-the-management-console.md b/windows/application-management/app-v/appv-administering-virtual-applications-with-the-management-console.md
similarity index 100%
rename from windows/manage/appv-administering-virtual-applications-with-the-management-console.md
rename to windows/application-management/app-v/appv-administering-virtual-applications-with-the-management-console.md
diff --git a/windows/manage/appv-allow-administrators-to-enable-connection-groups.md b/windows/application-management/app-v/appv-allow-administrators-to-enable-connection-groups.md
similarity index 100%
rename from windows/manage/appv-allow-administrators-to-enable-connection-groups.md
rename to windows/application-management/app-v/appv-allow-administrators-to-enable-connection-groups.md
diff --git a/windows/manage/appv-application-publishing-and-client-interaction.md b/windows/application-management/app-v/appv-application-publishing-and-client-interaction.md
similarity index 100%
rename from windows/manage/appv-application-publishing-and-client-interaction.md
rename to windows/application-management/app-v/appv-application-publishing-and-client-interaction.md
diff --git a/windows/manage/appv-apply-the-deployment-configuration-file-with-powershell.md b/windows/application-management/app-v/appv-apply-the-deployment-configuration-file-with-powershell.md
similarity index 100%
rename from windows/manage/appv-apply-the-deployment-configuration-file-with-powershell.md
rename to windows/application-management/app-v/appv-apply-the-deployment-configuration-file-with-powershell.md
diff --git a/windows/manage/appv-apply-the-user-configuration-file-with-powershell.md b/windows/application-management/app-v/appv-apply-the-user-configuration-file-with-powershell.md
similarity index 100%
rename from windows/manage/appv-apply-the-user-configuration-file-with-powershell.md
rename to windows/application-management/app-v/appv-apply-the-user-configuration-file-with-powershell.md
diff --git a/windows/manage/appv-auto-batch-sequencing.md b/windows/application-management/app-v/appv-auto-batch-sequencing.md
similarity index 100%
rename from windows/manage/appv-auto-batch-sequencing.md
rename to windows/application-management/app-v/appv-auto-batch-sequencing.md
diff --git a/windows/manage/appv-auto-batch-updating.md b/windows/application-management/app-v/appv-auto-batch-updating.md
similarity index 100%
rename from windows/manage/appv-auto-batch-updating.md
rename to windows/application-management/app-v/appv-auto-batch-updating.md
diff --git a/windows/manage/appv-auto-clean-unpublished-packages.md b/windows/application-management/app-v/appv-auto-clean-unpublished-packages.md
similarity index 100%
rename from windows/manage/appv-auto-clean-unpublished-packages.md
rename to windows/application-management/app-v/appv-auto-clean-unpublished-packages.md
diff --git a/windows/manage/appv-auto-provision-a-vm.md b/windows/application-management/app-v/appv-auto-provision-a-vm.md
similarity index 100%
rename from windows/manage/appv-auto-provision-a-vm.md
rename to windows/application-management/app-v/appv-auto-provision-a-vm.md
diff --git a/windows/manage/appv-available-mdm-settings.md b/windows/application-management/app-v/appv-available-mdm-settings.md
similarity index 100%
rename from windows/manage/appv-available-mdm-settings.md
rename to windows/application-management/app-v/appv-available-mdm-settings.md
diff --git a/windows/manage/appv-capacity-planning.md b/windows/application-management/app-v/appv-capacity-planning.md
similarity index 100%
rename from windows/manage/appv-capacity-planning.md
rename to windows/application-management/app-v/appv-capacity-planning.md
diff --git a/windows/manage/appv-client-configuration-settings.md b/windows/application-management/app-v/appv-client-configuration-settings.md
similarity index 100%
rename from windows/manage/appv-client-configuration-settings.md
rename to windows/application-management/app-v/appv-client-configuration-settings.md
diff --git a/windows/manage/appv-configure-access-to-packages-with-the-management-console.md b/windows/application-management/app-v/appv-configure-access-to-packages-with-the-management-console.md
similarity index 100%
rename from windows/manage/appv-configure-access-to-packages-with-the-management-console.md
rename to windows/application-management/app-v/appv-configure-access-to-packages-with-the-management-console.md
diff --git a/windows/manage/appv-configure-connection-groups-to-ignore-the-package-version.md b/windows/application-management/app-v/appv-configure-connection-groups-to-ignore-the-package-version.md
similarity index 100%
rename from windows/manage/appv-configure-connection-groups-to-ignore-the-package-version.md
rename to windows/application-management/app-v/appv-configure-connection-groups-to-ignore-the-package-version.md
diff --git a/windows/manage/appv-configure-the-client-to-receive-updates-from-the-publishing-server.md b/windows/application-management/app-v/appv-configure-the-client-to-receive-updates-from-the-publishing-server.md
similarity index 100%
rename from windows/manage/appv-configure-the-client-to-receive-updates-from-the-publishing-server.md
rename to windows/application-management/app-v/appv-configure-the-client-to-receive-updates-from-the-publishing-server.md
diff --git a/windows/manage/appv-connect-to-the-management-console.md b/windows/application-management/app-v/appv-connect-to-the-management-console.md
similarity index 100%
rename from windows/manage/appv-connect-to-the-management-console.md
rename to windows/application-management/app-v/appv-connect-to-the-management-console.md
diff --git a/windows/manage/appv-connection-group-file.md b/windows/application-management/app-v/appv-connection-group-file.md
similarity index 100%
rename from windows/manage/appv-connection-group-file.md
rename to windows/application-management/app-v/appv-connection-group-file.md
diff --git a/windows/manage/appv-connection-group-virtual-environment.md b/windows/application-management/app-v/appv-connection-group-virtual-environment.md
similarity index 100%
rename from windows/manage/appv-connection-group-virtual-environment.md
rename to windows/application-management/app-v/appv-connection-group-virtual-environment.md
diff --git a/windows/manage/appv-convert-a-package-created-in-a-previous-version-of-appv.md b/windows/application-management/app-v/appv-convert-a-package-created-in-a-previous-version-of-appv.md
similarity index 100%
rename from windows/manage/appv-convert-a-package-created-in-a-previous-version-of-appv.md
rename to windows/application-management/app-v/appv-convert-a-package-created-in-a-previous-version-of-appv.md
diff --git a/windows/manage/appv-create-a-connection-group-with-user-published-and-globally-published-packages.md b/windows/application-management/app-v/appv-create-a-connection-group-with-user-published-and-globally-published-packages.md
similarity index 100%
rename from windows/manage/appv-create-a-connection-group-with-user-published-and-globally-published-packages.md
rename to windows/application-management/app-v/appv-create-a-connection-group-with-user-published-and-globally-published-packages.md
diff --git a/windows/manage/appv-create-a-connection-group.md b/windows/application-management/app-v/appv-create-a-connection-group.md
similarity index 100%
rename from windows/manage/appv-create-a-connection-group.md
rename to windows/application-management/app-v/appv-create-a-connection-group.md
diff --git a/windows/manage/appv-create-a-custom-configuration-file-with-the-management-console.md b/windows/application-management/app-v/appv-create-a-custom-configuration-file-with-the-management-console.md
similarity index 100%
rename from windows/manage/appv-create-a-custom-configuration-file-with-the-management-console.md
rename to windows/application-management/app-v/appv-create-a-custom-configuration-file-with-the-management-console.md
diff --git a/windows/manage/appv-create-a-package-accelerator-with-powershell.md b/windows/application-management/app-v/appv-create-a-package-accelerator-with-powershell.md
similarity index 100%
rename from windows/manage/appv-create-a-package-accelerator-with-powershell.md
rename to windows/application-management/app-v/appv-create-a-package-accelerator-with-powershell.md
diff --git a/windows/manage/appv-create-a-package-accelerator.md b/windows/application-management/app-v/appv-create-a-package-accelerator.md
similarity index 100%
rename from windows/manage/appv-create-a-package-accelerator.md
rename to windows/application-management/app-v/appv-create-a-package-accelerator.md
diff --git a/windows/manage/appv-create-a-virtual-application-package-package-accelerator.md b/windows/application-management/app-v/appv-create-a-virtual-application-package-package-accelerator.md
similarity index 100%
rename from windows/manage/appv-create-a-virtual-application-package-package-accelerator.md
rename to windows/application-management/app-v/appv-create-a-virtual-application-package-package-accelerator.md
diff --git a/windows/manage/appv-create-and-use-a-project-template.md b/windows/application-management/app-v/appv-create-and-use-a-project-template.md
similarity index 100%
rename from windows/manage/appv-create-and-use-a-project-template.md
rename to windows/application-management/app-v/appv-create-and-use-a-project-template.md
diff --git a/windows/manage/appv-creating-and-managing-virtualized-applications.md b/windows/application-management/app-v/appv-creating-and-managing-virtualized-applications.md
similarity index 100%
rename from windows/manage/appv-creating-and-managing-virtualized-applications.md
rename to windows/application-management/app-v/appv-creating-and-managing-virtualized-applications.md
diff --git a/windows/manage/appv-customize-virtual-application-extensions-with-the-management-console.md b/windows/application-management/app-v/appv-customize-virtual-application-extensions-with-the-management-console.md
similarity index 100%
rename from windows/manage/appv-customize-virtual-application-extensions-with-the-management-console.md
rename to windows/application-management/app-v/appv-customize-virtual-application-extensions-with-the-management-console.md
diff --git a/windows/manage/appv-delete-a-connection-group.md b/windows/application-management/app-v/appv-delete-a-connection-group.md
similarity index 100%
rename from windows/manage/appv-delete-a-connection-group.md
rename to windows/application-management/app-v/appv-delete-a-connection-group.md
diff --git a/windows/manage/appv-delete-a-package-with-the-management-console.md b/windows/application-management/app-v/appv-delete-a-package-with-the-management-console.md
similarity index 100%
rename from windows/manage/appv-delete-a-package-with-the-management-console.md
rename to windows/application-management/app-v/appv-delete-a-package-with-the-management-console.md
diff --git a/windows/manage/appv-deploy-appv-databases-with-sql-scripts.md b/windows/application-management/app-v/appv-deploy-appv-databases-with-sql-scripts.md
similarity index 100%
rename from windows/manage/appv-deploy-appv-databases-with-sql-scripts.md
rename to windows/application-management/app-v/appv-deploy-appv-databases-with-sql-scripts.md
diff --git a/windows/manage/appv-deploy-appv-packages-with-electronic-software-distribution-solutions.md b/windows/application-management/app-v/appv-deploy-appv-packages-with-electronic-software-distribution-solutions.md
similarity index 100%
rename from windows/manage/appv-deploy-appv-packages-with-electronic-software-distribution-solutions.md
rename to windows/application-management/app-v/appv-deploy-appv-packages-with-electronic-software-distribution-solutions.md
diff --git a/windows/manage/appv-deploy-the-appv-server-with-a-script.md b/windows/application-management/app-v/appv-deploy-the-appv-server-with-a-script.md
similarity index 100%
rename from windows/manage/appv-deploy-the-appv-server-with-a-script.md
rename to windows/application-management/app-v/appv-deploy-the-appv-server-with-a-script.md
diff --git a/windows/manage/appv-deploy-the-appv-server.md b/windows/application-management/app-v/appv-deploy-the-appv-server.md
similarity index 100%
rename from windows/manage/appv-deploy-the-appv-server.md
rename to windows/application-management/app-v/appv-deploy-the-appv-server.md
diff --git a/windows/manage/appv-deploying-appv.md b/windows/application-management/app-v/appv-deploying-appv.md
similarity index 100%
rename from windows/manage/appv-deploying-appv.md
rename to windows/application-management/app-v/appv-deploying-appv.md
diff --git a/windows/manage/appv-deploying-microsoft-office-2010-wth-appv.md b/windows/application-management/app-v/appv-deploying-microsoft-office-2010-wth-appv.md
similarity index 100%
rename from windows/manage/appv-deploying-microsoft-office-2010-wth-appv.md
rename to windows/application-management/app-v/appv-deploying-microsoft-office-2010-wth-appv.md
diff --git a/windows/manage/appv-deploying-microsoft-office-2013-with-appv.md b/windows/application-management/app-v/appv-deploying-microsoft-office-2013-with-appv.md
similarity index 100%
rename from windows/manage/appv-deploying-microsoft-office-2013-with-appv.md
rename to windows/application-management/app-v/appv-deploying-microsoft-office-2013-with-appv.md
diff --git a/windows/manage/appv-deploying-microsoft-office-2016-with-appv.md b/windows/application-management/app-v/appv-deploying-microsoft-office-2016-with-appv.md
similarity index 100%
rename from windows/manage/appv-deploying-microsoft-office-2016-with-appv.md
rename to windows/application-management/app-v/appv-deploying-microsoft-office-2016-with-appv.md
diff --git a/windows/manage/appv-deploying-packages-with-electronic-software-distribution-solutions.md b/windows/application-management/app-v/appv-deploying-packages-with-electronic-software-distribution-solutions.md
similarity index 100%
rename from windows/manage/appv-deploying-packages-with-electronic-software-distribution-solutions.md
rename to windows/application-management/app-v/appv-deploying-packages-with-electronic-software-distribution-solutions.md
diff --git a/windows/manage/appv-deploying-the-appv-sequencer-and-client.md b/windows/application-management/app-v/appv-deploying-the-appv-sequencer-and-client.md
similarity index 100%
rename from windows/manage/appv-deploying-the-appv-sequencer-and-client.md
rename to windows/application-management/app-v/appv-deploying-the-appv-sequencer-and-client.md
diff --git a/windows/manage/appv-deploying-the-appv-server.md b/windows/application-management/app-v/appv-deploying-the-appv-server.md
similarity index 100%
rename from windows/manage/appv-deploying-the-appv-server.md
rename to windows/application-management/app-v/appv-deploying-the-appv-server.md
diff --git a/windows/manage/appv-deployment-checklist.md b/windows/application-management/app-v/appv-deployment-checklist.md
similarity index 100%
rename from windows/manage/appv-deployment-checklist.md
rename to windows/application-management/app-v/appv-deployment-checklist.md
diff --git a/windows/manage/appv-dynamic-configuration.md b/windows/application-management/app-v/appv-dynamic-configuration.md
similarity index 100%
rename from windows/manage/appv-dynamic-configuration.md
rename to windows/application-management/app-v/appv-dynamic-configuration.md
diff --git a/windows/manage/appv-enable-administrators-to-publish-packages-with-electronic-software-distribution-solutions.md b/windows/application-management/app-v/appv-enable-administrators-to-publish-packages-with-electronic-software-distribution-solutions.md
similarity index 100%
rename from windows/manage/appv-enable-administrators-to-publish-packages-with-electronic-software-distribution-solutions.md
rename to windows/application-management/app-v/appv-enable-administrators-to-publish-packages-with-electronic-software-distribution-solutions.md
diff --git a/windows/manage/appv-enable-reporting-on-the-appv-client-with-powershell.md b/windows/application-management/app-v/appv-enable-reporting-on-the-appv-client-with-powershell.md
similarity index 100%
rename from windows/manage/appv-enable-reporting-on-the-appv-client-with-powershell.md
rename to windows/application-management/app-v/appv-enable-reporting-on-the-appv-client-with-powershell.md
diff --git a/windows/manage/appv-enable-the-app-v-desktop-client.md b/windows/application-management/app-v/appv-enable-the-app-v-desktop-client.md
similarity index 100%
rename from windows/manage/appv-enable-the-app-v-desktop-client.md
rename to windows/application-management/app-v/appv-enable-the-app-v-desktop-client.md
diff --git a/windows/manage/appv-evaluating-appv.md b/windows/application-management/app-v/appv-evaluating-appv.md
similarity index 100%
rename from windows/manage/appv-evaluating-appv.md
rename to windows/application-management/app-v/appv-evaluating-appv.md
diff --git a/windows/manage/appv-for-windows.md b/windows/application-management/app-v/appv-for-windows.md
similarity index 100%
rename from windows/manage/appv-for-windows.md
rename to windows/application-management/app-v/appv-for-windows.md
diff --git a/windows/manage/appv-getting-started.md b/windows/application-management/app-v/appv-getting-started.md
similarity index 100%
rename from windows/manage/appv-getting-started.md
rename to windows/application-management/app-v/appv-getting-started.md
diff --git a/windows/manage/appv-high-level-architecture.md b/windows/application-management/app-v/appv-high-level-architecture.md
similarity index 100%
rename from windows/manage/appv-high-level-architecture.md
rename to windows/application-management/app-v/appv-high-level-architecture.md
diff --git a/windows/manage/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md b/windows/application-management/app-v/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md
similarity index 100%
rename from windows/manage/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md
rename to windows/application-management/app-v/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md
diff --git a/windows/manage/appv-install-the-management-and-reporting-databases-on-separate-computers.md b/windows/application-management/app-v/appv-install-the-management-and-reporting-databases-on-separate-computers.md
similarity index 100%
rename from windows/manage/appv-install-the-management-and-reporting-databases-on-separate-computers.md
rename to windows/application-management/app-v/appv-install-the-management-and-reporting-databases-on-separate-computers.md
diff --git a/windows/manage/appv-install-the-management-server-on-a-standalone-computer.md b/windows/application-management/app-v/appv-install-the-management-server-on-a-standalone-computer.md
similarity index 100%
rename from windows/manage/appv-install-the-management-server-on-a-standalone-computer.md
rename to windows/application-management/app-v/appv-install-the-management-server-on-a-standalone-computer.md
diff --git a/windows/manage/appv-install-the-publishing-server-on-a-remote-computer.md b/windows/application-management/app-v/appv-install-the-publishing-server-on-a-remote-computer.md
similarity index 100%
rename from windows/manage/appv-install-the-publishing-server-on-a-remote-computer.md
rename to windows/application-management/app-v/appv-install-the-publishing-server-on-a-remote-computer.md
diff --git a/windows/manage/appv-install-the-reporting-server-on-a-standalone-computer.md b/windows/application-management/app-v/appv-install-the-reporting-server-on-a-standalone-computer.md
similarity index 100%
rename from windows/manage/appv-install-the-reporting-server-on-a-standalone-computer.md
rename to windows/application-management/app-v/appv-install-the-reporting-server-on-a-standalone-computer.md
diff --git a/windows/manage/appv-install-the-sequencer.md b/windows/application-management/app-v/appv-install-the-sequencer.md
similarity index 100%
rename from windows/manage/appv-install-the-sequencer.md
rename to windows/application-management/app-v/appv-install-the-sequencer.md
diff --git a/windows/manage/appv-load-the-powershell-cmdlets-and-get-cmdlet-help.md b/windows/application-management/app-v/appv-load-the-powershell-cmdlets-and-get-cmdlet-help.md
similarity index 100%
rename from windows/manage/appv-load-the-powershell-cmdlets-and-get-cmdlet-help.md
rename to windows/application-management/app-v/appv-load-the-powershell-cmdlets-and-get-cmdlet-help.md
diff --git a/windows/manage/appv-maintaining-appv.md b/windows/application-management/app-v/appv-maintaining-appv.md
similarity index 100%
rename from windows/manage/appv-maintaining-appv.md
rename to windows/application-management/app-v/appv-maintaining-appv.md
diff --git a/windows/manage/appv-manage-appv-packages-running-on-a-stand-alone-computer-with-powershell.md b/windows/application-management/app-v/appv-manage-appv-packages-running-on-a-stand-alone-computer-with-powershell.md
similarity index 100%
rename from windows/manage/appv-manage-appv-packages-running-on-a-stand-alone-computer-with-powershell.md
rename to windows/application-management/app-v/appv-manage-appv-packages-running-on-a-stand-alone-computer-with-powershell.md
diff --git a/windows/manage/appv-manage-connection-groups-on-a-stand-alone-computer-with-powershell.md b/windows/application-management/app-v/appv-manage-connection-groups-on-a-stand-alone-computer-with-powershell.md
similarity index 100%
rename from windows/manage/appv-manage-connection-groups-on-a-stand-alone-computer-with-powershell.md
rename to windows/application-management/app-v/appv-manage-connection-groups-on-a-stand-alone-computer-with-powershell.md
diff --git a/windows/manage/appv-managing-connection-groups.md b/windows/application-management/app-v/appv-managing-connection-groups.md
similarity index 100%
rename from windows/manage/appv-managing-connection-groups.md
rename to windows/application-management/app-v/appv-managing-connection-groups.md
diff --git a/windows/manage/appv-migrating-to-appv-from-a-previous-version.md b/windows/application-management/app-v/appv-migrating-to-appv-from-a-previous-version.md
similarity index 100%
rename from windows/manage/appv-migrating-to-appv-from-a-previous-version.md
rename to windows/application-management/app-v/appv-migrating-to-appv-from-a-previous-version.md
diff --git a/windows/manage/appv-modify-an-existing-virtual-application-package.md b/windows/application-management/app-v/appv-modify-an-existing-virtual-application-package.md
similarity index 100%
rename from windows/manage/appv-modify-an-existing-virtual-application-package.md
rename to windows/application-management/app-v/appv-modify-an-existing-virtual-application-package.md
diff --git a/windows/manage/appv-modify-client-configuration-with-powershell.md b/windows/application-management/app-v/appv-modify-client-configuration-with-powershell.md
similarity index 100%
rename from windows/manage/appv-modify-client-configuration-with-powershell.md
rename to windows/application-management/app-v/appv-modify-client-configuration-with-powershell.md
diff --git a/windows/manage/appv-move-the-appv-server-to-another-computer.md b/windows/application-management/app-v/appv-move-the-appv-server-to-another-computer.md
similarity index 100%
rename from windows/manage/appv-move-the-appv-server-to-another-computer.md
rename to windows/application-management/app-v/appv-move-the-appv-server-to-another-computer.md
diff --git a/windows/manage/appv-operations.md b/windows/application-management/app-v/appv-operations.md
similarity index 100%
rename from windows/manage/appv-operations.md
rename to windows/application-management/app-v/appv-operations.md
diff --git a/windows/manage/appv-performance-guidance.md b/windows/application-management/app-v/appv-performance-guidance.md
similarity index 99%
rename from windows/manage/appv-performance-guidance.md
rename to windows/application-management/app-v/appv-performance-guidance.md
index e0a277bf9c..86b7d3eb82 100644
--- a/windows/manage/appv-performance-guidance.md
+++ b/windows/application-management/app-v/appv-performance-guidance.md
@@ -263,11 +263,11 @@ We recommend using User Experience Virtualization (UE-V) to capture and centrali
For more information, see:
-- [User Experience Virtualization (UE-V) for Windows 10 overview](uev-for-windows.md)
+- [User Experience Virtualization (UE-V) for Windows 10 overview](/windows/configuration/ue-v/uev-for-windows)
-- [Get Started with UE-V](uev-getting-started.md)
+- [Get Started with UE-V](/windows/configuration/ue-v/uev-getting-started)
-In essence all that is required is to enable the UE-V service and download the following Microsoft authored App-V settings template from the [Microsoft User Experience Virtualization (UE-V) template gallery](http://gallery.technet.microsoft.com/Authored-UE-V-Settings-bb442a33). Register the template. For more information about UE-V templates, see [User Experience Virtualization (UE-V) for Windows 10 overview](uev-for-windows.md).
+In essence all that is required is to enable the UE-V service and download the following Microsoft authored App-V settings template from the [Microsoft User Experience Virtualization (UE-V) template gallery](http://gallery.technet.microsoft.com/Authored-UE-V-Settings-bb442a33). Register the template. For more information about UE-V templates, see [User Experience Virtualization (UE-V) for Windows 10 overview](/windows/configuration/ue-v/uev-for-windows).
**Note**
Without performing an additional configuration step, User Environment Virtualization (UE-V) will not be able to synchronize the Start menu shortcuts (.lnk files) on the target computer. The .lnk file type is excluded by default.
diff --git a/windows/manage/appv-planning-checklist.md b/windows/application-management/app-v/appv-planning-checklist.md
similarity index 100%
rename from windows/manage/appv-planning-checklist.md
rename to windows/application-management/app-v/appv-planning-checklist.md
diff --git a/windows/manage/appv-planning-folder-redirection-with-appv.md b/windows/application-management/app-v/appv-planning-folder-redirection-with-appv.md
similarity index 100%
rename from windows/manage/appv-planning-folder-redirection-with-appv.md
rename to windows/application-management/app-v/appv-planning-folder-redirection-with-appv.md
diff --git a/windows/manage/appv-planning-for-appv-server-deployment.md b/windows/application-management/app-v/appv-planning-for-appv-server-deployment.md
similarity index 100%
rename from windows/manage/appv-planning-for-appv-server-deployment.md
rename to windows/application-management/app-v/appv-planning-for-appv-server-deployment.md
diff --git a/windows/manage/appv-planning-for-appv.md b/windows/application-management/app-v/appv-planning-for-appv.md
similarity index 100%
rename from windows/manage/appv-planning-for-appv.md
rename to windows/application-management/app-v/appv-planning-for-appv.md
diff --git a/windows/manage/appv-planning-for-high-availability-with-appv.md b/windows/application-management/app-v/appv-planning-for-high-availability-with-appv.md
similarity index 100%
rename from windows/manage/appv-planning-for-high-availability-with-appv.md
rename to windows/application-management/app-v/appv-planning-for-high-availability-with-appv.md
diff --git a/windows/manage/appv-planning-for-sequencer-and-client-deployment.md b/windows/application-management/app-v/appv-planning-for-sequencer-and-client-deployment.md
similarity index 100%
rename from windows/manage/appv-planning-for-sequencer-and-client-deployment.md
rename to windows/application-management/app-v/appv-planning-for-sequencer-and-client-deployment.md
diff --git a/windows/manage/appv-planning-for-using-appv-with-office.md b/windows/application-management/app-v/appv-planning-for-using-appv-with-office.md
similarity index 100%
rename from windows/manage/appv-planning-for-using-appv-with-office.md
rename to windows/application-management/app-v/appv-planning-for-using-appv-with-office.md
diff --git a/windows/manage/appv-planning-to-deploy-appv-with-electronic-software-distribution-solutions.md b/windows/application-management/app-v/appv-planning-to-deploy-appv-with-electronic-software-distribution-solutions.md
similarity index 100%
rename from windows/manage/appv-planning-to-deploy-appv-with-electronic-software-distribution-solutions.md
rename to windows/application-management/app-v/appv-planning-to-deploy-appv-with-electronic-software-distribution-solutions.md
diff --git a/windows/manage/appv-planning-to-deploy-appv.md b/windows/application-management/app-v/appv-planning-to-deploy-appv.md
similarity index 100%
rename from windows/manage/appv-planning-to-deploy-appv.md
rename to windows/application-management/app-v/appv-planning-to-deploy-appv.md
diff --git a/windows/manage/appv-preparing-your-environment.md b/windows/application-management/app-v/appv-preparing-your-environment.md
similarity index 100%
rename from windows/manage/appv-preparing-your-environment.md
rename to windows/application-management/app-v/appv-preparing-your-environment.md
diff --git a/windows/manage/appv-prerequisites.md b/windows/application-management/app-v/appv-prerequisites.md
similarity index 100%
rename from windows/manage/appv-prerequisites.md
rename to windows/application-management/app-v/appv-prerequisites.md
diff --git a/windows/manage/appv-publish-a-connection-group.md b/windows/application-management/app-v/appv-publish-a-connection-group.md
similarity index 100%
rename from windows/manage/appv-publish-a-connection-group.md
rename to windows/application-management/app-v/appv-publish-a-connection-group.md
diff --git a/windows/manage/appv-publish-a-packages-with-the-management-console.md b/windows/application-management/app-v/appv-publish-a-packages-with-the-management-console.md
similarity index 100%
rename from windows/manage/appv-publish-a-packages-with-the-management-console.md
rename to windows/application-management/app-v/appv-publish-a-packages-with-the-management-console.md
diff --git a/windows/manage/appv-register-and-unregister-a-publishing-server-with-the-management-console.md b/windows/application-management/app-v/appv-register-and-unregister-a-publishing-server-with-the-management-console.md
similarity index 100%
rename from windows/manage/appv-register-and-unregister-a-publishing-server-with-the-management-console.md
rename to windows/application-management/app-v/appv-register-and-unregister-a-publishing-server-with-the-management-console.md
diff --git a/windows/manage/appv-release-notes-for-appv-for-windows-1703.md b/windows/application-management/app-v/appv-release-notes-for-appv-for-windows-1703.md
similarity index 100%
rename from windows/manage/appv-release-notes-for-appv-for-windows-1703.md
rename to windows/application-management/app-v/appv-release-notes-for-appv-for-windows-1703.md
diff --git a/windows/manage/appv-release-notes-for-appv-for-windows.md b/windows/application-management/app-v/appv-release-notes-for-appv-for-windows.md
similarity index 100%
rename from windows/manage/appv-release-notes-for-appv-for-windows.md
rename to windows/application-management/app-v/appv-release-notes-for-appv-for-windows.md
diff --git a/windows/manage/appv-reporting.md b/windows/application-management/app-v/appv-reporting.md
similarity index 100%
rename from windows/manage/appv-reporting.md
rename to windows/application-management/app-v/appv-reporting.md
diff --git a/windows/manage/appv-running-locally-installed-applications-inside-a-virtual-environment.md b/windows/application-management/app-v/appv-running-locally-installed-applications-inside-a-virtual-environment.md
similarity index 100%
rename from windows/manage/appv-running-locally-installed-applications-inside-a-virtual-environment.md
rename to windows/application-management/app-v/appv-running-locally-installed-applications-inside-a-virtual-environment.md
diff --git a/windows/manage/appv-security-considerations.md b/windows/application-management/app-v/appv-security-considerations.md
similarity index 100%
rename from windows/manage/appv-security-considerations.md
rename to windows/application-management/app-v/appv-security-considerations.md
diff --git a/windows/manage/appv-sequence-a-new-application.md b/windows/application-management/app-v/appv-sequence-a-new-application.md
similarity index 100%
rename from windows/manage/appv-sequence-a-new-application.md
rename to windows/application-management/app-v/appv-sequence-a-new-application.md
diff --git a/windows/manage/appv-sequence-a-package-with-powershell.md b/windows/application-management/app-v/appv-sequence-a-package-with-powershell.md
similarity index 100%
rename from windows/manage/appv-sequence-a-package-with-powershell.md
rename to windows/application-management/app-v/appv-sequence-a-package-with-powershell.md
diff --git a/windows/manage/appv-supported-configurations.md b/windows/application-management/app-v/appv-supported-configurations.md
similarity index 100%
rename from windows/manage/appv-supported-configurations.md
rename to windows/application-management/app-v/appv-supported-configurations.md
diff --git a/windows/manage/appv-technical-reference.md b/windows/application-management/app-v/appv-technical-reference.md
similarity index 100%
rename from windows/manage/appv-technical-reference.md
rename to windows/application-management/app-v/appv-technical-reference.md
diff --git a/windows/manage/appv-transfer-access-and-configurations-to-another-version-of-a-package-with-the-management-console.md b/windows/application-management/app-v/appv-transfer-access-and-configurations-to-another-version-of-a-package-with-the-management-console.md
similarity index 100%
rename from windows/manage/appv-transfer-access-and-configurations-to-another-version-of-a-package-with-the-management-console.md
rename to windows/application-management/app-v/appv-transfer-access-and-configurations-to-another-version-of-a-package-with-the-management-console.md
diff --git a/windows/manage/appv-troubleshooting.md b/windows/application-management/app-v/appv-troubleshooting.md
similarity index 100%
rename from windows/manage/appv-troubleshooting.md
rename to windows/application-management/app-v/appv-troubleshooting.md
diff --git a/windows/manage/appv-upgrading-to-app-v-for-windows-10-from-an-existing-installation.md b/windows/application-management/app-v/appv-upgrading-to-app-v-for-windows-10-from-an-existing-installation.md
similarity index 100%
rename from windows/manage/appv-upgrading-to-app-v-for-windows-10-from-an-existing-installation.md
rename to windows/application-management/app-v/appv-upgrading-to-app-v-for-windows-10-from-an-existing-installation.md
diff --git a/windows/manage/appv-using-the-client-management-console.md b/windows/application-management/app-v/appv-using-the-client-management-console.md
similarity index 100%
rename from windows/manage/appv-using-the-client-management-console.md
rename to windows/application-management/app-v/appv-using-the-client-management-console.md
diff --git a/windows/manage/appv-view-and-configure-applications-and-default-virtual-application-extensions-with-the-management-console.md b/windows/application-management/app-v/appv-view-and-configure-applications-and-default-virtual-application-extensions-with-the-management-console.md
similarity index 100%
rename from windows/manage/appv-view-and-configure-applications-and-default-virtual-application-extensions-with-the-management-console.md
rename to windows/application-management/app-v/appv-view-and-configure-applications-and-default-virtual-application-extensions-with-the-management-console.md
diff --git a/windows/manage/appv-viewing-appv-server-publishing-metadata.md b/windows/application-management/app-v/appv-viewing-appv-server-publishing-metadata.md
similarity index 100%
rename from windows/manage/appv-viewing-appv-server-publishing-metadata.md
rename to windows/application-management/app-v/appv-viewing-appv-server-publishing-metadata.md
diff --git a/windows/configure/images/app-v-in-adk.png b/windows/application-management/app-v/images/app-v-in-adk.png
similarity index 100%
rename from windows/configure/images/app-v-in-adk.png
rename to windows/application-management/app-v/images/app-v-in-adk.png
diff --git a/windows/configure/images/checklistbox.gif b/windows/application-management/app-v/images/checklistbox.gif
similarity index 100%
rename from windows/configure/images/checklistbox.gif
rename to windows/application-management/app-v/images/checklistbox.gif
diff --git a/windows/configure/images/packageaddfileandregistrydata-global.png b/windows/application-management/app-v/images/packageaddfileandregistrydata-global.png
similarity index 100%
rename from windows/configure/images/packageaddfileandregistrydata-global.png
rename to windows/application-management/app-v/images/packageaddfileandregistrydata-global.png
diff --git a/windows/configure/images/packageaddfileandregistrydata-stream.png b/windows/application-management/app-v/images/packageaddfileandregistrydata-stream.png
similarity index 100%
rename from windows/configure/images/packageaddfileandregistrydata-stream.png
rename to windows/application-management/app-v/images/packageaddfileandregistrydata-stream.png
diff --git a/windows/configure/images/packageaddfileandregistrydata.png b/windows/application-management/app-v/images/packageaddfileandregistrydata.png
similarity index 100%
rename from windows/configure/images/packageaddfileandregistrydata.png
rename to windows/application-management/app-v/images/packageaddfileandregistrydata.png
diff --git a/windows/application-management/index.md b/windows/application-management/index.md
new file mode 100644
index 0000000000..2302c372d1
--- /dev/null
+++ b/windows/application-management/index.md
@@ -0,0 +1,23 @@
+---
+title: Windows 10 application management
+description: Windows 10 application management
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+author: jdeckerMS
+localizationpriority: medium
+---
+
+# Windows 10 application management
+
+**Applies to**
+- Windows 10
+
+Learn about managing applications in Window 10 and Windows 10 Mobile clients.
+
+
+| Topic | Description |
+|---|---|
+|[App-V](app-v/appv-getting-started.md)| Microsoft Application Virtualization (App-V) for Windows 10 enables organizations to deliver Win32 applications to users as virtual applications|
+|[Sideload apps in Windows 10](sideload-apps-in-windows-10.md)| Requirements and instructions for side-loading LOB applications on Windows 10 and Windows 10 Mobile clients|
+
diff --git a/windows/deploy/sideload-apps-in-windows-10.md b/windows/application-management/sideload-apps-in-windows-10.md
similarity index 100%
rename from windows/deploy/sideload-apps-in-windows-10.md
rename to windows/application-management/sideload-apps-in-windows-10.md
diff --git a/windows/breadcrumb/toc.yml b/windows/breadcrumb/toc.yml
deleted file mode 100644
index 40ff5fde9b..0000000000
--- a/windows/breadcrumb/toc.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-- name: Windows
- tocHref: /itpro/windows/
- topicHref: /itpro/windows/index
- items:
- - name: What's new
- tocHref: /itpro/windows/whats-new/
- topicHref: /itpro/windows/whats-new/index
- - name: Plan
- tocHref: /itpro/windows/plan/
- topicHref: /itpro/windows/plan/index
- - name: Deploy
- tocHref: /itpro/windows/deploy/
- topicHref: /itpro/windows/deploy/index
- - name: Configure
- tocHref: /itpro/windows/configure/
- topicHref: /itpro/windows/configure/index
- - name: Update
- tocHref: /itpro/windows/update/
- topicHref: /itpro/windows/update/index
- - name: Keep secure
- tocHref: /itpro/windows/keep-secure/
- topicHref: /itpro/windows/keep-secure/index
- - name: Manage
- tocHref: /itpro/windows/manage/
- topicHref: /itpro/windows/manage/index
\ No newline at end of file
diff --git a/windows/client-management/TOC.md b/windows/client-management/TOC.md
new file mode 100644
index 0000000000..bc68853b9d
--- /dev/null
+++ b/windows/client-management/TOC.md
@@ -0,0 +1,10 @@
+# [Manage clients in Windows 10](index.md)
+## [Create mandatory user profiles](mandatory-user-profile.md)
+## [Connect to remote Azure Active Directory-joined PC](connect-to-remote-aadj-pc.md)
+## [Join Windows 10 Mobile to Azure Active Directory](join-windows-10-mobile-to-azure-active-directory.md)
+## [New policies for Windows 10](new-policies-for-windows-10.md)
+## [Group Policies that apply only to Windows 10 Enterprise and Windows 10 Education](group-policies-for-enterprise-and-education-editions.md)
+## [Manage the Settings app with Group Policy](manage-settings-app-with-group-policy.md)
+## [Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md)
+## [Windows 10 Mobile deployment and management guide](windows-10-mobile-and-mdm.md)
+## [Windows libraries](windows-libraries.md)
\ No newline at end of file
diff --git a/windows/manage/administrative-tools-in-windows-10.md b/windows/client-management/administrative-tools-in-windows-10.md
similarity index 100%
rename from windows/manage/administrative-tools-in-windows-10.md
rename to windows/client-management/administrative-tools-in-windows-10.md
diff --git a/windows/manage/connect-to-remote-aadj-pc.md b/windows/client-management/connect-to-remote-aadj-pc.md
similarity index 93%
rename from windows/manage/connect-to-remote-aadj-pc.md
rename to windows/client-management/connect-to-remote-aadj-pc.md
index 506052a5b3..e67fdf2234 100644
--- a/windows/manage/connect-to-remote-aadj-pc.md
+++ b/windows/client-management/connect-to-remote-aadj-pc.md
@@ -24,7 +24,7 @@ From its release, Windows 10 has supported remote connections to PCs that are jo
## Set up
- Both PCs (local and remote) must be running Windows 10, version 1607. Remote connection to an Azure AD-joined PC that is running earlier versions of Windows 10 is not supported.
-- Ensure [Remote Credential Guard](../keep-secure/remote-credential-guard.md), a new feature in Windows 10, version 1607, is turned off on the client PC that you are using to connect to the remote PC.
+- Ensure [Remote Credential Guard](/windows/access-protection/remote-credential-guard), a new feature in Windows 10, version 1607, is turned off on the client PC that you are using to connect to the remote PC.
- On the PC that you want to connect to:
1. Open system properties for the remote PC.
2. Enable **Allow remote connections to this computer** and select **Allow connections only from computers running Remote Desktop with Network Level Authentication**.
diff --git a/windows/manage/group-policies-for-enterprise-and-education-editions.md b/windows/client-management/group-policies-for-enterprise-and-education-editions.md
similarity index 67%
rename from windows/manage/group-policies-for-enterprise-and-education-editions.md
rename to windows/client-management/group-policies-for-enterprise-and-education-editions.md
index 74dced9953..ecb2e27c4a 100644
--- a/windows/manage/group-policies-for-enterprise-and-education-editions.md
+++ b/windows/client-management/group-policies-for-enterprise-and-education-editions.md
@@ -18,18 +18,18 @@ In Windows 10, version 1607, the following Group Policy settings apply only to W
| Policy name | Policy path | Comments |
| --- | --- | --- |
-| **Configure Spotlight on lock screen** | User Configuration > Administrative Templates > Windows Components > Cloud Content | For more info, see [Windows spotlight on the lock screen](../configure/windows-spotlight.md). Note that an additional **Cloud Content** policy, **Do not suggest third-party content in Windows spotlight**, does apply to Windows 10 Pro. |
-| **Turn off all Windows Spotlight features** | User Configuration > Administrative Templates > Windows Components > Cloud Content | For more info, see [Windows spotlight on the lock screen](../configure/windows-spotlight.md) |
-| **Turn off Microsoft consumer features** | Computer Configuration > Administrative Templates > Windows Components > Cloud Content | For more info, see [Windows spotlight on the lock screen](../configure/windows-spotlight.md) |
-| **Do not display the lock screen** | Computer Configuration > Administrative Templates > Control Panel > Personalization | For more info, see [Windows spotlight on the lock screen](../configure/windows-spotlight.md) |
-| **Do not require CTRL+ALT+DEL** combined with**Turn off app notifications on the lock screen** | Computer Configuration > Administrative Templates > System > Logon andComputer Configuration > Windows Settings > Security Settings > Local Policies > Security Options > Interactive logon | When both of these policy settings are enabled, the combination will also disable lock screen apps ([assigned access](set-up-a-device-for-anyone-to-use.md)) on Windows 10 Enterprise and Windows 10 Education only. These policy settings can be applied to Windows 10 Pro, but lock screen apps will not be disabled on Windows 10 Pro. **Important:** The description for **Interactive logon: Do not require CTRL+ALT+DEL** in the Group Policy Editor incorrectly states that it only applies to Windows 10 Enterprise and Education. The description will be corrected in a future release.|
-| **Do not show Windows Tips** | Computer Configuration > Administrative Templates > Windows Components > Cloud Content | For more info, see [Windows spotlight on the lock screen](../configure/windows-spotlight.md |
-| **Force a specific default lock screen image** | Computer Configuration > Administrative Templates > Control Panel > Personalization | For more info, see [Windows spotlight on the lock screen](../configure/windows-spotlight.md) |
-| **Start layout** | User Configuration\Administrative Templates\Start Menu and Taskbar | For more info, see [Manage Windows 10 Start layout options and policies](windows-10-start-layout-options-and-policies.md) |
+| **Configure Spotlight on lock screen** | User Configuration > Administrative Templates > Windows Components > Cloud Content | For more info, see [Windows spotlight on the lock screen](/windows/configuration/windows-spotlight). Note that an additional **Cloud Content** policy, **Do not suggest third-party content in Windows spotlight**, does apply to Windows 10 Pro. |
+| **Turn off all Windows Spotlight features** | User Configuration > Administrative Templates > Windows Components > Cloud Content | For more info, see [Windows spotlight on the lock screen](/windows/configuration/windows-spotlight) |
+| **Turn off Microsoft consumer features** | Computer Configuration > Administrative Templates > Windows Components > Cloud Content | For more info, see [Windows spotlight on the lock screen](/windows/configuration/windows-spotlight) |
+| **Do not display the lock screen** | Computer Configuration > Administrative Templates > Control Panel > Personalization | For more info, see [Windows spotlight on the lock screen](/windows/configuration/windows-spotlight) |
+| **Do not require CTRL+ALT+DEL** combined with**Turn off app notifications on the lock screen** | Computer Configuration > Administrative Templates > System > Logon andComputer Configuration > Windows Settings > Security Settings > Local Policies > Security Options > Interactive logon | When both of these policy settings are enabled, the combination will also disable lock screen apps ([assigned access](/windows/configuration/set-up-a-device-for-anyone-to-use)) on Windows 10 Enterprise and Windows 10 Education only. These policy settings can be applied to Windows 10 Pro, but lock screen apps will not be disabled on Windows 10 Pro. **Important:** The description for **Interactive logon: Do not require CTRL+ALT+DEL** in the Group Policy Editor incorrectly states that it only applies to Windows 10 Enterprise and Education. The description will be corrected in a future release.|
+| **Do not show Windows Tips** | Computer Configuration > Administrative Templates > Windows Components > Cloud Content | For more info, see [Windows spotlight on the lock screen](/windows/configuration/windows-spotlight |
+| **Force a specific default lock screen image** | Computer Configuration > Administrative Templates > Control Panel > Personalization | For more info, see [Windows spotlight on the lock screen](/windows/configuration/windows-spotlight) |
+| **Start layout** | User Configuration\Administrative Templates\Start Menu and Taskbar | For more info, see [Manage Windows 10 Start layout options and policies](/windows/configuration/windows-10-start-layout-options-and-policies) |
| **Turn off the Store application** | Computer Configuration > Administrative Templates > Windows Components > Store > Turn off the Store application
User Configuration > Administrative Templates > Windows Components > Store > Turn off the Store application | For more info, see [Knowledge Base article# 3135657](https://support.microsoft.com/kb/3135657). |
-| **Only display the private store within the Windows Store app** | Computer Configuration > Administrative Templates > Windows Components > Store > Only display the private store within the Windows Store app
User Configuration > Administrative Templates > Windows Components > Store > Only display the private store within the Windows Store app | For more info, see [Manage access to private store](manage-access-to-private-store.md) |
-| **Don't search the web or display web results** | Computer Configuration\Administrative Templates\Windows Components\Search\Don't search the web or display web results | For more info, see [Cortana integration in your enterprise](../configure/cortana-at-work-overview.md) |
+| **Only display the private store within the Windows Store app** | Computer Configuration > Administrative Templates > Windows Components > Store > Only display the private store within the Windows Store app
User Configuration > Administrative Templates > Windows Components > Store > Only display the private store within the Windows Store app | For more info, see [Manage access to private store](/microsoft-store/manage-access-to-private-store) |
+| **Don't search the web or display web results** | Computer Configuration\Administrative Templates\Windows Components\Search\Don't search the web or display web results | For more info, see [Cortana integration in your enterprise](/windows/configuration/cortana-at-work/cortana-at-work-overview) |
-
+
\ No newline at end of file
diff --git a/windows/configure/images/aadj1.jpg b/windows/client-management/images/aadj1.jpg
similarity index 100%
rename from windows/configure/images/aadj1.jpg
rename to windows/client-management/images/aadj1.jpg
diff --git a/windows/configure/images/aadj2.jpg b/windows/client-management/images/aadj2.jpg
similarity index 100%
rename from windows/configure/images/aadj2.jpg
rename to windows/client-management/images/aadj2.jpg
diff --git a/windows/configure/images/aadj3.jpg b/windows/client-management/images/aadj3.jpg
similarity index 100%
rename from windows/configure/images/aadj3.jpg
rename to windows/client-management/images/aadj3.jpg
diff --git a/windows/configure/images/aadj4.jpg b/windows/client-management/images/aadj4.jpg
similarity index 100%
rename from windows/configure/images/aadj4.jpg
rename to windows/client-management/images/aadj4.jpg
diff --git a/windows/configure/images/aadjbrowser.jpg b/windows/client-management/images/aadjbrowser.jpg
similarity index 100%
rename from windows/configure/images/aadjbrowser.jpg
rename to windows/client-management/images/aadjbrowser.jpg
diff --git a/windows/configure/images/aadjcal.jpg b/windows/client-management/images/aadjcal.jpg
similarity index 100%
rename from windows/configure/images/aadjcal.jpg
rename to windows/client-management/images/aadjcal.jpg
diff --git a/windows/configure/images/aadjcalmail.jpg b/windows/client-management/images/aadjcalmail.jpg
similarity index 100%
rename from windows/configure/images/aadjcalmail.jpg
rename to windows/client-management/images/aadjcalmail.jpg
diff --git a/windows/configure/images/aadjmail1.jpg b/windows/client-management/images/aadjmail1.jpg
similarity index 100%
rename from windows/configure/images/aadjmail1.jpg
rename to windows/client-management/images/aadjmail1.jpg
diff --git a/windows/configure/images/aadjmail2.jpg b/windows/client-management/images/aadjmail2.jpg
similarity index 100%
rename from windows/configure/images/aadjmail2.jpg
rename to windows/client-management/images/aadjmail2.jpg
diff --git a/windows/configure/images/aadjmail3.jpg b/windows/client-management/images/aadjmail3.jpg
similarity index 100%
rename from windows/configure/images/aadjmail3.jpg
rename to windows/client-management/images/aadjmail3.jpg
diff --git a/windows/configure/images/aadjonedrive.jpg b/windows/client-management/images/aadjonedrive.jpg
similarity index 100%
rename from windows/configure/images/aadjonedrive.jpg
rename to windows/client-management/images/aadjonedrive.jpg
diff --git a/windows/configure/images/aadjonenote.jpg b/windows/client-management/images/aadjonenote.jpg
similarity index 100%
rename from windows/configure/images/aadjonenote.jpg
rename to windows/client-management/images/aadjonenote.jpg
diff --git a/windows/configure/images/aadjonenote2.jpg b/windows/client-management/images/aadjonenote2.jpg
similarity index 100%
rename from windows/configure/images/aadjonenote2.jpg
rename to windows/client-management/images/aadjonenote2.jpg
diff --git a/windows/configure/images/aadjonenote3.jpg b/windows/client-management/images/aadjonenote3.jpg
similarity index 100%
rename from windows/configure/images/aadjonenote3.jpg
rename to windows/client-management/images/aadjonenote3.jpg
diff --git a/windows/configure/images/aadjpin.jpg b/windows/client-management/images/aadjpin.jpg
similarity index 100%
rename from windows/configure/images/aadjpin.jpg
rename to windows/client-management/images/aadjpin.jpg
diff --git a/windows/configure/images/aadjppt.jpg b/windows/client-management/images/aadjppt.jpg
similarity index 100%
rename from windows/configure/images/aadjppt.jpg
rename to windows/client-management/images/aadjppt.jpg
diff --git a/windows/configure/images/aadjverify.jpg b/windows/client-management/images/aadjverify.jpg
similarity index 100%
rename from windows/configure/images/aadjverify.jpg
rename to windows/client-management/images/aadjverify.jpg
diff --git a/windows/configure/images/aadjword.jpg b/windows/client-management/images/aadjword.jpg
similarity index 100%
rename from windows/configure/images/aadjword.jpg
rename to windows/client-management/images/aadjword.jpg
diff --git a/windows/configure/images/aadjwsfb.jpg b/windows/client-management/images/aadjwsfb.jpg
similarity index 100%
rename from windows/configure/images/aadjwsfb.jpg
rename to windows/client-management/images/aadjwsfb.jpg
diff --git a/windows/configure/images/admin-tools-folder.png b/windows/client-management/images/admin-tools-folder.png
similarity index 100%
rename from windows/configure/images/admin-tools-folder.png
rename to windows/client-management/images/admin-tools-folder.png
diff --git a/windows/configure/images/admin-tools.png b/windows/client-management/images/admin-tools.png
similarity index 100%
rename from windows/configure/images/admin-tools.png
rename to windows/client-management/images/admin-tools.png
diff --git a/windows/configure/images/allow-rdp.png b/windows/client-management/images/allow-rdp.png
similarity index 100%
rename from windows/configure/images/allow-rdp.png
rename to windows/client-management/images/allow-rdp.png
diff --git a/windows/configure/images/checkmark.png b/windows/client-management/images/checkmark.png
similarity index 100%
rename from windows/configure/images/checkmark.png
rename to windows/client-management/images/checkmark.png
diff --git a/windows/configure/images/copy-to-change.png b/windows/client-management/images/copy-to-change.png
similarity index 100%
rename from windows/configure/images/copy-to-change.png
rename to windows/client-management/images/copy-to-change.png
diff --git a/windows/configure/images/copy-to-path.png b/windows/client-management/images/copy-to-path.png
similarity index 100%
rename from windows/configure/images/copy-to-path.png
rename to windows/client-management/images/copy-to-path.png
diff --git a/windows/configure/images/copy-to.PNG b/windows/client-management/images/copy-to.PNG
similarity index 100%
rename from windows/configure/images/copy-to.PNG
rename to windows/client-management/images/copy-to.PNG
diff --git a/windows/configure/images/crossmark.png b/windows/client-management/images/crossmark.png
similarity index 100%
rename from windows/configure/images/crossmark.png
rename to windows/client-management/images/crossmark.png
diff --git a/windows/configure/images/rdp.png b/windows/client-management/images/rdp.png
similarity index 100%
rename from windows/configure/images/rdp.png
rename to windows/client-management/images/rdp.png
diff --git a/windows/manage/images/settings-page-visibility-gp.png b/windows/client-management/images/settings-page-visibility-gp.png
similarity index 100%
rename from windows/manage/images/settings-page-visibility-gp.png
rename to windows/client-management/images/settings-page-visibility-gp.png
diff --git a/windows/configure/images/sysprep-error.png b/windows/client-management/images/sysprep-error.png
similarity index 100%
rename from windows/configure/images/sysprep-error.png
rename to windows/client-management/images/sysprep-error.png
diff --git a/windows/configure/images/windows-10-management-cyod-byod-flow.png b/windows/client-management/images/windows-10-management-cyod-byod-flow.png
similarity index 100%
rename from windows/configure/images/windows-10-management-cyod-byod-flow.png
rename to windows/client-management/images/windows-10-management-cyod-byod-flow.png
diff --git a/windows/configure/images/windows-10-management-gp-intune-flow.png b/windows/client-management/images/windows-10-management-gp-intune-flow.png
similarity index 100%
rename from windows/configure/images/windows-10-management-gp-intune-flow.png
rename to windows/client-management/images/windows-10-management-gp-intune-flow.png
diff --git a/windows/configure/images/windows-10-management-range-of-options.png b/windows/client-management/images/windows-10-management-range-of-options.png
similarity index 100%
rename from windows/configure/images/windows-10-management-range-of-options.png
rename to windows/client-management/images/windows-10-management-range-of-options.png
diff --git a/windows/client-management/index.md b/windows/client-management/index.md
new file mode 100644
index 0000000000..9360321453
--- /dev/null
+++ b/windows/client-management/index.md
@@ -0,0 +1,30 @@
+---
+title: Client management (Windows 10)
+description: Windows 10 client management
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+author: jdeckerMS
+localizationpriority: medium
+---
+
+# Client Management
+
+**Applies to**
+- Windows 10
+
+Learn about the administrative tools, tasks and best practices for managing Windows 10 and Windows 10 Mobile clients across your enterprise.
+
+| Topic | Description |
+|---|---|
+|[Administrative tools in Windows 10](administrative-tools-in-windows-10.md)| Listing of administrative tools useful for ITPros and advanced users in managing Windows client.|
+|[Connect to remote AADJ PCs](connect-to-remote-aadj-pc.md)| Instructions for connecting to a remote PC joined to Azure Active Directory (Azure AD)|
+|[Group policies for enterprise and education editions](group-policies-for-enterprise-and-education-editions.md)| Listing of all group policy settings that apply specifically to Windows 10 Enterprise and Education editions|
+|[Join Windows 10 Mobile to AAD](join-windows-10-mobile-to-azure-active-directory.md)| Describes the considerations and options for using Windows 10 Mobile with Azure AD in your organization.|
+|[Manage corporate devices](manage-corporate-devices.md)| Listing of resources to manage all your corporate devices running Windows 10 : desktops, laptops, tablets, and phones |
+|[Transitioning to modern ITPro management](manage-windows-10-in-your-organization-modern-management.md)| Describes modern Windows 10 ITPro management scenarios across traditional, hybrid and cloud-based enterprise needs|
+|[Mandatory user profiles](mandatory-user-profile.md)| Instructions for managing settings commonly defined in a mandatory profiles, including (but are not limited to): icons that appear on the desktop, desktop backgrounds, user preferences in Control Panel, printer selections, and more.|
+|[New policies for Windows 10](new-policies-for-windows-10.md)| Listing of new group policy settings available in Windows 10|
+|[Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md)| Instructions for resetting a Windows 10 Mobile device using either *factory* or *'wipe and persist'* reset options|
+|[Deploy Windows 10 Mobile](windows-10-mobile-and-mdm.md)| Considerations and instructions for deploying Windows 10 Mobile|
+|[Windows libraries](windows-libraries.md)| Considerations and instructions for managing Windows 10 libraries such as My Documents, My Pictures, and My Music.|
diff --git a/windows/manage/join-windows-10-mobile-to-azure-active-directory.md b/windows/client-management/join-windows-10-mobile-to-azure-active-directory.md
similarity index 97%
rename from windows/manage/join-windows-10-mobile-to-azure-active-directory.md
rename to windows/client-management/join-windows-10-mobile-to-azure-active-directory.md
index 61e6b65929..1b2593fec1 100644
--- a/windows/manage/join-windows-10-mobile-to-azure-active-directory.md
+++ b/windows/client-management/join-windows-10-mobile-to-azure-active-directory.md
@@ -122,7 +122,7 @@ An added work account provides the same SSO experience in browser apps like Offi

- **Note** To learn more about the PIN requirement, see [Why a PIN is better than a password](../keep-secure/why-a-pin-is-better-than-a-password.md).
+ **Note** To learn more about the PIN requirement, see [Why a PIN is better than a password](/windows/access-protection/hello-for-business/hello-why-pin-is-better-than-password).
@@ -191,7 +191,7 @@ To see the Notebooks that your Azure AD account has access to, tap **More Notebo
## Use Windows Store for Business
-[Windows Store for Business](windows-store-for-business.md) allows you to specify applications to be available to your users in the Windows Store application. These applications show up on a tab titled for your company. Applications approved in the Windows Store for Business portal can be installed by users.
+[Windows Store for Business](/microsoft-store/index) allows you to specify applications to be available to your users in the Windows Store application. These applications show up on a tab titled for your company. Applications approved in the Windows Store for Business portal can be installed by users.

diff --git a/windows/manage/manage-corporate-devices.md b/windows/client-management/manage-corporate-devices.md
similarity index 82%
rename from windows/manage/manage-corporate-devices.md
rename to windows/client-management/manage-corporate-devices.md
index c282a281cf..a966ef1982 100644
--- a/windows/manage/manage-corporate-devices.md
+++ b/windows/client-management/manage-corporate-devices.md
@@ -27,12 +27,12 @@ You can use the same management tools to manage all device types running Windows
| --- | --- |
| [Manage Windows 10 in your organization - transitioning to modern management](manage-windows-10-in-your-organization-modern-management.md) | Strategies for deploying and managing Windows 10, including deploying Windows 10 in a mixed environment |
| [Connect to remote Azure Active Directory-joined PC](connect-to-remote-aadj-pc.md) | How to use Remote Desktop Connection to connect to an Azure AD-joined PC |
-| [Manage Windows 10 and Windows Store tips, tricks, and suggestions](manage-tips-and-suggestions.md) | Options to manage user experiences to provide a consistent and predictable experience for employees |
+| [Manage Windows 10 and Windows Store tips, tricks, and suggestions](/windows/configuration/manage-tips-and-suggestions) | Options to manage user experiences to provide a consistent and predictable experience for employees |
| [New policies for Windows 10](new-policies-for-windows-10.md) | New Group Policy settings added in Windows 10 |
| [Group Policies that apply only to Windows 10 Enterprise and Windows 10 Education](group-policies-for-enterprise-and-education-editions.md) | Group Policy settings that apply only to Windows 10 Enterprise and Windows 10 Education |
-| [Changes to Group Policy settings for Start in Windows 10](changes-to-start-policies-in-windows-10.md) | Changes to the Group Policy settings that you use to manage Start |
+| [Changes to Group Policy settings for Start in Windows 10](/windows/configuration/changes-to-start-policies-in-windows-10) | Changes to the Group Policy settings that you use to manage Start |
| [Windows 10 Mobile and MDM](windows-10-mobile-and-mdm.md) | How to plan for and deploy Windows 10 Mobile devices |
-| [Introduction to configuration service providers (CSPs) for IT pros](how-it-pros-can-use-configuration-service-providers.md) | How IT pros and system administrators can take advantage of many settings available through CSPs to configure devices running Windows 10 and Windows 10 Mobile in their organizations |
+| [Introduction to configuration service providers (CSPs) for IT pros](/windows/configuration/provisioning-packages/how-it-pros-can-use-configuration-service-providers) | How IT pros and system administrators can take advantage of many settings available through CSPs to configure devices running Windows 10 and Windows 10 Mobile in their organizations |
## Learn more
diff --git a/windows/manage/manage-settings-app-with-group-policy.md b/windows/client-management/manage-settings-app-with-group-policy.md
similarity index 100%
rename from windows/manage/manage-settings-app-with-group-policy.md
rename to windows/client-management/manage-settings-app-with-group-policy.md
diff --git a/windows/manage/manage-windows-10-in-your-organization-modern-management.md b/windows/client-management/manage-windows-10-in-your-organization-modern-management.md
similarity index 100%
rename from windows/manage/manage-windows-10-in-your-organization-modern-management.md
rename to windows/client-management/manage-windows-10-in-your-organization-modern-management.md
diff --git a/windows/manage/mandatory-user-profile.md b/windows/client-management/mandatory-user-profile.md
similarity index 96%
rename from windows/manage/mandatory-user-profile.md
rename to windows/client-management/mandatory-user-profile.md
index 3ced9aa8fd..f3344f6f15 100644
--- a/windows/manage/mandatory-user-profile.md
+++ b/windows/client-management/mandatory-user-profile.md
@@ -162,10 +162,9 @@ When a user is configured with a mandatory profile, Windows 10 starts as though
## Related topics
-- [Manage Windows 10 Start layout and taskbar options](windows-10-start-layout-options-and-policies.md)
-- [Lock down Windows 10 to specific apps](lock-down-windows-10-to-specific-apps.md)
-- [Windows Spotlight on the lock screen](../configure/windows-spotlight.md)
-- [Configure devices without MDM](configure-devices-without-mdm.md)
-
+- [Manage Windows 10 Start layout and taskbar options](/windows/configuration/windows-10-start-layout-options-and-policies)
+- [Lock down Windows 10 to specific apps](/windows/configuration/lock-down-windows-10-to-specific-apps)
+- [Windows Spotlight on the lock screen](/windows/configuration/windows-spotlight)
+- [Configure devices without MDM](/windows/configuration/configure-devices-without-mdm)
diff --git a/windows/manage/new-policies-for-windows-10.md b/windows/client-management/new-policies-for-windows-10.md
similarity index 90%
rename from windows/manage/new-policies-for-windows-10.md
rename to windows/client-management/new-policies-for-windows-10.md
index 311f3f125f..bdb9f28644 100644
--- a/windows/manage/new-policies-for-windows-10.md
+++ b/windows/client-management/new-policies-for-windows-10.md
@@ -35,7 +35,7 @@ There are some new policy settings in Group Policy for devices running Windows
- Allow applications to share app data between users
-- [Start screen and Start menu layout](customize-windows-10-start-screens-by-using-group-policy.md)
+- [Start screen and Start menu layout](/windows/configuration/customize-windows-10-start-screens-by-using-group-policy)
- Windows Tips
@@ -62,7 +62,7 @@ Mobile device management (MDM) for Windows 10 Pro, Windows 10 Enterprise, Wind
- Hardware-based device health attestation
-- [Kiosk mode](set-up-a-device-for-anyone-to-use.md), start screen, start menu layout
+- [Kiosk mode](/windows/configuration/set-up-a-device-for-anyone-to-use), start screen, start menu layout
- Security
@@ -85,7 +85,7 @@ No new [Exchange ActiveSync policies](https://go.microsoft.com/fwlink/p/?LinkId=
[Manage corporate devices](manage-corporate-devices.md)
-[Changes to Group Policy settings for Start in Windows 10](changes-to-start-policies-in-windows-10.md)
+[Changes to Group Policy settings for Start in Windows 10](/windows/configuration/changes-to-start-policies-in-windows-10)
[Windows 10 Mobile and MDM](windows-10-mobile-and-mdm.md)
diff --git a/windows/manage/reset-a-windows-10-mobile-device.md b/windows/client-management/reset-a-windows-10-mobile-device.md
similarity index 100%
rename from windows/manage/reset-a-windows-10-mobile-device.md
rename to windows/client-management/reset-a-windows-10-mobile-device.md
diff --git a/windows/manage/windows-10-mobile-and-mdm.md b/windows/client-management/windows-10-mobile-and-mdm.md
similarity index 99%
rename from windows/manage/windows-10-mobile-and-mdm.md
rename to windows/client-management/windows-10-mobile-and-mdm.md
index cc517ce971..0d6a833f58 100644
--- a/windows/manage/windows-10-mobile-and-mdm.md
+++ b/windows/client-management/windows-10-mobile-and-mdm.md
@@ -195,7 +195,7 @@ The Windows Push Notification Services enable software developers to send toast,
However, push notifications can affect battery life so the battery saver in Windows 10 Mobile limits background activity on the devices to extend battery life. Users can configure battery saver to turn on automatically when the battery drops below a set threshold. Windows 10 Mobile disables the receipt of push notifications to save energy when battery saver is on.
However, there is an exception to this behavior. In Windows 10 Mobile, the Always allowed battery saver setting (found in the Settings app) allows apps to receive push notifications even when battery saver is on. Users can manually configure this list, or IT can use the MDM system to configure the battery saver settings URI scheme in Windows 10 Mobile (ms-settings:batterysaver-settings).
-For more information about health attestation in Windows 10 Mobile, see the [Windows 10 Mobile security guide](../keep-secure/windows-10-mobile-security-guide.md).
+For more information about health attestation in Windows 10 Mobile, see the [Windows 10 Mobile security guide](/windows/device-security/windows-10-mobile-security-guide).
**Windows Update for Business**
Microsoft designed Windows Update for Business to provide IT administrators with additional Windows Update-centric management capabilities, such as the ability to deploy updates to groups of devices and to define maintenance windows for installing updates.
@@ -301,7 +301,7 @@ Certificates help improve security by providing account authentication, Wi Fi au
To install certificates manually, you can post them on Microsoft Edge website or send them directly via email, which is ideal for testing purposes.
Using SCEP and MDM systems, certificate management is completely transparent and requires no user intervention, helping improve user productivity, and reduce support calls. Your MDM system can automatically deploy these certificates to the devices’ certificate stores after you enroll the device (as long as the MDM system supports the Simple Certificate Enrollment Protocol (SCEP) or Personal Information Exchange (PFX)). The MDM server can also query and delete SCEP enrolled client certificate (including user installed certificates), or trigger a new enrollment request before the current certificate is expired.
In addition to SCEP certificate management, Windows 10 Mobile supports deployment of PFX certificates. The table below lists the Windows 10 Mobile PFX certificate deployment settings.
-Get more detailed information about MDM certificate management in the [Client Certificate Install CSP](https://msdn.microsoft.com/en-us/library/windows/hardware/dn920023(v=vs.85).aspx) and [Install digital certificates on Windows 10 Mobile](../keep-secure/installing-digital-certificates-on-windows-10-mobile.md).
+Get more detailed information about MDM certificate management in the [Client Certificate Install CSP](https://msdn.microsoft.com/en-us/library/windows/hardware/dn920023(v=vs.85).aspx) and [Install digital certificates on Windows 10 Mobile](/windows/access-protection/installing-digital-certificates-on-windows-10-mobile).
Use the Allow Manual Root Certificate Installation setting to prevent users from manually installing root and intermediate CA certificates intentionally or accidently.
>**Note:** To diagnose certificate-related issues on Windows 10 Mobile devices, use the free Certificates app in Windows Store. This Windows 10 Mobile app can help you:
@@ -520,7 +520,7 @@ To install acquired Windows Store or LOB apps offline on a Windows 10 Mobile dev
Windows Store apps or LOB apps that have been uploaded to the Windows Store for Business are automatically trusted on all Windows devices, as they are cryptographically signed with Windows Store certificates. LOB apps that are uploaded to the Windows Store for Business are private to your organization and are never visible to other companies or consumers. If you do not want to upload your LOB apps, you have to establish trust for the app on your devices. To establish this trust, you’ll need to generate a signing certificate with your Public Key Infrastructure and add your chain of trust to the trusted certificates on the device (see the certificates section). You can install up to 20 self-signed LOB apps per device with Windows 10 Mobile. To install more than 20 apps on a device, you can purchase a signing certificate from a trusted public Certificate Authority, or upgrade your devices to Windows 10 Mobile Enterprise edition.
-Learn more about the [Windows Store for Business](windows-store-for-business.md).
+Learn more about the [Windows Store for Business](/microsoft-store/index).
### Managing apps
@@ -590,7 +590,7 @@ The following table lists the settings that can be configured for Windows Inform
>**Note:** * Are mandatory Windows Information Protection policies. To make Windows Information Protection functional, AppLocker and network isolation settings - specifically Enterprise IP Range and Enterprise Network Domain Names – must be configured. This defines the source of all corporate data that needs protection and also ensures data written to these locations won’t be encrypted by the user’s encryption key (so that others in the company can access it.
-For more information on Windows Information Protection, see the [EnterpriseDataProtection CSP](https://msdn.microsoft.com/en-us/library/windows/hardware/mt697634(v=vs.85).aspx) and the following in-depth article series [Protect your enterprise data using Windows Information Protection](../keep-secure/protect-enterprise-data-using-wip.md).
+For more information on Windows Information Protection, see the [EnterpriseDataProtection CSP](https://msdn.microsoft.com/en-us/library/windows/hardware/mt697634(v=vs.85).aspx) and the following in-depth article series [Protect your enterprise data using Windows Information Protection](/windows/threat-protection/windows-information-protection/protect-enterprise-data-using-wip).
### Managing user activities
@@ -796,7 +796,7 @@ Upgrading to Windows 10 Mobile Enterprise edition provides additional device and
- **Deploy an unlimited number of self-signed LOB apps to a single device:** To use an MDM system to deploy LOB apps directly to devices, you must cryptographically sign the software packages with a code signing certificate that your organization’s certificate authority (CA) generates. You can deploy a maximum of 20 self-signed LOB apps to a Windows 10 Mobile device. To deploy more than 20 self-signed LOB apps, Windows 10 Mobile Enterprise is required.
- **Set the telemetry level:** Microsoft collects telemetry data to help keep Windows devices secure and to help Microsoft improve the quality of Windows and Microsoft services. An upgrade to Windows 10 Mobile Enterprise edition is required to set the telemetry level so that only telemetry information required to keep devices secured is gathered.
-To learn more about telemetry, visit [Configure Windows telemetry in your organization](configure-windows-telemetry-in-your-organization.md).
+To learn more about telemetry, visit [Configure Windows telemetry in your organization](/windows/configuration/configure-windows-telemetry-in-your-organization).
To activate Windows 10 Mobile Enterprise, use your MDM system or a provisioning package to inject the Windows 10 Enterprise license on a Windows 10 Mobile device. Licenses can be obtained from the Volume Licensing portal. For testing purposes, you can obtain a licensing file from the MSDN download center. A valid MSDN subscription is required.
@@ -897,7 +897,7 @@ In addition, in version 1607, you can configure when the update is applied to th
Although Windows 10 Enterprise enables IT administrators to defer installation of new updates from Windows Update, enterprises may also want additional control over update processes. With this in mind, Microsoft created Windows Update for Business. Microsoft designed Windows Update for Business to provide IT administrators with additional Windows Update-centric management capabilities, such as the ability to deploy updates to groups of devices and to define maintenance windows for installing updates. If you are using a MDM system, the use of Windows Update for Business is not a requirement, as you can manage these features from your MDM system.
-Learn more about [Windows Update for Business](../plan/windows-update-for-business.md).
+Learn more about [Windows Update for Business](/windows/deployment/update/waas-manage-updates-wufb).
IT administrators can specify where the device gets updates from with AllowUpdateService. This could be Microsoft Update, Windows Update for Business, or Windows Server Update Services (WSUS.
@@ -950,7 +950,7 @@ DHA-enabled device management solutions help IT managers create a unified securi
>**Note:** Windows Device Health Attestation Service can be used for conditional access scenarios which may be enabled by Mobile Device Management solutions (e.g.: Microsoft Intune) and other types of management systems (e.g.: SCCM) purchased separately.
-For more information about health attestation in Windows 10 Mobile, see the [Windows 10 Mobile security guide](../keep-secure/windows-10-mobile-security-guide.md).
+For more information about health attestation in Windows 10 Mobile, see the [Windows 10 Mobile security guide](/windows/device-security/windows-10-mobile-security-guide).
Thisis a lists of attributes that are supported by DHA and can trigger the corrective actions mentioned above.
- **Attestation Identity Key (AIK) present** Indicates that an AIK is present (i.e., the device can be trusted more than a device without an AIK).
@@ -1014,7 +1014,7 @@ Microsoft uses telemetry (diagnostics, performance, and usage data) from Windows
You can control the level of data that telemetry systems collect. To configure devices, specify one of these levels in the Allow Telemetry setting with your MDM system.
-For more information, see [Configure Windows telemetry in Your organization](configure-windows-telemetry-in-your-organization.md).
+For more information, see [Configure Windows telemetry in Your organization](/windows/configuration/configure-windows-telemetry-in-your-organization).
>**Note:** Telemetry can only be managed when the device is upgraded to Windows 10 Mobile Enterprise edition.
@@ -1072,4 +1072,3 @@ A better option than wiping the entire device is to use Windows Information Prot
- November 2015 Updated for Windows 10 Mobile (version 1511)
- August 2016 Updated for Windows 10 Mobile Anniversary Update (version 1607)
-
diff --git a/windows/manage/windows-libraries.md b/windows/client-management/windows-libraries.md
similarity index 99%
rename from windows/manage/windows-libraries.md
rename to windows/client-management/windows-libraries.md
index f8937e7a43..0b4746f88d 100644
--- a/windows/manage/windows-libraries.md
+++ b/windows/client-management/windows-libraries.md
@@ -7,10 +7,9 @@ ms.manager: dongill
ms.technology: storage
ms.topic: article
author: jasongerend
-ms.date: 2/6/2017
description: All about Windows Libraries, which are containers for users' content, such as Documents and Pictures.
---
-# Windows Libraries
+# Windows libraries
> Applies to: Windows 10, Windows 8.1, Windows 7, Windows Server 2016, Windows Server 2012 R2, Windows Server 2012, Windows Server 2008 R2
diff --git a/windows/configuration/TOC.md b/windows/configuration/TOC.md
new file mode 100644
index 0000000000..962281e962
--- /dev/null
+++ b/windows/configuration/TOC.md
@@ -0,0 +1,92 @@
+# [Configure Windows 10](index.md)
+## [Configure Windows telemetry in your organization](configure-windows-telemetry-in-your-organization.md)
+## [Basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields.md)
+## [Windows 10, version 1703 diagnostic data](windows-diagnostic-data.md)
+## [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md)
+## [Manage Wi-Fi Sense in your company](manage-wifi-sense-in-enterprise.md)
+## [Configure kiosk and shared devices running Windows 10 desktop editions](kiosk-shared-pc.md)
+### [Set up a shared or guest PC with Windows 10](set-up-shared-or-guest-pc.md)
+### [Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md)
+### [Guidelines for choosing an app for assigned access (kiosk mode)](guidelines-for-assigned-access-app.md)
+### [Lock down Windows 10 to specific apps (AppLocker)](lock-down-windows-10-to-specific-apps.md)
+## [Configure Windows 10 Mobile devices](mobile-devices/configure-mobile.md)
+### [Set up a kiosk on Windows 10 Mobile or Windows 10 Mobile Enterprise](mobile-devices/set-up-a-kiosk-for-windows-10-for-mobile-edition.md)
+### [Use Windows Configuration Designer to configure Windows 10 Mobile devices](mobile-devices/provisioning-configure-mobile.md)
+#### [NFC-based device provisioning](mobile-devices/provisioning-nfc.md)
+#### [Barcode provisioning and the package splitter tool](mobile-devices/provisioning-package-splitter.md)
+### [Use the Lockdown Designer app to create a Lockdown XML file](mobile-devices/mobile-lockdown-designer.md)
+### [Configure Windows 10 Mobile using Lockdown XML](mobile-devices/lockdown-xml.md)
+### [Settings and quick actions that can be locked down in Windows 10 Mobile](mobile-devices/settings-that-can-be-locked-down.md)
+### [Product IDs in Windows 10 Mobile](mobile-devices/product-ids-in-windows-10-mobile.md)
+### [Start layout XML for mobile editions of Windows 10 (reference)](mobile-devices/start-layout-xml-mobile.md)
+## [Configure Start, taskbar, and lock screen](start-taskbar-lockscreen.md)
+### [Configure Windows Spotlight on the lock screen](windows-spotlight.md)
+### [Manage Windows 10 and Windows Store tips, tricks, and suggestions](manage-tips-and-suggestions.md)
+### [Manage Windows 10 Start and taskbar layout](windows-10-start-layout-options-and-policies.md)
+#### [Configure Windows 10 taskbar](configure-windows-10-taskbar.md)
+#### [Customize and export Start layout](customize-and-export-start-layout.md)
+#### [Add image for secondary tiles](start-secondary-tiles.md)
+#### [Start layout XML for desktop editions of Windows 10 (reference)](start-layout-xml-desktop.md)
+#### [Customize Windows 10 Start and taskbar with Group Policy](customize-windows-10-start-screens-by-using-group-policy.md)
+#### [Customize Windows 10 Start and taskbar with provisioning packages](customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md)
+#### [Customize Windows 10 Start and tasbkar with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md)
+#### [Changes to Start policies in Windows 10](changes-to-start-policies-in-windows-10.md)
+## [Cortana integration in your business or enterprise](cortana-at-work/cortana-at-work-overview.md)
+### [Testing scenarios using Cortana in your business or organization](cortana-at-work/cortana-at-work-testing-scenarios.md)
+#### [Test scenario 1 - Sign-in to Azure AD and use Cortana to manage the notebook](cortana-at-work/cortana-at-work-scenario-1.md)
+#### [Test scenario 2 - Test scenario 2 - Perform a quick search with Cortana at work](cortana-at-work/cortana-at-work-scenario-2.md)
+#### [Test scenario 3 - Set a reminder for a specific location using Cortana at work](cortana-at-work/cortana-at-work-scenario-3.md)
+#### [Test scenario 4 - Use Cortana at work to find your upcoming meetings](cortana-at-work/cortana-at-work-scenario-4.md)
+#### [Test scenario 5 - Use Cortana to send email to a co-worker](cortana-at-work/cortana-at-work-scenario-5.md)
+#### [Test scenario 6 - Review a reminder suggested by Cortana based on what you’ve promised in email](cortana-at-work/cortana-at-work-scenario-6.md)
+#### [Test scenario 7 - Use Cortana and Windows Information Protection (WIP) to help protect your organization’s data on a device](cortana-at-work/cortana-at-work-scenario-7.md)
+### [Set up and test Cortana with Office 365 in your organization](cortana-at-work/cortana-at-work-o365.md)
+### [Set up and test Cortana with Microsoft Dynamics CRM (Preview feature) in your organization](cortana-at-work/cortana-at-work-crm.md)
+### [Set up and test Cortana for Power BI in your organization](cortana-at-work/cortana-at-work-powerbi.md)
+### [Set up and test custom voice commands in Cortana for your organization](cortana-at-work/cortana-at-work-voice-commands.md)
+### [Use Group Policy and mobile device management (MDM) settings to configure Cortana in your organization](cortana-at-work/cortana-at-work-policy-settings.md)
+### [Send feedback about Cortana at work back to Microsoft](cortana-at-work/cortana-at-work-feedback.md)
+## [Configure access to Windows Store](stop-employees-from-using-the-windows-store.md)
+## [Provisioning packages for Windows 10](provisioning-packages/provisioning-packages.md)
+### [How provisioning works in Windows 10](provisioning-packages/provisioning-how-it-works.md)
+### [Introduction to configuration service providers (CSPs)](provisioning-packages/how-it-pros-can-use-configuration-service-providers.md)
+### [Install Windows Configuration Designer](provisioning-packages/provisioning-install-icd.md)
+### [Create a provisioning package](provisioning-packages/provisioning-create-package.md)
+### [Apply a provisioning package](provisioning-packages/provisioning-apply-package.md)
+### [Settings changed when you uninstall a provisioning package](provisioning-packages/provisioning-uninstall-package.md)
+### [Provision PCs with common settings for initial deployment (desktop wizard)](provisioning-packages/provision-pcs-for-initial-deployment.md)
+### [Provision PCs with apps](provisioning-packages/provision-pcs-with-apps.md)
+### [Use a script to install a desktop app in provisioning packages](provisioning-packages/provisioning-script-to-install-app.md)
+### [PowerShell cmdlets for provisioning Windows 10 (reference)](provisioning-packages/provisioning-powershell.md)
+### [Windows ICD command-line interface (reference)](provisioning-packages/provisioning-command-line.md)
+### [Create a provisioning package with multivariant settings](provisioning-packages/provisioning-multivariant.md)
+## [Lockdown features from Windows Embedded 8.1 Industry](lockdown-features-windows-10.md)
+## [User Experience Virtualization (UE-V) for Windows](ue-v/uev-for-windows.md)
+### [Get Started with UE-V](ue-v/uev-getting-started.md)
+#### [What's New in UE-V for Windows 10, version 1607](ue-v/uev-whats-new-in-uev-for-windows.md)
+#### [User Experience Virtualization Release Notes](ue-v/uev-release-notes-1607.md)
+#### [Upgrade to UE-V for Windows 10](ue-v/uev-upgrade-uev-from-previous-releases.md)
+### [Prepare a UE-V Deployment](ue-v/uev-prepare-for-deployment.md)
+#### [Deploy Required UE-V Features](ue-v/uev-deploy-required-features.md)
+#### [Deploy UE-V for use with Custom Applications](ue-v/uev-deploy-uev-for-custom-applications.md)
+### [Administering UE-V](ue-v/uev-administering-uev.md)
+#### [Manage Configurations for UE-V](ue-v/uev-manage-configurations.md)
+##### [Configuring UE-V with Group Policy Objects](ue-v/uev-configuring-uev-with-group-policy-objects.md)
+##### [Configuring UE-V with System Center Configuration Manager](ue-v/uev-configuring-uev-with-system-center-configuration-manager.md)
+##### [Administering UE-V with Windows PowerShell and WMI](ue-v/uev-administering-uev-with-windows-powershell-and-wmi.md)
+###### [Managing the UE-V Service and Packages with Windows PowerShell and WMI](ue-v/uev-managing-uev-agent-and-packages-with-windows-powershell-and-wmi.md)
+###### [Managing UE-V Settings Location Templates Using Windows PowerShell and WMI](ue-v/uev-managing-settings-location-templates-using-windows-powershell-and-wmi.md)
+#### [Working with Custom UE-V Templates and the UE-V Template Generator](ue-v/uev-working-with-custom-templates-and-the-uev-generator.md)
+#### [Manage Administrative Backup and Restore in UE-V](ue-v/uev-manage-administrative-backup-and-restore.md)
+#### [Changing the Frequency of UE-V Scheduled Tasks](ue-v/uev-changing-the-frequency-of-scheduled-tasks.md)
+#### [Migrating UE-V Settings Packages](ue-v/uev-migrating-settings-packages.md)
+#### [Using UE-V with Application Virtualization Applications](ue-v/uev-using-uev-with-application-virtualization-applications.md)
+### [Troubleshooting UE-V](ue-v/uev-troubleshooting.md)
+### [Technical Reference for UE-V](ue-v/uev-technical-reference.md)
+#### [Sync Methods for UE-V](ue-v/uev-sync-methods.md)
+#### [Sync Trigger Events for UE-V](ue-v/uev-sync-trigger-events.md)
+#### [Synchronizing Microsoft Office with UE-V](ue-v/uev-synchronizing-microsoft-office-with-uev.md)
+#### [Application Template Schema Reference for UE-V](ue-v/uev-application-template-schema-reference.md)
+#### [Security Considerations for UE-V](ue-v/uev-security-considerations.md)
+
+## [Change history for Configure Windows 10](change-history-for-configure-windows-10.md)
diff --git a/windows/configure/basic-level-windows-diagnostic-events-and-fields.md b/windows/configuration/basic-level-windows-diagnostic-events-and-fields.md
similarity index 100%
rename from windows/configure/basic-level-windows-diagnostic-events-and-fields.md
rename to windows/configuration/basic-level-windows-diagnostic-events-and-fields.md
diff --git a/windows/configure/change-history-for-configure-windows-10.md b/windows/configuration/change-history-for-configure-windows-10.md
similarity index 66%
rename from windows/configure/change-history-for-configure-windows-10.md
rename to windows/configuration/change-history-for-configure-windows-10.md
index 7f36bcbec3..8398eff1df 100644
--- a/windows/configure/change-history-for-configure-windows-10.md
+++ b/windows/configuration/change-history-for-configure-windows-10.md
@@ -12,15 +12,15 @@ author: jdeckerMS
# Change history for Configure Windows 10
-This topic lists new and updated topics in the [Configure Windows 10](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md).
+This topic lists new and updated topics in the [Configure Windows 10](index.md) documentation for Windows 10 and Windows 10 Mobile.
## RELEASE: Windows 10, version 1703
-The topics in this library have been updated for Windows 10, version 1703 (also known as the Creators Update). These topics were previously published in the [Deploy Windows 10](../deploy/index.md) or [Manage and update Windows 10](../manage/index.md) sections. The following new topics have been added:
+The topics in this library have been updated for Windows 10, version 1703 (also known as the Creators Update). The following new topics have been added:
-- [Use the Lockdown Designer app to create a Lockdown XML file](mobile-lockdown-designer.md)
+- [Use the Lockdown Designer app to create a Lockdown XML file](mobile-devices/mobile-lockdown-designer.md)
- [Add image for secondary tiles](start-secondary-tiles.md)
-- [Provision PCs with apps](provision-pcs-with-apps.md)
+- [Provision PCs with apps](provisioning-packages/provision-pcs-with-apps.md)
- [Windows 10, version 1703 basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields.md)
- [Windows 10, version 1703 Diagnostic Data](windows-diagnostic-data.md)
\ No newline at end of file
diff --git a/windows/configure/changes-to-start-policies-in-windows-10.md b/windows/configuration/changes-to-start-policies-in-windows-10.md
similarity index 100%
rename from windows/configure/changes-to-start-policies-in-windows-10.md
rename to windows/configuration/changes-to-start-policies-in-windows-10.md
diff --git a/windows/configure/configure-devices-without-mdm.md b/windows/configuration/configure-devices-without-mdm.md
similarity index 100%
rename from windows/configure/configure-devices-without-mdm.md
rename to windows/configuration/configure-devices-without-mdm.md
diff --git a/windows/configure/configure-windows-10-taskbar.md b/windows/configuration/configure-windows-10-taskbar.md
similarity index 100%
rename from windows/configure/configure-windows-10-taskbar.md
rename to windows/configuration/configure-windows-10-taskbar.md
diff --git a/windows/configure/configure-windows-telemetry-in-your-organization.md b/windows/configuration/configure-windows-telemetry-in-your-organization.md
similarity index 99%
rename from windows/configure/configure-windows-telemetry-in-your-organization.md
rename to windows/configuration/configure-windows-telemetry-in-your-organization.md
index d8710b1bb2..657bb0863c 100644
--- a/windows/configure/configure-windows-telemetry-in-your-organization.md
+++ b/windows/configuration/configure-windows-telemetry-in-your-organization.md
@@ -98,7 +98,7 @@ Windows telemetry also helps Microsoft better understand how customers use (or d
### Insights into your own organization
-Sharing information with Microsoft helps make Windows and other products better, but it can also help make your internal processes and user experiences better, as well. Microsoft is in the process of developing a set of analytics customized for your internal use. The first of these, called [Upgrade Readiness](../deploy/manage-windows-upgrades-with-upgrade-readiness.md).
+Sharing information with Microsoft helps make Windows and other products better, but it can also help make your internal processes and user experiences better, as well. Microsoft is in the process of developing a set of analytics customized for your internal use. The first of these, called [Upgrade Readiness](../deployment/upgrade/manage-windows-upgrades-with-upgrade-readiness.md).
#### Upgrade Readiness
diff --git a/windows/configure/cortana-at-work-crm.md b/windows/configuration/cortana-at-work/cortana-at-work-crm.md
similarity index 96%
rename from windows/configure/cortana-at-work-crm.md
rename to windows/configuration/cortana-at-work/cortana-at-work-crm.md
index 4bfca8e08c..a1011e2397 100644
--- a/windows/configure/cortana-at-work-crm.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-crm.md
@@ -19,7 +19,7 @@ Cortana integration is a Preview feature that's available for your test or dev e
>[!NOTE]
>For more info about Dynamics CRM integration, how to turn on Cortana, and how to provide feedback, see [Preview feature: Set up Cortana integration](http://go.microsoft.com/fwlink/p/?LinkId=746819).
-
+
## Turn on Cortana with Dynamics CRM in your organization
You must be a CRM administrator to turn on and use Preview features. For more info about what Preview features are and how to use them, see [What are Preview features and how do I enable them](http://go.microsoft.com/fwlink/p/?LinkId=746817)?
@@ -43,7 +43,7 @@ You must tell your employees to turn on Cortana, before they’ll be able to use
2. Click on **Connected Services**, click **Dynamics CRM**, and then click **Connect**.
- 
+ 
The employee can also disconnect by clicking **Disconnect** from the **Dynamics CRM** screen.
diff --git a/windows/configure/cortana-at-work-feedback.md b/windows/configuration/cortana-at-work/cortana-at-work-feedback.md
similarity index 96%
rename from windows/configure/cortana-at-work-feedback.md
rename to windows/configuration/cortana-at-work/cortana-at-work-feedback.md
index d27d30e1cf..fc46c6b7ee 100644
--- a/windows/configure/cortana-at-work-feedback.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-feedback.md
@@ -16,7 +16,7 @@ localizationpriority: high
We ask that you report bugs and issues. To provide feedback, you can click the **Feedback** icon in the Cortana window. When you send this form to Microsoft it also includes troubleshooting info, in case you run into problems.
-
+
If you don't want to use the feedback tool in Cortana, you can add feedback through the general Windows Insider Program feedback app. For info about the feedback app, see [How to use Windows Insider Preview – Updates and feedback](http://windows.microsoft.com/en-us/windows/preview-updates-feedback-pc).
diff --git a/windows/configure/cortana-at-work-o365.md b/windows/configuration/cortana-at-work/cortana-at-work-o365.md
similarity index 97%
rename from windows/configure/cortana-at-work-o365.md
rename to windows/configuration/cortana-at-work/cortana-at-work-o365.md
index be3a27e0f3..b9b9f1f63c 100644
--- a/windows/configure/cortana-at-work-o365.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-o365.md
@@ -18,7 +18,7 @@ Cortana in Windows 10 is already great at letting your employees quickly see wha
But Cortana works even harder when she connects to Office 365, helping employees to be notified about unusual events, such as meetings over lunch or during a typical commute time, and about early meetings, even setting an alarm so the employee isn’t late.
-
+
We’re continuing to add more and more capabilities to Cortana so she can become even more helpful with your productivity-related tasks, such as emailing, scheduling, and other tasks that are important to help you be successful.
@@ -45,7 +45,7 @@ You must tell your employees to turn on Cortana before they’ll be able to use
2. Click on **Connected Services**, click **Office 365**, and then click **Connect**.
- 
+ 
The employee can also disconnect by clicking **Disconnect** from the **Office 365** screen.
diff --git a/windows/configure/cortana-at-work-overview.md b/windows/configuration/cortana-at-work/cortana-at-work-overview.md
similarity index 92%
rename from windows/configure/cortana-at-work-overview.md
rename to windows/configuration/cortana-at-work/cortana-at-work-overview.md
index 9202776ada..c6a9a191ca 100644
--- a/windows/configure/cortana-at-work-overview.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-overview.md
@@ -20,7 +20,7 @@ Cortana has powerful configuration options, specifically optimized for your busi
Using Azure AD also means that you can remove an employee’s profile (for example, when an employee leaves your organization) while respecting Windows Information Protection (WIP) policies and ignoring enterprise content, such as emails, calendar items, and people lists that are marked as enterprise data.
-
+
## Where is Cortana available for use in my organization?
You can use Cortana at work in all countries/regions where Cortana is supported for consumers. This includes the United States, United Kingdom, Canada, France, Italy, Germany, Spain, China, Japan, India, and Australia. As Cortana comes to more countries, she will also become available to enterprise customers.
@@ -42,7 +42,7 @@ Cortana requires the following hardware and software to successfully run the inc
|Client operating system |
**Desktop:** Windows 10, version 1703
**Mobile:** Windows 10 Mobile, version 1703 (with limited functionality)
|
|Azure Active Directory (Azure AD) |While all employees signing into Cortana need an Azure AD account; an Azure AD premium tenant isn’t required. |
|Additional policies (Group Policy and Mobile Device Management (MDM)) |There is a rich set of policies that can be used to manage various aspects of Cortana. Most of these policies will limit the abilities of Cortana, but won't turn Cortana off.
For example:
If you turn **Location** off, Cortana won't be able to provide location-based reminders, such as reminding you to visit the mail room when you get to work.
If you turn **Speech** off, your employees won't be able to use “Hello Cortana” for hands free usage or voice commands to easily ask for help. |
-|Windows Information Protection (WIP) (optional) |If you want to secure the calendar, email, and contact info provided to Cortana on a device, you can use WIP. For more info about WIP, see [Protect your enterprise data using Windows Information Protection (WIP)](../keep-secure/protect-enterprise-data-using-wip.md)
If you decide to use WIP, you must also have a management solution. This can be Microsoft Intune, Microsoft System Center Configuration Manager (version 1606 or later), or your current company-wide 3rd party mobile device management (MDM) solution.|
+|Windows Information Protection (WIP) (optional) |If you want to secure the calendar, email, and contact info provided to Cortana on a device, you can use WIP. For more info about WIP, see [Protect your enterprise data using Windows Information Protection (WIP)](/windows/threat-protection/windows-information-protection/protect-enterprise-data-using-wip)
If you decide to use WIP, you must also have a management solution. This can be Microsoft Intune, Microsoft System Center Configuration Manager (version 1606 or later), or your current company-wide 3rd party mobile device management (MDM) solution.|
## Signing in using Azure AD
Your organization must have an Azure AD tenant and your employees’ devices must all be Azure AD-joined for Cortana to work properly. For info about what an Azure AD tenant is, how to get your devices joined, and other Azure AD maintenance info, see [What is an Azure AD directory?](https://msdn.microsoft.com/library/azure/jj573650.aspx)
diff --git a/windows/configure/cortana-at-work-policy-settings.md b/windows/configuration/cortana-at-work/cortana-at-work-policy-settings.md
similarity index 100%
rename from windows/configure/cortana-at-work-policy-settings.md
rename to windows/configuration/cortana-at-work/cortana-at-work-policy-settings.md
diff --git a/windows/configure/cortana-at-work-powerbi.md b/windows/configuration/cortana-at-work/cortana-at-work-powerbi.md
similarity index 88%
rename from windows/configure/cortana-at-work-powerbi.md
rename to windows/configuration/cortana-at-work/cortana-at-work-powerbi.md
index d5fce7c38e..26579a4c9c 100644
--- a/windows/configure/cortana-at-work-powerbi.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-powerbi.md
@@ -44,35 +44,35 @@ Before you can start this testing scenario, you must first set up your test envi
2. Expand the left rail by clicking the **Show the navigation pane** icon.
- 
+ 
3. Click **Get Data** from the left-hand navigation in Power BI.
- 
+ 
4. Click **Samples** from the **Content Pack Library** area of the **Get Data** screen.
- 
+ 
5. Click **Retail Analysis Sample**, and then click **Connect**.
- 
+ 
The sample data is imported and you’re returned to the **Power BI** screen.
6. Click **Dashboards** from the left pane of the **Power BI** screen, and then click **Retail Analysis Sample**.
- 
+ 
7. In the upper right-hand menu, click the **Settings** icon, and then click **Settings**.
- 
+ 
8. Click the **Datasets** tab, and then pick the **Retail Analysis Sample** dataset from the list.
9. Click **Q&A and Cortana**, check the **Allow Cortana to access this dataset** box, and then click **Apply**.
- 
+ 
>[!NOTE]
>It can take up to 30 minutes for a new dataset to appear for Power BI and Cortana. Logging in and out of Windows 10, or otherwise restarting Cortana, causes the new content to appear immediately.
If you enable a dataset for Cortana, and that dataset is part of a content pack you own, you’ll need to re-publish for your colleagues to also use it with Cortana.
@@ -88,7 +88,7 @@ After you’ve finished creating your Answer Page, you can continue to the inclu
**To create a custom sales data Answer Page for Cortana**
1. In Power BI, click **My Workspace**, click **Create**, and then click **Report**.
- 
+ 
2. In the **Create Report** screen, click the **Retail Analysis Sample**, and then click **Create**.
@@ -96,11 +96,11 @@ After you’ve finished creating your Answer Page, you can continue to the inclu
3. In the **Visualizations** pane, click the paint roller icon, expand **Page Size**, and then pick **Cortana** from the **Type** drop-down list.
- 
+ 
4. In the **Fields** pane, click to expand **Sales**, expand **This year sales**, and then add both **Value** and **Goal**.
- 
+ 
The automatically generated graph is added to your blank report. You have the option to change colors, add borders, add additional visualizations, and modify this page so that it answers the question about sales data as precisely, and in as custom a way, as you want. You just need to make sure that it all stays within the page borders.
@@ -108,7 +108,7 @@ After you’ve finished creating your Answer Page, you can continue to the inclu
The alternate names help Cortana to know what questions to look for and when to show this report. To also improve your results, you should avoid using the names of your report columns.
- 
+ 
6. Click **File**, click **Save as**, and save the report as _Sales data 2016_.
@@ -124,13 +124,13 @@ Now that you’ve set up your device, you can use Cortana to show your info from
Cortana shows you the available results.
- 
+ 
3. In the **Power BI** area, click **This year in sales – in Retail Analysis Sample**.
Cortana returns your custom report.
- 
+ 
>[!NOTE]
>For more info about how to connect your own data, build your own custom Power BI cards and Answer Pages for Cortana, and how to share the cards with everyone in your organization, see [Use Power BI to create a custom Answer Page for Cortana](https://powerbi.microsoft.com/documentation/powerbi-service-cortana-desktop-entity-cards/).
diff --git a/windows/configure/cortana-at-work-scenario-1.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-1.md
similarity index 92%
rename from windows/configure/cortana-at-work-scenario-1.md
rename to windows/configuration/cortana-at-work/cortana-at-work-scenario-1.md
index 869f6285f7..54b801cabc 100644
--- a/windows/configure/cortana-at-work-scenario-1.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-1.md
@@ -49,8 +49,8 @@ This process helps you to manage the content Cortana shows in your Notebook.
3. Add *Redmond, Washington*, double-click the search result, click **Add**, and then click **Save**.
- 
+ 
4. Click on the **Home** icon and scroll to the weather forecast for Redmond, Washington.
- 
\ No newline at end of file
+ 
\ No newline at end of file
diff --git a/windows/configure/cortana-at-work-scenario-2.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md
similarity index 94%
rename from windows/configure/cortana-at-work-scenario-2.md
rename to windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md
index 0ae41c64a4..af1b1610ae 100644
--- a/windows/configure/cortana-at-work-scenario-2.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md
@@ -27,7 +27,7 @@ This process helps you use Cortana at work to perform a quick search.
You should see the weather in New York, New York at the top of the search results.
- 
+ 
## Search with Cortana, by using voice commands
This process helps you to use Cortana at work and voice commands to perform a quick search.
@@ -36,4 +36,4 @@ This process helps you to use Cortana at work and voice commands to perform a qu
2. Say *What's the weather in Chicago?* Cortana tells you and shows you the current weather in Chicago.
- 
\ No newline at end of file
+ 
\ No newline at end of file
diff --git a/windows/configure/cortana-at-work-scenario-3.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md
similarity index 85%
rename from windows/configure/cortana-at-work-scenario-3.md
rename to windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md
index 2200f6b5f9..540ea0bb4b 100644
--- a/windows/configure/cortana-at-work-scenario-3.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md
@@ -28,11 +28,11 @@ This process helps you to create a reminder based on a specific location.
2. Click the **+** sign, add a subject for your reminder, such as _Remember to file expense report receipts_, and then click **Place**.
- 
+ 
3. Choose **Arrive** from the drop-down box, and then type a location to associate with your reminder. For example, you can use the physical address of where you work. Just make sure you can physically get to your location, so you can test the reminder.
- 
+ 
4. Click **Done**.
@@ -47,13 +47,13 @@ This process helps you to create a reminder based on a specific location.
The photo is stored with the reminder.
- 
+ 
8. Review the reminder info, and then click **Remind**.
The reminder is saved and ready to be triggered.
- 
+ 
## Create a reminder for a specific location by using voice commands
This process helps you to use Cortana at work and voice commands to create a reminder for a specific location.
@@ -64,21 +64,21 @@ This process helps you to use Cortana at work and voice commands to create a rem
Cortana opens a new reminder task and asks if it sounds good.
- 
+ 
3. Say _Yes_ so Cortana can save the reminder.
- 
+ 
## Edit or archive an existing reminder
This process helps you to edit or archive and existing or completed reminder.
1. Click on the **Cortana** icon in the taskbar, click on the **Notebook** icon, and then click **Reminders**.
- 
+ 
2. Click the pending reminder you want to edit.
- 
+ 
3. Change any text that you want to change, click **Add photo** if you want to add or replace an image, click **Delete** if you want to delete the entire reminder, click **Save** to save your changes, and click **Complete and move to History** if you want to save a completed reminder in your **Reminder History**.
\ No newline at end of file
diff --git a/windows/configure/cortana-at-work-scenario-4.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md
similarity index 90%
rename from windows/configure/cortana-at-work-scenario-4.md
rename to windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md
index 736de5db9f..cf313aa77c 100644
--- a/windows/configure/cortana-at-work-scenario-4.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md
@@ -32,7 +32,7 @@ This process helps you find your upcoming meetings.
You’ll see all your meetings scheduled for the next day.
- 
+ 
## Find out about upcoming meetings by using voice commands
This process helps you to use Cortana at work and voice commands to find your upcoming meetings.
@@ -44,6 +44,6 @@ This process helps you to use Cortana at work and voice commands to find your up
>[!IMPORTANT]
>Make sure that you have a meeting scheduled for the time you specify here.
- 
+ 
diff --git a/windows/configure/cortana-at-work-scenario-5.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md
similarity index 89%
rename from windows/configure/cortana-at-work-scenario-5.md
rename to windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md
index a662de7d04..5df8bb1b2e 100644
--- a/windows/configure/cortana-at-work-scenario-5.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md
@@ -31,7 +31,7 @@ This process helps you to send a quick message to a co-worker from the work addr
4. Type your email message subject into the **Quick message** (255 characters or less) box and your message into the **Message** (unlimited characters) box, and then click **Send**.
- 
+ 
## Send an email to a co-worker by using voice commands
This process helps you to use Cortana at work and voice commands to send a quick message to a co-worker from the work address book.
@@ -46,10 +46,10 @@ This process helps you to use Cortana at work and voice commands to send a quick
The message is added and you’re asked if you want to **Send it**, **Add more**, or **Make changes**.
- 
+ 
4. Say _Send it_.
The email is sent.
- 
\ No newline at end of file
+ 
\ No newline at end of file
diff --git a/windows/configure/cortana-at-work-scenario-6.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md
similarity index 91%
rename from windows/configure/cortana-at-work-scenario-6.md
rename to windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md
index 8c7e307ed1..f369b838fb 100644
--- a/windows/configure/cortana-at-work-scenario-6.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md
@@ -29,11 +29,11 @@ Cortana automatically finds patterns in your email, suggesting reminders based t
3. Make sure the **Contacts, email, calendar, and communication history** option is turned on.
- 
+ 
4. Click the **Notebook** icon again, click the **Suggested reminders** option, click to turn on the **All reminder suggestions cards** option, click the **Notify me when something I mentioned doing is coming up** box, and then click **Save**.
- 
+ 
5. Create and send an email to yourself (so you can see the Suggested reminder), including the text, _I’ll finish this project by end of day today_.
@@ -41,5 +41,5 @@ Cortana automatically finds patterns in your email, suggesting reminders based t
If the reminder has a specific date or time associated with it, like end of day, Cortana notifies you at the appropriate time and puts the reminder into the Action Center. Also from the Home screen, you can view the email where you made the promise, set aside time on your calendar, officially set the reminder, or mark the reminder as completed.
- 
+ 
diff --git a/windows/configure/cortana-at-work-scenario-7.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md
similarity index 93%
rename from windows/configure/cortana-at-work-scenario-7.md
rename to windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md
index 4c2451c969..7fff5ef044 100644
--- a/windows/configure/cortana-at-work-scenario-7.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md
@@ -20,7 +20,7 @@ This optional scenario helps you to protect your organization’s data on a devi
## Use Cortana and WIP to protect your organization’s data
-1. Create and deploy an WIP policy to your organization. For info about how to do this, see [Protect your enterprise data using Windows Information Protection (WIP)](../keep-secure/protect-enterprise-data-using-wip.md).
+1. Create and deploy an WIP policy to your organization. For info about how to do this, see [Protect your enterprise data using Windows Information Protection (WIP)](/windows/threat-protection/windows-information-protection/protect-enterprise-data-using-wip).
2. Create a new email from a non-protected or personal mailbox, including the text _I’ll send you that presentation tomorrow_.
diff --git a/windows/configure/cortana-at-work-testing-scenarios.md b/windows/configuration/cortana-at-work/cortana-at-work-testing-scenarios.md
similarity index 100%
rename from windows/configure/cortana-at-work-testing-scenarios.md
rename to windows/configuration/cortana-at-work/cortana-at-work-testing-scenarios.md
diff --git a/windows/configure/cortana-at-work-voice-commands.md b/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
similarity index 98%
rename from windows/configure/cortana-at-work-voice-commands.md
rename to windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
index 7c4ea66ce4..8d7ff55a35 100644
--- a/windows/configure/cortana-at-work-voice-commands.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
@@ -49,7 +49,7 @@ While these aren't line-of-business apps, we've worked to make sure to implement
2. Click on **Connected Services**, click **Uber**, and then click **Connect**.
- 
+ 
**To use the voice-enabled commands with Cortana**
1. Click on the **Cortana** icon in the taskbar, and then click the **Microphone** icon (to the right of the **Search** box).
diff --git a/windows/configure/images/cortana-about-me.png b/windows/configuration/cortana-at-work/images/cortana-about-me.png
similarity index 100%
rename from windows/configure/images/cortana-about-me.png
rename to windows/configuration/cortana-at-work/images/cortana-about-me.png
diff --git a/windows/configure/images/cortana-add-reminder.png b/windows/configuration/cortana-at-work/images/cortana-add-reminder.png
similarity index 100%
rename from windows/configure/images/cortana-add-reminder.png
rename to windows/configuration/cortana-at-work/images/cortana-add-reminder.png
diff --git a/windows/configure/images/cortana-chicago-weather.png b/windows/configuration/cortana-at-work/images/cortana-chicago-weather.png
similarity index 100%
rename from windows/configure/images/cortana-chicago-weather.png
rename to windows/configuration/cortana-at-work/images/cortana-chicago-weather.png
diff --git a/windows/configure/images/cortana-communication-history-permissions.png b/windows/configuration/cortana-at-work/images/cortana-communication-history-permissions.png
similarity index 100%
rename from windows/configure/images/cortana-communication-history-permissions.png
rename to windows/configuration/cortana-at-work/images/cortana-communication-history-permissions.png
diff --git a/windows/configure/images/cortana-complete-send-email-coworker-mic.png b/windows/configuration/cortana-at-work/images/cortana-complete-send-email-coworker-mic.png
similarity index 100%
rename from windows/configure/images/cortana-complete-send-email-coworker-mic.png
rename to windows/configuration/cortana-at-work/images/cortana-complete-send-email-coworker-mic.png
diff --git a/windows/configure/images/cortana-connect-crm.png b/windows/configuration/cortana-at-work/images/cortana-connect-crm.png
similarity index 100%
rename from windows/configure/images/cortana-connect-crm.png
rename to windows/configuration/cortana-at-work/images/cortana-connect-crm.png
diff --git a/windows/configure/images/cortana-connect-o365.png b/windows/configuration/cortana-at-work/images/cortana-connect-o365.png
similarity index 100%
rename from windows/configure/images/cortana-connect-o365.png
rename to windows/configuration/cortana-at-work/images/cortana-connect-o365.png
diff --git a/windows/configure/images/cortana-connect-uber.png b/windows/configuration/cortana-at-work/images/cortana-connect-uber.png
similarity index 100%
rename from windows/configure/images/cortana-connect-uber.png
rename to windows/configuration/cortana-at-work/images/cortana-connect-uber.png
diff --git a/windows/configure/images/cortana-crm-screen.png b/windows/configuration/cortana-at-work/images/cortana-crm-screen.png
similarity index 100%
rename from windows/configure/images/cortana-crm-screen.png
rename to windows/configuration/cortana-at-work/images/cortana-crm-screen.png
diff --git a/windows/configure/images/cortana-feedback.png b/windows/configuration/cortana-at-work/images/cortana-feedback.png
similarity index 100%
rename from windows/configure/images/cortana-feedback.png
rename to windows/configuration/cortana-at-work/images/cortana-feedback.png
diff --git a/windows/configure/images/cortana-final-reminder.png b/windows/configuration/cortana-at-work/images/cortana-final-reminder.png
similarity index 100%
rename from windows/configure/images/cortana-final-reminder.png
rename to windows/configuration/cortana-at-work/images/cortana-final-reminder.png
diff --git a/windows/configure/images/cortana-meeting-specific-time.png b/windows/configuration/cortana-at-work/images/cortana-meeting-specific-time.png
similarity index 100%
rename from windows/configure/images/cortana-meeting-specific-time.png
rename to windows/configuration/cortana-at-work/images/cortana-meeting-specific-time.png
diff --git a/windows/configure/images/cortana-meeting-tomorrow.png b/windows/configuration/cortana-at-work/images/cortana-meeting-tomorrow.png
similarity index 100%
rename from windows/configure/images/cortana-meeting-tomorrow.png
rename to windows/configuration/cortana-at-work/images/cortana-meeting-tomorrow.png
diff --git a/windows/configure/images/cortana-newyork-weather.png b/windows/configuration/cortana-at-work/images/cortana-newyork-weather.png
similarity index 100%
rename from windows/configure/images/cortana-newyork-weather.png
rename to windows/configuration/cortana-at-work/images/cortana-newyork-weather.png
diff --git a/windows/configure/images/cortana-o365-screen.png b/windows/configuration/cortana-at-work/images/cortana-o365-screen.png
similarity index 100%
rename from windows/configure/images/cortana-o365-screen.png
rename to windows/configuration/cortana-at-work/images/cortana-o365-screen.png
diff --git a/windows/configure/images/cortana-place-reminder.png b/windows/configuration/cortana-at-work/images/cortana-place-reminder.png
similarity index 100%
rename from windows/configure/images/cortana-place-reminder.png
rename to windows/configuration/cortana-at-work/images/cortana-place-reminder.png
diff --git a/windows/configure/images/cortana-powerbi-create-report.png b/windows/configuration/cortana-at-work/images/cortana-powerbi-create-report.png
similarity index 100%
rename from windows/configure/images/cortana-powerbi-create-report.png
rename to windows/configuration/cortana-at-work/images/cortana-powerbi-create-report.png
diff --git a/windows/configure/images/cortana-powerbi-expand-nav.png b/windows/configuration/cortana-at-work/images/cortana-powerbi-expand-nav.png
similarity index 100%
rename from windows/configure/images/cortana-powerbi-expand-nav.png
rename to windows/configuration/cortana-at-work/images/cortana-powerbi-expand-nav.png
diff --git a/windows/configure/images/cortana-powerbi-field-selection.png b/windows/configuration/cortana-at-work/images/cortana-powerbi-field-selection.png
similarity index 100%
rename from windows/configure/images/cortana-powerbi-field-selection.png
rename to windows/configuration/cortana-at-work/images/cortana-powerbi-field-selection.png
diff --git a/windows/configure/images/cortana-powerbi-getdata-samples.png b/windows/configuration/cortana-at-work/images/cortana-powerbi-getdata-samples.png
similarity index 100%
rename from windows/configure/images/cortana-powerbi-getdata-samples.png
rename to windows/configuration/cortana-at-work/images/cortana-powerbi-getdata-samples.png
diff --git a/windows/configure/images/cortana-powerbi-getdata.png b/windows/configuration/cortana-at-work/images/cortana-powerbi-getdata.png
similarity index 100%
rename from windows/configure/images/cortana-powerbi-getdata.png
rename to windows/configuration/cortana-at-work/images/cortana-powerbi-getdata.png
diff --git a/windows/configure/images/cortana-powerbi-myreport.png b/windows/configuration/cortana-at-work/images/cortana-powerbi-myreport.png
similarity index 100%
rename from windows/configure/images/cortana-powerbi-myreport.png
rename to windows/configuration/cortana-at-work/images/cortana-powerbi-myreport.png
diff --git a/windows/configure/images/cortana-powerbi-pagesize.png b/windows/configuration/cortana-at-work/images/cortana-powerbi-pagesize.png
similarity index 100%
rename from windows/configure/images/cortana-powerbi-pagesize.png
rename to windows/configuration/cortana-at-work/images/cortana-powerbi-pagesize.png
diff --git a/windows/configure/images/cortana-powerbi-report-qna.png b/windows/configuration/cortana-at-work/images/cortana-powerbi-report-qna.png
similarity index 100%
rename from windows/configure/images/cortana-powerbi-report-qna.png
rename to windows/configuration/cortana-at-work/images/cortana-powerbi-report-qna.png
diff --git a/windows/configure/images/cortana-powerbi-retail-analysis-dashboard.png b/windows/configuration/cortana-at-work/images/cortana-powerbi-retail-analysis-dashboard.png
similarity index 100%
rename from windows/configure/images/cortana-powerbi-retail-analysis-dashboard.png
rename to windows/configuration/cortana-at-work/images/cortana-powerbi-retail-analysis-dashboard.png
diff --git a/windows/configure/images/cortana-powerbi-retail-analysis-dataset.png b/windows/configuration/cortana-at-work/images/cortana-powerbi-retail-analysis-dataset.png
similarity index 100%
rename from windows/configure/images/cortana-powerbi-retail-analysis-dataset.png
rename to windows/configuration/cortana-at-work/images/cortana-powerbi-retail-analysis-dataset.png
diff --git a/windows/configure/images/cortana-powerbi-retail-analysis-sample.png b/windows/configuration/cortana-at-work/images/cortana-powerbi-retail-analysis-sample.png
similarity index 100%
rename from windows/configure/images/cortana-powerbi-retail-analysis-sample.png
rename to windows/configuration/cortana-at-work/images/cortana-powerbi-retail-analysis-sample.png
diff --git a/windows/configure/images/cortana-powerbi-search.png b/windows/configuration/cortana-at-work/images/cortana-powerbi-search.png
similarity index 100%
rename from windows/configure/images/cortana-powerbi-search.png
rename to windows/configuration/cortana-at-work/images/cortana-powerbi-search.png
diff --git a/windows/configure/images/cortana-powerbi-settings.png b/windows/configuration/cortana-at-work/images/cortana-powerbi-settings.png
similarity index 100%
rename from windows/configure/images/cortana-powerbi-settings.png
rename to windows/configuration/cortana-at-work/images/cortana-powerbi-settings.png
diff --git a/windows/configure/images/cortana-redmond-weather.png b/windows/configuration/cortana-at-work/images/cortana-redmond-weather.png
similarity index 100%
rename from windows/configure/images/cortana-redmond-weather.png
rename to windows/configuration/cortana-at-work/images/cortana-redmond-weather.png
diff --git a/windows/configure/images/cortana-reminder-edit.png b/windows/configuration/cortana-at-work/images/cortana-reminder-edit.png
similarity index 100%
rename from windows/configure/images/cortana-reminder-edit.png
rename to windows/configuration/cortana-at-work/images/cortana-reminder-edit.png
diff --git a/windows/configure/images/cortana-reminder-list.png b/windows/configuration/cortana-at-work/images/cortana-reminder-list.png
similarity index 100%
rename from windows/configure/images/cortana-reminder-list.png
rename to windows/configuration/cortana-at-work/images/cortana-reminder-list.png
diff --git a/windows/configure/images/cortana-reminder-mic.png b/windows/configuration/cortana-at-work/images/cortana-reminder-mic.png
similarity index 100%
rename from windows/configure/images/cortana-reminder-mic.png
rename to windows/configuration/cortana-at-work/images/cortana-reminder-mic.png
diff --git a/windows/configure/images/cortana-reminder-pending-mic.png b/windows/configuration/cortana-at-work/images/cortana-reminder-pending-mic.png
similarity index 100%
rename from windows/configure/images/cortana-reminder-pending-mic.png
rename to windows/configuration/cortana-at-work/images/cortana-reminder-pending-mic.png
diff --git a/windows/configure/images/cortana-reminder-pending.png b/windows/configuration/cortana-at-work/images/cortana-reminder-pending.png
similarity index 100%
rename from windows/configure/images/cortana-reminder-pending.png
rename to windows/configuration/cortana-at-work/images/cortana-reminder-pending.png
diff --git a/windows/configure/images/cortana-send-email-coworker-mic.png b/windows/configuration/cortana-at-work/images/cortana-send-email-coworker-mic.png
similarity index 100%
rename from windows/configure/images/cortana-send-email-coworker-mic.png
rename to windows/configuration/cortana-at-work/images/cortana-send-email-coworker-mic.png
diff --git a/windows/configure/images/cortana-send-email-coworker.png b/windows/configuration/cortana-at-work/images/cortana-send-email-coworker.png
similarity index 100%
rename from windows/configure/images/cortana-send-email-coworker.png
rename to windows/configuration/cortana-at-work/images/cortana-send-email-coworker.png
diff --git a/windows/configure/images/cortana-suggested-reminder-settings.png b/windows/configuration/cortana-at-work/images/cortana-suggested-reminder-settings.png
similarity index 100%
rename from windows/configure/images/cortana-suggested-reminder-settings.png
rename to windows/configuration/cortana-at-work/images/cortana-suggested-reminder-settings.png
diff --git a/windows/configure/images/cortana-suggested-reminder.png b/windows/configuration/cortana-at-work/images/cortana-suggested-reminder.png
similarity index 100%
rename from windows/configure/images/cortana-suggested-reminder.png
rename to windows/configuration/cortana-at-work/images/cortana-suggested-reminder.png
diff --git a/windows/configure/images/cortana-weather-multipanel.png b/windows/configuration/cortana-at-work/images/cortana-weather-multipanel.png
similarity index 100%
rename from windows/configure/images/cortana-weather-multipanel.png
rename to windows/configuration/cortana-at-work/images/cortana-weather-multipanel.png
diff --git a/windows/configure/customize-and-export-start-layout.md b/windows/configuration/customize-and-export-start-layout.md
similarity index 100%
rename from windows/configure/customize-and-export-start-layout.md
rename to windows/configuration/customize-and-export-start-layout.md
diff --git a/windows/configure/customize-windows-10-start-screens-by-using-group-policy.md b/windows/configuration/customize-windows-10-start-screens-by-using-group-policy.md
similarity index 100%
rename from windows/configure/customize-windows-10-start-screens-by-using-group-policy.md
rename to windows/configuration/customize-windows-10-start-screens-by-using-group-policy.md
diff --git a/windows/configure/customize-windows-10-start-screens-by-using-mobile-device-management.md b/windows/configuration/customize-windows-10-start-screens-by-using-mobile-device-management.md
similarity index 99%
rename from windows/configure/customize-windows-10-start-screens-by-using-mobile-device-management.md
rename to windows/configuration/customize-windows-10-start-screens-by-using-mobile-device-management.md
index 5bbbcc8808..5255a639ff 100644
--- a/windows/configure/customize-windows-10-start-screens-by-using-mobile-device-management.md
+++ b/windows/configuration/customize-windows-10-start-screens-by-using-mobile-device-management.md
@@ -25,7 +25,7 @@ In Windows 10 Mobile, Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Ed
>[!NOTE]
>Support for applying a customized taskbar using MDM is added in Windows 10, version 1703.
-**Before you begin**: [Customize and export Start layout](customize-and-export-start-layout.md) for desktop editions or [create a Start layout XML](mobile-lockdown-designer.md) for mobile.
+**Before you begin**: [Customize and export Start layout](customize-and-export-start-layout.md) for desktop editions or [create a Start layout XML](mobile-devices/mobile-lockdown-designer.md) for mobile.
>[!WARNING]
>When a full Start layout is applied with this method, the users cannot pin, unpin, or uninstall apps from Start. Users can view and open all apps in the **All Apps** view, but they cannot pin any apps to Start. When a partial Start layout is applied, the contents of the specified tile groups cannot be changed, but users can move those groups, and can also create and customize their own groups.
diff --git a/windows/configure/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md b/windows/configuration/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md
similarity index 98%
rename from windows/configure/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md
rename to windows/configuration/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md
index 07d5c016a8..842bde95de 100644
--- a/windows/configure/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md
+++ b/windows/configuration/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md
@@ -25,7 +25,7 @@ In Windows 10 Mobile, Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Ed
>[!IMPORTANT]
>If you use a provisioning package to configure the taskbar, your configuration will be reapplied each time the explorer.exe process restarts. If your configuration pins an app and the user unpins that app, the user's change will be overwritten the next time the configuration is applied. To apply a taskbar configuration and allow users to make changes that will persist, apply your configuration by using Group Policy.
-**Before you begin**: [Customize and export Start layout](customize-and-export-start-layout.md) for desktop editions or [create a Start layout XML](mobile-lockdown-designer.md) for mobile.
+**Before you begin**: [Customize and export Start layout](customize-and-export-start-layout.md) for desktop editions or [create a Start layout XML](mobile-devices/mobile-lockdown-designer.md) for mobile.
## How Start layout control works
@@ -54,7 +54,7 @@ The **Export-StartLayout** cmdlet produces an XML file. Because Windows Configur
## Create a provisioning package that contains a customized Start layout
-Use the Windows Configuration Designer tool to create a provisioning package. [Learn how to install Windows Configuration Designer.](provisioning-install-icd.md)
+Use the Windows Configuration Designer tool to create a provisioning package. [Learn how to install Windows Configuration Designer.](provisioning-packages/provisioning-install-icd.md)
>[!IMPORTANT]
>When you build a provisioning package, you may include sensitive information in the project files and in the provisioning package (.ppkg) file. Although you have the option to encrypt the .ppkg file, project files are not encrypted. You should store the project files in a secure location and delete the project files when they are no longer needed.
diff --git a/windows/configure/guidelines-for-assigned-access-app.md b/windows/configuration/guidelines-for-assigned-access-app.md
similarity index 100%
rename from windows/configure/guidelines-for-assigned-access-app.md
rename to windows/configuration/guidelines-for-assigned-access-app.md
diff --git a/windows/configure/images/ActionCenterXML.jpg b/windows/configuration/images/ActionCenterXML.jpg
similarity index 100%
rename from windows/configure/images/ActionCenterXML.jpg
rename to windows/configuration/images/ActionCenterXML.jpg
diff --git a/windows/configure/images/AppsXML.jpg b/windows/configuration/images/AppsXML.jpg
similarity index 100%
rename from windows/configure/images/AppsXML.jpg
rename to windows/configuration/images/AppsXML.jpg
diff --git a/windows/configure/images/AppsXML.png b/windows/configuration/images/AppsXML.png
similarity index 100%
rename from windows/configure/images/AppsXML.png
rename to windows/configuration/images/AppsXML.png
diff --git a/windows/configure/images/ButtonsXML.jpg b/windows/configuration/images/ButtonsXML.jpg
similarity index 100%
rename from windows/configure/images/ButtonsXML.jpg
rename to windows/configuration/images/ButtonsXML.jpg
diff --git a/windows/configure/images/CSPRunnerXML.jpg b/windows/configuration/images/CSPRunnerXML.jpg
similarity index 100%
rename from windows/configure/images/CSPRunnerXML.jpg
rename to windows/configuration/images/CSPRunnerXML.jpg
diff --git a/windows/configure/images/ICD.png b/windows/configuration/images/ICD.png
similarity index 100%
rename from windows/configure/images/ICD.png
rename to windows/configuration/images/ICD.png
diff --git a/windows/configure/images/ICDstart-option.PNG b/windows/configuration/images/ICDstart-option.PNG
similarity index 100%
rename from windows/configure/images/ICDstart-option.PNG
rename to windows/configuration/images/ICDstart-option.PNG
diff --git a/windows/configure/images/ISE.PNG b/windows/configuration/images/ISE.PNG
similarity index 100%
rename from windows/configure/images/ISE.PNG
rename to windows/configuration/images/ISE.PNG
diff --git a/windows/configure/images/MenuItemsXML.png b/windows/configuration/images/MenuItemsXML.png
similarity index 100%
rename from windows/configure/images/MenuItemsXML.png
rename to windows/configuration/images/MenuItemsXML.png
diff --git a/windows/configure/images/PoC-big.png b/windows/configuration/images/PoC-big.png
similarity index 100%
rename from windows/configure/images/PoC-big.png
rename to windows/configuration/images/PoC-big.png
diff --git a/windows/configure/images/PoC.png b/windows/configuration/images/PoC.png
similarity index 100%
rename from windows/configure/images/PoC.png
rename to windows/configuration/images/PoC.png
diff --git a/windows/configure/images/SettingsXML.png b/windows/configuration/images/SettingsXML.png
similarity index 100%
rename from windows/configure/images/SettingsXML.png
rename to windows/configuration/images/SettingsXML.png
diff --git a/windows/configure/images/StartGrid.jpg b/windows/configuration/images/StartGrid.jpg
similarity index 100%
rename from windows/configure/images/StartGrid.jpg
rename to windows/configuration/images/StartGrid.jpg
diff --git a/windows/configure/images/StartGridPinnedApps.jpg b/windows/configuration/images/StartGridPinnedApps.jpg
similarity index 100%
rename from windows/configure/images/StartGridPinnedApps.jpg
rename to windows/configuration/images/StartGridPinnedApps.jpg
diff --git a/windows/configure/images/TilesXML.png b/windows/configuration/images/TilesXML.png
similarity index 100%
rename from windows/configure/images/TilesXML.png
rename to windows/configuration/images/TilesXML.png
diff --git a/windows/configure/images/account-management-details.PNG b/windows/configuration/images/account-management-details.PNG
similarity index 100%
rename from windows/configure/images/account-management-details.PNG
rename to windows/configuration/images/account-management-details.PNG
diff --git a/windows/configure/images/account-management.PNG b/windows/configuration/images/account-management.PNG
similarity index 100%
rename from windows/configure/images/account-management.PNG
rename to windows/configuration/images/account-management.PNG
diff --git a/windows/configure/images/add-applications-details.PNG b/windows/configuration/images/add-applications-details.PNG
similarity index 100%
rename from windows/configure/images/add-applications-details.PNG
rename to windows/configuration/images/add-applications-details.PNG
diff --git a/windows/configure/images/add-applications.PNG b/windows/configuration/images/add-applications.PNG
similarity index 100%
rename from windows/configure/images/add-applications.PNG
rename to windows/configuration/images/add-applications.PNG
diff --git a/windows/configure/images/add-certificates-details.PNG b/windows/configuration/images/add-certificates-details.PNG
similarity index 100%
rename from windows/configure/images/add-certificates-details.PNG
rename to windows/configuration/images/add-certificates-details.PNG
diff --git a/windows/configure/images/add-certificates.PNG b/windows/configuration/images/add-certificates.PNG
similarity index 100%
rename from windows/configure/images/add-certificates.PNG
rename to windows/configuration/images/add-certificates.PNG
diff --git a/windows/configure/images/adk-install.png b/windows/configuration/images/adk-install.png
similarity index 100%
rename from windows/configure/images/adk-install.png
rename to windows/configuration/images/adk-install.png
diff --git a/windows/manage/images/admin-tools-folder.png b/windows/configuration/images/admin-tools-folder.png
similarity index 100%
rename from windows/manage/images/admin-tools-folder.png
rename to windows/configuration/images/admin-tools-folder.png
diff --git a/windows/manage/images/admin-tools.png b/windows/configuration/images/admin-tools.png
similarity index 100%
rename from windows/manage/images/admin-tools.png
rename to windows/configuration/images/admin-tools.png
diff --git a/windows/manage/images/allow-rdp.png b/windows/configuration/images/allow-rdp.png
similarity index 100%
rename from windows/manage/images/allow-rdp.png
rename to windows/configuration/images/allow-rdp.png
diff --git a/windows/manage/images/app-v-in-adk.png b/windows/configuration/images/app-v-in-adk.png
similarity index 100%
rename from windows/manage/images/app-v-in-adk.png
rename to windows/configuration/images/app-v-in-adk.png
diff --git a/windows/configure/images/apprule.png b/windows/configuration/images/apprule.png
similarity index 100%
rename from windows/configure/images/apprule.png
rename to windows/configuration/images/apprule.png
diff --git a/windows/configure/images/apps.png b/windows/configuration/images/apps.png
similarity index 100%
rename from windows/configure/images/apps.png
rename to windows/configuration/images/apps.png
diff --git a/windows/configure/images/appwarning.png b/windows/configuration/images/appwarning.png
similarity index 100%
rename from windows/configure/images/appwarning.png
rename to windows/configuration/images/appwarning.png
diff --git a/windows/configure/images/azureadjoined.png b/windows/configuration/images/azureadjoined.png
similarity index 100%
rename from windows/configure/images/azureadjoined.png
rename to windows/configuration/images/azureadjoined.png
diff --git a/windows/configure/images/backicon.png b/windows/configuration/images/backicon.png
similarity index 100%
rename from windows/configure/images/backicon.png
rename to windows/configuration/images/backicon.png
diff --git a/windows/configure/images/bulk-enroll-mobile-details.PNG b/windows/configuration/images/bulk-enroll-mobile-details.PNG
similarity index 100%
rename from windows/configure/images/bulk-enroll-mobile-details.PNG
rename to windows/configuration/images/bulk-enroll-mobile-details.PNG
diff --git a/windows/configure/images/bulk-enroll-mobile.PNG b/windows/configuration/images/bulk-enroll-mobile.PNG
similarity index 100%
rename from windows/configure/images/bulk-enroll-mobile.PNG
rename to windows/configuration/images/bulk-enroll-mobile.PNG
diff --git a/windows/configure/images/check_blu.png b/windows/configuration/images/check_blu.png
similarity index 100%
rename from windows/configure/images/check_blu.png
rename to windows/configuration/images/check_blu.png
diff --git a/windows/configure/images/check_grn.png b/windows/configuration/images/check_grn.png
similarity index 100%
rename from windows/configure/images/check_grn.png
rename to windows/configuration/images/check_grn.png
diff --git a/windows/manage/images/checklistbox.gif b/windows/configuration/images/checklistbox.gif
similarity index 100%
rename from windows/manage/images/checklistbox.gif
rename to windows/configuration/images/checklistbox.gif
diff --git a/windows/configure/images/checklistdone.png b/windows/configuration/images/checklistdone.png
similarity index 100%
rename from windows/configure/images/checklistdone.png
rename to windows/configuration/images/checklistdone.png
diff --git a/windows/deploy/images/checkmark.png b/windows/configuration/images/checkmark.png
similarity index 100%
rename from windows/deploy/images/checkmark.png
rename to windows/configuration/images/checkmark.png
diff --git a/windows/configure/images/choose-package.png b/windows/configuration/images/choose-package.png
similarity index 100%
rename from windows/configure/images/choose-package.png
rename to windows/configuration/images/choose-package.png
diff --git a/windows/configure/images/config-policy.png b/windows/configuration/images/config-policy.png
similarity index 100%
rename from windows/configure/images/config-policy.png
rename to windows/configuration/images/config-policy.png
diff --git a/windows/configure/images/config-source.png b/windows/configuration/images/config-source.png
similarity index 100%
rename from windows/configure/images/config-source.png
rename to windows/configuration/images/config-source.png
diff --git a/windows/configure/images/configconflict.png b/windows/configuration/images/configconflict.png
similarity index 100%
rename from windows/configure/images/configconflict.png
rename to windows/configuration/images/configconflict.png
diff --git a/windows/configure/images/connect-aad.png b/windows/configuration/images/connect-aad.png
similarity index 100%
rename from windows/configure/images/connect-aad.png
rename to windows/configuration/images/connect-aad.png
diff --git a/windows/configure/images/convert.png b/windows/configuration/images/convert.png
similarity index 100%
rename from windows/configure/images/convert.png
rename to windows/configuration/images/convert.png
diff --git a/windows/manage/images/copy-to-change.png b/windows/configuration/images/copy-to-change.png
similarity index 100%
rename from windows/manage/images/copy-to-change.png
rename to windows/configuration/images/copy-to-change.png
diff --git a/windows/manage/images/copy-to-path.png b/windows/configuration/images/copy-to-path.png
similarity index 100%
rename from windows/manage/images/copy-to-path.png
rename to windows/configuration/images/copy-to-path.png
diff --git a/windows/manage/images/copy-to.PNG b/windows/configuration/images/copy-to.PNG
similarity index 100%
rename from windows/manage/images/copy-to.PNG
rename to windows/configuration/images/copy-to.PNG
diff --git a/windows/manage/images/cortana-about-me.png b/windows/configuration/images/cortana-about-me.png
similarity index 100%
rename from windows/manage/images/cortana-about-me.png
rename to windows/configuration/images/cortana-about-me.png
diff --git a/windows/manage/images/cortana-add-reminder.png b/windows/configuration/images/cortana-add-reminder.png
similarity index 100%
rename from windows/manage/images/cortana-add-reminder.png
rename to windows/configuration/images/cortana-add-reminder.png
diff --git a/windows/manage/images/cortana-chicago-weather.png b/windows/configuration/images/cortana-chicago-weather.png
similarity index 100%
rename from windows/manage/images/cortana-chicago-weather.png
rename to windows/configuration/images/cortana-chicago-weather.png
diff --git a/windows/manage/images/cortana-communication-history-permissions.png b/windows/configuration/images/cortana-communication-history-permissions.png
similarity index 100%
rename from windows/manage/images/cortana-communication-history-permissions.png
rename to windows/configuration/images/cortana-communication-history-permissions.png
diff --git a/windows/manage/images/cortana-complete-send-email-coworker-mic.png b/windows/configuration/images/cortana-complete-send-email-coworker-mic.png
similarity index 100%
rename from windows/manage/images/cortana-complete-send-email-coworker-mic.png
rename to windows/configuration/images/cortana-complete-send-email-coworker-mic.png
diff --git a/windows/manage/images/cortana-connect-crm.png b/windows/configuration/images/cortana-connect-crm.png
similarity index 100%
rename from windows/manage/images/cortana-connect-crm.png
rename to windows/configuration/images/cortana-connect-crm.png
diff --git a/windows/manage/images/cortana-connect-o365.png b/windows/configuration/images/cortana-connect-o365.png
similarity index 100%
rename from windows/manage/images/cortana-connect-o365.png
rename to windows/configuration/images/cortana-connect-o365.png
diff --git a/windows/manage/images/cortana-connect-uber.png b/windows/configuration/images/cortana-connect-uber.png
similarity index 100%
rename from windows/manage/images/cortana-connect-uber.png
rename to windows/configuration/images/cortana-connect-uber.png
diff --git a/windows/manage/images/cortana-crm-screen.png b/windows/configuration/images/cortana-crm-screen.png
similarity index 100%
rename from windows/manage/images/cortana-crm-screen.png
rename to windows/configuration/images/cortana-crm-screen.png
diff --git a/windows/manage/images/cortana-feedback.png b/windows/configuration/images/cortana-feedback.png
similarity index 100%
rename from windows/manage/images/cortana-feedback.png
rename to windows/configuration/images/cortana-feedback.png
diff --git a/windows/manage/images/cortana-final-reminder.png b/windows/configuration/images/cortana-final-reminder.png
similarity index 100%
rename from windows/manage/images/cortana-final-reminder.png
rename to windows/configuration/images/cortana-final-reminder.png
diff --git a/windows/manage/images/cortana-meeting-specific-time.png b/windows/configuration/images/cortana-meeting-specific-time.png
similarity index 100%
rename from windows/manage/images/cortana-meeting-specific-time.png
rename to windows/configuration/images/cortana-meeting-specific-time.png
diff --git a/windows/manage/images/cortana-meeting-tomorrow.png b/windows/configuration/images/cortana-meeting-tomorrow.png
similarity index 100%
rename from windows/manage/images/cortana-meeting-tomorrow.png
rename to windows/configuration/images/cortana-meeting-tomorrow.png
diff --git a/windows/manage/images/cortana-newyork-weather.png b/windows/configuration/images/cortana-newyork-weather.png
similarity index 100%
rename from windows/manage/images/cortana-newyork-weather.png
rename to windows/configuration/images/cortana-newyork-weather.png
diff --git a/windows/manage/images/cortana-o365-screen.png b/windows/configuration/images/cortana-o365-screen.png
similarity index 100%
rename from windows/manage/images/cortana-o365-screen.png
rename to windows/configuration/images/cortana-o365-screen.png
diff --git a/windows/manage/images/cortana-place-reminder.png b/windows/configuration/images/cortana-place-reminder.png
similarity index 100%
rename from windows/manage/images/cortana-place-reminder.png
rename to windows/configuration/images/cortana-place-reminder.png
diff --git a/windows/manage/images/cortana-powerbi-create-report.png b/windows/configuration/images/cortana-powerbi-create-report.png
similarity index 100%
rename from windows/manage/images/cortana-powerbi-create-report.png
rename to windows/configuration/images/cortana-powerbi-create-report.png
diff --git a/windows/manage/images/cortana-powerbi-expand-nav.png b/windows/configuration/images/cortana-powerbi-expand-nav.png
similarity index 100%
rename from windows/manage/images/cortana-powerbi-expand-nav.png
rename to windows/configuration/images/cortana-powerbi-expand-nav.png
diff --git a/windows/manage/images/cortana-powerbi-field-selection.png b/windows/configuration/images/cortana-powerbi-field-selection.png
similarity index 100%
rename from windows/manage/images/cortana-powerbi-field-selection.png
rename to windows/configuration/images/cortana-powerbi-field-selection.png
diff --git a/windows/manage/images/cortana-powerbi-getdata-samples.png b/windows/configuration/images/cortana-powerbi-getdata-samples.png
similarity index 100%
rename from windows/manage/images/cortana-powerbi-getdata-samples.png
rename to windows/configuration/images/cortana-powerbi-getdata-samples.png
diff --git a/windows/manage/images/cortana-powerbi-getdata.png b/windows/configuration/images/cortana-powerbi-getdata.png
similarity index 100%
rename from windows/manage/images/cortana-powerbi-getdata.png
rename to windows/configuration/images/cortana-powerbi-getdata.png
diff --git a/windows/manage/images/cortana-powerbi-myreport.png b/windows/configuration/images/cortana-powerbi-myreport.png
similarity index 100%
rename from windows/manage/images/cortana-powerbi-myreport.png
rename to windows/configuration/images/cortana-powerbi-myreport.png
diff --git a/windows/manage/images/cortana-powerbi-pagesize.png b/windows/configuration/images/cortana-powerbi-pagesize.png
similarity index 100%
rename from windows/manage/images/cortana-powerbi-pagesize.png
rename to windows/configuration/images/cortana-powerbi-pagesize.png
diff --git a/windows/manage/images/cortana-powerbi-report-qna.png b/windows/configuration/images/cortana-powerbi-report-qna.png
similarity index 100%
rename from windows/manage/images/cortana-powerbi-report-qna.png
rename to windows/configuration/images/cortana-powerbi-report-qna.png
diff --git a/windows/manage/images/cortana-powerbi-retail-analysis-dashboard.png b/windows/configuration/images/cortana-powerbi-retail-analysis-dashboard.png
similarity index 100%
rename from windows/manage/images/cortana-powerbi-retail-analysis-dashboard.png
rename to windows/configuration/images/cortana-powerbi-retail-analysis-dashboard.png
diff --git a/windows/manage/images/cortana-powerbi-retail-analysis-dataset.png b/windows/configuration/images/cortana-powerbi-retail-analysis-dataset.png
similarity index 100%
rename from windows/manage/images/cortana-powerbi-retail-analysis-dataset.png
rename to windows/configuration/images/cortana-powerbi-retail-analysis-dataset.png
diff --git a/windows/manage/images/cortana-powerbi-retail-analysis-sample.png b/windows/configuration/images/cortana-powerbi-retail-analysis-sample.png
similarity index 100%
rename from windows/manage/images/cortana-powerbi-retail-analysis-sample.png
rename to windows/configuration/images/cortana-powerbi-retail-analysis-sample.png
diff --git a/windows/manage/images/cortana-powerbi-search.png b/windows/configuration/images/cortana-powerbi-search.png
similarity index 100%
rename from windows/manage/images/cortana-powerbi-search.png
rename to windows/configuration/images/cortana-powerbi-search.png
diff --git a/windows/manage/images/cortana-powerbi-settings.png b/windows/configuration/images/cortana-powerbi-settings.png
similarity index 100%
rename from windows/manage/images/cortana-powerbi-settings.png
rename to windows/configuration/images/cortana-powerbi-settings.png
diff --git a/windows/manage/images/cortana-redmond-weather.png b/windows/configuration/images/cortana-redmond-weather.png
similarity index 100%
rename from windows/manage/images/cortana-redmond-weather.png
rename to windows/configuration/images/cortana-redmond-weather.png
diff --git a/windows/manage/images/cortana-reminder-edit.png b/windows/configuration/images/cortana-reminder-edit.png
similarity index 100%
rename from windows/manage/images/cortana-reminder-edit.png
rename to windows/configuration/images/cortana-reminder-edit.png
diff --git a/windows/manage/images/cortana-reminder-list.png b/windows/configuration/images/cortana-reminder-list.png
similarity index 100%
rename from windows/manage/images/cortana-reminder-list.png
rename to windows/configuration/images/cortana-reminder-list.png
diff --git a/windows/manage/images/cortana-reminder-mic.png b/windows/configuration/images/cortana-reminder-mic.png
similarity index 100%
rename from windows/manage/images/cortana-reminder-mic.png
rename to windows/configuration/images/cortana-reminder-mic.png
diff --git a/windows/manage/images/cortana-reminder-pending-mic.png b/windows/configuration/images/cortana-reminder-pending-mic.png
similarity index 100%
rename from windows/manage/images/cortana-reminder-pending-mic.png
rename to windows/configuration/images/cortana-reminder-pending-mic.png
diff --git a/windows/manage/images/cortana-reminder-pending.png b/windows/configuration/images/cortana-reminder-pending.png
similarity index 100%
rename from windows/manage/images/cortana-reminder-pending.png
rename to windows/configuration/images/cortana-reminder-pending.png
diff --git a/windows/manage/images/cortana-send-email-coworker-mic.png b/windows/configuration/images/cortana-send-email-coworker-mic.png
similarity index 100%
rename from windows/manage/images/cortana-send-email-coworker-mic.png
rename to windows/configuration/images/cortana-send-email-coworker-mic.png
diff --git a/windows/manage/images/cortana-send-email-coworker.png b/windows/configuration/images/cortana-send-email-coworker.png
similarity index 100%
rename from windows/manage/images/cortana-send-email-coworker.png
rename to windows/configuration/images/cortana-send-email-coworker.png
diff --git a/windows/manage/images/cortana-suggested-reminder-settings.png b/windows/configuration/images/cortana-suggested-reminder-settings.png
similarity index 100%
rename from windows/manage/images/cortana-suggested-reminder-settings.png
rename to windows/configuration/images/cortana-suggested-reminder-settings.png
diff --git a/windows/manage/images/cortana-suggested-reminder.png b/windows/configuration/images/cortana-suggested-reminder.png
similarity index 100%
rename from windows/manage/images/cortana-suggested-reminder.png
rename to windows/configuration/images/cortana-suggested-reminder.png
diff --git a/windows/manage/images/cortana-weather-multipanel.png b/windows/configuration/images/cortana-weather-multipanel.png
similarity index 100%
rename from windows/manage/images/cortana-weather-multipanel.png
rename to windows/configuration/images/cortana-weather-multipanel.png
diff --git a/windows/deploy/images/crossmark.png b/windows/configuration/images/crossmark.png
similarity index 100%
rename from windows/deploy/images/crossmark.png
rename to windows/configuration/images/crossmark.png
diff --git a/windows/configure/images/csp-placeholder.png b/windows/configuration/images/csp-placeholder.png
similarity index 100%
rename from windows/configure/images/csp-placeholder.png
rename to windows/configuration/images/csp-placeholder.png
diff --git a/windows/configure/images/cspinicd.png b/windows/configuration/images/cspinicd.png
similarity index 100%
rename from windows/configure/images/cspinicd.png
rename to windows/configuration/images/cspinicd.png
diff --git a/windows/configure/images/csptable.png b/windows/configuration/images/csptable.png
similarity index 100%
rename from windows/configure/images/csptable.png
rename to windows/configuration/images/csptable.png
diff --git a/windows/configure/images/customization-start-edge.PNG b/windows/configuration/images/customization-start-edge.PNG
similarity index 100%
rename from windows/configure/images/customization-start-edge.PNG
rename to windows/configuration/images/customization-start-edge.PNG
diff --git a/windows/configure/images/customization-start.PNG b/windows/configuration/images/customization-start.PNG
similarity index 100%
rename from windows/configure/images/customization-start.PNG
rename to windows/configuration/images/customization-start.PNG
diff --git a/windows/configure/images/dep-win8-l-usmt-migrationcomparemigstores.gif b/windows/configuration/images/dep-win8-l-usmt-migrationcomparemigstores.gif
similarity index 100%
rename from windows/configure/images/dep-win8-l-usmt-migrationcomparemigstores.gif
rename to windows/configuration/images/dep-win8-l-usmt-migrationcomparemigstores.gif
diff --git a/windows/configure/images/dep-win8-l-usmt-pcrefresh.jpg b/windows/configuration/images/dep-win8-l-usmt-pcrefresh.jpg
similarity index 100%
rename from windows/configure/images/dep-win8-l-usmt-pcrefresh.jpg
rename to windows/configuration/images/dep-win8-l-usmt-pcrefresh.jpg
diff --git a/windows/configure/images/dep-win8-l-usmt-pcreplace.jpg b/windows/configuration/images/dep-win8-l-usmt-pcreplace.jpg
similarity index 100%
rename from windows/configure/images/dep-win8-l-usmt-pcreplace.jpg
rename to windows/configuration/images/dep-win8-l-usmt-pcreplace.jpg
diff --git a/windows/configure/images/dep-win8-l-vamt-findingcomputerdialog.gif b/windows/configuration/images/dep-win8-l-vamt-findingcomputerdialog.gif
similarity index 100%
rename from windows/configure/images/dep-win8-l-vamt-findingcomputerdialog.gif
rename to windows/configuration/images/dep-win8-l-vamt-findingcomputerdialog.gif
diff --git a/windows/configure/images/dep-win8-l-vamt-firewallconfigurationformultiplesubnets.gif b/windows/configuration/images/dep-win8-l-vamt-firewallconfigurationformultiplesubnets.gif
similarity index 100%
rename from windows/configure/images/dep-win8-l-vamt-firewallconfigurationformultiplesubnets.gif
rename to windows/configuration/images/dep-win8-l-vamt-firewallconfigurationformultiplesubnets.gif
diff --git a/windows/configure/images/dep-win8-l-vamt-image001-enterprise.jpg b/windows/configuration/images/dep-win8-l-vamt-image001-enterprise.jpg
similarity index 100%
rename from windows/configure/images/dep-win8-l-vamt-image001-enterprise.jpg
rename to windows/configuration/images/dep-win8-l-vamt-image001-enterprise.jpg
diff --git a/windows/configure/images/dep-win8-l-vamt-makindependentactivationscenario.jpg b/windows/configuration/images/dep-win8-l-vamt-makindependentactivationscenario.jpg
similarity index 100%
rename from windows/configure/images/dep-win8-l-vamt-makindependentactivationscenario.jpg
rename to windows/configuration/images/dep-win8-l-vamt-makindependentactivationscenario.jpg
diff --git a/windows/configure/images/dep-win8-l-vamt-makproxyactivationscenario.jpg b/windows/configuration/images/dep-win8-l-vamt-makproxyactivationscenario.jpg
similarity index 100%
rename from windows/configure/images/dep-win8-l-vamt-makproxyactivationscenario.jpg
rename to windows/configuration/images/dep-win8-l-vamt-makproxyactivationscenario.jpg
diff --git a/windows/configure/images/deploy-finish.PNG b/windows/configuration/images/deploy-finish.PNG
similarity index 100%
rename from windows/configure/images/deploy-finish.PNG
rename to windows/configuration/images/deploy-finish.PNG
diff --git a/windows/configure/images/deploymentworkflow.png b/windows/configuration/images/deploymentworkflow.png
similarity index 100%
rename from windows/configure/images/deploymentworkflow.png
rename to windows/configuration/images/deploymentworkflow.png
diff --git a/windows/configure/images/developer-setup.PNG b/windows/configuration/images/developer-setup.PNG
similarity index 100%
rename from windows/configure/images/developer-setup.PNG
rename to windows/configuration/images/developer-setup.PNG
diff --git a/windows/configure/images/disk2vhd-convert.PNG b/windows/configuration/images/disk2vhd-convert.PNG
similarity index 100%
rename from windows/configure/images/disk2vhd-convert.PNG
rename to windows/configuration/images/disk2vhd-convert.PNG
diff --git a/windows/configure/images/disk2vhd-gen2.PNG b/windows/configuration/images/disk2vhd-gen2.PNG
similarity index 100%
rename from windows/configure/images/disk2vhd-gen2.PNG
rename to windows/configuration/images/disk2vhd-gen2.PNG
diff --git a/windows/configure/images/disk2vhd.PNG b/windows/configuration/images/disk2vhd.PNG
similarity index 100%
rename from windows/configure/images/disk2vhd.PNG
rename to windows/configuration/images/disk2vhd.PNG
diff --git a/windows/configure/images/disk2vhd4.PNG b/windows/configuration/images/disk2vhd4.PNG
similarity index 100%
rename from windows/configure/images/disk2vhd4.PNG
rename to windows/configuration/images/disk2vhd4.PNG
diff --git a/windows/configure/images/doneicon.png b/windows/configuration/images/doneicon.png
similarity index 100%
rename from windows/configure/images/doneicon.png
rename to windows/configuration/images/doneicon.png
diff --git a/windows/configure/images/download_vhd.png b/windows/configuration/images/download_vhd.png
similarity index 100%
rename from windows/configure/images/download_vhd.png
rename to windows/configuration/images/download_vhd.png
diff --git a/windows/configure/images/e3-activated.png b/windows/configuration/images/e3-activated.png
similarity index 100%
rename from windows/configure/images/e3-activated.png
rename to windows/configuration/images/e3-activated.png
diff --git a/windows/configure/images/edge-with-logo.png b/windows/configuration/images/edge-with-logo.png
similarity index 100%
rename from windows/configure/images/edge-with-logo.png
rename to windows/configuration/images/edge-with-logo.png
diff --git a/windows/configure/images/edge-without-logo.png b/windows/configuration/images/edge-without-logo.png
similarity index 100%
rename from windows/configure/images/edge-without-logo.png
rename to windows/configuration/images/edge-without-logo.png
diff --git a/windows/configure/images/enterprise-e3-ad-connect.png b/windows/configuration/images/enterprise-e3-ad-connect.png
similarity index 100%
rename from windows/configure/images/enterprise-e3-ad-connect.png
rename to windows/configuration/images/enterprise-e3-ad-connect.png
diff --git a/windows/configure/images/enterprise-e3-choose-how.png b/windows/configuration/images/enterprise-e3-choose-how.png
similarity index 100%
rename from windows/configure/images/enterprise-e3-choose-how.png
rename to windows/configuration/images/enterprise-e3-choose-how.png
diff --git a/windows/configure/images/enterprise-e3-connect-to-work-or-school.png b/windows/configuration/images/enterprise-e3-connect-to-work-or-school.png
similarity index 100%
rename from windows/configure/images/enterprise-e3-connect-to-work-or-school.png
rename to windows/configuration/images/enterprise-e3-connect-to-work-or-school.png
diff --git a/windows/configure/images/enterprise-e3-lets-get-2.png b/windows/configuration/images/enterprise-e3-lets-get-2.png
similarity index 100%
rename from windows/configure/images/enterprise-e3-lets-get-2.png
rename to windows/configuration/images/enterprise-e3-lets-get-2.png
diff --git a/windows/configure/images/enterprise-e3-lets-get.png b/windows/configuration/images/enterprise-e3-lets-get.png
similarity index 100%
rename from windows/configure/images/enterprise-e3-lets-get.png
rename to windows/configuration/images/enterprise-e3-lets-get.png
diff --git a/windows/configure/images/enterprise-e3-set-up-work-or-school.png b/windows/configuration/images/enterprise-e3-set-up-work-or-school.png
similarity index 100%
rename from windows/configure/images/enterprise-e3-set-up-work-or-school.png
rename to windows/configuration/images/enterprise-e3-set-up-work-or-school.png
diff --git a/windows/configure/images/enterprise-e3-sign-in.png b/windows/configuration/images/enterprise-e3-sign-in.png
similarity index 100%
rename from windows/configure/images/enterprise-e3-sign-in.png
rename to windows/configuration/images/enterprise-e3-sign-in.png
diff --git a/windows/configure/images/enterprise-e3-who-owns.png b/windows/configuration/images/enterprise-e3-who-owns.png
similarity index 100%
rename from windows/configure/images/enterprise-e3-who-owns.png
rename to windows/configuration/images/enterprise-e3-who-owns.png
diff --git a/windows/configure/images/enterprise-e3-win-10-activated-enterprise-subscription-active.png b/windows/configuration/images/enterprise-e3-win-10-activated-enterprise-subscription-active.png
similarity index 100%
rename from windows/configure/images/enterprise-e3-win-10-activated-enterprise-subscription-active.png
rename to windows/configuration/images/enterprise-e3-win-10-activated-enterprise-subscription-active.png
diff --git a/windows/configure/images/enterprise-e3-win-10-activated-enterprise-subscription-not-active.png b/windows/configuration/images/enterprise-e3-win-10-activated-enterprise-subscription-not-active.png
similarity index 100%
rename from windows/configure/images/enterprise-e3-win-10-activated-enterprise-subscription-not-active.png
rename to windows/configuration/images/enterprise-e3-win-10-activated-enterprise-subscription-not-active.png
diff --git a/windows/configure/images/enterprise-e3-win-10-not-activated-enterprise-subscription-active.png b/windows/configuration/images/enterprise-e3-win-10-not-activated-enterprise-subscription-active.png
similarity index 100%
rename from windows/configure/images/enterprise-e3-win-10-not-activated-enterprise-subscription-active.png
rename to windows/configuration/images/enterprise-e3-win-10-not-activated-enterprise-subscription-active.png
diff --git a/windows/configure/images/enterprise-e3-win-10-not-activated-enterprise-subscription-not-active.png b/windows/configuration/images/enterprise-e3-win-10-not-activated-enterprise-subscription-not-active.png
similarity index 100%
rename from windows/configure/images/enterprise-e3-win-10-not-activated-enterprise-subscription-not-active.png
rename to windows/configuration/images/enterprise-e3-win-10-not-activated-enterprise-subscription-not-active.png
diff --git a/windows/configure/images/export-mgt-desktop.png b/windows/configuration/images/export-mgt-desktop.png
similarity index 100%
rename from windows/configure/images/export-mgt-desktop.png
rename to windows/configuration/images/export-mgt-desktop.png
diff --git a/windows/configure/images/export-mgt-mobile.png b/windows/configuration/images/export-mgt-mobile.png
similarity index 100%
rename from windows/configure/images/export-mgt-mobile.png
rename to windows/configuration/images/export-mgt-mobile.png
diff --git a/windows/configure/images/express-settings.png b/windows/configuration/images/express-settings.png
similarity index 100%
rename from windows/configure/images/express-settings.png
rename to windows/configuration/images/express-settings.png
diff --git a/windows/configure/images/fig1-deferupgrades.png b/windows/configuration/images/fig1-deferupgrades.png
similarity index 100%
rename from windows/configure/images/fig1-deferupgrades.png
rename to windows/configuration/images/fig1-deferupgrades.png
diff --git a/windows/configure/images/fig10-contosoinstall.png b/windows/configuration/images/fig10-contosoinstall.png
similarity index 100%
rename from windows/configure/images/fig10-contosoinstall.png
rename to windows/configuration/images/fig10-contosoinstall.png
diff --git a/windows/configure/images/fig10-unattend.png b/windows/configuration/images/fig10-unattend.png
similarity index 100%
rename from windows/configure/images/fig10-unattend.png
rename to windows/configuration/images/fig10-unattend.png
diff --git a/windows/configure/images/fig13-captureimage.png b/windows/configuration/images/fig13-captureimage.png
similarity index 100%
rename from windows/configure/images/fig13-captureimage.png
rename to windows/configuration/images/fig13-captureimage.png
diff --git a/windows/configure/images/fig16-contentstatus.png b/windows/configuration/images/fig16-contentstatus.png
similarity index 100%
rename from windows/configure/images/fig16-contentstatus.png
rename to windows/configuration/images/fig16-contentstatus.png
diff --git a/windows/configure/images/fig17-win10image.png b/windows/configuration/images/fig17-win10image.png
similarity index 100%
rename from windows/configure/images/fig17-win10image.png
rename to windows/configuration/images/fig17-win10image.png
diff --git a/windows/configure/images/fig18-distwindows.png b/windows/configuration/images/fig18-distwindows.png
similarity index 100%
rename from windows/configure/images/fig18-distwindows.png
rename to windows/configuration/images/fig18-distwindows.png
diff --git a/windows/configure/images/fig2-deploymenttimeline.png b/windows/configuration/images/fig2-deploymenttimeline.png
similarity index 100%
rename from windows/configure/images/fig2-deploymenttimeline.png
rename to windows/configuration/images/fig2-deploymenttimeline.png
diff --git a/windows/configure/images/fig2-gather.png b/windows/configuration/images/fig2-gather.png
similarity index 100%
rename from windows/configure/images/fig2-gather.png
rename to windows/configuration/images/fig2-gather.png
diff --git a/windows/configure/images/fig2-importedos.png b/windows/configuration/images/fig2-importedos.png
similarity index 100%
rename from windows/configure/images/fig2-importedos.png
rename to windows/configuration/images/fig2-importedos.png
diff --git a/windows/configure/images/fig2-taskseq.png b/windows/configuration/images/fig2-taskseq.png
similarity index 100%
rename from windows/configure/images/fig2-taskseq.png
rename to windows/configuration/images/fig2-taskseq.png
diff --git a/windows/configure/images/fig21-add-drivers.png b/windows/configuration/images/fig21-add-drivers.png
similarity index 100%
rename from windows/configure/images/fig21-add-drivers.png
rename to windows/configuration/images/fig21-add-drivers.png
diff --git a/windows/configure/images/fig22-createcategories.png b/windows/configuration/images/fig22-createcategories.png
similarity index 100%
rename from windows/configure/images/fig22-createcategories.png
rename to windows/configuration/images/fig22-createcategories.png
diff --git a/windows/configure/images/fig27-driverpackage.png b/windows/configuration/images/fig27-driverpackage.png
similarity index 100%
rename from windows/configure/images/fig27-driverpackage.png
rename to windows/configuration/images/fig27-driverpackage.png
diff --git a/windows/configure/images/fig28-addapp.png b/windows/configuration/images/fig28-addapp.png
similarity index 100%
rename from windows/configure/images/fig28-addapp.png
rename to windows/configuration/images/fig28-addapp.png
diff --git a/windows/configure/images/fig3-overlaprelease.png b/windows/configuration/images/fig3-overlaprelease.png
similarity index 100%
rename from windows/configure/images/fig3-overlaprelease.png
rename to windows/configuration/images/fig3-overlaprelease.png
diff --git a/windows/configure/images/fig30-settingspack.png b/windows/configuration/images/fig30-settingspack.png
similarity index 100%
rename from windows/configure/images/fig30-settingspack.png
rename to windows/configuration/images/fig30-settingspack.png
diff --git a/windows/configure/images/fig32-deploywiz.png b/windows/configuration/images/fig32-deploywiz.png
similarity index 100%
rename from windows/configure/images/fig32-deploywiz.png
rename to windows/configuration/images/fig32-deploywiz.png
diff --git a/windows/configure/images/fig4-oob-drivers.png b/windows/configuration/images/fig4-oob-drivers.png
similarity index 100%
rename from windows/configure/images/fig4-oob-drivers.png
rename to windows/configuration/images/fig4-oob-drivers.png
diff --git a/windows/configure/images/fig5-selectprofile.png b/windows/configuration/images/fig5-selectprofile.png
similarity index 100%
rename from windows/configure/images/fig5-selectprofile.png
rename to windows/configuration/images/fig5-selectprofile.png
diff --git a/windows/configure/images/fig6-taskseq.png b/windows/configuration/images/fig6-taskseq.png
similarity index 100%
rename from windows/configure/images/fig6-taskseq.png
rename to windows/configuration/images/fig6-taskseq.png
diff --git a/windows/configure/images/fig8-cust-tasks.png b/windows/configuration/images/fig8-cust-tasks.png
similarity index 100%
rename from windows/configure/images/fig8-cust-tasks.png
rename to windows/configuration/images/fig8-cust-tasks.png
diff --git a/windows/configure/images/fig8-suspend.png b/windows/configuration/images/fig8-suspend.png
similarity index 100%
rename from windows/configure/images/fig8-suspend.png
rename to windows/configuration/images/fig8-suspend.png
diff --git a/windows/configure/images/fig9-resumetaskseq.png b/windows/configuration/images/fig9-resumetaskseq.png
similarity index 100%
rename from windows/configure/images/fig9-resumetaskseq.png
rename to windows/configuration/images/fig9-resumetaskseq.png
diff --git a/windows/configure/images/figure4-deployment-workbench.png b/windows/configuration/images/figure4-deployment-workbench.png
similarity index 100%
rename from windows/configure/images/figure4-deployment-workbench.png
rename to windows/configuration/images/figure4-deployment-workbench.png
diff --git a/windows/configure/images/finish-details-mobile.PNG b/windows/configuration/images/finish-details-mobile.PNG
similarity index 100%
rename from windows/configure/images/finish-details-mobile.PNG
rename to windows/configuration/images/finish-details-mobile.PNG
diff --git a/windows/configure/images/finish-details.png b/windows/configuration/images/finish-details.png
similarity index 100%
rename from windows/configure/images/finish-details.png
rename to windows/configuration/images/finish-details.png
diff --git a/windows/configure/images/finish-mobile.PNG b/windows/configuration/images/finish-mobile.PNG
similarity index 100%
rename from windows/configure/images/finish-mobile.PNG
rename to windows/configuration/images/finish-mobile.PNG
diff --git a/windows/configure/images/finish.PNG b/windows/configuration/images/finish.PNG
similarity index 100%
rename from windows/configure/images/finish.PNG
rename to windows/configuration/images/finish.PNG
diff --git a/windows/configure/images/five.png b/windows/configuration/images/five.png
similarity index 100%
rename from windows/configure/images/five.png
rename to windows/configuration/images/five.png
diff --git a/windows/configure/images/four.png b/windows/configuration/images/four.png
similarity index 100%
rename from windows/configure/images/four.png
rename to windows/configuration/images/four.png
diff --git a/windows/configure/images/funfacts.png b/windows/configuration/images/funfacts.png
similarity index 100%
rename from windows/configure/images/funfacts.png
rename to windows/configuration/images/funfacts.png
diff --git a/windows/configure/images/genrule.png b/windows/configuration/images/genrule.png
similarity index 100%
rename from windows/configure/images/genrule.png
rename to windows/configuration/images/genrule.png
diff --git a/windows/configure/images/gp-branch.png b/windows/configuration/images/gp-branch.png
similarity index 100%
rename from windows/configure/images/gp-branch.png
rename to windows/configuration/images/gp-branch.png
diff --git a/windows/configure/images/gp-exclude-drivers.png b/windows/configuration/images/gp-exclude-drivers.png
similarity index 100%
rename from windows/configure/images/gp-exclude-drivers.png
rename to windows/configuration/images/gp-exclude-drivers.png
diff --git a/windows/configure/images/gp-feature.png b/windows/configuration/images/gp-feature.png
similarity index 100%
rename from windows/configure/images/gp-feature.png
rename to windows/configuration/images/gp-feature.png
diff --git a/windows/configure/images/gp-quality.png b/windows/configuration/images/gp-quality.png
similarity index 100%
rename from windows/configure/images/gp-quality.png
rename to windows/configuration/images/gp-quality.png
diff --git a/windows/configure/images/hyper-v-feature.png b/windows/configuration/images/hyper-v-feature.png
similarity index 100%
rename from windows/configure/images/hyper-v-feature.png
rename to windows/configuration/images/hyper-v-feature.png
diff --git a/windows/configure/images/icd-adv-shared-pc.PNG b/windows/configuration/images/icd-adv-shared-pc.PNG
similarity index 100%
rename from windows/configure/images/icd-adv-shared-pc.PNG
rename to windows/configuration/images/icd-adv-shared-pc.PNG
diff --git a/windows/configure/images/icd-create-options-1703.PNG b/windows/configuration/images/icd-create-options-1703.PNG
similarity index 100%
rename from windows/configure/images/icd-create-options-1703.PNG
rename to windows/configuration/images/icd-create-options-1703.PNG
diff --git a/windows/configure/images/icd-create-options.PNG b/windows/configuration/images/icd-create-options.PNG
similarity index 100%
rename from windows/configure/images/icd-create-options.PNG
rename to windows/configuration/images/icd-create-options.PNG
diff --git a/windows/configure/images/icd-desktop-1703.PNG b/windows/configuration/images/icd-desktop-1703.PNG
similarity index 100%
rename from windows/configure/images/icd-desktop-1703.PNG
rename to windows/configuration/images/icd-desktop-1703.PNG
diff --git a/windows/configure/images/icd-export-menu.png b/windows/configuration/images/icd-export-menu.png
similarity index 100%
rename from windows/configure/images/icd-export-menu.png
rename to windows/configuration/images/icd-export-menu.png
diff --git a/windows/configure/images/icd-install.PNG b/windows/configuration/images/icd-install.PNG
similarity index 100%
rename from windows/configure/images/icd-install.PNG
rename to windows/configuration/images/icd-install.PNG
diff --git a/windows/configure/images/icd-multi-target-true.png b/windows/configuration/images/icd-multi-target-true.png
similarity index 100%
rename from windows/configure/images/icd-multi-target-true.png
rename to windows/configuration/images/icd-multi-target-true.png
diff --git a/windows/configure/images/icd-multi-targetstate-true.png b/windows/configuration/images/icd-multi-targetstate-true.png
similarity index 100%
rename from windows/configure/images/icd-multi-targetstate-true.png
rename to windows/configuration/images/icd-multi-targetstate-true.png
diff --git a/windows/configure/images/icd-runtime.PNG b/windows/configuration/images/icd-runtime.PNG
similarity index 100%
rename from windows/configure/images/icd-runtime.PNG
rename to windows/configuration/images/icd-runtime.PNG
diff --git a/windows/configure/images/icd-school.PNG b/windows/configuration/images/icd-school.PNG
similarity index 100%
rename from windows/configure/images/icd-school.PNG
rename to windows/configuration/images/icd-school.PNG
diff --git a/windows/configure/images/icd-script1.png b/windows/configuration/images/icd-script1.png
similarity index 100%
rename from windows/configure/images/icd-script1.png
rename to windows/configuration/images/icd-script1.png
diff --git a/windows/configure/images/icd-script2.png b/windows/configuration/images/icd-script2.png
similarity index 100%
rename from windows/configure/images/icd-script2.png
rename to windows/configuration/images/icd-script2.png
diff --git a/windows/configure/images/icd-setting-help.PNG b/windows/configuration/images/icd-setting-help.PNG
similarity index 100%
rename from windows/configure/images/icd-setting-help.PNG
rename to windows/configuration/images/icd-setting-help.PNG
diff --git a/windows/configure/images/icd-settings.PNG b/windows/configuration/images/icd-settings.PNG
similarity index 100%
rename from windows/configure/images/icd-settings.PNG
rename to windows/configuration/images/icd-settings.PNG
diff --git a/windows/configure/images/icd-simple-edit.png b/windows/configuration/images/icd-simple-edit.png
similarity index 100%
rename from windows/configure/images/icd-simple-edit.png
rename to windows/configuration/images/icd-simple-edit.png
diff --git a/windows/configure/images/icd-simple.PNG b/windows/configuration/images/icd-simple.PNG
similarity index 100%
rename from windows/configure/images/icd-simple.PNG
rename to windows/configuration/images/icd-simple.PNG
diff --git a/windows/configure/images/icd-step1.PNG b/windows/configuration/images/icd-step1.PNG
similarity index 100%
rename from windows/configure/images/icd-step1.PNG
rename to windows/configuration/images/icd-step1.PNG
diff --git a/windows/configure/images/icd-step2.PNG b/windows/configuration/images/icd-step2.PNG
similarity index 100%
rename from windows/configure/images/icd-step2.PNG
rename to windows/configuration/images/icd-step2.PNG
diff --git a/windows/configure/images/icd-step3.PNG b/windows/configuration/images/icd-step3.PNG
similarity index 100%
rename from windows/configure/images/icd-step3.PNG
rename to windows/configuration/images/icd-step3.PNG
diff --git a/windows/configure/images/icd-step4.PNG b/windows/configuration/images/icd-step4.PNG
similarity index 100%
rename from windows/configure/images/icd-step4.PNG
rename to windows/configuration/images/icd-step4.PNG
diff --git a/windows/configure/images/icd-step5.PNG b/windows/configuration/images/icd-step5.PNG
similarity index 100%
rename from windows/configure/images/icd-step5.PNG
rename to windows/configuration/images/icd-step5.PNG
diff --git a/windows/configure/images/icd-switch.PNG b/windows/configuration/images/icd-switch.PNG
similarity index 100%
rename from windows/configure/images/icd-switch.PNG
rename to windows/configuration/images/icd-switch.PNG
diff --git a/windows/configure/images/icdbrowse.png b/windows/configuration/images/icdbrowse.png
similarity index 100%
rename from windows/configure/images/icdbrowse.png
rename to windows/configuration/images/icdbrowse.png
diff --git a/windows/configure/images/identitychoices.png b/windows/configuration/images/identitychoices.png
similarity index 100%
rename from windows/configure/images/identitychoices.png
rename to windows/configuration/images/identitychoices.png
diff --git a/windows/configure/images/image.PNG b/windows/configuration/images/image.PNG
similarity index 100%
rename from windows/configure/images/image.PNG
rename to windows/configuration/images/image.PNG
diff --git a/windows/configure/images/installing-drivers.png b/windows/configuration/images/installing-drivers.png
similarity index 100%
rename from windows/configure/images/installing-drivers.png
rename to windows/configuration/images/installing-drivers.png
diff --git a/windows/configure/images/kiosk-account-details.PNG b/windows/configuration/images/kiosk-account-details.PNG
similarity index 100%
rename from windows/configure/images/kiosk-account-details.PNG
rename to windows/configuration/images/kiosk-account-details.PNG
diff --git a/windows/configure/images/kiosk-account.PNG b/windows/configuration/images/kiosk-account.PNG
similarity index 100%
rename from windows/configure/images/kiosk-account.PNG
rename to windows/configuration/images/kiosk-account.PNG
diff --git a/windows/configure/images/kiosk-common-details.PNG b/windows/configuration/images/kiosk-common-details.PNG
similarity index 100%
rename from windows/configure/images/kiosk-common-details.PNG
rename to windows/configuration/images/kiosk-common-details.PNG
diff --git a/windows/configure/images/kiosk-common.PNG b/windows/configuration/images/kiosk-common.PNG
similarity index 100%
rename from windows/configure/images/kiosk-common.PNG
rename to windows/configuration/images/kiosk-common.PNG
diff --git a/windows/configure/images/launchicon.png b/windows/configuration/images/launchicon.png
similarity index 100%
rename from windows/configure/images/launchicon.png
rename to windows/configuration/images/launchicon.png
diff --git a/windows/configure/images/ld-apps.PNG b/windows/configuration/images/ld-apps.PNG
similarity index 100%
rename from windows/configure/images/ld-apps.PNG
rename to windows/configuration/images/ld-apps.PNG
diff --git a/windows/configure/images/ld-buttons.PNG b/windows/configuration/images/ld-buttons.PNG
similarity index 100%
rename from windows/configure/images/ld-buttons.PNG
rename to windows/configuration/images/ld-buttons.PNG
diff --git a/windows/configure/images/ld-connect.PNG b/windows/configuration/images/ld-connect.PNG
similarity index 100%
rename from windows/configure/images/ld-connect.PNG
rename to windows/configuration/images/ld-connect.PNG
diff --git a/windows/configure/images/ld-csp.PNG b/windows/configuration/images/ld-csp.PNG
similarity index 100%
rename from windows/configure/images/ld-csp.PNG
rename to windows/configuration/images/ld-csp.PNG
diff --git a/windows/configure/images/ld-export.PNG b/windows/configuration/images/ld-export.PNG
similarity index 100%
rename from windows/configure/images/ld-export.PNG
rename to windows/configuration/images/ld-export.PNG
diff --git a/windows/configure/images/ld-other.PNG b/windows/configuration/images/ld-other.PNG
similarity index 100%
rename from windows/configure/images/ld-other.PNG
rename to windows/configuration/images/ld-other.PNG
diff --git a/windows/configure/images/ld-pair.PNG b/windows/configuration/images/ld-pair.PNG
similarity index 100%
rename from windows/configure/images/ld-pair.PNG
rename to windows/configuration/images/ld-pair.PNG
diff --git a/windows/configure/images/ld-quick.PNG b/windows/configuration/images/ld-quick.PNG
similarity index 100%
rename from windows/configure/images/ld-quick.PNG
rename to windows/configuration/images/ld-quick.PNG
diff --git a/windows/configure/images/ld-role.PNG b/windows/configuration/images/ld-role.PNG
similarity index 100%
rename from windows/configure/images/ld-role.PNG
rename to windows/configuration/images/ld-role.PNG
diff --git a/windows/configure/images/ld-settings.PNG b/windows/configuration/images/ld-settings.PNG
similarity index 100%
rename from windows/configure/images/ld-settings.PNG
rename to windows/configuration/images/ld-settings.PNG
diff --git a/windows/configure/images/ld-start.PNG b/windows/configuration/images/ld-start.PNG
similarity index 100%
rename from windows/configure/images/ld-start.PNG
rename to windows/configuration/images/ld-start.PNG
diff --git a/windows/configure/images/ld-sync.PNG b/windows/configuration/images/ld-sync.PNG
similarity index 100%
rename from windows/configure/images/ld-sync.PNG
rename to windows/configuration/images/ld-sync.PNG
diff --git a/windows/configure/images/ldstore.PNG b/windows/configuration/images/ldstore.PNG
similarity index 100%
rename from windows/configure/images/ldstore.PNG
rename to windows/configuration/images/ldstore.PNG
diff --git a/windows/configure/images/license-terms.png b/windows/configuration/images/license-terms.png
similarity index 100%
rename from windows/configure/images/license-terms.png
rename to windows/configuration/images/license-terms.png
diff --git a/windows/configure/images/lily.jpg b/windows/configuration/images/lily.jpg
similarity index 100%
rename from windows/configure/images/lily.jpg
rename to windows/configuration/images/lily.jpg
diff --git a/windows/configure/images/lockdownapps.png b/windows/configuration/images/lockdownapps.png
similarity index 100%
rename from windows/configure/images/lockdownapps.png
rename to windows/configuration/images/lockdownapps.png
diff --git a/windows/configure/images/lockscreen.png b/windows/configuration/images/lockscreen.png
similarity index 100%
rename from windows/configure/images/lockscreen.png
rename to windows/configuration/images/lockscreen.png
diff --git a/windows/configure/images/lockscreenpolicy.png b/windows/configuration/images/lockscreenpolicy.png
similarity index 100%
rename from windows/configure/images/lockscreenpolicy.png
rename to windows/configuration/images/lockscreenpolicy.png
diff --git a/windows/configure/images/mdm-diag-report-powershell.PNG b/windows/configuration/images/mdm-diag-report-powershell.PNG
similarity index 100%
rename from windows/configure/images/mdm-diag-report-powershell.PNG
rename to windows/configuration/images/mdm-diag-report-powershell.PNG
diff --git a/windows/configure/images/mdm.png b/windows/configuration/images/mdm.png
similarity index 100%
rename from windows/configure/images/mdm.png
rename to windows/configuration/images/mdm.png
diff --git a/windows/configure/images/mdt-01-fig01.png b/windows/configuration/images/mdt-01-fig01.png
similarity index 100%
rename from windows/configure/images/mdt-01-fig01.png
rename to windows/configuration/images/mdt-01-fig01.png
diff --git a/windows/configure/images/mdt-01-fig02.jpg b/windows/configuration/images/mdt-01-fig02.jpg
similarity index 100%
rename from windows/configure/images/mdt-01-fig02.jpg
rename to windows/configuration/images/mdt-01-fig02.jpg
diff --git a/windows/configure/images/mdt-03-fig01.png b/windows/configuration/images/mdt-03-fig01.png
similarity index 100%
rename from windows/configure/images/mdt-03-fig01.png
rename to windows/configuration/images/mdt-03-fig01.png
diff --git a/windows/configure/images/mdt-03-fig02.png b/windows/configuration/images/mdt-03-fig02.png
similarity index 100%
rename from windows/configure/images/mdt-03-fig02.png
rename to windows/configuration/images/mdt-03-fig02.png
diff --git a/windows/configure/images/mdt-03-fig03.png b/windows/configuration/images/mdt-03-fig03.png
similarity index 100%
rename from windows/configure/images/mdt-03-fig03.png
rename to windows/configuration/images/mdt-03-fig03.png
diff --git a/windows/configure/images/mdt-03-fig04.png b/windows/configuration/images/mdt-03-fig04.png
similarity index 100%
rename from windows/configure/images/mdt-03-fig04.png
rename to windows/configuration/images/mdt-03-fig04.png
diff --git a/windows/configure/images/mdt-03-fig05.png b/windows/configuration/images/mdt-03-fig05.png
similarity index 100%
rename from windows/configure/images/mdt-03-fig05.png
rename to windows/configuration/images/mdt-03-fig05.png
diff --git a/windows/configure/images/mdt-04-fig01.png b/windows/configuration/images/mdt-04-fig01.png
similarity index 100%
rename from windows/configure/images/mdt-04-fig01.png
rename to windows/configuration/images/mdt-04-fig01.png
diff --git a/windows/configure/images/mdt-05-fig01.png b/windows/configuration/images/mdt-05-fig01.png
similarity index 100%
rename from windows/configure/images/mdt-05-fig01.png
rename to windows/configuration/images/mdt-05-fig01.png
diff --git a/windows/configure/images/mdt-05-fig02.png b/windows/configuration/images/mdt-05-fig02.png
similarity index 100%
rename from windows/configure/images/mdt-05-fig02.png
rename to windows/configuration/images/mdt-05-fig02.png
diff --git a/windows/configure/images/mdt-05-fig03.png b/windows/configuration/images/mdt-05-fig03.png
similarity index 100%
rename from windows/configure/images/mdt-05-fig03.png
rename to windows/configuration/images/mdt-05-fig03.png
diff --git a/windows/configure/images/mdt-05-fig04.png b/windows/configuration/images/mdt-05-fig04.png
similarity index 100%
rename from windows/configure/images/mdt-05-fig04.png
rename to windows/configuration/images/mdt-05-fig04.png
diff --git a/windows/configure/images/mdt-05-fig05.png b/windows/configuration/images/mdt-05-fig05.png
similarity index 100%
rename from windows/configure/images/mdt-05-fig05.png
rename to windows/configuration/images/mdt-05-fig05.png
diff --git a/windows/configure/images/mdt-05-fig07.png b/windows/configuration/images/mdt-05-fig07.png
similarity index 100%
rename from windows/configure/images/mdt-05-fig07.png
rename to windows/configuration/images/mdt-05-fig07.png
diff --git a/windows/configure/images/mdt-05-fig08.png b/windows/configuration/images/mdt-05-fig08.png
similarity index 100%
rename from windows/configure/images/mdt-05-fig08.png
rename to windows/configuration/images/mdt-05-fig08.png
diff --git a/windows/configure/images/mdt-05-fig09.png b/windows/configuration/images/mdt-05-fig09.png
similarity index 100%
rename from windows/configure/images/mdt-05-fig09.png
rename to windows/configuration/images/mdt-05-fig09.png
diff --git a/windows/configure/images/mdt-05-fig10.png b/windows/configuration/images/mdt-05-fig10.png
similarity index 100%
rename from windows/configure/images/mdt-05-fig10.png
rename to windows/configuration/images/mdt-05-fig10.png
diff --git a/windows/configure/images/mdt-06-fig01.png b/windows/configuration/images/mdt-06-fig01.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig01.png
rename to windows/configuration/images/mdt-06-fig01.png
diff --git a/windows/configure/images/mdt-06-fig03.png b/windows/configuration/images/mdt-06-fig03.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig03.png
rename to windows/configuration/images/mdt-06-fig03.png
diff --git a/windows/configure/images/mdt-06-fig04.png b/windows/configuration/images/mdt-06-fig04.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig04.png
rename to windows/configuration/images/mdt-06-fig04.png
diff --git a/windows/configure/images/mdt-06-fig05.png b/windows/configuration/images/mdt-06-fig05.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig05.png
rename to windows/configuration/images/mdt-06-fig05.png
diff --git a/windows/configure/images/mdt-06-fig06.png b/windows/configuration/images/mdt-06-fig06.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig06.png
rename to windows/configuration/images/mdt-06-fig06.png
diff --git a/windows/configure/images/mdt-06-fig07.png b/windows/configuration/images/mdt-06-fig07.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig07.png
rename to windows/configuration/images/mdt-06-fig07.png
diff --git a/windows/configure/images/mdt-06-fig08.png b/windows/configuration/images/mdt-06-fig08.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig08.png
rename to windows/configuration/images/mdt-06-fig08.png
diff --git a/windows/configure/images/mdt-06-fig10.png b/windows/configuration/images/mdt-06-fig10.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig10.png
rename to windows/configuration/images/mdt-06-fig10.png
diff --git a/windows/configure/images/mdt-06-fig12.png b/windows/configuration/images/mdt-06-fig12.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig12.png
rename to windows/configuration/images/mdt-06-fig12.png
diff --git a/windows/configure/images/mdt-06-fig13.png b/windows/configuration/images/mdt-06-fig13.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig13.png
rename to windows/configuration/images/mdt-06-fig13.png
diff --git a/windows/configure/images/mdt-06-fig14.png b/windows/configuration/images/mdt-06-fig14.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig14.png
rename to windows/configuration/images/mdt-06-fig14.png
diff --git a/windows/configure/images/mdt-06-fig15.png b/windows/configuration/images/mdt-06-fig15.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig15.png
rename to windows/configuration/images/mdt-06-fig15.png
diff --git a/windows/configure/images/mdt-06-fig16.png b/windows/configuration/images/mdt-06-fig16.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig16.png
rename to windows/configuration/images/mdt-06-fig16.png
diff --git a/windows/configure/images/mdt-06-fig20.png b/windows/configuration/images/mdt-06-fig20.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig20.png
rename to windows/configuration/images/mdt-06-fig20.png
diff --git a/windows/configure/images/mdt-06-fig21.png b/windows/configuration/images/mdt-06-fig21.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig21.png
rename to windows/configuration/images/mdt-06-fig21.png
diff --git a/windows/configure/images/mdt-06-fig26.png b/windows/configuration/images/mdt-06-fig26.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig26.png
rename to windows/configuration/images/mdt-06-fig26.png
diff --git a/windows/configure/images/mdt-06-fig31.png b/windows/configuration/images/mdt-06-fig31.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig31.png
rename to windows/configuration/images/mdt-06-fig31.png
diff --git a/windows/configure/images/mdt-06-fig33.png b/windows/configuration/images/mdt-06-fig33.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig33.png
rename to windows/configuration/images/mdt-06-fig33.png
diff --git a/windows/configure/images/mdt-06-fig35.png b/windows/configuration/images/mdt-06-fig35.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig35.png
rename to windows/configuration/images/mdt-06-fig35.png
diff --git a/windows/configure/images/mdt-06-fig36.png b/windows/configuration/images/mdt-06-fig36.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig36.png
rename to windows/configuration/images/mdt-06-fig36.png
diff --git a/windows/configure/images/mdt-06-fig37.png b/windows/configuration/images/mdt-06-fig37.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig37.png
rename to windows/configuration/images/mdt-06-fig37.png
diff --git a/windows/configure/images/mdt-06-fig39.png b/windows/configuration/images/mdt-06-fig39.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig39.png
rename to windows/configuration/images/mdt-06-fig39.png
diff --git a/windows/configure/images/mdt-06-fig42.png b/windows/configuration/images/mdt-06-fig42.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig42.png
rename to windows/configuration/images/mdt-06-fig42.png
diff --git a/windows/configure/images/mdt-06-fig43.png b/windows/configuration/images/mdt-06-fig43.png
similarity index 100%
rename from windows/configure/images/mdt-06-fig43.png
rename to windows/configuration/images/mdt-06-fig43.png
diff --git a/windows/configure/images/mdt-07-fig01.png b/windows/configuration/images/mdt-07-fig01.png
similarity index 100%
rename from windows/configure/images/mdt-07-fig01.png
rename to windows/configuration/images/mdt-07-fig01.png
diff --git a/windows/configure/images/mdt-07-fig03.png b/windows/configuration/images/mdt-07-fig03.png
similarity index 100%
rename from windows/configure/images/mdt-07-fig03.png
rename to windows/configuration/images/mdt-07-fig03.png
diff --git a/windows/configure/images/mdt-07-fig08.png b/windows/configuration/images/mdt-07-fig08.png
similarity index 100%
rename from windows/configure/images/mdt-07-fig08.png
rename to windows/configuration/images/mdt-07-fig08.png
diff --git a/windows/configure/images/mdt-07-fig09.png b/windows/configuration/images/mdt-07-fig09.png
similarity index 100%
rename from windows/configure/images/mdt-07-fig09.png
rename to windows/configuration/images/mdt-07-fig09.png
diff --git a/windows/configure/images/mdt-07-fig10.png b/windows/configuration/images/mdt-07-fig10.png
similarity index 100%
rename from windows/configure/images/mdt-07-fig10.png
rename to windows/configuration/images/mdt-07-fig10.png
diff --git a/windows/configure/images/mdt-07-fig11.png b/windows/configuration/images/mdt-07-fig11.png
similarity index 100%
rename from windows/configure/images/mdt-07-fig11.png
rename to windows/configuration/images/mdt-07-fig11.png
diff --git a/windows/configure/images/mdt-07-fig13.png b/windows/configuration/images/mdt-07-fig13.png
similarity index 100%
rename from windows/configure/images/mdt-07-fig13.png
rename to windows/configuration/images/mdt-07-fig13.png
diff --git a/windows/configure/images/mdt-07-fig14.png b/windows/configuration/images/mdt-07-fig14.png
similarity index 100%
rename from windows/configure/images/mdt-07-fig14.png
rename to windows/configuration/images/mdt-07-fig14.png
diff --git a/windows/configure/images/mdt-07-fig15.png b/windows/configuration/images/mdt-07-fig15.png
similarity index 100%
rename from windows/configure/images/mdt-07-fig15.png
rename to windows/configuration/images/mdt-07-fig15.png
diff --git a/windows/configure/images/mdt-07-fig16.png b/windows/configuration/images/mdt-07-fig16.png
similarity index 100%
rename from windows/configure/images/mdt-07-fig16.png
rename to windows/configuration/images/mdt-07-fig16.png
diff --git a/windows/configure/images/mdt-08-fig01.png b/windows/configuration/images/mdt-08-fig01.png
similarity index 100%
rename from windows/configure/images/mdt-08-fig01.png
rename to windows/configuration/images/mdt-08-fig01.png
diff --git a/windows/configure/images/mdt-08-fig02.png b/windows/configuration/images/mdt-08-fig02.png
similarity index 100%
rename from windows/configure/images/mdt-08-fig02.png
rename to windows/configuration/images/mdt-08-fig02.png
diff --git a/windows/configure/images/mdt-08-fig03.png b/windows/configuration/images/mdt-08-fig03.png
similarity index 100%
rename from windows/configure/images/mdt-08-fig03.png
rename to windows/configuration/images/mdt-08-fig03.png
diff --git a/windows/configure/images/mdt-08-fig05.png b/windows/configuration/images/mdt-08-fig05.png
similarity index 100%
rename from windows/configure/images/mdt-08-fig05.png
rename to windows/configuration/images/mdt-08-fig05.png
diff --git a/windows/configure/images/mdt-08-fig06.png b/windows/configuration/images/mdt-08-fig06.png
similarity index 100%
rename from windows/configure/images/mdt-08-fig06.png
rename to windows/configuration/images/mdt-08-fig06.png
diff --git a/windows/configure/images/mdt-08-fig14.png b/windows/configuration/images/mdt-08-fig14.png
similarity index 100%
rename from windows/configure/images/mdt-08-fig14.png
rename to windows/configuration/images/mdt-08-fig14.png
diff --git a/windows/configure/images/mdt-08-fig15.png b/windows/configuration/images/mdt-08-fig15.png
similarity index 100%
rename from windows/configure/images/mdt-08-fig15.png
rename to windows/configuration/images/mdt-08-fig15.png
diff --git a/windows/configure/images/mdt-09-fig01.png b/windows/configuration/images/mdt-09-fig01.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig01.png
rename to windows/configuration/images/mdt-09-fig01.png
diff --git a/windows/configure/images/mdt-09-fig02.png b/windows/configuration/images/mdt-09-fig02.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig02.png
rename to windows/configuration/images/mdt-09-fig02.png
diff --git a/windows/configure/images/mdt-09-fig03.png b/windows/configuration/images/mdt-09-fig03.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig03.png
rename to windows/configuration/images/mdt-09-fig03.png
diff --git a/windows/configure/images/mdt-09-fig04.png b/windows/configuration/images/mdt-09-fig04.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig04.png
rename to windows/configuration/images/mdt-09-fig04.png
diff --git a/windows/configure/images/mdt-09-fig06.png b/windows/configuration/images/mdt-09-fig06.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig06.png
rename to windows/configuration/images/mdt-09-fig06.png
diff --git a/windows/configure/images/mdt-09-fig07.png b/windows/configuration/images/mdt-09-fig07.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig07.png
rename to windows/configuration/images/mdt-09-fig07.png
diff --git a/windows/configure/images/mdt-09-fig08.png b/windows/configuration/images/mdt-09-fig08.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig08.png
rename to windows/configuration/images/mdt-09-fig08.png
diff --git a/windows/configure/images/mdt-09-fig09.png b/windows/configuration/images/mdt-09-fig09.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig09.png
rename to windows/configuration/images/mdt-09-fig09.png
diff --git a/windows/configure/images/mdt-09-fig10.png b/windows/configuration/images/mdt-09-fig10.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig10.png
rename to windows/configuration/images/mdt-09-fig10.png
diff --git a/windows/configure/images/mdt-09-fig11.png b/windows/configuration/images/mdt-09-fig11.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig11.png
rename to windows/configuration/images/mdt-09-fig11.png
diff --git a/windows/configure/images/mdt-09-fig12.png b/windows/configuration/images/mdt-09-fig12.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig12.png
rename to windows/configuration/images/mdt-09-fig12.png
diff --git a/windows/configure/images/mdt-09-fig13.png b/windows/configuration/images/mdt-09-fig13.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig13.png
rename to windows/configuration/images/mdt-09-fig13.png
diff --git a/windows/configure/images/mdt-09-fig14.png b/windows/configuration/images/mdt-09-fig14.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig14.png
rename to windows/configuration/images/mdt-09-fig14.png
diff --git a/windows/configure/images/mdt-09-fig15.png b/windows/configuration/images/mdt-09-fig15.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig15.png
rename to windows/configuration/images/mdt-09-fig15.png
diff --git a/windows/configure/images/mdt-09-fig16.png b/windows/configuration/images/mdt-09-fig16.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig16.png
rename to windows/configuration/images/mdt-09-fig16.png
diff --git a/windows/configure/images/mdt-09-fig17.png b/windows/configuration/images/mdt-09-fig17.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig17.png
rename to windows/configuration/images/mdt-09-fig17.png
diff --git a/windows/configure/images/mdt-09-fig18.png b/windows/configuration/images/mdt-09-fig18.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig18.png
rename to windows/configuration/images/mdt-09-fig18.png
diff --git a/windows/configure/images/mdt-09-fig19.png b/windows/configuration/images/mdt-09-fig19.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig19.png
rename to windows/configuration/images/mdt-09-fig19.png
diff --git a/windows/configure/images/mdt-09-fig20.png b/windows/configuration/images/mdt-09-fig20.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig20.png
rename to windows/configuration/images/mdt-09-fig20.png
diff --git a/windows/configure/images/mdt-09-fig21.png b/windows/configuration/images/mdt-09-fig21.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig21.png
rename to windows/configuration/images/mdt-09-fig21.png
diff --git a/windows/configure/images/mdt-09-fig22.png b/windows/configuration/images/mdt-09-fig22.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig22.png
rename to windows/configuration/images/mdt-09-fig22.png
diff --git a/windows/configure/images/mdt-09-fig23.png b/windows/configuration/images/mdt-09-fig23.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig23.png
rename to windows/configuration/images/mdt-09-fig23.png
diff --git a/windows/configure/images/mdt-09-fig24.png b/windows/configuration/images/mdt-09-fig24.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig24.png
rename to windows/configuration/images/mdt-09-fig24.png
diff --git a/windows/configure/images/mdt-09-fig25.png b/windows/configuration/images/mdt-09-fig25.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig25.png
rename to windows/configuration/images/mdt-09-fig25.png
diff --git a/windows/configure/images/mdt-09-fig26.png b/windows/configuration/images/mdt-09-fig26.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig26.png
rename to windows/configuration/images/mdt-09-fig26.png
diff --git a/windows/configure/images/mdt-09-fig27.png b/windows/configuration/images/mdt-09-fig27.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig27.png
rename to windows/configuration/images/mdt-09-fig27.png
diff --git a/windows/configure/images/mdt-09-fig28.png b/windows/configuration/images/mdt-09-fig28.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig28.png
rename to windows/configuration/images/mdt-09-fig28.png
diff --git a/windows/configure/images/mdt-09-fig29.png b/windows/configuration/images/mdt-09-fig29.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig29.png
rename to windows/configuration/images/mdt-09-fig29.png
diff --git a/windows/configure/images/mdt-09-fig30.png b/windows/configuration/images/mdt-09-fig30.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig30.png
rename to windows/configuration/images/mdt-09-fig30.png
diff --git a/windows/configure/images/mdt-09-fig31.png b/windows/configuration/images/mdt-09-fig31.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig31.png
rename to windows/configuration/images/mdt-09-fig31.png
diff --git a/windows/configure/images/mdt-09-fig32.png b/windows/configuration/images/mdt-09-fig32.png
similarity index 100%
rename from windows/configure/images/mdt-09-fig32.png
rename to windows/configuration/images/mdt-09-fig32.png
diff --git a/windows/configure/images/mdt-10-fig01.png b/windows/configuration/images/mdt-10-fig01.png
similarity index 100%
rename from windows/configure/images/mdt-10-fig01.png
rename to windows/configuration/images/mdt-10-fig01.png
diff --git a/windows/configure/images/mdt-10-fig02.png b/windows/configuration/images/mdt-10-fig02.png
similarity index 100%
rename from windows/configure/images/mdt-10-fig02.png
rename to windows/configuration/images/mdt-10-fig02.png
diff --git a/windows/configure/images/mdt-10-fig03.png b/windows/configuration/images/mdt-10-fig03.png
similarity index 100%
rename from windows/configure/images/mdt-10-fig03.png
rename to windows/configuration/images/mdt-10-fig03.png
diff --git a/windows/configure/images/mdt-10-fig04.png b/windows/configuration/images/mdt-10-fig04.png
similarity index 100%
rename from windows/configure/images/mdt-10-fig04.png
rename to windows/configuration/images/mdt-10-fig04.png
diff --git a/windows/configure/images/mdt-10-fig05.png b/windows/configuration/images/mdt-10-fig05.png
similarity index 100%
rename from windows/configure/images/mdt-10-fig05.png
rename to windows/configuration/images/mdt-10-fig05.png
diff --git a/windows/configure/images/mdt-10-fig06.png b/windows/configuration/images/mdt-10-fig06.png
similarity index 100%
rename from windows/configure/images/mdt-10-fig06.png
rename to windows/configuration/images/mdt-10-fig06.png
diff --git a/windows/configure/images/mdt-10-fig07.png b/windows/configuration/images/mdt-10-fig07.png
similarity index 100%
rename from windows/configure/images/mdt-10-fig07.png
rename to windows/configuration/images/mdt-10-fig07.png
diff --git a/windows/configure/images/mdt-10-fig08.png b/windows/configuration/images/mdt-10-fig08.png
similarity index 100%
rename from windows/configure/images/mdt-10-fig08.png
rename to windows/configuration/images/mdt-10-fig08.png
diff --git a/windows/configure/images/mdt-10-fig09.png b/windows/configuration/images/mdt-10-fig09.png
similarity index 100%
rename from windows/configure/images/mdt-10-fig09.png
rename to windows/configuration/images/mdt-10-fig09.png
diff --git a/windows/configure/images/mdt-11-fig05.png b/windows/configuration/images/mdt-11-fig05.png
similarity index 100%
rename from windows/configure/images/mdt-11-fig05.png
rename to windows/configuration/images/mdt-11-fig05.png
diff --git a/windows/configure/images/mdt-11-fig06.png b/windows/configuration/images/mdt-11-fig06.png
similarity index 100%
rename from windows/configure/images/mdt-11-fig06.png
rename to windows/configuration/images/mdt-11-fig06.png
diff --git a/windows/configure/images/mdt-11-fig07.png b/windows/configuration/images/mdt-11-fig07.png
similarity index 100%
rename from windows/configure/images/mdt-11-fig07.png
rename to windows/configuration/images/mdt-11-fig07.png
diff --git a/windows/configure/images/mdt-11-fig08.png b/windows/configuration/images/mdt-11-fig08.png
similarity index 100%
rename from windows/configure/images/mdt-11-fig08.png
rename to windows/configuration/images/mdt-11-fig08.png
diff --git a/windows/configure/images/mdt-11-fig09.png b/windows/configuration/images/mdt-11-fig09.png
similarity index 100%
rename from windows/configure/images/mdt-11-fig09.png
rename to windows/configuration/images/mdt-11-fig09.png
diff --git a/windows/configure/images/mdt-11-fig10.png b/windows/configuration/images/mdt-11-fig10.png
similarity index 100%
rename from windows/configure/images/mdt-11-fig10.png
rename to windows/configuration/images/mdt-11-fig10.png
diff --git a/windows/configure/images/mdt-11-fig11.png b/windows/configuration/images/mdt-11-fig11.png
similarity index 100%
rename from windows/configure/images/mdt-11-fig11.png
rename to windows/configuration/images/mdt-11-fig11.png
diff --git a/windows/configure/images/mdt-11-fig12.png b/windows/configuration/images/mdt-11-fig12.png
similarity index 100%
rename from windows/configure/images/mdt-11-fig12.png
rename to windows/configuration/images/mdt-11-fig12.png
diff --git a/windows/configure/images/mdt-11-fig13.png b/windows/configuration/images/mdt-11-fig13.png
similarity index 100%
rename from windows/configure/images/mdt-11-fig13.png
rename to windows/configuration/images/mdt-11-fig13.png
diff --git a/windows/configure/images/mdt-11-fig14.png b/windows/configuration/images/mdt-11-fig14.png
similarity index 100%
rename from windows/configure/images/mdt-11-fig14.png
rename to windows/configuration/images/mdt-11-fig14.png
diff --git a/windows/configure/images/mdt-11-fig15.png b/windows/configuration/images/mdt-11-fig15.png
similarity index 100%
rename from windows/configure/images/mdt-11-fig15.png
rename to windows/configuration/images/mdt-11-fig15.png
diff --git a/windows/configure/images/mdt-11-fig16.png b/windows/configuration/images/mdt-11-fig16.png
similarity index 100%
rename from windows/configure/images/mdt-11-fig16.png
rename to windows/configuration/images/mdt-11-fig16.png
diff --git a/windows/configure/images/mobile-start-layout.png b/windows/configuration/images/mobile-start-layout.png
similarity index 100%
rename from windows/configure/images/mobile-start-layout.png
rename to windows/configuration/images/mobile-start-layout.png
diff --git a/windows/configure/images/multi-target.png b/windows/configuration/images/multi-target.png
similarity index 100%
rename from windows/configure/images/multi-target.png
rename to windows/configuration/images/multi-target.png
diff --git a/windows/configure/images/nfc.png b/windows/configuration/images/nfc.png
similarity index 100%
rename from windows/configure/images/nfc.png
rename to windows/configuration/images/nfc.png
diff --git a/windows/configure/images/oma-uri-shared-pc.png b/windows/configuration/images/oma-uri-shared-pc.png
similarity index 100%
rename from windows/configure/images/oma-uri-shared-pc.png
rename to windows/configuration/images/oma-uri-shared-pc.png
diff --git a/windows/configure/images/one.png b/windows/configuration/images/one.png
similarity index 100%
rename from windows/configure/images/one.png
rename to windows/configuration/images/one.png
diff --git a/windows/configure/images/oobe.jpg b/windows/configuration/images/oobe.jpg
similarity index 100%
rename from windows/configure/images/oobe.jpg
rename to windows/configuration/images/oobe.jpg
diff --git a/windows/configure/images/package-trust.png b/windows/configuration/images/package-trust.png
similarity index 100%
rename from windows/configure/images/package-trust.png
rename to windows/configuration/images/package-trust.png
diff --git a/windows/configure/images/package.png b/windows/configuration/images/package.png
similarity index 100%
rename from windows/configure/images/package.png
rename to windows/configuration/images/package.png
diff --git a/windows/manage/images/packageaddfileandregistrydata-global.png b/windows/configuration/images/packageaddfileandregistrydata-global.png
similarity index 100%
rename from windows/manage/images/packageaddfileandregistrydata-global.png
rename to windows/configuration/images/packageaddfileandregistrydata-global.png
diff --git a/windows/manage/images/packageaddfileandregistrydata-stream.png b/windows/configuration/images/packageaddfileandregistrydata-stream.png
similarity index 100%
rename from windows/manage/images/packageaddfileandregistrydata-stream.png
rename to windows/configuration/images/packageaddfileandregistrydata-stream.png
diff --git a/windows/manage/images/packageaddfileandregistrydata.png b/windows/configuration/images/packageaddfileandregistrydata.png
similarity index 100%
rename from windows/manage/images/packageaddfileandregistrydata.png
rename to windows/configuration/images/packageaddfileandregistrydata.png
diff --git a/windows/configure/images/packages-mobile.png b/windows/configuration/images/packages-mobile.png
similarity index 100%
rename from windows/configure/images/packages-mobile.png
rename to windows/configuration/images/packages-mobile.png
diff --git a/windows/configure/images/phoneprovision.png b/windows/configuration/images/phoneprovision.png
similarity index 100%
rename from windows/configure/images/phoneprovision.png
rename to windows/configuration/images/phoneprovision.png
diff --git a/windows/configure/images/policytocsp.png b/windows/configuration/images/policytocsp.png
similarity index 100%
rename from windows/configure/images/policytocsp.png
rename to windows/configuration/images/policytocsp.png
diff --git a/windows/configure/images/powericon.png b/windows/configuration/images/powericon.png
similarity index 100%
rename from windows/configure/images/powericon.png
rename to windows/configuration/images/powericon.png
diff --git a/windows/configure/images/priv-telemetry-levels.png b/windows/configuration/images/priv-telemetry-levels.png
similarity index 100%
rename from windows/configure/images/priv-telemetry-levels.png
rename to windows/configuration/images/priv-telemetry-levels.png
diff --git a/windows/configure/images/prov.jpg b/windows/configuration/images/prov.jpg
similarity index 100%
rename from windows/configure/images/prov.jpg
rename to windows/configuration/images/prov.jpg
diff --git a/windows/configure/images/provisioning-csp-assignedaccess.png b/windows/configuration/images/provisioning-csp-assignedaccess.png
similarity index 100%
rename from windows/configure/images/provisioning-csp-assignedaccess.png
rename to windows/configuration/images/provisioning-csp-assignedaccess.png
diff --git a/windows/manage/images/rdp.png b/windows/configuration/images/rdp.png
similarity index 100%
rename from windows/manage/images/rdp.png
rename to windows/configuration/images/rdp.png
diff --git a/windows/configure/images/resetdevice.png b/windows/configuration/images/resetdevice.png
similarity index 100%
rename from windows/configure/images/resetdevice.png
rename to windows/configuration/images/resetdevice.png
diff --git a/windows/configure/images/scanos.PNG b/windows/configuration/images/scanos.PNG
similarity index 100%
rename from windows/configure/images/scanos.PNG
rename to windows/configuration/images/scanos.PNG
diff --git a/windows/configure/images/sccm-asset.PNG b/windows/configuration/images/sccm-asset.PNG
similarity index 100%
rename from windows/configure/images/sccm-asset.PNG
rename to windows/configuration/images/sccm-asset.PNG
diff --git a/windows/configure/images/sccm-assets.PNG b/windows/configuration/images/sccm-assets.PNG
similarity index 100%
rename from windows/configure/images/sccm-assets.PNG
rename to windows/configuration/images/sccm-assets.PNG
diff --git a/windows/configure/images/sccm-client.PNG b/windows/configuration/images/sccm-client.PNG
similarity index 100%
rename from windows/configure/images/sccm-client.PNG
rename to windows/configuration/images/sccm-client.PNG
diff --git a/windows/configure/images/sccm-collection.PNG b/windows/configuration/images/sccm-collection.PNG
similarity index 100%
rename from windows/configure/images/sccm-collection.PNG
rename to windows/configuration/images/sccm-collection.PNG
diff --git a/windows/configure/images/sccm-install-os.PNG b/windows/configuration/images/sccm-install-os.PNG
similarity index 100%
rename from windows/configure/images/sccm-install-os.PNG
rename to windows/configuration/images/sccm-install-os.PNG
diff --git a/windows/configure/images/sccm-post-refresh.PNG b/windows/configuration/images/sccm-post-refresh.PNG
similarity index 100%
rename from windows/configure/images/sccm-post-refresh.PNG
rename to windows/configuration/images/sccm-post-refresh.PNG
diff --git a/windows/configure/images/sccm-pxe.PNG b/windows/configuration/images/sccm-pxe.PNG
similarity index 100%
rename from windows/configure/images/sccm-pxe.PNG
rename to windows/configuration/images/sccm-pxe.PNG
diff --git a/windows/configure/images/sccm-site.PNG b/windows/configuration/images/sccm-site.PNG
similarity index 100%
rename from windows/configure/images/sccm-site.PNG
rename to windows/configuration/images/sccm-site.PNG
diff --git a/windows/configure/images/sccm-software-cntr.PNG b/windows/configuration/images/sccm-software-cntr.PNG
similarity index 100%
rename from windows/configure/images/sccm-software-cntr.PNG
rename to windows/configuration/images/sccm-software-cntr.PNG
diff --git a/windows/configure/images/sec-bios.png b/windows/configuration/images/sec-bios.png
similarity index 100%
rename from windows/configure/images/sec-bios.png
rename to windows/configuration/images/sec-bios.png
diff --git a/windows/configure/images/set-up-device-details-desktop.PNG b/windows/configuration/images/set-up-device-details-desktop.PNG
similarity index 100%
rename from windows/configure/images/set-up-device-details-desktop.PNG
rename to windows/configuration/images/set-up-device-details-desktop.PNG
diff --git a/windows/configure/images/set-up-device-details-mobile.PNG b/windows/configuration/images/set-up-device-details-mobile.PNG
similarity index 100%
rename from windows/configure/images/set-up-device-details-mobile.PNG
rename to windows/configuration/images/set-up-device-details-mobile.PNG
diff --git a/windows/configure/images/set-up-device-details.PNG b/windows/configuration/images/set-up-device-details.PNG
similarity index 100%
rename from windows/configure/images/set-up-device-details.PNG
rename to windows/configuration/images/set-up-device-details.PNG
diff --git a/windows/configure/images/set-up-device-mobile.PNG b/windows/configuration/images/set-up-device-mobile.PNG
similarity index 100%
rename from windows/configure/images/set-up-device-mobile.PNG
rename to windows/configuration/images/set-up-device-mobile.PNG
diff --git a/windows/configure/images/set-up-device.PNG b/windows/configuration/images/set-up-device.PNG
similarity index 100%
rename from windows/configure/images/set-up-device.PNG
rename to windows/configuration/images/set-up-device.PNG
diff --git a/windows/configure/images/set-up-network-details-desktop.PNG b/windows/configuration/images/set-up-network-details-desktop.PNG
similarity index 100%
rename from windows/configure/images/set-up-network-details-desktop.PNG
rename to windows/configuration/images/set-up-network-details-desktop.PNG
diff --git a/windows/configure/images/set-up-network-details-mobile.PNG b/windows/configuration/images/set-up-network-details-mobile.PNG
similarity index 100%
rename from windows/configure/images/set-up-network-details-mobile.PNG
rename to windows/configuration/images/set-up-network-details-mobile.PNG
diff --git a/windows/configure/images/set-up-network-details.PNG b/windows/configuration/images/set-up-network-details.PNG
similarity index 100%
rename from windows/configure/images/set-up-network-details.PNG
rename to windows/configuration/images/set-up-network-details.PNG
diff --git a/windows/configure/images/set-up-network-mobile.PNG b/windows/configuration/images/set-up-network-mobile.PNG
similarity index 100%
rename from windows/configure/images/set-up-network-mobile.PNG
rename to windows/configuration/images/set-up-network-mobile.PNG
diff --git a/windows/configure/images/set-up-network.PNG b/windows/configuration/images/set-up-network.PNG
similarity index 100%
rename from windows/configure/images/set-up-network.PNG
rename to windows/configuration/images/set-up-network.PNG
diff --git a/windows/configure/images/settings-table.png b/windows/configuration/images/settings-table.png
similarity index 100%
rename from windows/configure/images/settings-table.png
rename to windows/configuration/images/settings-table.png
diff --git a/windows/configure/images/settingsicon.png b/windows/configuration/images/settingsicon.png
similarity index 100%
rename from windows/configure/images/settingsicon.png
rename to windows/configuration/images/settingsicon.png
diff --git a/windows/configure/images/setupmsg.jpg b/windows/configuration/images/setupmsg.jpg
similarity index 100%
rename from windows/configure/images/setupmsg.jpg
rename to windows/configuration/images/setupmsg.jpg
diff --git a/windows/configure/images/seven.png b/windows/configuration/images/seven.png
similarity index 100%
rename from windows/configure/images/seven.png
rename to windows/configuration/images/seven.png
diff --git a/windows/configure/images/show-more-tiles.png b/windows/configuration/images/show-more-tiles.png
similarity index 100%
rename from windows/configure/images/show-more-tiles.png
rename to windows/configuration/images/show-more-tiles.png
diff --git a/windows/configure/images/sign-in-prov.png b/windows/configuration/images/sign-in-prov.png
similarity index 100%
rename from windows/configure/images/sign-in-prov.png
rename to windows/configuration/images/sign-in-prov.png
diff --git a/windows/configure/images/six.png b/windows/configuration/images/six.png
similarity index 100%
rename from windows/configure/images/six.png
rename to windows/configuration/images/six.png
diff --git a/windows/configure/images/spotlight.png b/windows/configuration/images/spotlight.png
similarity index 100%
rename from windows/configure/images/spotlight.png
rename to windows/configuration/images/spotlight.png
diff --git a/windows/configure/images/spotlight2.png b/windows/configuration/images/spotlight2.png
similarity index 100%
rename from windows/configure/images/spotlight2.png
rename to windows/configuration/images/spotlight2.png
diff --git a/windows/configure/images/start-pinned-app.png b/windows/configuration/images/start-pinned-app.png
similarity index 100%
rename from windows/configure/images/start-pinned-app.png
rename to windows/configuration/images/start-pinned-app.png
diff --git a/windows/configure/images/start-screen-size.png b/windows/configuration/images/start-screen-size.png
similarity index 100%
rename from windows/configure/images/start-screen-size.png
rename to windows/configuration/images/start-screen-size.png
diff --git a/windows/configure/images/startannotated.png b/windows/configuration/images/startannotated.png
similarity index 100%
rename from windows/configure/images/startannotated.png
rename to windows/configuration/images/startannotated.png
diff --git a/windows/configure/images/starticon.png b/windows/configuration/images/starticon.png
similarity index 100%
rename from windows/configure/images/starticon.png
rename to windows/configuration/images/starticon.png
diff --git a/windows/configure/images/startlayoutpolicy.jpg b/windows/configuration/images/startlayoutpolicy.jpg
similarity index 100%
rename from windows/configure/images/startlayoutpolicy.jpg
rename to windows/configuration/images/startlayoutpolicy.jpg
diff --git a/windows/configure/images/starttemplate.jpg b/windows/configuration/images/starttemplate.jpg
similarity index 100%
rename from windows/configure/images/starttemplate.jpg
rename to windows/configuration/images/starttemplate.jpg
diff --git a/windows/configure/images/svr_mgr2.png b/windows/configuration/images/svr_mgr2.png
similarity index 100%
rename from windows/configure/images/svr_mgr2.png
rename to windows/configuration/images/svr_mgr2.png
diff --git a/windows/manage/images/sysprep-error.png b/windows/configuration/images/sysprep-error.png
similarity index 100%
rename from windows/manage/images/sysprep-error.png
rename to windows/configuration/images/sysprep-error.png
diff --git a/windows/configure/images/taskbar-blank.png b/windows/configuration/images/taskbar-blank.png
similarity index 100%
rename from windows/configure/images/taskbar-blank.png
rename to windows/configuration/images/taskbar-blank.png
diff --git a/windows/configure/images/taskbar-default-plus.png b/windows/configuration/images/taskbar-default-plus.png
similarity index 100%
rename from windows/configure/images/taskbar-default-plus.png
rename to windows/configuration/images/taskbar-default-plus.png
diff --git a/windows/configure/images/taskbar-default-removed.png b/windows/configuration/images/taskbar-default-removed.png
similarity index 100%
rename from windows/configure/images/taskbar-default-removed.png
rename to windows/configuration/images/taskbar-default-removed.png
diff --git a/windows/configure/images/taskbar-default.png b/windows/configuration/images/taskbar-default.png
similarity index 100%
rename from windows/configure/images/taskbar-default.png
rename to windows/configuration/images/taskbar-default.png
diff --git a/windows/configure/images/taskbar-generic.png b/windows/configuration/images/taskbar-generic.png
similarity index 100%
rename from windows/configure/images/taskbar-generic.png
rename to windows/configuration/images/taskbar-generic.png
diff --git a/windows/configure/images/taskbar-region-defr.png b/windows/configuration/images/taskbar-region-defr.png
similarity index 100%
rename from windows/configure/images/taskbar-region-defr.png
rename to windows/configuration/images/taskbar-region-defr.png
diff --git a/windows/configure/images/taskbar-region-other.png b/windows/configuration/images/taskbar-region-other.png
similarity index 100%
rename from windows/configure/images/taskbar-region-other.png
rename to windows/configuration/images/taskbar-region-other.png
diff --git a/windows/configure/images/taskbar-region-usuk.png b/windows/configuration/images/taskbar-region-usuk.png
similarity index 100%
rename from windows/configure/images/taskbar-region-usuk.png
rename to windows/configuration/images/taskbar-region-usuk.png
diff --git a/windows/configure/images/taskbarSTARTERBLANK.png b/windows/configuration/images/taskbarSTARTERBLANK.png
similarity index 100%
rename from windows/configure/images/taskbarSTARTERBLANK.png
rename to windows/configuration/images/taskbarSTARTERBLANK.png
diff --git a/windows/configure/images/three.png b/windows/configuration/images/three.png
similarity index 100%
rename from windows/configure/images/three.png
rename to windows/configuration/images/three.png
diff --git a/windows/configure/images/trust-package.png b/windows/configuration/images/trust-package.png
similarity index 100%
rename from windows/configure/images/trust-package.png
rename to windows/configuration/images/trust-package.png
diff --git a/windows/configure/images/twain.png b/windows/configuration/images/twain.png
similarity index 100%
rename from windows/configure/images/twain.png
rename to windows/configuration/images/twain.png
diff --git a/windows/configure/images/two.png b/windows/configuration/images/two.png
similarity index 100%
rename from windows/configure/images/two.png
rename to windows/configuration/images/two.png
diff --git a/windows/configure/images/ua-cg-01.png b/windows/configuration/images/ua-cg-01.png
similarity index 100%
rename from windows/configure/images/ua-cg-01.png
rename to windows/configuration/images/ua-cg-01.png
diff --git a/windows/configure/images/ua-cg-02.png b/windows/configuration/images/ua-cg-02.png
similarity index 100%
rename from windows/configure/images/ua-cg-02.png
rename to windows/configuration/images/ua-cg-02.png
diff --git a/windows/configure/images/ua-cg-03.png b/windows/configuration/images/ua-cg-03.png
similarity index 100%
rename from windows/configure/images/ua-cg-03.png
rename to windows/configuration/images/ua-cg-03.png
diff --git a/windows/configure/images/ua-cg-04.png b/windows/configuration/images/ua-cg-04.png
similarity index 100%
rename from windows/configure/images/ua-cg-04.png
rename to windows/configuration/images/ua-cg-04.png
diff --git a/windows/configure/images/ua-cg-05.png b/windows/configuration/images/ua-cg-05.png
similarity index 100%
rename from windows/configure/images/ua-cg-05.png
rename to windows/configuration/images/ua-cg-05.png
diff --git a/windows/configure/images/ua-cg-06.png b/windows/configuration/images/ua-cg-06.png
similarity index 100%
rename from windows/configure/images/ua-cg-06.png
rename to windows/configuration/images/ua-cg-06.png
diff --git a/windows/configure/images/ua-cg-07.png b/windows/configuration/images/ua-cg-07.png
similarity index 100%
rename from windows/configure/images/ua-cg-07.png
rename to windows/configuration/images/ua-cg-07.png
diff --git a/windows/configure/images/ua-cg-08.png b/windows/configuration/images/ua-cg-08.png
similarity index 100%
rename from windows/configure/images/ua-cg-08.png
rename to windows/configuration/images/ua-cg-08.png
diff --git a/windows/configure/images/ua-cg-09.png b/windows/configuration/images/ua-cg-09.png
similarity index 100%
rename from windows/configure/images/ua-cg-09.png
rename to windows/configuration/images/ua-cg-09.png
diff --git a/windows/configure/images/ua-cg-10.png b/windows/configuration/images/ua-cg-10.png
similarity index 100%
rename from windows/configure/images/ua-cg-10.png
rename to windows/configuration/images/ua-cg-10.png
diff --git a/windows/configure/images/ua-cg-11.png b/windows/configuration/images/ua-cg-11.png
similarity index 100%
rename from windows/configure/images/ua-cg-11.png
rename to windows/configuration/images/ua-cg-11.png
diff --git a/windows/configure/images/ua-cg-12.png b/windows/configuration/images/ua-cg-12.png
similarity index 100%
rename from windows/configure/images/ua-cg-12.png
rename to windows/configuration/images/ua-cg-12.png
diff --git a/windows/configure/images/ua-cg-13.png b/windows/configuration/images/ua-cg-13.png
similarity index 100%
rename from windows/configure/images/ua-cg-13.png
rename to windows/configuration/images/ua-cg-13.png
diff --git a/windows/configure/images/ua-cg-14.png b/windows/configuration/images/ua-cg-14.png
similarity index 100%
rename from windows/configure/images/ua-cg-14.png
rename to windows/configuration/images/ua-cg-14.png
diff --git a/windows/configure/images/ua-cg-15.png b/windows/configuration/images/ua-cg-15.png
similarity index 100%
rename from windows/configure/images/ua-cg-15.png
rename to windows/configuration/images/ua-cg-15.png
diff --git a/windows/configure/images/ua-cg-16.png b/windows/configuration/images/ua-cg-16.png
similarity index 100%
rename from windows/configure/images/ua-cg-16.png
rename to windows/configuration/images/ua-cg-16.png
diff --git a/windows/configure/images/ua-cg-17.png b/windows/configuration/images/ua-cg-17.png
similarity index 100%
rename from windows/configure/images/ua-cg-17.png
rename to windows/configuration/images/ua-cg-17.png
diff --git a/windows/configure/images/uc-01.png b/windows/configuration/images/uc-01.png
similarity index 100%
rename from windows/configure/images/uc-01.png
rename to windows/configuration/images/uc-01.png
diff --git a/windows/configure/images/uc-02.png b/windows/configuration/images/uc-02.png
similarity index 100%
rename from windows/configure/images/uc-02.png
rename to windows/configuration/images/uc-02.png
diff --git a/windows/configure/images/uc-02a.png b/windows/configuration/images/uc-02a.png
similarity index 100%
rename from windows/configure/images/uc-02a.png
rename to windows/configuration/images/uc-02a.png
diff --git a/windows/configure/images/uc-03.png b/windows/configuration/images/uc-03.png
similarity index 100%
rename from windows/configure/images/uc-03.png
rename to windows/configuration/images/uc-03.png
diff --git a/windows/configure/images/uc-03a.png b/windows/configuration/images/uc-03a.png
similarity index 100%
rename from windows/configure/images/uc-03a.png
rename to windows/configuration/images/uc-03a.png
diff --git a/windows/configure/images/uc-04.png b/windows/configuration/images/uc-04.png
similarity index 100%
rename from windows/configure/images/uc-04.png
rename to windows/configuration/images/uc-04.png
diff --git a/windows/configure/images/uc-04a.png b/windows/configuration/images/uc-04a.png
similarity index 100%
rename from windows/configure/images/uc-04a.png
rename to windows/configuration/images/uc-04a.png
diff --git a/windows/configure/images/uc-05.png b/windows/configuration/images/uc-05.png
similarity index 100%
rename from windows/configure/images/uc-05.png
rename to windows/configuration/images/uc-05.png
diff --git a/windows/configure/images/uc-05a.png b/windows/configuration/images/uc-05a.png
similarity index 100%
rename from windows/configure/images/uc-05a.png
rename to windows/configuration/images/uc-05a.png
diff --git a/windows/configure/images/uc-06.png b/windows/configuration/images/uc-06.png
similarity index 100%
rename from windows/configure/images/uc-06.png
rename to windows/configuration/images/uc-06.png
diff --git a/windows/configure/images/uc-06a.png b/windows/configuration/images/uc-06a.png
similarity index 100%
rename from windows/configure/images/uc-06a.png
rename to windows/configuration/images/uc-06a.png
diff --git a/windows/configure/images/uc-07.png b/windows/configuration/images/uc-07.png
similarity index 100%
rename from windows/configure/images/uc-07.png
rename to windows/configuration/images/uc-07.png
diff --git a/windows/configure/images/uc-07a.png b/windows/configuration/images/uc-07a.png
similarity index 100%
rename from windows/configure/images/uc-07a.png
rename to windows/configuration/images/uc-07a.png
diff --git a/windows/configure/images/uc-08.png b/windows/configuration/images/uc-08.png
similarity index 100%
rename from windows/configure/images/uc-08.png
rename to windows/configuration/images/uc-08.png
diff --git a/windows/configure/images/uc-08a.png b/windows/configuration/images/uc-08a.png
similarity index 100%
rename from windows/configure/images/uc-08a.png
rename to windows/configuration/images/uc-08a.png
diff --git a/windows/configure/images/uc-09.png b/windows/configuration/images/uc-09.png
similarity index 100%
rename from windows/configure/images/uc-09.png
rename to windows/configuration/images/uc-09.png
diff --git a/windows/configure/images/uc-09a.png b/windows/configuration/images/uc-09a.png
similarity index 100%
rename from windows/configure/images/uc-09a.png
rename to windows/configuration/images/uc-09a.png
diff --git a/windows/configure/images/uc-10.png b/windows/configuration/images/uc-10.png
similarity index 100%
rename from windows/configure/images/uc-10.png
rename to windows/configuration/images/uc-10.png
diff --git a/windows/configure/images/uc-10a.png b/windows/configuration/images/uc-10a.png
similarity index 100%
rename from windows/configure/images/uc-10a.png
rename to windows/configuration/images/uc-10a.png
diff --git a/windows/configure/images/uc-11.png b/windows/configuration/images/uc-11.png
similarity index 100%
rename from windows/configure/images/uc-11.png
rename to windows/configuration/images/uc-11.png
diff --git a/windows/configure/images/uc-12.png b/windows/configuration/images/uc-12.png
similarity index 100%
rename from windows/configure/images/uc-12.png
rename to windows/configuration/images/uc-12.png
diff --git a/windows/configure/images/uc-13.png b/windows/configuration/images/uc-13.png
similarity index 100%
rename from windows/configure/images/uc-13.png
rename to windows/configuration/images/uc-13.png
diff --git a/windows/configure/images/uc-14.png b/windows/configuration/images/uc-14.png
similarity index 100%
rename from windows/configure/images/uc-14.png
rename to windows/configuration/images/uc-14.png
diff --git a/windows/configure/images/uc-15.png b/windows/configuration/images/uc-15.png
similarity index 100%
rename from windows/configure/images/uc-15.png
rename to windows/configuration/images/uc-15.png
diff --git a/windows/configure/images/uc-16.png b/windows/configuration/images/uc-16.png
similarity index 100%
rename from windows/configure/images/uc-16.png
rename to windows/configuration/images/uc-16.png
diff --git a/windows/configure/images/uc-17.png b/windows/configuration/images/uc-17.png
similarity index 100%
rename from windows/configure/images/uc-17.png
rename to windows/configuration/images/uc-17.png
diff --git a/windows/configure/images/uc-18.png b/windows/configuration/images/uc-18.png
similarity index 100%
rename from windows/configure/images/uc-18.png
rename to windows/configuration/images/uc-18.png
diff --git a/windows/configure/images/uc-19.png b/windows/configuration/images/uc-19.png
similarity index 100%
rename from windows/configure/images/uc-19.png
rename to windows/configuration/images/uc-19.png
diff --git a/windows/configure/images/uc-20.png b/windows/configuration/images/uc-20.png
similarity index 100%
rename from windows/configure/images/uc-20.png
rename to windows/configuration/images/uc-20.png
diff --git a/windows/configure/images/uc-21.png b/windows/configuration/images/uc-21.png
similarity index 100%
rename from windows/configure/images/uc-21.png
rename to windows/configuration/images/uc-21.png
diff --git a/windows/configure/images/uc-22.png b/windows/configuration/images/uc-22.png
similarity index 100%
rename from windows/configure/images/uc-22.png
rename to windows/configuration/images/uc-22.png
diff --git a/windows/configure/images/uc-23.png b/windows/configuration/images/uc-23.png
similarity index 100%
rename from windows/configure/images/uc-23.png
rename to windows/configuration/images/uc-23.png
diff --git a/windows/configure/images/uc-24.png b/windows/configuration/images/uc-24.png
similarity index 100%
rename from windows/configure/images/uc-24.png
rename to windows/configuration/images/uc-24.png
diff --git a/windows/configure/images/uc-25.png b/windows/configuration/images/uc-25.png
similarity index 100%
rename from windows/configure/images/uc-25.png
rename to windows/configuration/images/uc-25.png
diff --git a/windows/configure/images/upgrade-analytics-apps-known-issues.png b/windows/configuration/images/upgrade-analytics-apps-known-issues.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-apps-known-issues.png
rename to windows/configuration/images/upgrade-analytics-apps-known-issues.png
diff --git a/windows/configure/images/upgrade-analytics-apps-no-known-issues.png b/windows/configuration/images/upgrade-analytics-apps-no-known-issues.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-apps-no-known-issues.png
rename to windows/configuration/images/upgrade-analytics-apps-no-known-issues.png
diff --git a/windows/configure/images/upgrade-analytics-architecture.png b/windows/configuration/images/upgrade-analytics-architecture.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-architecture.png
rename to windows/configuration/images/upgrade-analytics-architecture.png
diff --git a/windows/configure/images/upgrade-analytics-create-iedataoptin.png b/windows/configuration/images/upgrade-analytics-create-iedataoptin.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-create-iedataoptin.png
rename to windows/configuration/images/upgrade-analytics-create-iedataoptin.png
diff --git a/windows/configure/images/upgrade-analytics-deploy-eligible.png b/windows/configuration/images/upgrade-analytics-deploy-eligible.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-deploy-eligible.png
rename to windows/configuration/images/upgrade-analytics-deploy-eligible.png
diff --git a/windows/configure/images/upgrade-analytics-drivers-known.png b/windows/configuration/images/upgrade-analytics-drivers-known.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-drivers-known.png
rename to windows/configuration/images/upgrade-analytics-drivers-known.png
diff --git a/windows/configure/images/upgrade-analytics-most-active-sites.png b/windows/configuration/images/upgrade-analytics-most-active-sites.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-most-active-sites.png
rename to windows/configuration/images/upgrade-analytics-most-active-sites.png
diff --git a/windows/configure/images/upgrade-analytics-namepub-rollup.PNG b/windows/configuration/images/upgrade-analytics-namepub-rollup.PNG
similarity index 100%
rename from windows/configure/images/upgrade-analytics-namepub-rollup.PNG
rename to windows/configuration/images/upgrade-analytics-namepub-rollup.PNG
diff --git a/windows/configure/images/upgrade-analytics-overview.png b/windows/configuration/images/upgrade-analytics-overview.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-overview.png
rename to windows/configuration/images/upgrade-analytics-overview.png
diff --git a/windows/configure/images/upgrade-analytics-pilot.png b/windows/configuration/images/upgrade-analytics-pilot.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-pilot.png
rename to windows/configuration/images/upgrade-analytics-pilot.png
diff --git a/windows/configure/images/upgrade-analytics-prioritize.png b/windows/configuration/images/upgrade-analytics-prioritize.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-prioritize.png
rename to windows/configuration/images/upgrade-analytics-prioritize.png
diff --git a/windows/configure/images/upgrade-analytics-query-activex-name.png b/windows/configuration/images/upgrade-analytics-query-activex-name.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-query-activex-name.png
rename to windows/configuration/images/upgrade-analytics-query-activex-name.png
diff --git a/windows/configure/images/upgrade-analytics-ready-for-windows-status-guidance-precedence.PNG b/windows/configuration/images/upgrade-analytics-ready-for-windows-status-guidance-precedence.PNG
similarity index 100%
rename from windows/configure/images/upgrade-analytics-ready-for-windows-status-guidance-precedence.PNG
rename to windows/configuration/images/upgrade-analytics-ready-for-windows-status-guidance-precedence.PNG
diff --git a/windows/configure/images/upgrade-analytics-ready-for-windows-status.PNG b/windows/configuration/images/upgrade-analytics-ready-for-windows-status.PNG
similarity index 100%
rename from windows/configure/images/upgrade-analytics-ready-for-windows-status.PNG
rename to windows/configuration/images/upgrade-analytics-ready-for-windows-status.PNG
diff --git a/windows/configure/images/upgrade-analytics-site-activity-by-doc-mode.png b/windows/configuration/images/upgrade-analytics-site-activity-by-doc-mode.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-site-activity-by-doc-mode.png
rename to windows/configuration/images/upgrade-analytics-site-activity-by-doc-mode.png
diff --git a/windows/configure/images/upgrade-analytics-site-domain-detail.png b/windows/configuration/images/upgrade-analytics-site-domain-detail.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-site-domain-detail.png
rename to windows/configuration/images/upgrade-analytics-site-domain-detail.png
diff --git a/windows/configure/images/upgrade-analytics-telemetry.png b/windows/configuration/images/upgrade-analytics-telemetry.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-telemetry.png
rename to windows/configuration/images/upgrade-analytics-telemetry.png
diff --git a/windows/configure/images/upgrade-analytics-unsubscribe.png b/windows/configuration/images/upgrade-analytics-unsubscribe.png
similarity index 100%
rename from windows/configure/images/upgrade-analytics-unsubscribe.png
rename to windows/configuration/images/upgrade-analytics-unsubscribe.png
diff --git a/windows/configure/images/upgrade-process.png b/windows/configuration/images/upgrade-process.png
similarity index 100%
rename from windows/configure/images/upgrade-process.png
rename to windows/configuration/images/upgrade-process.png
diff --git a/windows/configure/images/upgradecfg-fig2-upgrading.png b/windows/configuration/images/upgradecfg-fig2-upgrading.png
similarity index 100%
rename from windows/configure/images/upgradecfg-fig2-upgrading.png
rename to windows/configuration/images/upgradecfg-fig2-upgrading.png
diff --git a/windows/configure/images/upgradecfg-fig3-upgrade.png b/windows/configuration/images/upgradecfg-fig3-upgrade.png
similarity index 100%
rename from windows/configure/images/upgradecfg-fig3-upgrade.png
rename to windows/configuration/images/upgradecfg-fig3-upgrade.png
diff --git a/windows/configure/images/upgrademdt-fig1-machines.png b/windows/configuration/images/upgrademdt-fig1-machines.png
similarity index 100%
rename from windows/configure/images/upgrademdt-fig1-machines.png
rename to windows/configuration/images/upgrademdt-fig1-machines.png
diff --git a/windows/configure/images/upgrademdt-fig2-importedos.png b/windows/configuration/images/upgrademdt-fig2-importedos.png
similarity index 100%
rename from windows/configure/images/upgrademdt-fig2-importedos.png
rename to windows/configuration/images/upgrademdt-fig2-importedos.png
diff --git a/windows/configure/images/upgrademdt-fig3-tasksequence.png b/windows/configuration/images/upgrademdt-fig3-tasksequence.png
similarity index 100%
rename from windows/configure/images/upgrademdt-fig3-tasksequence.png
rename to windows/configuration/images/upgrademdt-fig3-tasksequence.png
diff --git a/windows/configure/images/upgrademdt-fig4-selecttask.png b/windows/configuration/images/upgrademdt-fig4-selecttask.png
similarity index 100%
rename from windows/configure/images/upgrademdt-fig4-selecttask.png
rename to windows/configuration/images/upgrademdt-fig4-selecttask.png
diff --git a/windows/configure/images/upgrademdt-fig5-winupgrade.png b/windows/configuration/images/upgrademdt-fig5-winupgrade.png
similarity index 100%
rename from windows/configure/images/upgrademdt-fig5-winupgrade.png
rename to windows/configuration/images/upgrademdt-fig5-winupgrade.png
diff --git a/windows/configure/images/uwp-dependencies.PNG b/windows/configuration/images/uwp-dependencies.PNG
similarity index 100%
rename from windows/configure/images/uwp-dependencies.PNG
rename to windows/configuration/images/uwp-dependencies.PNG
diff --git a/windows/configure/images/uwp-family.PNG b/windows/configuration/images/uwp-family.PNG
similarity index 100%
rename from windows/configure/images/uwp-family.PNG
rename to windows/configuration/images/uwp-family.PNG
diff --git a/windows/configure/images/uwp-license.PNG b/windows/configuration/images/uwp-license.PNG
similarity index 100%
rename from windows/configure/images/uwp-license.PNG
rename to windows/configuration/images/uwp-license.PNG
diff --git a/windows/configure/images/vamtuserinterfaceupdated.jpg b/windows/configuration/images/vamtuserinterfaceupdated.jpg
similarity index 100%
rename from windows/configure/images/vamtuserinterfaceupdated.jpg
rename to windows/configuration/images/vamtuserinterfaceupdated.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-01.jpg b/windows/configuration/images/volumeactivationforwindows81-01.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-01.jpg
rename to windows/configuration/images/volumeactivationforwindows81-01.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-02.jpg b/windows/configuration/images/volumeactivationforwindows81-02.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-02.jpg
rename to windows/configuration/images/volumeactivationforwindows81-02.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-03.jpg b/windows/configuration/images/volumeactivationforwindows81-03.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-03.jpg
rename to windows/configuration/images/volumeactivationforwindows81-03.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-04.jpg b/windows/configuration/images/volumeactivationforwindows81-04.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-04.jpg
rename to windows/configuration/images/volumeactivationforwindows81-04.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-05.jpg b/windows/configuration/images/volumeactivationforwindows81-05.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-05.jpg
rename to windows/configuration/images/volumeactivationforwindows81-05.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-06.jpg b/windows/configuration/images/volumeactivationforwindows81-06.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-06.jpg
rename to windows/configuration/images/volumeactivationforwindows81-06.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-07.jpg b/windows/configuration/images/volumeactivationforwindows81-07.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-07.jpg
rename to windows/configuration/images/volumeactivationforwindows81-07.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-08.jpg b/windows/configuration/images/volumeactivationforwindows81-08.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-08.jpg
rename to windows/configuration/images/volumeactivationforwindows81-08.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-09.jpg b/windows/configuration/images/volumeactivationforwindows81-09.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-09.jpg
rename to windows/configuration/images/volumeactivationforwindows81-09.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-10.jpg b/windows/configuration/images/volumeactivationforwindows81-10.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-10.jpg
rename to windows/configuration/images/volumeactivationforwindows81-10.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-11.jpg b/windows/configuration/images/volumeactivationforwindows81-11.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-11.jpg
rename to windows/configuration/images/volumeactivationforwindows81-11.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-12.jpg b/windows/configuration/images/volumeactivationforwindows81-12.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-12.jpg
rename to windows/configuration/images/volumeactivationforwindows81-12.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-13.jpg b/windows/configuration/images/volumeactivationforwindows81-13.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-13.jpg
rename to windows/configuration/images/volumeactivationforwindows81-13.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-14.jpg b/windows/configuration/images/volumeactivationforwindows81-14.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-14.jpg
rename to windows/configuration/images/volumeactivationforwindows81-14.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-15.jpg b/windows/configuration/images/volumeactivationforwindows81-15.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-15.jpg
rename to windows/configuration/images/volumeactivationforwindows81-15.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-16.jpg b/windows/configuration/images/volumeactivationforwindows81-16.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-16.jpg
rename to windows/configuration/images/volumeactivationforwindows81-16.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-17.jpg b/windows/configuration/images/volumeactivationforwindows81-17.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-17.jpg
rename to windows/configuration/images/volumeactivationforwindows81-17.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-18.jpg b/windows/configuration/images/volumeactivationforwindows81-18.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-18.jpg
rename to windows/configuration/images/volumeactivationforwindows81-18.jpg
diff --git a/windows/configure/images/volumeactivationforwindows81-19.jpg b/windows/configuration/images/volumeactivationforwindows81-19.jpg
similarity index 100%
rename from windows/configure/images/volumeactivationforwindows81-19.jpg
rename to windows/configuration/images/volumeactivationforwindows81-19.jpg
diff --git a/windows/configure/images/w10servicing-f1-branches.png b/windows/configuration/images/w10servicing-f1-branches.png
similarity index 100%
rename from windows/configure/images/w10servicing-f1-branches.png
rename to windows/configuration/images/w10servicing-f1-branches.png
diff --git a/windows/configure/images/waas-active-hours-policy.PNG b/windows/configuration/images/waas-active-hours-policy.PNG
similarity index 100%
rename from windows/configure/images/waas-active-hours-policy.PNG
rename to windows/configuration/images/waas-active-hours-policy.PNG
diff --git a/windows/configure/images/waas-active-hours.PNG b/windows/configuration/images/waas-active-hours.PNG
similarity index 100%
rename from windows/configure/images/waas-active-hours.PNG
rename to windows/configuration/images/waas-active-hours.PNG
diff --git a/windows/configure/images/waas-auto-update-policy.PNG b/windows/configuration/images/waas-auto-update-policy.PNG
similarity index 100%
rename from windows/configure/images/waas-auto-update-policy.PNG
rename to windows/configuration/images/waas-auto-update-policy.PNG
diff --git a/windows/configure/images/waas-do-fig1.png b/windows/configuration/images/waas-do-fig1.png
similarity index 100%
rename from windows/configure/images/waas-do-fig1.png
rename to windows/configuration/images/waas-do-fig1.png
diff --git a/windows/configure/images/waas-do-fig2.png b/windows/configuration/images/waas-do-fig2.png
similarity index 100%
rename from windows/configure/images/waas-do-fig2.png
rename to windows/configuration/images/waas-do-fig2.png
diff --git a/windows/configure/images/waas-do-fig3.png b/windows/configuration/images/waas-do-fig3.png
similarity index 100%
rename from windows/configure/images/waas-do-fig3.png
rename to windows/configuration/images/waas-do-fig3.png
diff --git a/windows/configure/images/waas-do-fig4.png b/windows/configuration/images/waas-do-fig4.png
similarity index 100%
rename from windows/configure/images/waas-do-fig4.png
rename to windows/configuration/images/waas-do-fig4.png
diff --git a/windows/configure/images/waas-overview-patch.png b/windows/configuration/images/waas-overview-patch.png
similarity index 100%
rename from windows/configure/images/waas-overview-patch.png
rename to windows/configuration/images/waas-overview-patch.png
diff --git a/windows/configure/images/waas-restart-policy.PNG b/windows/configuration/images/waas-restart-policy.PNG
similarity index 100%
rename from windows/configure/images/waas-restart-policy.PNG
rename to windows/configuration/images/waas-restart-policy.PNG
diff --git a/windows/configure/images/waas-rings.png b/windows/configuration/images/waas-rings.png
similarity index 100%
rename from windows/configure/images/waas-rings.png
rename to windows/configuration/images/waas-rings.png
diff --git a/windows/configure/images/waas-sccm-fig1.png b/windows/configuration/images/waas-sccm-fig1.png
similarity index 100%
rename from windows/configure/images/waas-sccm-fig1.png
rename to windows/configuration/images/waas-sccm-fig1.png
diff --git a/windows/configure/images/waas-sccm-fig10.png b/windows/configuration/images/waas-sccm-fig10.png
similarity index 100%
rename from windows/configure/images/waas-sccm-fig10.png
rename to windows/configuration/images/waas-sccm-fig10.png
diff --git a/windows/configure/images/waas-sccm-fig11.png b/windows/configuration/images/waas-sccm-fig11.png
similarity index 100%
rename from windows/configure/images/waas-sccm-fig11.png
rename to windows/configuration/images/waas-sccm-fig11.png
diff --git a/windows/configure/images/waas-sccm-fig12.png b/windows/configuration/images/waas-sccm-fig12.png
similarity index 100%
rename from windows/configure/images/waas-sccm-fig12.png
rename to windows/configuration/images/waas-sccm-fig12.png
diff --git a/windows/configure/images/waas-sccm-fig2.png b/windows/configuration/images/waas-sccm-fig2.png
similarity index 100%
rename from windows/configure/images/waas-sccm-fig2.png
rename to windows/configuration/images/waas-sccm-fig2.png
diff --git a/windows/configure/images/waas-sccm-fig3.png b/windows/configuration/images/waas-sccm-fig3.png
similarity index 100%
rename from windows/configure/images/waas-sccm-fig3.png
rename to windows/configuration/images/waas-sccm-fig3.png
diff --git a/windows/configure/images/waas-sccm-fig4.png b/windows/configuration/images/waas-sccm-fig4.png
similarity index 100%
rename from windows/configure/images/waas-sccm-fig4.png
rename to windows/configuration/images/waas-sccm-fig4.png
diff --git a/windows/configure/images/waas-sccm-fig5.png b/windows/configuration/images/waas-sccm-fig5.png
similarity index 100%
rename from windows/configure/images/waas-sccm-fig5.png
rename to windows/configuration/images/waas-sccm-fig5.png
diff --git a/windows/configure/images/waas-sccm-fig6.png b/windows/configuration/images/waas-sccm-fig6.png
similarity index 100%
rename from windows/configure/images/waas-sccm-fig6.png
rename to windows/configuration/images/waas-sccm-fig6.png
diff --git a/windows/configure/images/waas-sccm-fig7.png b/windows/configuration/images/waas-sccm-fig7.png
similarity index 100%
rename from windows/configure/images/waas-sccm-fig7.png
rename to windows/configuration/images/waas-sccm-fig7.png
diff --git a/windows/configure/images/waas-sccm-fig8.png b/windows/configuration/images/waas-sccm-fig8.png
similarity index 100%
rename from windows/configure/images/waas-sccm-fig8.png
rename to windows/configuration/images/waas-sccm-fig8.png
diff --git a/windows/configure/images/waas-sccm-fig9.png b/windows/configuration/images/waas-sccm-fig9.png
similarity index 100%
rename from windows/configure/images/waas-sccm-fig9.png
rename to windows/configuration/images/waas-sccm-fig9.png
diff --git a/windows/configure/images/waas-strategy-fig1a.png b/windows/configuration/images/waas-strategy-fig1a.png
similarity index 100%
rename from windows/configure/images/waas-strategy-fig1a.png
rename to windows/configuration/images/waas-strategy-fig1a.png
diff --git a/windows/configure/images/waas-wsus-fig1.png b/windows/configuration/images/waas-wsus-fig1.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig1.png
rename to windows/configuration/images/waas-wsus-fig1.png
diff --git a/windows/configure/images/waas-wsus-fig10.png b/windows/configuration/images/waas-wsus-fig10.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig10.png
rename to windows/configuration/images/waas-wsus-fig10.png
diff --git a/windows/configure/images/waas-wsus-fig11.png b/windows/configuration/images/waas-wsus-fig11.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig11.png
rename to windows/configuration/images/waas-wsus-fig11.png
diff --git a/windows/configure/images/waas-wsus-fig12.png b/windows/configuration/images/waas-wsus-fig12.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig12.png
rename to windows/configuration/images/waas-wsus-fig12.png
diff --git a/windows/configure/images/waas-wsus-fig13.png b/windows/configuration/images/waas-wsus-fig13.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig13.png
rename to windows/configuration/images/waas-wsus-fig13.png
diff --git a/windows/configure/images/waas-wsus-fig14.png b/windows/configuration/images/waas-wsus-fig14.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig14.png
rename to windows/configuration/images/waas-wsus-fig14.png
diff --git a/windows/configure/images/waas-wsus-fig15.png b/windows/configuration/images/waas-wsus-fig15.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig15.png
rename to windows/configuration/images/waas-wsus-fig15.png
diff --git a/windows/configure/images/waas-wsus-fig16.png b/windows/configuration/images/waas-wsus-fig16.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig16.png
rename to windows/configuration/images/waas-wsus-fig16.png
diff --git a/windows/configure/images/waas-wsus-fig17.png b/windows/configuration/images/waas-wsus-fig17.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig17.png
rename to windows/configuration/images/waas-wsus-fig17.png
diff --git a/windows/configure/images/waas-wsus-fig18.png b/windows/configuration/images/waas-wsus-fig18.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig18.png
rename to windows/configuration/images/waas-wsus-fig18.png
diff --git a/windows/configure/images/waas-wsus-fig19.png b/windows/configuration/images/waas-wsus-fig19.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig19.png
rename to windows/configuration/images/waas-wsus-fig19.png
diff --git a/windows/configure/images/waas-wsus-fig2.png b/windows/configuration/images/waas-wsus-fig2.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig2.png
rename to windows/configuration/images/waas-wsus-fig2.png
diff --git a/windows/configure/images/waas-wsus-fig20.png b/windows/configuration/images/waas-wsus-fig20.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig20.png
rename to windows/configuration/images/waas-wsus-fig20.png
diff --git a/windows/configure/images/waas-wsus-fig3.png b/windows/configuration/images/waas-wsus-fig3.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig3.png
rename to windows/configuration/images/waas-wsus-fig3.png
diff --git a/windows/configure/images/waas-wsus-fig4.png b/windows/configuration/images/waas-wsus-fig4.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig4.png
rename to windows/configuration/images/waas-wsus-fig4.png
diff --git a/windows/configure/images/waas-wsus-fig5.png b/windows/configuration/images/waas-wsus-fig5.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig5.png
rename to windows/configuration/images/waas-wsus-fig5.png
diff --git a/windows/configure/images/waas-wsus-fig6.png b/windows/configuration/images/waas-wsus-fig6.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig6.png
rename to windows/configuration/images/waas-wsus-fig6.png
diff --git a/windows/configure/images/waas-wsus-fig7.png b/windows/configuration/images/waas-wsus-fig7.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig7.png
rename to windows/configuration/images/waas-wsus-fig7.png
diff --git a/windows/configure/images/waas-wsus-fig8.png b/windows/configuration/images/waas-wsus-fig8.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig8.png
rename to windows/configuration/images/waas-wsus-fig8.png
diff --git a/windows/configure/images/waas-wsus-fig9.png b/windows/configuration/images/waas-wsus-fig9.png
similarity index 100%
rename from windows/configure/images/waas-wsus-fig9.png
rename to windows/configuration/images/waas-wsus-fig9.png
diff --git a/windows/configure/images/waas-wufb-gp-broad.png b/windows/configuration/images/waas-wufb-gp-broad.png
similarity index 100%
rename from windows/configure/images/waas-wufb-gp-broad.png
rename to windows/configuration/images/waas-wufb-gp-broad.png
diff --git a/windows/configure/images/waas-wufb-gp-cb2-settings.png b/windows/configuration/images/waas-wufb-gp-cb2-settings.png
similarity index 100%
rename from windows/configure/images/waas-wufb-gp-cb2-settings.png
rename to windows/configuration/images/waas-wufb-gp-cb2-settings.png
diff --git a/windows/configure/images/waas-wufb-gp-cb2.png b/windows/configuration/images/waas-wufb-gp-cb2.png
similarity index 100%
rename from windows/configure/images/waas-wufb-gp-cb2.png
rename to windows/configuration/images/waas-wufb-gp-cb2.png
diff --git a/windows/configure/images/waas-wufb-gp-cbb1-settings.png b/windows/configuration/images/waas-wufb-gp-cbb1-settings.png
similarity index 100%
rename from windows/configure/images/waas-wufb-gp-cbb1-settings.png
rename to windows/configuration/images/waas-wufb-gp-cbb1-settings.png
diff --git a/windows/configure/images/waas-wufb-gp-cbb2-settings.png b/windows/configuration/images/waas-wufb-gp-cbb2-settings.png
similarity index 100%
rename from windows/configure/images/waas-wufb-gp-cbb2-settings.png
rename to windows/configuration/images/waas-wufb-gp-cbb2-settings.png
diff --git a/windows/configure/images/waas-wufb-gp-cbb2q-settings.png b/windows/configuration/images/waas-wufb-gp-cbb2q-settings.png
similarity index 100%
rename from windows/configure/images/waas-wufb-gp-cbb2q-settings.png
rename to windows/configuration/images/waas-wufb-gp-cbb2q-settings.png
diff --git a/windows/configure/images/waas-wufb-gp-create.png b/windows/configuration/images/waas-wufb-gp-create.png
similarity index 100%
rename from windows/configure/images/waas-wufb-gp-create.png
rename to windows/configuration/images/waas-wufb-gp-create.png
diff --git a/windows/configure/images/waas-wufb-gp-edit-defer.png b/windows/configuration/images/waas-wufb-gp-edit-defer.png
similarity index 100%
rename from windows/configure/images/waas-wufb-gp-edit-defer.png
rename to windows/configuration/images/waas-wufb-gp-edit-defer.png
diff --git a/windows/configure/images/waas-wufb-gp-edit.png b/windows/configuration/images/waas-wufb-gp-edit.png
similarity index 100%
rename from windows/configure/images/waas-wufb-gp-edit.png
rename to windows/configuration/images/waas-wufb-gp-edit.png
diff --git a/windows/configure/images/waas-wufb-gp-scope-cb2.png b/windows/configuration/images/waas-wufb-gp-scope-cb2.png
similarity index 100%
rename from windows/configure/images/waas-wufb-gp-scope-cb2.png
rename to windows/configuration/images/waas-wufb-gp-scope-cb2.png
diff --git a/windows/configure/images/waas-wufb-gp-scope.png b/windows/configuration/images/waas-wufb-gp-scope.png
similarity index 100%
rename from windows/configure/images/waas-wufb-gp-scope.png
rename to windows/configuration/images/waas-wufb-gp-scope.png
diff --git a/windows/configure/images/waas-wufb-intune-cb2a.png b/windows/configuration/images/waas-wufb-intune-cb2a.png
similarity index 100%
rename from windows/configure/images/waas-wufb-intune-cb2a.png
rename to windows/configuration/images/waas-wufb-intune-cb2a.png
diff --git a/windows/configure/images/waas-wufb-intune-cbb1a.png b/windows/configuration/images/waas-wufb-intune-cbb1a.png
similarity index 100%
rename from windows/configure/images/waas-wufb-intune-cbb1a.png
rename to windows/configuration/images/waas-wufb-intune-cbb1a.png
diff --git a/windows/configure/images/waas-wufb-intune-cbb2a.png b/windows/configuration/images/waas-wufb-intune-cbb2a.png
similarity index 100%
rename from windows/configure/images/waas-wufb-intune-cbb2a.png
rename to windows/configuration/images/waas-wufb-intune-cbb2a.png
diff --git a/windows/configure/images/waas-wufb-intune-step11a.png b/windows/configuration/images/waas-wufb-intune-step11a.png
similarity index 100%
rename from windows/configure/images/waas-wufb-intune-step11a.png
rename to windows/configuration/images/waas-wufb-intune-step11a.png
diff --git a/windows/configure/images/waas-wufb-intune-step19a.png b/windows/configuration/images/waas-wufb-intune-step19a.png
similarity index 100%
rename from windows/configure/images/waas-wufb-intune-step19a.png
rename to windows/configuration/images/waas-wufb-intune-step19a.png
diff --git a/windows/configure/images/waas-wufb-intune-step2a.png b/windows/configuration/images/waas-wufb-intune-step2a.png
similarity index 100%
rename from windows/configure/images/waas-wufb-intune-step2a.png
rename to windows/configuration/images/waas-wufb-intune-step2a.png
diff --git a/windows/configure/images/waas-wufb-intune-step7a.png b/windows/configuration/images/waas-wufb-intune-step7a.png
similarity index 100%
rename from windows/configure/images/waas-wufb-intune-step7a.png
rename to windows/configuration/images/waas-wufb-intune-step7a.png
diff --git a/windows/configure/images/wcd-app-commands.PNG b/windows/configuration/images/wcd-app-commands.PNG
similarity index 100%
rename from windows/configure/images/wcd-app-commands.PNG
rename to windows/configuration/images/wcd-app-commands.PNG
diff --git a/windows/configure/images/wcd-app-name.PNG b/windows/configuration/images/wcd-app-name.PNG
similarity index 100%
rename from windows/configure/images/wcd-app-name.PNG
rename to windows/configuration/images/wcd-app-name.PNG
diff --git a/windows/configure/images/who-owns-pc.png b/windows/configuration/images/who-owns-pc.png
similarity index 100%
rename from windows/configure/images/who-owns-pc.png
rename to windows/configuration/images/who-owns-pc.png
diff --git a/windows/configure/images/wifisense-grouppolicy.png b/windows/configuration/images/wifisense-grouppolicy.png
similarity index 100%
rename from windows/configure/images/wifisense-grouppolicy.png
rename to windows/configuration/images/wifisense-grouppolicy.png
diff --git a/windows/configure/images/wifisense-registry.png b/windows/configuration/images/wifisense-registry.png
similarity index 100%
rename from windows/configure/images/wifisense-registry.png
rename to windows/configuration/images/wifisense-registry.png
diff --git a/windows/configure/images/wifisense-settingscreens.png b/windows/configuration/images/wifisense-settingscreens.png
similarity index 100%
rename from windows/configure/images/wifisense-settingscreens.png
rename to windows/configuration/images/wifisense-settingscreens.png
diff --git a/windows/configure/images/win-10-adk-select.png b/windows/configuration/images/win-10-adk-select.png
similarity index 100%
rename from windows/configure/images/win-10-adk-select.png
rename to windows/configuration/images/win-10-adk-select.png
diff --git a/windows/configure/images/win10-mobile-mdm-fig1.png b/windows/configuration/images/win10-mobile-mdm-fig1.png
similarity index 100%
rename from windows/configure/images/win10-mobile-mdm-fig1.png
rename to windows/configuration/images/win10-mobile-mdm-fig1.png
diff --git a/windows/configure/images/win10-set-up-work-or-school.png b/windows/configuration/images/win10-set-up-work-or-school.png
similarity index 100%
rename from windows/configure/images/win10-set-up-work-or-school.png
rename to windows/configuration/images/win10-set-up-work-or-school.png
diff --git a/windows/configure/images/win10servicing-fig2-featureupgrade.png b/windows/configuration/images/win10servicing-fig2-featureupgrade.png
similarity index 100%
rename from windows/configure/images/win10servicing-fig2-featureupgrade.png
rename to windows/configuration/images/win10servicing-fig2-featureupgrade.png
diff --git a/windows/configure/images/win10servicing-fig3.png b/windows/configuration/images/win10servicing-fig3.png
similarity index 100%
rename from windows/configure/images/win10servicing-fig3.png
rename to windows/configuration/images/win10servicing-fig3.png
diff --git a/windows/configure/images/win10servicing-fig4-upgradereleases.png b/windows/configuration/images/win10servicing-fig4-upgradereleases.png
similarity index 100%
rename from windows/configure/images/win10servicing-fig4-upgradereleases.png
rename to windows/configuration/images/win10servicing-fig4-upgradereleases.png
diff --git a/windows/configure/images/win10servicing-fig5.png b/windows/configuration/images/win10servicing-fig5.png
similarity index 100%
rename from windows/configure/images/win10servicing-fig5.png
rename to windows/configuration/images/win10servicing-fig5.png
diff --git a/windows/configure/images/win10servicing-fig6.png b/windows/configuration/images/win10servicing-fig6.png
similarity index 100%
rename from windows/configure/images/win10servicing-fig6.png
rename to windows/configuration/images/win10servicing-fig6.png
diff --git a/windows/configure/images/win10servicing-fig7.png b/windows/configuration/images/win10servicing-fig7.png
similarity index 100%
rename from windows/configure/images/win10servicing-fig7.png
rename to windows/configuration/images/win10servicing-fig7.png
diff --git a/windows/manage/images/windows-10-management-cyod-byod-flow.png b/windows/configuration/images/windows-10-management-cyod-byod-flow.png
similarity index 100%
rename from windows/manage/images/windows-10-management-cyod-byod-flow.png
rename to windows/configuration/images/windows-10-management-cyod-byod-flow.png
diff --git a/windows/manage/images/windows-10-management-gp-intune-flow.png b/windows/configuration/images/windows-10-management-gp-intune-flow.png
similarity index 100%
rename from windows/manage/images/windows-10-management-gp-intune-flow.png
rename to windows/configuration/images/windows-10-management-gp-intune-flow.png
diff --git a/windows/manage/images/windows-10-management-range-of-options.png b/windows/configuration/images/windows-10-management-range-of-options.png
similarity index 100%
rename from windows/manage/images/windows-10-management-range-of-options.png
rename to windows/configuration/images/windows-10-management-range-of-options.png
diff --git a/windows/configure/images/windows-icd.png b/windows/configuration/images/windows-icd.png
similarity index 100%
rename from windows/configure/images/windows-icd.png
rename to windows/configuration/images/windows-icd.png
diff --git a/windows/configure/images/wsfb-distribute.png b/windows/configuration/images/wsfb-distribute.png
similarity index 100%
rename from windows/configure/images/wsfb-distribute.png
rename to windows/configuration/images/wsfb-distribute.png
diff --git a/windows/configure/images/wsfb-firstrun.png b/windows/configuration/images/wsfb-firstrun.png
similarity index 100%
rename from windows/configure/images/wsfb-firstrun.png
rename to windows/configuration/images/wsfb-firstrun.png
diff --git a/windows/configure/images/wsfb-inventory-viewlicense.png b/windows/configuration/images/wsfb-inventory-viewlicense.png
similarity index 100%
rename from windows/configure/images/wsfb-inventory-viewlicense.png
rename to windows/configuration/images/wsfb-inventory-viewlicense.png
diff --git a/windows/configure/images/wsfb-inventory.png b/windows/configuration/images/wsfb-inventory.png
similarity index 100%
rename from windows/configure/images/wsfb-inventory.png
rename to windows/configuration/images/wsfb-inventory.png
diff --git a/windows/configure/images/wsfb-inventoryaddprivatestore.png b/windows/configuration/images/wsfb-inventoryaddprivatestore.png
similarity index 100%
rename from windows/configure/images/wsfb-inventoryaddprivatestore.png
rename to windows/configuration/images/wsfb-inventoryaddprivatestore.png
diff --git a/windows/configure/images/wsfb-landing.png b/windows/configuration/images/wsfb-landing.png
similarity index 100%
rename from windows/configure/images/wsfb-landing.png
rename to windows/configuration/images/wsfb-landing.png
diff --git a/windows/configure/images/wsfb-licenseassign.png b/windows/configuration/images/wsfb-licenseassign.png
similarity index 100%
rename from windows/configure/images/wsfb-licenseassign.png
rename to windows/configuration/images/wsfb-licenseassign.png
diff --git a/windows/configure/images/wsfb-licensedetails.png b/windows/configuration/images/wsfb-licensedetails.png
similarity index 100%
rename from windows/configure/images/wsfb-licensedetails.png
rename to windows/configuration/images/wsfb-licensedetails.png
diff --git a/windows/configure/images/wsfb-licensereclaim.png b/windows/configuration/images/wsfb-licensereclaim.png
similarity index 100%
rename from windows/configure/images/wsfb-licensereclaim.png
rename to windows/configuration/images/wsfb-licensereclaim.png
diff --git a/windows/configure/images/wsfb-manageinventory.png b/windows/configuration/images/wsfb-manageinventory.png
similarity index 100%
rename from windows/configure/images/wsfb-manageinventory.png
rename to windows/configuration/images/wsfb-manageinventory.png
diff --git a/windows/configure/images/wsfb-offline-distribute-mdm.png b/windows/configuration/images/wsfb-offline-distribute-mdm.png
similarity index 100%
rename from windows/configure/images/wsfb-offline-distribute-mdm.png
rename to windows/configuration/images/wsfb-offline-distribute-mdm.png
diff --git a/windows/configure/images/wsfb-onboard-1.png b/windows/configuration/images/wsfb-onboard-1.png
similarity index 100%
rename from windows/configure/images/wsfb-onboard-1.png
rename to windows/configuration/images/wsfb-onboard-1.png
diff --git a/windows/configure/images/wsfb-onboard-2.png b/windows/configuration/images/wsfb-onboard-2.png
similarity index 100%
rename from windows/configure/images/wsfb-onboard-2.png
rename to windows/configuration/images/wsfb-onboard-2.png
diff --git a/windows/configure/images/wsfb-onboard-3.png b/windows/configuration/images/wsfb-onboard-3.png
similarity index 100%
rename from windows/configure/images/wsfb-onboard-3.png
rename to windows/configuration/images/wsfb-onboard-3.png
diff --git a/windows/configure/images/wsfb-onboard-4.png b/windows/configuration/images/wsfb-onboard-4.png
similarity index 100%
rename from windows/configure/images/wsfb-onboard-4.png
rename to windows/configuration/images/wsfb-onboard-4.png
diff --git a/windows/configure/images/wsfb-onboard-5.png b/windows/configuration/images/wsfb-onboard-5.png
similarity index 100%
rename from windows/configure/images/wsfb-onboard-5.png
rename to windows/configuration/images/wsfb-onboard-5.png
diff --git a/windows/configure/images/wsfb-onboard-7.png b/windows/configuration/images/wsfb-onboard-7.png
similarity index 100%
rename from windows/configure/images/wsfb-onboard-7.png
rename to windows/configuration/images/wsfb-onboard-7.png
diff --git a/windows/configure/images/wsfb-online-distribute-mdm.png b/windows/configuration/images/wsfb-online-distribute-mdm.png
similarity index 100%
rename from windows/configure/images/wsfb-online-distribute-mdm.png
rename to windows/configuration/images/wsfb-online-distribute-mdm.png
diff --git a/windows/configure/images/wsfb-paid-app-temp.png b/windows/configuration/images/wsfb-paid-app-temp.png
similarity index 100%
rename from windows/configure/images/wsfb-paid-app-temp.png
rename to windows/configuration/images/wsfb-paid-app-temp.png
diff --git a/windows/configure/images/wsfb-permissions-assignrole.png b/windows/configuration/images/wsfb-permissions-assignrole.png
similarity index 100%
rename from windows/configure/images/wsfb-permissions-assignrole.png
rename to windows/configuration/images/wsfb-permissions-assignrole.png
diff --git a/windows/configure/images/wsfb-private-store-gpo.PNG b/windows/configuration/images/wsfb-private-store-gpo.PNG
similarity index 100%
rename from windows/configure/images/wsfb-private-store-gpo.PNG
rename to windows/configuration/images/wsfb-private-store-gpo.PNG
diff --git a/windows/configure/images/wsfb-privatestore.png b/windows/configuration/images/wsfb-privatestore.png
similarity index 100%
rename from windows/configure/images/wsfb-privatestore.png
rename to windows/configuration/images/wsfb-privatestore.png
diff --git a/windows/configure/images/wsfb-privatestoreapps.png b/windows/configuration/images/wsfb-privatestoreapps.png
similarity index 100%
rename from windows/configure/images/wsfb-privatestoreapps.png
rename to windows/configuration/images/wsfb-privatestoreapps.png
diff --git a/windows/configure/images/wsfb-renameprivatestore.png b/windows/configuration/images/wsfb-renameprivatestore.png
similarity index 100%
rename from windows/configure/images/wsfb-renameprivatestore.png
rename to windows/configuration/images/wsfb-renameprivatestore.png
diff --git a/windows/configure/images/wsfb-settings-mgmt.png b/windows/configuration/images/wsfb-settings-mgmt.png
similarity index 100%
rename from windows/configure/images/wsfb-settings-mgmt.png
rename to windows/configuration/images/wsfb-settings-mgmt.png
diff --git a/windows/configure/images/wsfb-settings-permissions.png b/windows/configuration/images/wsfb-settings-permissions.png
similarity index 100%
rename from windows/configure/images/wsfb-settings-permissions.png
rename to windows/configuration/images/wsfb-settings-permissions.png
diff --git a/windows/configure/images/wsfb-wsappaddacct.png b/windows/configuration/images/wsfb-wsappaddacct.png
similarity index 100%
rename from windows/configure/images/wsfb-wsappaddacct.png
rename to windows/configuration/images/wsfb-wsappaddacct.png
diff --git a/windows/configure/images/wsfb-wsappprivatestore.png b/windows/configuration/images/wsfb-wsappprivatestore.png
similarity index 100%
rename from windows/configure/images/wsfb-wsappprivatestore.png
rename to windows/configuration/images/wsfb-wsappprivatestore.png
diff --git a/windows/configure/images/wsfb-wsappsignin.png b/windows/configuration/images/wsfb-wsappsignin.png
similarity index 100%
rename from windows/configure/images/wsfb-wsappsignin.png
rename to windows/configuration/images/wsfb-wsappsignin.png
diff --git a/windows/configure/images/wsfb-wsappworkacct.png b/windows/configuration/images/wsfb-wsappworkacct.png
similarity index 100%
rename from windows/configure/images/wsfb-wsappworkacct.png
rename to windows/configuration/images/wsfb-wsappworkacct.png
diff --git a/windows/configure/images/wufb-config1a.png b/windows/configuration/images/wufb-config1a.png
similarity index 100%
rename from windows/configure/images/wufb-config1a.png
rename to windows/configuration/images/wufb-config1a.png
diff --git a/windows/configure/images/wufb-config2.png b/windows/configuration/images/wufb-config2.png
similarity index 100%
rename from windows/configure/images/wufb-config2.png
rename to windows/configuration/images/wufb-config2.png
diff --git a/windows/configure/images/wufb-config3a.png b/windows/configuration/images/wufb-config3a.png
similarity index 100%
rename from windows/configure/images/wufb-config3a.png
rename to windows/configuration/images/wufb-config3a.png
diff --git a/windows/configure/images/wufb-do.png b/windows/configuration/images/wufb-do.png
similarity index 100%
rename from windows/configure/images/wufb-do.png
rename to windows/configuration/images/wufb-do.png
diff --git a/windows/configure/images/wufb-groups.png b/windows/configuration/images/wufb-groups.png
similarity index 100%
rename from windows/configure/images/wufb-groups.png
rename to windows/configuration/images/wufb-groups.png
diff --git a/windows/configure/images/wufb-pause-feature.png b/windows/configuration/images/wufb-pause-feature.png
similarity index 100%
rename from windows/configure/images/wufb-pause-feature.png
rename to windows/configuration/images/wufb-pause-feature.png
diff --git a/windows/configure/images/wufb-qual.png b/windows/configuration/images/wufb-qual.png
similarity index 100%
rename from windows/configure/images/wufb-qual.png
rename to windows/configuration/images/wufb-qual.png
diff --git a/windows/configure/images/wufb-sccm.png b/windows/configuration/images/wufb-sccm.png
similarity index 100%
rename from windows/configure/images/wufb-sccm.png
rename to windows/configuration/images/wufb-sccm.png
diff --git a/windows/configure/images/x_blk.png b/windows/configuration/images/x_blk.png
similarity index 100%
rename from windows/configure/images/x_blk.png
rename to windows/configuration/images/x_blk.png
diff --git a/windows/configure/index.md b/windows/configuration/index.md
similarity index 77%
rename from windows/configure/index.md
rename to windows/configuration/index.md
index 41f72b3b92..28d1b0978f 100644
--- a/windows/configure/index.md
+++ b/windows/configuration/index.md
@@ -19,16 +19,16 @@ Enterprises often need to apply custom configurations to devices for their users
| Topic | Description |
| --- | --- |
| [Configure Windows telemetry in your organization](configure-windows-telemetry-in-your-organization.md) | Use this article to make informed decisions about how you can configure Windows telemetry in your organization. |
-| [Basic level Windows diagnostic data](windows-diagnostic-data.md) | Learn about diagnostic data that is collected at the basic level in Windows 10, version 1703. |
+| [Basic level Windows diagnostic data](basic-level-windows-diagnostic-events-and-fields.md) | Learn about diagnostic data that is collected at the basic level in Windows 10, version 1703. |
| [Windows 10, version 1703 diagnostic data](windows-diagnostic-data.md) | Learn about the types of data that is collected at the full level in Windows 10, version 1703. |
| [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md) | Learn about the network connections that Windows components make to Microsoft and also the privacy settings that affect data that is shared with either Microsoft or apps and how they can be managed by an IT Pro. |
| [Manage Wi-Fi Sense in your company](manage-wifi-sense-in-enterprise.md) | Wi-Fi Sense automatically connects you to Wi-Fi, so you can get online quickly in more places. It can connect you to open Wi-Fi hotspots it knows about through crowdsourcing, or to Wi-Fi networks your contacts have shared with you by using Wi-Fi Sense. The initial settings for Wi-Fi Sense are determined by the options you chose when you first set up your PC with Windows 10. |
| [Configure kiosk and shared devices running Windows 10 desktop editions](kiosk-shared-pc.md) | These topics help you configure Windows 10 devices to be shared by multiple users or to run as a kiosk device that runs a single app. |
-| [Configure Windows 10 Mobile devices](configure-mobile.md) | These topics help you configure the features and apps and Start screen for a device running Windows 10 Mobile, as well as how to configure a kiosk device that runs a single app. |
+| [Configure Windows 10 Mobile devices](mobile-devices/configure-mobile.md) | These topics help you configure the features and apps and Start screen for a device running Windows 10 Mobile, as well as how to configure a kiosk device that runs a single app. |
| [Configure Start, taskbar, and lock screen](start-taskbar-lockscreen.md) | A standard, customized Start layout can be useful on devices that are common to multiple users and devices that are locked down for specialized purposes. Configuring the taskbar allows the organization to pin useful apps for their employees and to remove apps that are pinned by default. |
-| [Cortana integration in your business or enterprise](cortana-at-work-overview.md) | The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments. |
+| [Cortana integration in your business or enterprise](cortana-at-work/cortana-at-work-overview.md) | The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments. |
| [Configure access to Windows Store](stop-employees-from-using-the-windows-store.md) | IT Pros can configure access to Windows Store for client computers in their organization. For some organizations, business policies require blocking access to Windows Store. |
-| [Provisioning packages for Windows 10](provisioning-packages.md) | Learn how to use the Windows Configuration Designer and provisioning packages to easily configure multiple devices. |
+| [Provisioning packages for Windows 10](provisioning-packages/provisioning-packages.md) | Learn how to use the Windows Configuration Designer and provisioning packages to easily configure multiple devices. |
| [Lockdown features from Windows Embedded 8.1 Industry](lockdown-features-windows-10.md) | Many of the lockdown features available in Windows Embedded 8.1 Industry have been modified in some form for Windows 10. |
| [Change history for Configure Windows 10](change-history-for-configure-windows-10.md) | This topic lists new and updated topics in the Configure Windows 10 documentation for Windows 10 and Windows 10 Mobile. |
diff --git a/windows/configure/kiosk-shared-pc.md b/windows/configuration/kiosk-shared-pc.md
similarity index 100%
rename from windows/configure/kiosk-shared-pc.md
rename to windows/configuration/kiosk-shared-pc.md
diff --git a/windows/configure/lock-down-windows-10-to-specific-apps.md b/windows/configuration/lock-down-windows-10-to-specific-apps.md
similarity index 96%
rename from windows/configure/lock-down-windows-10-to-specific-apps.md
rename to windows/configuration/lock-down-windows-10-to-specific-apps.md
index 8ae79ef7f2..4430902cec 100644
--- a/windows/configure/lock-down-windows-10-to-specific-apps.md
+++ b/windows/configuration/lock-down-windows-10-to-specific-apps.md
@@ -22,9 +22,9 @@ localizationpriority: high
Learn how to configure a device running Windows 10 Enterprise or Windows 10 Education so that users can only run a few specific apps. The result is similar to [a kiosk device](set-up-a-device-for-anyone-to-use.md), but with multiple apps available. For example, you might set up a library computer so that users can search the catalog and browse the Internet, but can't run any other apps or change computer settings.
-You can restrict users to a specific set of apps on a device running Windows 10 Enterprise or Windows 10 Education by using [AppLocker](../keep-secure/applocker-overview.md). AppLocker rules specify which apps are allowed to run on the device.
+You can restrict users to a specific set of apps on a device running Windows 10 Enterprise or Windows 10 Education by using [AppLocker](/windows/device-security/applocker/applocker-overview). AppLocker rules specify which apps are allowed to run on the device.
-AppLocker rules are organized into collections based on file format. If no AppLocker rules for a specific rule collection exist, all files with that file format are allowed to run. However, when an AppLocker rule for a specific rule collection is created, only the files explicitly allowed in a rule are permitted to run. For more information, see [How AppLocker works](../keep-secure/how-applocker-works-techref.md).
+AppLocker rules are organized into collections based on file format. If no AppLocker rules for a specific rule collection exist, all files with that file format are allowed to run. However, when an AppLocker rule for a specific rule collection is created, only the files explicitly allowed in a rule are permitted to run. For more information, see [How AppLocker works](/windows/device-security/applocker/how-applocker-works-techref).
This topic describes how to lock down apps on a local device. You can also use AppLocker to set rules for applications in a domain by using Group Policy.
diff --git a/windows/configure/lock-down-windows-10.md b/windows/configuration/lock-down-windows-10.md
similarity index 100%
rename from windows/configure/lock-down-windows-10.md
rename to windows/configuration/lock-down-windows-10.md
diff --git a/windows/configure/lockdown-features-windows-10.md b/windows/configuration/lockdown-features-windows-10.md
similarity index 99%
rename from windows/configure/lockdown-features-windows-10.md
rename to windows/configuration/lockdown-features-windows-10.md
index c6eaa7e68d..7c72bb6e2b 100644
--- a/windows/configure/lockdown-features-windows-10.md
+++ b/windows/configuration/lockdown-features-windows-10.md
@@ -61,7 +61,7 @@ Many of the lockdown features available in Windows Embedded 8.1 Industry have be
[Dialog Filter](https://go.microsoft.com/fwlink/p/?LinkId=626762): suppress system dialogs and control which processes can run
Dialog Filter has been deprecated for Windows 10. Dialog Filter provided two capabilities; the ability to control which processes were able to run, and the ability to prevent dialogs (in practice, system dialogs) from appearing.
Control over which processes are able to run will now be provided by AppLocker.
diff --git a/windows/configure/manage-connections-from-windows-operating-system-components-to-microsoft-services.md b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
similarity index 99%
rename from windows/configure/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
rename to windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
index b60faaac1a..f844b54aa3 100644
--- a/windows/configure/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
+++ b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
@@ -25,7 +25,7 @@ If you want to minimize connections from Windows to Microsoft services, or confi
You can configure telemetry at the Security level, turn off Windows Defender telemetry and MSRT reporting, and turn off all other connections to Microsoft network endpoints as described in this article to help prevent Windows from sending any data to Microsoft. There are many reasons why these communications are enabled by default, such as updating malware definitions and maintain current certificate revocation lists, which is why we strongly recommend against this. This data helps us deliver a secure, reliable, and more delightful personalized experience.
-To help make it easier to deploy settings to restrict connections from Windows 10 to Microsoft, you can apply the [Windows Restricted Traffic Limited Functionality Baseline](https://go.microsoft.com/fwlink/?linkid=828887). This baseline was created in the same way as the [Windows security baselines](../keep-secure/windows-security-baselines.md) that are often used to efficiently configure Windows to a known secure state. Running the Windows Restricted Traffic Limited Functionality Baseline on devices in your organization will allow you to quickly configure all of the settings covered in this document. However, some of the settings reduce the functionality and security configuration of your device and are therefore not recommended. Make sure should you've chosen the right settings configuration for your environment before applying. Applying this baseline is equivalent to applying the Windows 10 steps covered in this article.
+To help make it easier to deploy settings to restrict connections from Windows 10 to Microsoft, you can apply the [Windows Restricted Traffic Limited Functionality Baseline](https://go.microsoft.com/fwlink/?linkid=828887). This baseline was created in the same way as the [Windows security baselines](/windows/device-security/windows-security-baselines) that are often used to efficiently configure Windows to a known secure state. Running the Windows Restricted Traffic Limited Functionality Baseline on devices in your organization will allow you to quickly configure all of the settings covered in this document. However, some of the settings reduce the functionality and security configuration of your device and are therefore not recommended. Make sure should you've chosen the right settings configuration for your environment before applying. Applying this baseline is equivalent to applying the Windows 10 steps covered in this article.
We are always striving to improve our documentation and welcome your feedback. You can provide feedback by contacting telmhelp@microsoft.com.
@@ -1603,7 +1603,7 @@ If you're not running Windows 10, version 1607 or later, you can use the other o
- Create a new REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\CloudContent!DisableWindowsConsumerFeatures**, with a value of 1 (one).
-For more info, see [Windows Spotlight on the lock screen](../configure/windows-spotlight.md).
+For more info, see [Windows Spotlight on the lock screen](windows-spotlight.md).
### 25. Windows Store
diff --git a/windows/configure/manage-tips-and-suggestions.md b/windows/configuration/manage-tips-and-suggestions.md
similarity index 98%
rename from windows/configure/manage-tips-and-suggestions.md
rename to windows/configuration/manage-tips-and-suggestions.md
index c3394002a8..2af7244b3d 100644
--- a/windows/configure/manage-tips-and-suggestions.md
+++ b/windows/configuration/manage-tips-and-suggestions.md
@@ -49,7 +49,7 @@ Windows 10, version 1607 (also known as the Anniversary Update), provides organi
## Related topics
- [Manage Windows 10 Start layout](windows-10-start-layout-options-and-policies.md)
-- [Cortana integration in your business or enterprise](cortana-at-work-overview.md)
+- [Cortana integration in your business or enterprise](cortana-at-work/cortana-at-work-overview.md)
- [Windows spotlight on the lock screen](../whats-new/windows-spotlight.md)
- [Windows 10 editions for education customers](https://technet.microsoft.com/en-us/edu/windows/windows-editions-for-education-customers)
diff --git a/windows/configure/manage-wifi-sense-in-enterprise.md b/windows/configuration/manage-wifi-sense-in-enterprise.md
similarity index 100%
rename from windows/configure/manage-wifi-sense-in-enterprise.md
rename to windows/configuration/manage-wifi-sense-in-enterprise.md
diff --git a/windows/configure/configure-mobile.md b/windows/configuration/mobile-devices/configure-mobile.md
similarity index 100%
rename from windows/configure/configure-mobile.md
rename to windows/configuration/mobile-devices/configure-mobile.md
diff --git a/windows/manage/images/doneicon.png b/windows/configuration/mobile-devices/images/doneicon.png
similarity index 100%
rename from windows/manage/images/doneicon.png
rename to windows/configuration/mobile-devices/images/doneicon.png
diff --git a/windows/configure/lockdown-xml.md b/windows/configuration/mobile-devices/lockdown-xml.md
similarity index 96%
rename from windows/configure/lockdown-xml.md
rename to windows/configuration/mobile-devices/lockdown-xml.md
index 36fa6806f7..a6904b3499 100644
--- a/windows/configure/lockdown-xml.md
+++ b/windows/configuration/mobile-devices/lockdown-xml.md
@@ -24,9 +24,9 @@ This is accomplished using Lockdown XML, an XML file that contains settings for
In this topic, you'll learn how to create an XML file that contains all lockdown entries available in the AssignedAccessXml area of the [EnterpriseAssignedAccess configuration service provider (CSP)](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/enterpriseassignedaccess-csp). This topic provides example XML that you can use in your own lockdown XML file that can be included in a provisioning package or when using a mobile device management (MDM) solution to push lockdown settings to enrolled devices. You can also use the [Lockdown Designer app](mobile-lockdown-designer.md) to configure and export your lockdown XML file.
> [!NOTE]
-> On Windows 10 desktop editions, *assigned access* is a feature that lets you configure the device to run a single app above the lockscreen ([kiosk mode](set-up-a-device-for-anyone-to-use.md)). On a Windows 10 Mobile device, assigned access refers to the lockdown settings in AssignedAccessXml in the [EnterpriseAssignedAccess configuration service provider (CSP)](https://go.microsoft.com/fwlink/p/?LinkID=618601).
+> On Windows 10 desktop editions, *assigned access* is a feature that lets you configure the device to run a single app above the lockscreen ([kiosk mode](../set-up-a-device-for-anyone-to-use.md)). On a Windows 10 Mobile device, assigned access refers to the lockdown settings in AssignedAccessXml in the [EnterpriseAssignedAccess configuration service provider (CSP)](https://go.microsoft.com/fwlink/p/?LinkID=618601).
-If you're not familiar with CSPs, read [Introduction to configuration service providers (CSPs)](how-it-pros-can-use-configuration-service-providers.md) first.
+If you're not familiar with CSPs, read [Introduction to configuration service providers (CSPs)](../provisioning-packages/how-it-pros-can-use-configuration-service-providers.md) first.
## Overview of the lockdown XML file
@@ -57,7 +57,7 @@ The settings for the Default role and other roles must be listed in your XML fil
## Action Center
-
+
The Action Center setting controls whether the user can open the Action Center on the device. When the Action Center is disabled, notifications on the lockscreen and toasts are also disabled. You can use optional attributes with the Action Center element to change that behavior for either notifications, toasts, or both.
@@ -87,7 +87,7 @@ The following example is a complete lockdown XML file that disables Action Cente
## Apps
-
+
The Apps setting serves as an allow list and specifies the applications that will be available in the All apps list. Apps that are not included in this setting are hidden from the user and blocked from running.
@@ -105,7 +105,7 @@ The following example makes Outlook Calendar available on the device.
When you list an app, you can also set the app to be pinned to the Start screen by specifying the tile size and location. Tip: draw a grid and mark your app tiles on it to make sure you get the result you want. The width (X axis) in the following example is the limit for Windows 10 Mobile, but the length (Y axis) is unlimited. The number of columns available to you depends on the value for [StartScreenSize](#start-screen-size).
-
+
Tile sizes are:
* Small: 1x1
@@ -147,7 +147,7 @@ In the following example, Outlook Calendar and Outlook Mail are pinned to the St
That layout would appear on a device like this:
-
+
You can create and pin folders to Start by using the Apps setting. Each folder requires a **folderId**, which must be a consecutive positive integer starting with `1`. You can also specify a **folderName** (optional) which will be displayed on Start.
@@ -198,7 +198,7 @@ When an app is contained in a folder, its **PinToStart** configuration (tile siz
## Buttons
-
+
In the Buttons setting, you use ButtonLockdownList to disable hardware buttons and ButtonRemapList to change button events to open an app that you specify.
@@ -208,11 +208,11 @@ When a user taps a button that is in the lockdown list, nothing will happen. The
Button | Press | PressAndHold | All
---|:---:|:---:|:--:|-
-Start |  |  | 
-Back |  |  | 
-Search |  |  | 
-Camera |  |  | 
-Custom 1, 2, and 3 |  |  | 
+Start |  |  | 
+Back |  |  | 
+Search |  |  | 
+Camera |  |  | 
+Custom 1, 2, and 3 |  |  | 
> [!NOTE]
> Custom buttons are hardware buttons that can be added to devices by OEMs.
@@ -265,7 +265,7 @@ In the following example, when a user presses the Search button, the phone diale
## CSPRunner
-
+
You can use CSPRunner to include settings that are not defined in AssignedAccessXML. For example, you can include settings from other sections of EnterpriseAssignedAccess CSP, such as lockscreen, theme, and time zone. You can also include settings from other CSPs, such as [Wi-Fi CSP](https://go.microsoft.com/fwlink/p/?LinkID=717460) or [Policy CSP](https://msdn.microsoft.com/library/windows/hardware/dn904962%28v=vs.85%29.aspx).
@@ -312,7 +312,7 @@ SyncML entry | Description
## Menu items
-
+
Use DisableMenuItems to prevent use of the context menu, which is displayed when a user presses and holds an application in the All Apps list. You can include this entry in the default profile and in any additional user role profiles that you create.
@@ -324,7 +324,7 @@ Use DisableMenuItems to prevent use of the context menu, which is displayed when
## Settings
-
+
The **Settings** section contains an `allow` list of pages in the Settings app and quick actions. The following example allows all settings.
@@ -358,7 +358,7 @@ For a list of the settings and quick actions that you can allow or block, see [S
## Tiles
- 
+ 
By default, under Assigned Access, tile manipulation is turned off (blocked) and only available if enabled in the user’s profile. If tile manipulation is enabled in the user’s profile, they can pin/unpin, move, and resize tiles based on their preferences. When multiple people use one device and you want to enable tile manipulation for multiple users, you must enable it for each user in their user profile.
@@ -441,7 +441,7 @@ Use the Windows ICD tool included in the Windows Assessment and Deployment Kit (
3. In the center pane, click **Browse** to locate and select the lockdown XML file that you created.
- 
+ 
4. On the **File** menu, select **Save.**
diff --git a/windows/configure/mobile-lockdown-designer.md b/windows/configuration/mobile-devices/mobile-lockdown-designer.md
similarity index 66%
rename from windows/configure/mobile-lockdown-designer.md
rename to windows/configuration/mobile-devices/mobile-lockdown-designer.md
index bc580504e6..4ae14d1eaa 100644
--- a/windows/configure/mobile-lockdown-designer.md
+++ b/windows/configuration/mobile-devices/mobile-lockdown-designer.md
@@ -11,7 +11,7 @@ author: jdeckerMS
# Use the Lockdown Designer app to create a Lockdown XML file
-
+
Windows 10 Mobile allows enterprises to lock down a device, define multiple user roles, and configure custom layouts on a device. For example, the enterprise can lock down a device so that only applications and settings in an allow list are available. This is accomplished using Lockdown XML, an XML file that contains settings for Windows 10 Mobile.
@@ -50,7 +50,7 @@ Perform these steps on the device running Windows 10 Mobile that you will use to
>[!IMPORTANT]
>Check **Settings > Personalization > Start > Show more tiles** on the test mobile device. If **Show more tiles** is **On**, you must select **Large** on the [**Start screen** page](#start) in Lockdown Designer. If you want to apply a **Small** layout, set **Show more tiles** on the test mobile device to **Off**.
>
->
+>
## Prepare the PC
@@ -84,7 +84,7 @@ If you want to connect the PC and the test mobile device using a USB cable, perf
3. Click **Pair**.
- 
+ 
**Connect to remote device** appears.
@@ -94,7 +94,7 @@ If you want to connect the PC and the test mobile device using a USB cable, perf
6. Next, click **Sync** to pull information from the device in to Lockdown Designer.
- 
+ 
7. Click the **Save** icon and enter a name for your project.
@@ -108,7 +108,7 @@ If you want to connect the PC and the test mobile device using a USB cable, perf
3. On the **Project setting** > **General settings** page, click **Pair**.
- 
+ 
**Connect to remote device** appears.
@@ -118,7 +118,7 @@ If you want to connect the PC and the test mobile device using a USB cable, perf
6. Next, click **Sync** to pull information from the device in to Lockdown Designer.
- 
+ 
7. Click the **Save** icon and enter a name for your project.
@@ -129,13 +129,13 @@ The apps and settings available in the pages of Lockdown Designer should now be
| Page | Description |
| --- | --- |
-|  | Each app from the test mobile device is listed. Select the apps that you want visible to users.You can select an app to run automatically when a user signs in to the device. The **Select Auto-Run** menu is populated by the apps that you select to allow on the device. |
-|  | CSPRunner enables you to include settings and policies that are not defined in other sections of the app. To make use of CSPRunner, you must create the SyncML block that contains the settings, and then import the SyncML in Lockdown Designer. [Learn how to use CSPRunner and author SyncML.](lockdown-xml.md#csprunner) |
-|  | On this page, you select the settings that you want visible to users. See the [ms settings: URI scheme reference](https://docs.microsoft.com/windows/uwp/launch-resume/launch-settings-app#ms-settings-uri-scheme-reference) to see which Settings page maps to a URI. |
-|  | On this page, you select the settings that you want visible to users. |
-|  | Each hardware button on a mobile device has different actions that can be disabled. In addition, the behavior for **Search** button can be changed to open an app other than **Search**.Some devices may have additional hardware buttons provided by the OEM. These are listed as Custom1, Custom2, and Custom3. If your device has custom hardware buttons, contact your equipment provider to identify how their custom buttons are defined. |
-|  | This page contains several settings that you can configure:- The context menu is displayed when a user presses and holds an application in the All Apps list. You can enable or disable the context menu.- Tile manipulation allows users to pin, unpin, move, and resize tiles on the Start screen. You can enable or disable tile manipulation.- The Action Center setting controls whether the user can open the Action Center on the device. When the Action Center is disabled, notifications on the lockscreen and toasts are also disabled. You can use optional attributes with the Action Center element to change that behavior for either notifications, toasts, or both. |
-|  | On this page, you can start a remote simulation session with the test mobile device. Click **Start remote simulation**. You will see a **Start screen remote simulation in progress** message on the PC. (If the **Start remote simulation** button is not active, [pair the mobile device with the PC again](#pair).)On the test mobile device, tiles for the apps that you allowed on the **Applications** page are displayed on the screen. You can move, resize, or unpin these tiles to achieve the desired layout.When you are done changing the layout on the test mobile device, click **Accept** on the PC. |
+|  | Each app from the test mobile device is listed. Select the apps that you want visible to users.You can select an app to run automatically when a user signs in to the device. The **Select Auto-Run** menu is populated by the apps that you select to allow on the device. |
+|  | CSPRunner enables you to include settings and policies that are not defined in other sections of the app. To make use of CSPRunner, you must create the SyncML block that contains the settings, and then import the SyncML in Lockdown Designer. [Learn how to use CSPRunner and author SyncML.](lockdown-xml.md#csprunner) |
+|  | On this page, you select the settings that you want visible to users. See the [ms settings: URI scheme reference](https://docs.microsoft.com/windows/uwp/launch-resume/launch-settings-app#ms-settings-uri-scheme-reference) to see which Settings page maps to a URI. |
+|  | On this page, you select the settings that you want visible to users. |
+|  | Each hardware button on a mobile device has different actions that can be disabled. In addition, the behavior for **Search** button can be changed to open an app other than **Search**.Some devices may have additional hardware buttons provided by the OEM. These are listed as Custom1, Custom2, and Custom3. If your device has custom hardware buttons, contact your equipment provider to identify how their custom buttons are defined. |
+|  | This page contains several settings that you can configure:- The context menu is displayed when a user presses and holds an application in the All Apps list. You can enable or disable the context menu.- Tile manipulation allows users to pin, unpin, move, and resize tiles on the Start screen. You can enable or disable tile manipulation.- The Action Center setting controls whether the user can open the Action Center on the device. When the Action Center is disabled, notifications on the lockscreen and toasts are also disabled. You can use optional attributes with the Action Center element to change that behavior for either notifications, toasts, or both. |
+|  | On this page, you can start a remote simulation session with the test mobile device. Click **Start remote simulation**. You will see a **Start screen remote simulation in progress** message on the PC. (If the **Start remote simulation** button is not active, [pair the mobile device with the PC again](#pair).)On the test mobile device, tiles for the apps that you allowed on the **Applications** page are displayed on the screen. You can move, resize, or unpin these tiles to achieve the desired layout.When you are done changing the layout on the test mobile device, click **Accept** on the PC. |
## Validate and export
@@ -164,7 +164,7 @@ You can create additional roles for the device and have unique configurations fo
4. Configure the settings for the role as above, but make sure on each page that you select the correct role.
- 
+ 
diff --git a/windows/configure/product-ids-in-windows-10-mobile.md b/windows/configuration/mobile-devices/product-ids-in-windows-10-mobile.md
similarity index 100%
rename from windows/configure/product-ids-in-windows-10-mobile.md
rename to windows/configuration/mobile-devices/product-ids-in-windows-10-mobile.md
diff --git a/windows/configure/provisioning-configure-mobile.md b/windows/configuration/mobile-devices/provisioning-configure-mobile.md
similarity index 58%
rename from windows/configure/provisioning-configure-mobile.md
rename to windows/configuration/mobile-devices/provisioning-configure-mobile.md
index 5c1a5048cf..06784fdafb 100644
--- a/windows/configure/provisioning-configure-mobile.md
+++ b/windows/configuration/mobile-devices/provisioning-configure-mobile.md
@@ -16,7 +16,7 @@ Windows provisioning makes it easy for IT administrators to configure end-user d
A provisioning package (.ppkg) is a container for a collection of configuration settings. Using Windows Configuration Designer, you can create provisioning packages that let you quickly and efficiently configure a device without having to install a new image.
-Windows Configuration Designer can be installed from the [Windows Assessment and Deployment Kit (ADK) for Windows 10](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit). Windows Configuration Designer is also available as an app in the Windows Store. [Learn more about installing Windows Configuration Designer.](provisioning-install-icd.md)
+Windows Configuration Designer can be installed from the [Windows Assessment and Deployment Kit (ADK) for Windows 10](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit). Windows Configuration Designer is also available as an app in the Windows Store. [Learn more about installing Windows Configuration Designer.](../provisioning-packages/provisioning-install-icd.md)
## Create a provisioning package using the wizard
@@ -39,10 +39,10 @@ The **Provision Windows mobile devices** wizard lets you configure common settin
### Configure settings in the wizard
-
Enter a device name. Optionally, you can enter a product key to upgrade the device from Windows 10 Mobile to Windows 10 Mobile Enterprise.
 Toggle **On** or **Off** for wireless network connectivity. If you select **On**, enter the SSID, network type (**Open** or **WPA2-Personal**), and (if **WPA2-Personal**) the password for the wireless network.

-
 Before you use a Windows Configuration Designer wizard to configure bulk Azure AD enrollment, [set up Azure AD join in your organization](https://docs.microsoft.com/azure/active-directory/active-directory-azureadjoin-setup). The **maximum number of devices per user** setting in your Azure AD tenant determines how many times the bulk token that you get in the wizard can be used. Set an expiration date for the token (maximum is 30 days from the date you get the token). Click **Get bulk token**. In the **Let's get you signed in** window, enter an account that has permissions to join a device to Azure AD, and then the password. Click **Accept** to give Windows Configuration Designer the necessary permissions.**Warning:** You must run Windows Configuration Designer on Windows 10 to configure Azure Active Directory enrollment using any of the wizards.

-
 You can set a password to protect your provisioning package. You must enter this password when you apply the provisioning package to a device.

+
Enter a device name. Optionally, you can enter a product key to upgrade the device from Windows 10 Mobile to Windows 10 Mobile Enterprise.
 Toggle **On** or **Off** for wireless network connectivity. If you select **On**, enter the SSID, network type (**Open** or **WPA2-Personal**), and (if **WPA2-Personal**) the password for the wireless network.

+
 Before you use a Windows Configuration Designer wizard to configure bulk Azure AD enrollment, [set up Azure AD join in your organization](https://docs.microsoft.com/azure/active-directory/active-directory-azureadjoin-setup). The **maximum number of devices per user** setting in your Azure AD tenant determines how many times the bulk token that you get in the wizard can be used. Set an expiration date for the token (maximum is 30 days from the date you get the token). Click **Get bulk token**. In the **Let's get you signed in** window, enter an account that has permissions to join a device to Azure AD, and then the password. Click **Accept** to give Windows Configuration Designer the necessary permissions.**Warning:** You must run Windows Configuration Designer on Windows 10 to configure Azure Active Directory enrollment using any of the wizards.

+
 You can set a password to protect your provisioning package. You must enter this password when you apply the provisioning package to a device.

After you're done, click **Create**. It only takes a few seconds. When the package is built, the location where the package is stored is displayed as a hyperlink at the bottom of the page.
@@ -61,13 +61,13 @@ You can apply a provisioning package to a device running Windows 10 Mobile by us
1. Insert an SD card containing the provisioning package into the device.
2. Navigate to **Settings** > **Accounts** > **Access work or school** > **Add or remove a provisioning package** > **Add a package**, and select the package to install.
- 
+ 
3. Click **Add**.
4. On the device, the **Is this package from a source you trust?** message will appear. Tap **Yes, add it**.
- 
+ 
### Copying the provisioning package to the device
@@ -77,7 +77,7 @@ You can apply a provisioning package to a device running Windows 10 Mobile by us
3. On the device, the **Is this package from a source you trust?** message will appear. Tap **Yes, add it**.
- 
+ 
## Related topics
diff --git a/windows/configure/provisioning-nfc.md b/windows/configuration/mobile-devices/provisioning-nfc.md
similarity index 99%
rename from windows/configure/provisioning-nfc.md
rename to windows/configuration/mobile-devices/provisioning-nfc.md
index fad3428d0c..96659b0229 100644
--- a/windows/configure/provisioning-nfc.md
+++ b/windows/configuration/mobile-devices/provisioning-nfc.md
@@ -25,7 +25,7 @@ All Windows 10 Mobile Enterprise and Windows 10 Mobile images have the NFC provi
On all Windows devices, device provisioning during OOBE can be triggered by 5 fast taps on the Windows hardware key, which shows the **Provision this device** screen. In the **Provision this device** screen, select **NFC** for NFC-based provisioning.
-
+
If there is an error during NFC provisioning, the device will show a message if any of the following errors occur:
diff --git a/windows/configure/provisioning-package-splitter.md b/windows/configuration/mobile-devices/provisioning-package-splitter.md
similarity index 92%
rename from windows/configure/provisioning-package-splitter.md
rename to windows/configuration/mobile-devices/provisioning-package-splitter.md
index 00a62a1ae4..a6842ac37c 100644
--- a/windows/configure/provisioning-package-splitter.md
+++ b/windows/configuration/mobile-devices/provisioning-package-splitter.md
@@ -23,14 +23,14 @@ Enterprise IT professionals who want to use a barcode to provision mobile device
The smallest provisioning package is typically 5-6 KB, which cannot fit into one single barcode. The package splitter tool allows partners to split the original provisioning package into multiple smaller sized chunks that are encoded with Base64 so that enterprises can leverage their existing tools to convert these files into barcodes.
-When you [install Windows Configuration Designer](provisioning-install-icd.md) from the Windows Assessment and Deployment Kit (ADK), **ppkgtobase64.exe** is installed to the same folder.
+When you [install Windows Configuration Designer](../provisioning-packages/provisioning-install-icd.md) from the Windows Assessment and Deployment Kit (ADK), **ppkgtobase64.exe** is installed to the same folder.
## Prerequisites
Before you can use the tool, you must have a built provisioning package. The package file is the input to the package splitter tool.
- To build a provisioning package using the Windows Configuration Designer UI, see [Use Windows Configuration Designer to configure Windows 10 Mobile devices](provisioning-configure-mobile.md).
-- To build a provisioning package using the Windows Configuration Designer CLI, see [Windows Configuration Designer command-line interface](provisioning-command-line.md).
+- To build a provisioning package using the Windows Configuration Designer CLI, see [Windows Configuration Designer command-line interface](../provisioning-packages/provisioning-command-line.md).
## To use the package splitter tool (ppkgtobase64.exe)
diff --git a/windows/configure/set-up-a-kiosk-for-windows-10-for-mobile-edition.md b/windows/configuration/mobile-devices/set-up-a-kiosk-for-windows-10-for-mobile-edition.md
similarity index 91%
rename from windows/configure/set-up-a-kiosk-for-windows-10-for-mobile-edition.md
rename to windows/configuration/mobile-devices/set-up-a-kiosk-for-windows-10-for-mobile-edition.md
index 9cb47b71cd..6eb9545022 100644
--- a/windows/configure/set-up-a-kiosk-for-windows-10-for-mobile-edition.md
+++ b/windows/configuration/mobile-devices/set-up-a-kiosk-for-windows-10-for-mobile-edition.md
@@ -53,7 +53,7 @@ In AssignedAccessXml, for Application, you enter the product ID for the app to r
#### Create the provisioning package
-1. [Install Windows Configuration Designer.](provisioning-install-icd.md)
+1. [Install Windows Configuration Designer.](../provisioning-packages/provisioning-install-icd.md)
2. Open Windows Configuration Designer (if you installed it from the Windows ADK, `%windir%\\Program Files (x86)\\Windows Kits\\10\\Assessment and Deployment Kit\\Imaging and Configuration Designer\\x86\\ICD.exe`).
@@ -163,33 +163,33 @@ Apps Corner lets you set up a custom Start screen on your Windows 10 Mobile or
**To set up Apps Corner**
-1. On Start , swipe over to the App list, then tap **Settings**  > **Accounts** > **Apps Corner**.
+1. On Start , swipe over to the App list, then tap **Settings**  > **Accounts** > **Apps Corner**.
2. Tap **Apps**, tap to select the app that you want people to use in the kiosk mode, and then tap done .
-3. If your phone doesn't already have a lock screen password, you can set one now to ensure that people can't get to your Start screen from Apps Corner. Tap **Protect my phone with a password**, click **Add**, type a PIN in the **New PIN** box, type it again in the **Confirm PIN** box, and then tap **OK**. Press **Back**  to the Apps Corner settings.
+3. If your phone doesn't already have a lock screen password, you can set one now to ensure that people can't get to your Start screen from Apps Corner. Tap **Protect my phone with a password**, click **Add**, type a PIN in the **New PIN** box, type it again in the **Confirm PIN** box, and then tap **OK**. Press **Back**  to the Apps Corner settings.
4. Turn **Action center** on or off, depending on whether you want people to be able to use these features when using the device in kiosk mode.
5. Tap **advanced**, and then turn features on or off, depending on whether you want people to be able to use them.
-6. Press **Back**  when you're done.
+6. Press **Back**  when you're done.
**To use Apps Corner**
-1. On Start , swipe over to the App list, then tap **Settings**  > **Accounts** > **Apps Corner** > launch .
+1. On Start , swipe over to the App list, then tap **Settings**  > **Accounts** > **Apps Corner** > launch .
>[!TIP]
>Want to get to Apps Corner with one tap? In **Settings**, tap **Apps Corner** > **pin** to pin the Apps Corner tile to your Start screen.
2. Give the device to someone else, so they can use the device and only the one app you chose.
-3. When they're done and you get the device back, press and hold Power , and then swipe right to exit Apps Corner.
+3. When they're done and you get the device back, press and hold Power , and then swipe right to exit Apps Corner.
## Related topics
-[Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md)
+[Set up a kiosk on Windows 10 Pro, Enterprise, or Education](../set-up-a-kiosk-for-windows-10-for-desktop-editions.md)
[Configure Windows 10 Mobile using Lockdown XML](lockdown-xml.md)
diff --git a/windows/configure/settings-that-can-be-locked-down.md b/windows/configuration/mobile-devices/settings-that-can-be-locked-down.md
similarity index 100%
rename from windows/configure/settings-that-can-be-locked-down.md
rename to windows/configuration/mobile-devices/settings-that-can-be-locked-down.md
diff --git a/windows/configure/start-layout-xml-mobile.md b/windows/configuration/mobile-devices/start-layout-xml-mobile.md
similarity index 96%
rename from windows/configure/start-layout-xml-mobile.md
rename to windows/configuration/mobile-devices/start-layout-xml-mobile.md
index f25c2d2413..8096be33e4 100644
--- a/windows/configure/start-layout-xml-mobile.md
+++ b/windows/configuration/mobile-devices/start-layout-xml-mobile.md
@@ -31,7 +31,7 @@ On Windows 10 Mobile, the customized Start works by:
The following diagrams show the default Windows 10, version 1607 Start layouts for single SIM and dual SIM devices with Cortana support, and single SIM and dual SIM devices with no Cortana support.
-
+
The diagrams show:
@@ -370,13 +370,13 @@ This should set the value of **StartLayout**. The setting appears in the **Selec
## Related topics
-- [Manage Windows 10 Start layout options](windows-10-start-layout-options-and-policies.md)
-- [Configure Windows 10 taskbar](configure-windows-10-taskbar.md)
-- [Customize Windows 10 Start and taskbar with Group Policy](customize-windows-10-start-screens-by-using-group-policy.md)
-- [Customize Windows 10 Start and taskbar with ICD and provisioning packages](customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md)
-- [Customize Windows 10 Start with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md)
-- [Changes to Group Policy settings for Windows 10 Start](changes-to-start-policies-in-windows-10.md)
-- [Start layout XML for desktop editions of Windows 10 (reference)](start-layout-xml-desktop.md)
+- [Manage Windows 10 Start layout options](../windows-10-start-layout-options-and-policies.md)
+- [Configure Windows 10 taskbar](../configure-windows-10-taskbar.md)
+- [Customize Windows 10 Start and taskbar with Group Policy](../customize-windows-10-start-screens-by-using-group-policy.md)
+- [Customize Windows 10 Start and taskbar with ICD and provisioning packages](../customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md)
+- [Customize Windows 10 Start with mobile device management (MDM)](../customize-windows-10-start-screens-by-using-mobile-device-management.md)
+- [Changes to Group Policy settings for Windows 10 Start](../changes-to-start-policies-in-windows-10.md)
+- [Start layout XML for desktop editions of Windows 10 (reference)](../start-layout-xml-desktop.md)
diff --git a/windows/configure/how-it-pros-can-use-configuration-service-providers.md b/windows/configuration/provisioning-packages/how-it-pros-can-use-configuration-service-providers.md
similarity index 93%
rename from windows/configure/how-it-pros-can-use-configuration-service-providers.md
rename to windows/configuration/provisioning-packages/how-it-pros-can-use-configuration-service-providers.md
index 4a4fc4883a..87a452fa0f 100644
--- a/windows/configure/how-it-pros-can-use-configuration-service-providers.md
+++ b/windows/configuration/provisioning-packages/how-it-pros-can-use-configuration-service-providers.md
@@ -37,7 +37,7 @@ Each CSP provides access to specific settings. For example, the [Wi-Fi CSP](http
CSPs are behind many of the management tasks and policies for Windows 10 in Microsoft Intune and non-Microsoft MDM service providers. For example, in Intune, the policy to allow search suggestions in the Microsoft Edge address bar uses **Browser/AllowSearchSuggestionsinAddressBar** in the [Policy CSP](https://go.microsoft.com/fwlink/p/?LinkID=623244).
-
+
CSPs receive configuration policies in the XML-based SyncML format pushed to it from an MDM-compliant management server such as Microsoft Intune. Traditional enterprise management systems, such as System Center Configuration Manager, can also target CSPs by using a client-side WMI-to-CSP bridge.
@@ -58,7 +58,7 @@ Generally, enterprises rely on Group Policy or MDM to configure and manage devic
In addition, you may have unmanaged devices, or a large number of devices that you want to configure before enrolling them in management, or you want to apply custom settings that aren't available through your MDM service. The [CSP documentation](#bkmk-csp-doc) can help you understand the settings that can be configured or queried.
-In addition, some of the topics in the [Windows 10 and Windows 10 Mobile](../index.md) library on Technet include links to applicable CSP reference topics, such as [Cortana integration in your business or enterprise](cortana-at-work-overview.md) which links to the [Policy CSP](https://go.microsoft.com/fwlink/p/?LinkID=623244). In the CSP topics, you can learn about all of the available configuration settings.
+In addition, some of the topics in the [Windows 10 and Windows 10 Mobile](/windows/windows-10) library on Technet include links to applicable CSP reference topics, such as [Cortana integration in your business or enterprise](../cortana-at-work/cortana-at-work-overview.md) which links to the [Policy CSP](https://go.microsoft.com/fwlink/p/?LinkID=623244). In the CSP topics, you can learn about all of the available configuration settings.
### CSPs in Windows Configuration Designer
@@ -66,7 +66,7 @@ You can use Windows Configuration Designer to create [provisioning packages](htt
Many settings in Windows Configuration Designer will display documentation for that setting in the center pane, and will include a reference to the CSP if the setting uses one, as shown in the following image.
-
+
[Provisioning packages in Windows 10](provisioning-packages.md) explains how to use the Windows Configuration Designer tool to create a runtime provisioning package.
@@ -78,7 +78,7 @@ When a CSP is available but is not explicitly included in your MDM solution, you
### CSPs in Lockdown XML
-Lockdown XML can be used to configure devices running Windows 10 Mobile. You can manually author a [Lockdown XML file](lockdown-xml.md) to make use of the configuration settings available through the [EnterpriseAssignedAccess configuration service provider (CSP)](https://go.microsoft.com/fwlink/p/?LinkID=618601). In Windows 10, version 1703, you can also use the new [Lockdown Designer app](mobile-lockdown-designer.md) to configure your Lockdown XML.
+Lockdown XML can be used to configure devices running Windows 10 Mobile. You can manually author a [Lockdown XML file](../mobile-devices/lockdown-xml.md) to make use of the configuration settings available through the [EnterpriseAssignedAccess configuration service provider (CSP)](https://go.microsoft.com/fwlink/p/?LinkID=618601). In Windows 10, version 1703, you can also use the new [Lockdown Designer app](../mobile-devices/mobile-lockdown-designer.md) to configure your Lockdown XML.
## How do you use the CSP documentation?
@@ -87,7 +87,7 @@ All CSPs in Windows 10 are documented in the [Configuration service provider re
The [main CSP topic](https://go.microsoft.com/fwlink/p/?LinkId=717390) tells you which CSPs are supported on each edition of Windows 10, and links to the documentation for each individual CSP.
-
+
The documentation for each CSP follows the same structure. After an introduction that explains the purpose of the CSP, a diagram shows the parts of the CSP in tree format.
@@ -95,7 +95,7 @@ The full path to a specific configuration setting is represented by its Open Mob
The following example shows the diagram for the [AssignedAccess CSP](https://go.microsoft.com/fwlink/p/?LinkID=626608). The diagram maps to the XML for that CSP. Notice the different shapes in the diagram: rounded elements are nodes and rectangular elements are settings or policies for which a value must be supplied.
-
+
The element in the tree diagram after the root node tells you the name of the CSP. Knowing this structure, you would recognize in XML the parts of the URI path for that CSP and, if you saw it in XML, you would know which CSP reference to look up. For example, in the following OMS-URI path for the kiosk mode app settings, you can see it uses the [AssignedAccess CSP](https://go.microsoft.com/fwlink/p/?LinkID=626608).
@@ -105,7 +105,7 @@ The element in the tree diagram after the root node tells you the name of the CS
When an element in the diagram uses italic font, it indicates a placeholder for specific information, such as the tenant ID in the following example.
-
+
After the diagram, the documentation describes each element. For each policy or setting, the valid values are listed.
diff --git a/windows/configuration/provisioning-packages/provision-pcs-for-initial-deployment.md b/windows/configuration/provisioning-packages/provision-pcs-for-initial-deployment.md
new file mode 100644
index 0000000000..eba24fd12d
--- /dev/null
+++ b/windows/configuration/provisioning-packages/provision-pcs-for-initial-deployment.md
@@ -0,0 +1,117 @@
+---
+title: Provision PCs with common settings (Windows 10)
+description: Create a provisioning package to apply common settings to a PC running Windows 10.
+ms.assetid: 66D14E97-E116-4218-8924-E2A326C9367E
+keywords: ["runtime provisioning", "provisioning package"]
+ms.prod: W10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+author: jdeckerMS
+localizationpriority: high
+---
+
+# Provision PCs with common settings for initial deployment (desktop wizard)
+
+
+**Applies to**
+
+- Windows 10
+
+This topic explains how to create and apply a provisioning package that contains common enterprise settings to a device running all desktop editions of Windows 10 except Windows 10 Home.
+
+You can apply a provisioning package on a USB drive to off-the-shelf devices during setup, making it fast and easy to configure new devices.
+
+## Advantages
+- You can configure new devices without reimaging.
+
+- Works on both mobile and desktop devices.
+
+- No network connectivity required.
+
+- Simple to apply.
+
+[Learn more about the benefits and uses of provisioning packages.](provisioning-packages.md)
+
+## What does the desktop wizard do?
+
+The desktop wizard helps you configure the following settings in a provisioning package:
+
+- Set device name
+- Upgrade product edition
+- Configure the device for shared use
+- Remove pre-installed software
+- Configure Wi-Fi network
+- Enroll device in Active Directory or Azure Active Directory
+- Create local administrator account
+- Add applications and certificates
+
+>[!WARNING]
+>You must run Windows Configuration Designer on Windows 10 to configure Azure Active Directory enrollment using any of the wizards.
+
+Provisioning packages can include management instructions and policies, installation of specific apps, customization of network connections and policies, and more.
+
+> [!TIP]
+> Use the desktop wizard to create a package with the common settings, then switch to the advanced editor to add other settings, apps, policies, etc.
+>
+>
+
+## Create the provisioning package
+
+Use the Windows Configuration Designer tool to create a provisioning package. [Learn how to install Windows Configuration Designer.](provisioning-install-icd.md)
+
+1. Open Windows Configuration Designer (by default, %windir%\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Imaging and Configuration Designer\x86\ICD.exe).
+
+2. Click **Provision desktop devices**.
+
+ 
+
+3. Name your project and click **Finish**. The pages for desktop provisioning will walk you through the following steps.
+
+ 
+
+> [!IMPORTANT]
+> When you build a provisioning package, you may include sensitive information in the project files and in the provisioning package (.ppkg) file. Although you have the option to encrypt the .ppkg file, project files are not encrypted. You should store the project files in a secure location and delete the project files when they are no longer needed.
+
+## Configure settings
+
+
+
+
Enter a name for the device.(Optional) Select a license file to upgrade Windows 10 to a different edition. [See the permitted upgrades.](https://technet.microsoft.com/itpro/windows/deploy/windows-10-edition-upgrades)Toggle **Yes** or **No** to **Configure devices for shared use**. This setting optimizes Windows 10 for shared use scenarios. [Learn more about shared PC configuration.](../set-up-shared-or-guest-pc.md)You can also select to remove pre-installed software from the device.

+
 Toggle **On** or **Off** for wireless network connectivity. If you select **On**, enter the SSID, the network type (**Open** or **WPA2-Personal**), and (if **WPA2-Personal**) the password for the wireless network.

+
 Enable account management if you want to configure settings on this page. You can enroll the device in Active Directory, enroll in Azure Active Directory, or create a local administrator account on the deviceTo enroll the device in Active Directory, enter the credentials for a least-privileged user account to join the device to the domain.Before you use a Windows Configuration Designer wizard to configure bulk Azure AD enrollment, [set up Azure AD join in your organization](https://docs.microsoft.com/azure/active-directory/active-directory-azureadjoin-setup). The **maximum number of devices per user** setting in your Azure AD tenant determines how many times the bulk token that you get in the wizard can be used. To enroll the device in Azure AD, select that option and enter a friendly name for the bulk token you will get using the wizard. Set an expiration date for the token (maximum is 30 days from the date you get the token). Click **Get bulk token**. In the **Let's get you signed in** window, enter an account that has permissions to join a device to Azure AD, and then the password. Click **Accept** to give Windows Configuration Designer the necessary permissions. To create a local administrator account, select that option and enter a user name and password. **Important:** If you create a local account in the provisioning package, you must change the password using the **Settings** app every 42 days. If the password is not changed during that period, the account might be locked out and unable to sign in.

+
 You can install multiple applications, both Classic Windows (Win32) apps and Universal Windows Platform (UWP) apps, in a provisioning package. The settings in this step vary according to the application that you select. For help with the settings, see [Provision PCs with apps](provision-pcs-with-apps.md).

+
 To provision the device with a certificate, click **Add a certificate**. Enter a name for the certificate, and then browse to and select the certificate to be used.

+
You can set a password to protect your provisioning package. You must enter this password when you apply the provisioning package to a device.

+
+
+After you're done, click **Create**. It only takes a few seconds. When the package is built, the location where the package is stored is displayed as a hyperlink at the bottom of the page.
+
+ **Next step**: [How to apply a provisioning package](provisioning-apply-package.md)
+
+
+## Learn more
+
+- Watch the video: [Provisioning Windows 10 Devices with New Tools](https://go.microsoft.com/fwlink/p/?LinkId=615921)
+
+- Watch the video: [Windows 10 for Mobile Devices: Provisioning Is Not Imaging](https://go.microsoft.com/fwlink/p/?LinkId=615922)
+
+
+## Related topics
+
+- [Provisioning packages for Windows 10](provisioning-packages.md)
+- [How provisioning works in Windows 10](provisioning-how-it-works.md)
+- [Install Windows Configuration Designer](provisioning-install-icd.md)
+- [Create a provisioning package](provisioning-create-package.md)
+- [Apply a provisioning package](provisioning-apply-package.md)
+- [Settings changed when you uninstall a provisioning package](provisioning-uninstall-package.md)
+- [Use a script to install a desktop app in provisioning packages](provisioning-script-to-install-app.md)
+- [PowerShell cmdlets for provisioning Windows 10 (reference)](provisioning-powershell.md)
+- [NFC-based device provisioning](../mobile-devices/provisioning-nfc.md)
+- [Use the package splitter tool](../mobile-devices/provisioning-package-splitter.md)
+- [Windows Configuration Designer command-line interface (reference)](provisioning-command-line.md)
+- [Create a provisioning package with multivariant settings](provisioning-multivariant.md)
+
+
+
+
+
diff --git a/windows/configure/provision-pcs-with-apps-and-certificates.md b/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md
similarity index 92%
rename from windows/configure/provision-pcs-with-apps-and-certificates.md
rename to windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md
index 370464708c..137062fe5d 100644
--- a/windows/configure/provision-pcs-with-apps-and-certificates.md
+++ b/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md
@@ -41,7 +41,7 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi
2. Click **Advanced provisioning**.
- 
+ 
3. Name your project and click **Next**.
@@ -62,25 +62,25 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi
### Add a universal app to your package
-Universal apps that you can distribute in the provisioning package can be line-of-business (LOB) apps developed by your organization, Windows Store for Business apps that you acquire with [offline licensing](../manage/acquire-apps-windows-store-for-business.md), or third-party apps. This procedure will assume you are distributing apps from the Windows Store for Business. For other apps, obtain the necessary information (such as the package family name) from the app developer.
+Universal apps that you can distribute in the provisioning package can be line-of-business (LOB) apps developed by your organization, Windows Store for Business apps that you acquire with [offline licensing](/microsoft-store/acquire-apps-windows-store-for-business), or third-party apps. This procedure will assume you are distributing apps from the Windows Store for Business. For other apps, obtain the necessary information (such as the package family name) from the app developer.
1. In the **Available customizations** pane, go to **Runtime settings** > **UniversalAppInstall**.
2. For **DeviceContextApp**, specify the **PackageFamilyName** for the app. In Windows Store for Business, the package family name is listed in the **Package details** section of the download page.
- 
+ 
3. For **ApplicationFile**, click **Browse** to find and select the target app (either an \*.appx or \*.appxbundle).
4. For **DependencyAppxFiles**, click **Browse** to find and add any dependencies for the app. In Windows Store for Business, any dependencies for the app are listed in the **Required frameworks** section of the download page.
- 
+ 
5. For **DeviceContextAppLicense**, enter the **LicenseProductID**.
- In Windows Store for Business, generate the unencoded license for the app on the app's download page, and change the extension of the license file from **.xml** to **.ms-windows-store-license**.
- 
+ 
- Open the license file and search for **LicenseID=** to get the GUID, enter the GUID in the **LicenseProductID** field and click **Add**.
@@ -88,7 +88,7 @@ Universal apps that you can distribute in the provisioning package can be line-o
7. For **LicenseInstall**, click **Browse**, navigate to the license file that you renamed **.**ms-windows-store-license**, and select the license file.
-[Learn more about distributing offline apps from the Windows Store for Business.](../manage/distribute-offline-apps.md)
+[Learn more about distributing offline apps from the Windows Store for Business.](/microsoft-store/distribute-offline-apps)
> [!NOTE]
> Removing a provisioning package will not remove any apps installed by device context in that provisioning package.
@@ -189,8 +189,8 @@ If your build is successful, the name of the provisioning package, output direct
- [Settings changed when you uninstall a provisioning package](provisioning-uninstall-package.md)
- [Provision PCs with common settings for initial deployment (simple provisioning)](provision-pcs-for-initial-deployment.md)
- [Use a script to install a desktop app in provisioning packages](provisioning-script-to-install-app.md)
-- [NFC-based device provisioning](provisioning-nfc.md)
-- [Use the package splitter tool](provisioning-package-splitter.md)
+- [NFC-based device provisioning](../mobile-devices/provisioning-nfc.md)
+- [Use the package splitter tool](../mobile-devices/provisioning-package-splitter.md)
- [Windows Configuration Designer command-line interface (reference)](provisioning-command-line.md)
- [Create a provisioning package with multivariant settings](provisioning-multivariant.md)
diff --git a/windows/configure/provision-pcs-with-apps.md b/windows/configuration/provisioning-packages/provision-pcs-with-apps.md
similarity index 92%
rename from windows/configure/provision-pcs-with-apps.md
rename to windows/configuration/provisioning-packages/provision-pcs-with-apps.md
index 80b614659c..ea6c976ffe 100644
--- a/windows/configure/provision-pcs-with-apps.md
+++ b/windows/configuration/provisioning-packages/provision-pcs-with-apps.md
@@ -62,33 +62,33 @@ When you add an app in a Windows Configuration Designer wizard, the appropriate
2. Enter a name for the first app, and then click **Add**.
- 
+ 
3. [Configure the settings for the appropriate installer type.](#settings-for-classic-windows-apps)
- 
+ 
### Add a universal app to your package
-Universal apps that you can distribute in the provisioning package can be line-of-business (LOB) apps developed by your organization, Windows Store for Business apps that you acquire with [offline licensing](../manage/acquire-apps-windows-store-for-business.md), or third-party apps. This procedure will assume you are distributing apps from the Windows Store for Business. For other apps, obtain the necessary information (such as the package family name) from the app developer.
+Universal apps that you can distribute in the provisioning package can be line-of-business (LOB) apps developed by your organization, Windows Store for Business apps that you acquire with [offline licensing](/microsoft-store/acquire-apps-windows-store-for-business), or third-party apps. This procedure will assume you are distributing apps from the Windows Store for Business. For other apps, obtain the necessary information (such as the package family name) from the app developer.
1. In the **Available customizations** pane, go to **Runtime settings** > **UniversalAppInstall**.
2. For **DeviceContextApp**, specify the **PackageFamilyName** for the app. In Windows Store for Business, the package family name is listed in the **Package details** section of the download page.
- 
+ 
3. For **ApplicationFile**, click **Browse** to find and select the target app (either an \*.appx or \*.appxbundle).
4. For **DependencyAppxFiles**, click **Browse** to find and add any dependencies for the app. In Windows Store for Business, any dependencies for the app are listed in the **Required frameworks** section of the download page.
- 
+ 
5. For **DeviceContextAppLicense**, enter the **LicenseProductID**.
- In Windows Store for Business, generate the unencoded license for the app on the app's download page.
- 
+ 
- Open the license file and search for **LicenseID=** to get the GUID, enter the GUID in the **LicenseProductID** field and click **Add**.
@@ -96,7 +96,7 @@ Universal apps that you can distribute in the provisioning package can be line-o
7. For **LicenseInstall**, click **Browse**, navigate to the license file that you renamed **.**ms-windows-store-license**, and select the license file.
-[Learn more about distributing offline apps from the Windows Store for Business.](../manage/distribute-offline-apps.md)
+[Learn more about distributing offline apps from the Windows Store for Business.](/microsoft-store/distribute-offline-apps)
> [!NOTE]
> Removing a provisioning package will not remove any apps installed by device context in that provisioning package.
@@ -198,8 +198,8 @@ If your build is successful, the name of the provisioning package, output direct
- [Provision PCs with common settings for initial deployment (simple provisioning)](provision-pcs-for-initial-deployment.md)
- [Use a script to install a desktop app in provisioning packages](provisioning-script-to-install-app.md)
- [PowerShell cmdlets for provisioning Windows 10 (reference)](provisioning-powershell.md)
-- [NFC-based device provisioning](provisioning-nfc.md)
-- [Use the package splitter tool](provisioning-package-splitter.md)
+- [NFC-based device provisioning](../mobile-devices/provisioning-nfc.md)
+- [Use the package splitter tool](../mobile-devices/provisioning-package-splitter.md)
- [Windows Configuration Designer command-line interface (reference)](provisioning-command-line.md)
- [Create a provisioning package with multivariant settings](provisioning-multivariant.md)
diff --git a/windows/configure/provisioning-apply-package.md b/windows/configuration/provisioning-packages/provisioning-apply-package.md
similarity index 85%
rename from windows/configure/provisioning-apply-package.md
rename to windows/configuration/provisioning-packages/provisioning-apply-package.md
index 2725bb140c..bc88e92479 100644
--- a/windows/configure/provisioning-apply-package.md
+++ b/windows/configuration/provisioning-packages/provisioning-apply-package.md
@@ -24,23 +24,23 @@ Provisioning packages can be applied to a device during the first-run experience
1. Start with a computer on the first-run setup screen. If the PC has gone past this screen, reset the PC to start over. To reset the PC, go to **Settings** > **Update & security** > **Recovery** > **Reset this PC**.
- 
+ 
2. Insert the USB drive. Windows Setup will recognize the drive and ask if you want to set up the device. Select **Set up**.
- 
+ 
3. The next screen asks you to select a provisioning source. Select **Removable Media** and tap **Next**.
- 
+ 
4. Select the provisioning package (\*.ppkg) that you want to apply, and tap **Next**.
- 
+ 
5. Select **Yes, add it**.
- 
+ 
@@ -48,7 +48,7 @@ Provisioning packages can be applied to a device during the first-run experience
Insert the USB drive to a desktop computer, navigate to **Settings** > **Accounts** > **Access work or school** > **Add or remove a provisioning package** > **Add a package**, and select the package to install. For a provisioning package stored on a network forlder or on a SharePoint site, navigate to the provisioning package and double-click it to begin installation.
-
+
## Mobile editions
@@ -57,13 +57,13 @@ Insert the USB drive to a desktop computer, navigate to **Settings** > **Account
1. Insert an SD card containing the provisioning package into the device.
2. Navigate to **Settings** > **Accounts** > **Access work or school** > **Add or remove a provisioning package** > **Add a package**, and select the package to install.
- 
+ 
3. Click **Add**.
4. On the device, the **Is this package from a source you trust?** message will appear. Tap **Yes, add it**.
- 
+ 
### Copying the provisioning package to the device
@@ -73,7 +73,7 @@ Insert the USB drive to a desktop computer, navigate to **Settings** > **Account
3. On the device, the **Is this package from a source you trust?** message will appear. Tap **Yes, add it**.
- 
+ 
diff --git a/windows/configure/provisioning-command-line.md b/windows/configuration/provisioning-packages/provisioning-command-line.md
similarity index 100%
rename from windows/configure/provisioning-command-line.md
rename to windows/configuration/provisioning-packages/provisioning-command-line.md
diff --git a/windows/configure/provisioning-create-package.md b/windows/configuration/provisioning-packages/provisioning-create-package.md
similarity index 88%
rename from windows/configure/provisioning-create-package.md
rename to windows/configuration/provisioning-packages/provisioning-create-package.md
index a73b54f4f8..3beb70be19 100644
--- a/windows/configure/provisioning-create-package.md
+++ b/windows/configuration/provisioning-packages/provisioning-create-package.md
@@ -34,13 +34,13 @@ You use Windows Configuration Designer to create a provisioning package (.ppkg)
2. Select your desired option on the **Start** page, which offers multiple options for creating a provisioning package, as shown in the following image:
- 
+ 
- The wizard options provide a simple interface for configuring common settings for desktop, mobile, and kiosk devices. Wizards are also available for creating provisioning packages for Microsoft Surface Hub and Microsoft HoloLens devices. For a summary of the settings available in the desktop, mobile, and kiosk devices, see [What you can configure using Configuration Designer wizardS](provisioning-packages.md#configuration-designer-wizards).
- [Instructions for the desktop wizard](provision-pcs-for-initial-deployment.md)
- - [Instructions for the mobile wizard](provisioning-configure-mobile.md)
- - [Instructions for the kiosk wizard](set-up-a-kiosk-for-windows-10-for-desktop-editions.md#wizard)
+ - [Instructions for the mobile wizard](../mobile-devices/provisioning-configure-mobile.md)
+ - [Instructions for the kiosk wizard](../set-up-a-kiosk-for-windows-10-for-desktop-editions.md#wizard)
- [Instructions for HoloLens wizard](https://technet.microsoft.com/itpro/hololens/hololens-provisioning)
- [Instructions for Surface Hub wizard](https://technet.microsoft.com/itpro/surface-hub/provisioning-packages-for-certificates-surface-hub)
@@ -49,7 +49,7 @@ You use Windows Configuration Designer to create a provisioning package (.ppkg)
>[!TIP]
> You can start a project in the simple wizard editor and then switch the project to the advanced editor.
>
- > 
+ > 
3. Enter a name for your project, and then click **Next**.
@@ -78,30 +78,30 @@ After you click **Finish**, Windows Configuration Designer will open the **Avail
For an advanced provisioning project, Windows Configuration Designer opens the **Available customizations** pane. The example in the following image is based on **All Windows desktop editions** settings.
-
+
The settings in Windows Configuration Designer are based on Windows 10 configuration service providers (CSPs). To learn more about CSPs, see [Introduction to configuration service providers (CSPs) for IT pros](https://technet.microsoft.com/itpro/windows/manage/how-it-pros-can-use-configuration-service-providers).
The process for configuring settings is similar for all settings. The following table shows an example.
Enter a value for the setting. Click **Add** if the button is displayed.

-
Some settings, such as this example, require additional information. In **Available customizations**, select the value you just created, and additional settings are displayed.

-
When the setting is configured, it is displayed in the **Selected customizations** pane.
Enter a value for the setting. Click **Add** if the button is displayed.

+
Some settings, such as this example, require additional information. In **Available customizations**, select the value you just created, and additional settings are displayed.

+
When the setting is configured, it is displayed in the **Selected customizations** pane.
For details on each specific setting, see [Windows Provisioning settings reference](https://msdn.microsoft.com/library/windows/hardware/dn965990.aspx). The reference topic for a setting is also displayed in Windows Configuration Designer when you select the setting, as shown in the following image.
-
+
## Build package
1. After you're done configuring your customizations, click **Export** and select **Provisioning Package**.
- 
+ 
2. In the **Describe the provisioning package** window, enter the following information, and then click **Next**:
- **Name** - This field is pre-populated with the project name. You can change this value by entering a different name in the **Name** field.
diff --git a/windows/configure/provisioning-how-it-works.md b/windows/configuration/provisioning-packages/provisioning-how-it-works.md
similarity index 100%
rename from windows/configure/provisioning-how-it-works.md
rename to windows/configuration/provisioning-packages/provisioning-how-it-works.md
diff --git a/windows/configure/provisioning-install-icd.md b/windows/configuration/provisioning-packages/provisioning-install-icd.md
similarity index 98%
rename from windows/configure/provisioning-install-icd.md
rename to windows/configuration/provisioning-packages/provisioning-install-icd.md
index 16ae7f94d5..29a9eb537c 100644
--- a/windows/configure/provisioning-install-icd.md
+++ b/windows/configuration/provisioning-packages/provisioning-install-icd.md
@@ -61,7 +61,7 @@ On devices running Windows 10, you can install [the Windows Configuration Design
6. On the **Select the features you want to install** page, clear all selections except **Configuration Designer**, and then click **Install**.
- 
+ 
## Current Windows Configuration Designer limitations
diff --git a/windows/configure/provisioning-multivariant.md b/windows/configuration/provisioning-packages/provisioning-multivariant.md
similarity index 98%
rename from windows/configure/provisioning-multivariant.md
rename to windows/configuration/provisioning-packages/provisioning-multivariant.md
index d28ac354ee..e3479458a2 100644
--- a/windows/configure/provisioning-multivariant.md
+++ b/windows/configuration/provisioning-packages/provisioning-multivariant.md
@@ -30,12 +30,12 @@ In the XML file, you provide an **Id**, or friendly name, for each **Target**. E
A **Target** can have more than one **TargetState**, and a **TargetState** can have more than one **Condition**.
-
+
The following table describes the logic for the target definition.
-
When all **Condition** elements are TRUE, **TargetState** is TRUE.

-
If any of the **TargetState** elements is TRUE, **Target** is TRUE, and the **Id** can be used for setting customizations.

+
When all **Condition** elements are TRUE, **TargetState** is TRUE.

+
If any of the **TargetState** elements is TRUE, **Target** is TRUE, and the **Id** can be used for setting customizations.

### Conditions
diff --git a/windows/configure/provisioning-packages.md b/windows/configuration/provisioning-packages/provisioning-packages.md
similarity index 85%
rename from windows/configure/provisioning-packages.md
rename to windows/configuration/provisioning-packages/provisioning-packages.md
index 18a290180a..d04fbce120 100644
--- a/windows/configure/provisioning-packages.md
+++ b/windows/configuration/provisioning-packages/provisioning-packages.md
@@ -70,18 +70,18 @@ Provisioning packages can be:
The following table describes settings that you can configure using the wizards in Windows Configuration Designer to create provisioning packages.
(Only device name and upgrade key)

-
Set up network
Connect to a Wi-Fi network



-
Account management
Enroll device in Active Directory,enroll device in Azure Active Directory,or create a local administrator account



-
Bulk Enrollment in Azure AD
Enroll device in Azure Active DirectoryBefore you use a Windows Configuration Designer wizard to configure bulk Azure AD enrollment, [set up Azure AD join in your organization](https://docs.microsoft.com/azure/active-directory/active-directory-azureadjoin-setup).



-
Add applications
Install applications using the provisioning package.



-
Add certificates
Include a certificate file in the provisioning package.



-
Configure kiosk account and app
Create local account to run the kiosk mode app,specify the app to run in kiosk mode



-
Configure kiosk common settings
Set tablet mode,configure welcome and shutdown screens,turn off timeout settings
(Only device name and upgrade key)

+
Set up network
Connect to a Wi-Fit network



+
Account management
Enroll device in Active Directory,enroll device in Azure Active Directory,or create a local administrator account



+
Bulk Enrollment in Azure AD
Enroll device in Azure Active DirectoryBefore you use a Windows Configuration Designer wizard to configure bulk Azure AD enrollment, [set up Azure AD join in your organization](https://docs.microsoft.com/azure/active-directory/active-directory-azureadjoin-setup).



+
Add applications
Install applications using the provisioning package.



+
Add certificates
Include a certificate file in the provisioning package.



+
Configure kiosk account and app
Create local account to run the kiosk mode app,specify the app to run in kiosk mode



+
Configure kiosk common settings
Set tablet mode,configure welcome and shutdown screens,turn off timeout settings



- [Instructions for the desktop wizard](provision-pcs-for-initial-deployment.md)
-- [Instructions for the mobile wizard](provisioning-configure-mobile.md)
-- [Instructions for the kiosk wizard](set-up-a-kiosk-for-windows-10-for-desktop-editions.md#wizard)
+- [Instructions for the mobile wizard](../mobile-devices/provisioning-configure-mobile.md)
+- [Instructions for the kiosk wizard](../set-up-a-kiosk-for-windows-10-for-desktop-editions.md#wizard)
@@ -115,7 +115,7 @@ For details about the settings you can customize in provisioning packages, see [
Windows ICD for Windows 10, version 1607, simplified common provisioning scenarios.
-
+
Windows ICD in Windows 10, version 1607, supported the following scenarios for IT administrators:
@@ -153,7 +153,7 @@ Windows ICD in Windows 10, version 1607, supported the following scenarios for I
- [PowerShell cmdlets for provisioning Windows 10 (reference)](provisioning-powershell.md)
- [Windows Configuration Designer command-line interface (reference)](provisioning-command-line.md)
- [Create a provisioning package with multivariant settings](provisioning-multivariant.md)
-- [Use Windows Configuration Designer to configure Windows 10 Mobile devices](provisioning-configure-mobile.md)
+- [Use Windows Configuration Designer to configure Windows 10 Mobile devices](../mobile-devices/provisioning-configure-mobile.md)
diff --git a/windows/configure/provisioning-powershell.md b/windows/configuration/provisioning-packages/provisioning-powershell.md
similarity index 100%
rename from windows/configure/provisioning-powershell.md
rename to windows/configuration/provisioning-packages/provisioning-powershell.md
diff --git a/windows/configure/provisioning-script-to-install-app.md b/windows/configuration/provisioning-packages/provisioning-script-to-install-app.md
similarity index 98%
rename from windows/configure/provisioning-script-to-install-app.md
rename to windows/configuration/provisioning-packages/provisioning-script-to-install-app.md
index 0e47014f47..d4b208b83a 100644
--- a/windows/configure/provisioning-script-to-install-app.md
+++ b/windows/configuration/provisioning-packages/provisioning-script-to-install-app.md
@@ -184,13 +184,13 @@ cmd /c InstallMyApp.bat
In Windows Configuration Designer, this looks like:
-
+
You also need to add the relevant assets for that command line including the orchestrator script and any other assets it references such as installers or .cab files.
In Windows Configuration Designer, that is done by adding files under the `ProvisioningCommands/DeviceContext/CommandFiles` setting.
-
+
When you are done, [build the package](provisioning-create-package.md#build-package).
diff --git a/windows/configure/provisioning-uninstall-package.md b/windows/configuration/provisioning-packages/provisioning-uninstall-package.md
similarity index 100%
rename from windows/configure/provisioning-uninstall-package.md
rename to windows/configuration/provisioning-packages/provisioning-uninstall-package.md
diff --git a/windows/configure/set-up-a-device-for-anyone-to-use.md b/windows/configuration/set-up-a-device-for-anyone-to-use.md
similarity index 95%
rename from windows/configure/set-up-a-device-for-anyone-to-use.md
rename to windows/configuration/set-up-a-device-for-anyone-to-use.md
index 7a58deaa8f..cecb14db32 100644
--- a/windows/configure/set-up-a-device-for-anyone-to-use.md
+++ b/windows/configuration/set-up-a-device-for-anyone-to-use.md
@@ -8,7 +8,6 @@ ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
localizationpriority: high
-redirect_url: https://technet.microsoft.com/itpro/windows/configure/kiosk-shared-pc
---
# Set up a device for anyone to use (kiosk mode)
@@ -70,7 +69,7 @@ The following table identifies the type of application that can be used on each
A single-use device is easy to set up in Windows 10 for desktop editions (Pro, Enterprise, and Education). For a kiosk device to run a Universal Windows app, use the assigned access feature. For a kiosk device (Windows 10 Enterprise or Education) to run a Classic Windows application, use Shell Launcher to set a custom user interface as the shell.
-
[Set up a kiosk on Windows 10 Mobile or Windows 10 Mobile Enterprise](set-up-a-kiosk-for-windows-10-for-mobile-edition.md)
+
[Set up a kiosk on Windows 10 Mobile or Windows 10 Mobile Enterprise](mobile-devices/set-up-a-kiosk-for-windows-10-for-mobile-edition.md)
A device in kiosk mode runs a specified app with no access to other device functions, menus, or settings. You configure a device running Windows 10 Mobile or Windows 10 Mobile Enterprise for kiosk mode by using the Apps Corner feature. You can also use the Enterprise Assigned Access configuration service provider (CSP) to configure a kiosk experience.
diff --git a/windows/configure/set-up-a-kiosk-for-windows-10-for-desktop-editions.md b/windows/configuration/set-up-a-kiosk-for-windows-10-for-desktop-editions.md
similarity index 95%
rename from windows/configure/set-up-a-kiosk-for-windows-10-for-desktop-editions.md
rename to windows/configuration/set-up-a-kiosk-for-windows-10-for-desktop-editions.md
index e9f19dfa8f..fd1177208a 100644
--- a/windows/configure/set-up-a-kiosk-for-windows-10-for-desktop-editions.md
+++ b/windows/configuration/set-up-a-kiosk-for-windows-10-for-desktop-editions.md
@@ -49,7 +49,7 @@ When you use the **Provision kiosk devices** wizard in Windows Configuration Des
>When you build a provisioning package, you may include sensitive information in the project files and in the provisioning package (.ppkg) file. Although you have the option to encrypt the .ppkg file, project files are not encrypted. You should store the project files in a secure location and delete the project files when they are no longer needed.
-[Install Windows Configuration Designer](provisioning-install-icd.md), then open Windows Configuration Designer and select **Provision kiosk devices**. After you name your project, and click **Next**, configure the settings as shown in the following table.
+[Install Windows Configuration Designer](provisioning-packages/provisioning-install-icd.md), then open Windows Configuration Designer and select **Provision kiosk devices**. After you name your project, and click **Next**, configure the settings as shown in the following table.
@@ -57,7 +57,7 @@ When you use the **Provision kiosk devices** wizard in Windows Configuration Des
Enable device setup if you want to configure settings on this page.**If enabled:**Enter a name for the device.(Optional) Select a license file to upgrade Windows 10 to a different edition. [See the permitted upgrades.](https://technet.microsoft.com/itpro/windows/deploy/windows-10-edition-upgrades)Toggle **Configure devices for shared use** off. This setting optimizes Windows 10 for shared use scenarios and isn't necessary for a kiosk scenario.You can also select to remove pre-installed software from the device.

 Enable network setup if you want to configure settings on this page.**If enabled:**Toggle **On** or **Off** for wireless network connectivity. If you select **On**, enter the SSID, the network type (**Open** or **WPA2-Personal**), and (if **WPA2-Personal**) the password for the wireless network.

 Enable account management if you want to configure settings on this page. **If enabled:**You can enroll the device in Active Directory, enroll in Azure Active Directory, or create a local administrator account on the deviceTo enroll the device in Active Directory, enter the credentials for a least-privileged user account to join the device to the domain.Before you use a Windows Configuration Designer wizard to configure bulk Azure AD enrollment, [set up Azure AD join in your organization](https://docs.microsoft.com/azure/active-directory/active-directory-azureadjoin-setup). The **maximum number of devices per user** setting in your Azure AD tenant determines how many times the bulk token that you get in the wizard can be used. To enroll the device in Azure AD, select that option and enter a friendly name for the bulk token you will get using the wizard. Set an expiration date for the token (maximum is 30 days from the date you get the token). Click **Get bulk token**. In the **Let's get you signed in** window, enter an account that has permissions to join a device to Azure AD, and then the password. Click **Accept** to give Windows Configuration Designer the necessary permissions.**Warning:** You must run Windows Configuration Designer on Windows 10 to configure Azure Active Directory enrollment using any of the wizards.To create a local administrator account, select that option and enter a user name and password. **Important:** If you create a local account in the provisioning package, you must change the password using the **Settings** app every 42 days. If the password is not changed during that period, the account might be locked out and unable to sign in.

-
 You can provision the kiosk app in the **Add applications** step. You can install multiple applications, both Classic Windows (Win32) apps and Universal Windows Platform (UWP) apps, in a provisioning package. The settings in this step vary according to the application that you select. For help with the settings, see [Provision PCs with apps](provision-pcs-with-apps.md)**Warning:** If you click the plus button to add an application, you must specify an application for the provisioning package to validate. If you click the plus button in error, select any executable file in **Installer Path**, and then a **Cancel** button becomes available, allowing you to complete the provisioning package without an application.

+
 You can provision the kiosk app in the **Add applications** step. You can install multiple applications, both Classic Windows (Win32) apps and Universal Windows Platform (UWP) apps, in a provisioning package. The settings in this step vary according to the application that you select. For help with the settings, see [Provision PCs with apps](provisioning-packages/provision-pcs-with-apps.md)**Warning:** If you click the plus button to add an application, you must specify an application for the provisioning package to validate. If you click the plus button in error, select any executable file in **Installer Path**, and then a **Cancel** button becomes available, allowing you to complete the provisioning package without an application.

 To provision the device with a certificate for the kiosk app, click **Add a certificate**. Enter a name for the certificate, and then browse to and select the certificate to be used.

 **Important:** You must use the Windows Configuration Designer app from Windows Store to select a Classic Windows application as the kiosk app in a provisioning package.You can create a local standard user account that will be used to run the kiosk app. If you toggle **No**, make sure that you have an existing user account to run the kiosk app.If you want to create an account, enter the user name and password, and then toggle **Yes** or **No** to automatically sign in the account when the device starts.In **Configure the kiosk mode app**, enter the name of the user account that will run the kiosk mode app. Select the type of app to run in kiosk mode, and then enter the path or filename (for a Classic Windows app) or the AUMID (for a Universal Windows app). For a Classic Windows app, you can use the filename if the path to the file is in the PATH environment variable, otherwise the full path is required.

 On this step, select your options for tablet mode, the user experience on the Welcome and shutdown screens, and the timeout settings.

@@ -72,7 +72,7 @@ When you use the **Provision kiosk devices** wizard in Windows Configuration Des
-[Learn how to apply a provisioning package.](provisioning-apply-package.md)
+[Learn how to apply a provisioning package.](provisioning-packages/provisioning-apply-package.md)
@@ -427,7 +427,7 @@ For a more secure kiosk experience, we recommend that you make the following con
## Related topics
-- [Set up a kiosk on Windows 10 Mobile or Windows 10 Mobile Enterprise](set-up-a-kiosk-for-windows-10-for-mobile-edition.md)
+- [Set up a kiosk on Windows 10 Mobile or Windows 10 Mobile Enterprise](mobile-devices/set-up-a-kiosk-for-windows-10-for-mobile-edition.md)
diff --git a/windows/configure/set-up-shared-or-guest-pc.md b/windows/configuration/set-up-shared-or-guest-pc.md
similarity index 99%
rename from windows/configure/set-up-shared-or-guest-pc.md
rename to windows/configuration/set-up-shared-or-guest-pc.md
index 23d35abc14..68d3432d27 100644
--- a/windows/configure/set-up-shared-or-guest-pc.md
+++ b/windows/configuration/set-up-shared-or-guest-pc.md
@@ -89,7 +89,7 @@ You can configure Windows to be in shared PC mode in a couple different ways:
### Create a provisioning package for shared use
-1. [install Windows Configuration Designer](provisioning-install-icd.md)
+1. [install Windows Configuration Designer](provisioning-packages/provisioning-install-icd.md)
1. Open Windows Configuration Designer.
diff --git a/windows/configure/start-layout-xml-desktop.md b/windows/configuration/start-layout-xml-desktop.md
similarity index 99%
rename from windows/configure/start-layout-xml-desktop.md
rename to windows/configuration/start-layout-xml-desktop.md
index b8a3205aa6..5e6da82bec 100644
--- a/windows/configure/start-layout-xml-desktop.md
+++ b/windows/configuration/start-layout-xml-desktop.md
@@ -483,7 +483,7 @@ Once you have created the LayoutModification.xml file and it is present in the d
- [Customize Windows 10 Start and taskbar with provisioning packages](customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md)
- [Customize Windows 10 Start and tasbkar with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md)
- [Changes to Start policies in Windows 10](changes-to-start-policies-in-windows-10.md)
-- [Start layout XML for mobile editions of Windows 10 (reference)](start-layout-xml-mobile.md)
+- [Start layout XML for mobile editions of Windows 10 (reference)](mobile-devices/start-layout-xml-mobile.md)
diff --git a/windows/configure/start-secondary-tiles.md b/windows/configuration/start-secondary-tiles.md
similarity index 99%
rename from windows/configure/start-secondary-tiles.md
rename to windows/configuration/start-secondary-tiles.md
index 2fb633a235..83495bc80c 100644
--- a/windows/configure/start-secondary-tiles.md
+++ b/windows/configuration/start-secondary-tiles.md
@@ -97,7 +97,7 @@ The **export-StartLayout** and **export-StartLayoutEdgeAssets** cmdlets produce
#### Create a provisioning package that contains a customized Start layout
-Use the Windows Configuration Designer tool to create a provisioning package. [Learn how to install Windows Configuration Designer.](provisioning-install-icd.md)
+Use the Windows Configuration Designer tool to create a provisioning package. [Learn how to install Windows Configuration Designer.](provisioning-packages/provisioning-install-icd.md)
>[!IMPORTANT]
>When you build a provisioning package, you may include sensitive information in the project files and in the provisioning package (.ppkg) file. Although you have the option to encrypt the .ppkg file, project files are not encrypted. You should store the project files in a secure location and delete the project files when they are no longer needed.
diff --git a/windows/configure/start-taskbar-lockscreen.md b/windows/configuration/start-taskbar-lockscreen.md
similarity index 94%
rename from windows/configure/start-taskbar-lockscreen.md
rename to windows/configuration/start-taskbar-lockscreen.md
index 966ef97fca..d10dad3276 100644
--- a/windows/configure/start-taskbar-lockscreen.md
+++ b/windows/configuration/start-taskbar-lockscreen.md
@@ -24,4 +24,4 @@ author: jdeckerMS
## Related topics
-- [Configure Windows 10 Mobile devices](configure-mobile.md)
\ No newline at end of file
+- [Configure Windows 10 Mobile devices](mobile-devices/configure-mobile.md)
\ No newline at end of file
diff --git a/windows/configure/stop-employees-from-using-the-windows-store.md b/windows/configuration/stop-employees-from-using-the-windows-store.md
similarity index 87%
rename from windows/configure/stop-employees-from-using-the-windows-store.md
rename to windows/configuration/stop-employees-from-using-the-windows-store.md
index 04c5aa20d2..4868f99cb9 100644
--- a/windows/configure/stop-employees-from-using-the-windows-store.md
+++ b/windows/configuration/stop-employees-from-using-the-windows-store.md
@@ -34,7 +34,7 @@ Applies to: Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile
AppLocker provides policy-based access control management for applications. You can block access to Windows Store app with AppLocker by creating a rule for packaged apps. You'll give the name of the Windows Store app as the packaged app that you want to block from client computers.
-For more information on AppLocker, see [What is AppLocker?](../keep-secure/what-is-applocker.md) For more information on creating an AppLocker rule for app packages, see [Create a rule for packaged apps](../keep-secure/create-a-rule-for-packaged-apps.md).
+For more information on AppLocker, see [What is AppLocker?](/windows/device-security/applocker/what-is-applocker) For more information on creating an AppLocker rule for app packages, see [Create a rule for packaged apps](/windows/device-security/applocker/create-a-rule-for-packaged-apps).
**To block Windows Store using AppLocker**
@@ -52,7 +52,7 @@ For more information on AppLocker, see [What is AppLocker?](../keep-secure/what-
7. On **Select applications**, find and click **Store** under **Applications** column, and then click **OK**. Click **Next**.
- [Create a rule for packaged apps](../keep-secure/create-a-rule-for-packaged-apps.md) has more information on reference options and setting the scope on packaged app rules.
+ [Create a rule for packaged apps](/windows/device-security/applocker/create-a-rule-for-packaged-apps) has more information on reference options and setting the scope on packaged app rules.
8. Optional: On **Exceptions**, specify conditions by which to exclude files from being affected by the rule. This allows you to add exceptions based on the same rule reference and rule scope as you set before. Click **Next**.
@@ -89,7 +89,7 @@ When your MDM tool supports Windows Store for Business, the MDM can use these CS
- [EnterpriseAssignedAccess](https://msdn.microsoft.com/library/windows/hardware/mt157024.aspx) (Windows 10 Mobile, only)
-For more information, see [Configure an MDM provider](../manage/configure-mdm-provider-windows-store-for-business.md).
+For more information, see [Configure an MDM provider](/microsoft-store/configure-mdm-provider-windows-store-for-business).
## Show private store only using Group Policy
Applies to Windows 10 Enterprise, version 1607, Windows 10 Education
@@ -110,9 +110,9 @@ If you're using Windows Store for Business and you want employees to only see ap
## Related topics
-[Distribute apps using your private store](../manage/distribute-apps-from-your-private-store.md)
+[Distribute apps using your private store](/microsoft-store/distribute-apps-from-your-private-store)
-[Manage access to private store](../manage/manage-access-to-private-store.md)
+[Manage access to private store](/microsoft-store/manage-access-to-private-store)
diff --git a/windows/configure/images/uev-adk-select-uev-feature.png b/windows/configuration/ue-v/images/uev-adk-select-uev-feature.png
similarity index 100%
rename from windows/configure/images/uev-adk-select-uev-feature.png
rename to windows/configuration/ue-v/images/uev-adk-select-uev-feature.png
diff --git a/windows/configure/images/uev-archdiagram.png b/windows/configuration/ue-v/images/uev-archdiagram.png
similarity index 100%
rename from windows/configure/images/uev-archdiagram.png
rename to windows/configuration/ue-v/images/uev-archdiagram.png
diff --git a/windows/configure/images/uev-checklist-box.gif b/windows/configuration/ue-v/images/uev-checklist-box.gif
similarity index 100%
rename from windows/configure/images/uev-checklist-box.gif
rename to windows/configuration/ue-v/images/uev-checklist-box.gif
diff --git a/windows/configure/images/uev-deployment-preparation.png b/windows/configuration/ue-v/images/uev-deployment-preparation.png
similarity index 100%
rename from windows/configure/images/uev-deployment-preparation.png
rename to windows/configuration/ue-v/images/uev-deployment-preparation.png
diff --git a/windows/configure/images/uev-generator-process.png b/windows/configuration/ue-v/images/uev-generator-process.png
similarity index 100%
rename from windows/configure/images/uev-generator-process.png
rename to windows/configuration/ue-v/images/uev-generator-process.png
diff --git a/windows/manage/uev-administering-uev-with-windows-powershell-and-wmi.md b/windows/configuration/ue-v/uev-administering-uev-with-windows-powershell-and-wmi.md
similarity index 100%
rename from windows/manage/uev-administering-uev-with-windows-powershell-and-wmi.md
rename to windows/configuration/ue-v/uev-administering-uev-with-windows-powershell-and-wmi.md
diff --git a/windows/manage/uev-administering-uev.md b/windows/configuration/ue-v/uev-administering-uev.md
similarity index 100%
rename from windows/manage/uev-administering-uev.md
rename to windows/configuration/ue-v/uev-administering-uev.md
diff --git a/windows/manage/uev-application-template-schema-reference.md b/windows/configuration/ue-v/uev-application-template-schema-reference.md
similarity index 100%
rename from windows/manage/uev-application-template-schema-reference.md
rename to windows/configuration/ue-v/uev-application-template-schema-reference.md
diff --git a/windows/manage/uev-changing-the-frequency-of-scheduled-tasks.md b/windows/configuration/ue-v/uev-changing-the-frequency-of-scheduled-tasks.md
similarity index 100%
rename from windows/manage/uev-changing-the-frequency-of-scheduled-tasks.md
rename to windows/configuration/ue-v/uev-changing-the-frequency-of-scheduled-tasks.md
diff --git a/windows/manage/uev-configuring-uev-with-group-policy-objects.md b/windows/configuration/ue-v/uev-configuring-uev-with-group-policy-objects.md
similarity index 100%
rename from windows/manage/uev-configuring-uev-with-group-policy-objects.md
rename to windows/configuration/ue-v/uev-configuring-uev-with-group-policy-objects.md
diff --git a/windows/manage/uev-configuring-uev-with-system-center-configuration-manager.md b/windows/configuration/ue-v/uev-configuring-uev-with-system-center-configuration-manager.md
similarity index 100%
rename from windows/manage/uev-configuring-uev-with-system-center-configuration-manager.md
rename to windows/configuration/ue-v/uev-configuring-uev-with-system-center-configuration-manager.md
diff --git a/windows/manage/uev-deploy-required-features.md b/windows/configuration/ue-v/uev-deploy-required-features.md
similarity index 100%
rename from windows/manage/uev-deploy-required-features.md
rename to windows/configuration/ue-v/uev-deploy-required-features.md
diff --git a/windows/manage/uev-deploy-uev-for-custom-applications.md b/windows/configuration/ue-v/uev-deploy-uev-for-custom-applications.md
similarity index 100%
rename from windows/manage/uev-deploy-uev-for-custom-applications.md
rename to windows/configuration/ue-v/uev-deploy-uev-for-custom-applications.md
diff --git a/windows/manage/uev-for-windows.md b/windows/configuration/ue-v/uev-for-windows.md
similarity index 100%
rename from windows/manage/uev-for-windows.md
rename to windows/configuration/ue-v/uev-for-windows.md
diff --git a/windows/manage/uev-getting-started.md b/windows/configuration/ue-v/uev-getting-started.md
similarity index 100%
rename from windows/manage/uev-getting-started.md
rename to windows/configuration/ue-v/uev-getting-started.md
diff --git a/windows/manage/uev-manage-administrative-backup-and-restore.md b/windows/configuration/ue-v/uev-manage-administrative-backup-and-restore.md
similarity index 100%
rename from windows/manage/uev-manage-administrative-backup-and-restore.md
rename to windows/configuration/ue-v/uev-manage-administrative-backup-and-restore.md
diff --git a/windows/manage/uev-manage-configurations.md b/windows/configuration/ue-v/uev-manage-configurations.md
similarity index 100%
rename from windows/manage/uev-manage-configurations.md
rename to windows/configuration/ue-v/uev-manage-configurations.md
diff --git a/windows/manage/uev-managing-settings-location-templates-using-windows-powershell-and-wmi.md b/windows/configuration/ue-v/uev-managing-settings-location-templates-using-windows-powershell-and-wmi.md
similarity index 100%
rename from windows/manage/uev-managing-settings-location-templates-using-windows-powershell-and-wmi.md
rename to windows/configuration/ue-v/uev-managing-settings-location-templates-using-windows-powershell-and-wmi.md
diff --git a/windows/manage/uev-managing-uev-agent-and-packages-with-windows-powershell-and-wmi.md b/windows/configuration/ue-v/uev-managing-uev-agent-and-packages-with-windows-powershell-and-wmi.md
similarity index 100%
rename from windows/manage/uev-managing-uev-agent-and-packages-with-windows-powershell-and-wmi.md
rename to windows/configuration/ue-v/uev-managing-uev-agent-and-packages-with-windows-powershell-and-wmi.md
diff --git a/windows/manage/uev-migrating-settings-packages.md b/windows/configuration/ue-v/uev-migrating-settings-packages.md
similarity index 100%
rename from windows/manage/uev-migrating-settings-packages.md
rename to windows/configuration/ue-v/uev-migrating-settings-packages.md
diff --git a/windows/manage/uev-prepare-for-deployment.md b/windows/configuration/ue-v/uev-prepare-for-deployment.md
similarity index 100%
rename from windows/manage/uev-prepare-for-deployment.md
rename to windows/configuration/ue-v/uev-prepare-for-deployment.md
diff --git a/windows/manage/uev-release-notes-1607.md b/windows/configuration/ue-v/uev-release-notes-1607.md
similarity index 100%
rename from windows/manage/uev-release-notes-1607.md
rename to windows/configuration/ue-v/uev-release-notes-1607.md
diff --git a/windows/manage/uev-security-considerations.md b/windows/configuration/ue-v/uev-security-considerations.md
similarity index 100%
rename from windows/manage/uev-security-considerations.md
rename to windows/configuration/ue-v/uev-security-considerations.md
diff --git a/windows/manage/uev-sync-methods.md b/windows/configuration/ue-v/uev-sync-methods.md
similarity index 100%
rename from windows/manage/uev-sync-methods.md
rename to windows/configuration/ue-v/uev-sync-methods.md
diff --git a/windows/manage/uev-sync-trigger-events.md b/windows/configuration/ue-v/uev-sync-trigger-events.md
similarity index 100%
rename from windows/manage/uev-sync-trigger-events.md
rename to windows/configuration/ue-v/uev-sync-trigger-events.md
diff --git a/windows/manage/uev-synchronizing-microsoft-office-with-uev.md b/windows/configuration/ue-v/uev-synchronizing-microsoft-office-with-uev.md
similarity index 100%
rename from windows/manage/uev-synchronizing-microsoft-office-with-uev.md
rename to windows/configuration/ue-v/uev-synchronizing-microsoft-office-with-uev.md
diff --git a/windows/manage/uev-technical-reference.md b/windows/configuration/ue-v/uev-technical-reference.md
similarity index 100%
rename from windows/manage/uev-technical-reference.md
rename to windows/configuration/ue-v/uev-technical-reference.md
diff --git a/windows/manage/uev-troubleshooting.md b/windows/configuration/ue-v/uev-troubleshooting.md
similarity index 100%
rename from windows/manage/uev-troubleshooting.md
rename to windows/configuration/ue-v/uev-troubleshooting.md
diff --git a/windows/manage/uev-upgrade-uev-from-previous-releases.md b/windows/configuration/ue-v/uev-upgrade-uev-from-previous-releases.md
similarity index 100%
rename from windows/manage/uev-upgrade-uev-from-previous-releases.md
rename to windows/configuration/ue-v/uev-upgrade-uev-from-previous-releases.md
diff --git a/windows/manage/uev-using-uev-with-application-virtualization-applications.md b/windows/configuration/ue-v/uev-using-uev-with-application-virtualization-applications.md
similarity index 100%
rename from windows/manage/uev-using-uev-with-application-virtualization-applications.md
rename to windows/configuration/ue-v/uev-using-uev-with-application-virtualization-applications.md
diff --git a/windows/manage/uev-whats-new-in-uev-for-windows.md b/windows/configuration/ue-v/uev-whats-new-in-uev-for-windows.md
similarity index 100%
rename from windows/manage/uev-whats-new-in-uev-for-windows.md
rename to windows/configuration/ue-v/uev-whats-new-in-uev-for-windows.md
diff --git a/windows/manage/uev-working-with-custom-templates-and-the-uev-generator.md b/windows/configuration/ue-v/uev-working-with-custom-templates-and-the-uev-generator.md
similarity index 100%
rename from windows/manage/uev-working-with-custom-templates-and-the-uev-generator.md
rename to windows/configuration/ue-v/uev-working-with-custom-templates-and-the-uev-generator.md
diff --git a/windows/configure/windows-10-start-layout-options-and-policies.md b/windows/configuration/windows-10-start-layout-options-and-policies.md
similarity index 100%
rename from windows/configure/windows-10-start-layout-options-and-policies.md
rename to windows/configuration/windows-10-start-layout-options-and-policies.md
diff --git a/windows/configure/windows-diagnostic-data.md b/windows/configuration/windows-diagnostic-data.md
similarity index 100%
rename from windows/configure/windows-diagnostic-data.md
rename to windows/configuration/windows-diagnostic-data.md
diff --git a/windows/configure/windows-spotlight.md b/windows/configuration/windows-spotlight.md
similarity index 100%
rename from windows/configure/windows-spotlight.md
rename to windows/configuration/windows-spotlight.md
diff --git a/windows/configure/TOC.md b/windows/configure/TOC.md
deleted file mode 100644
index 75766ed065..0000000000
--- a/windows/configure/TOC.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# [Configure Windows 10](index.md)
-## [Configure Windows telemetry in your organization](configure-windows-telemetry-in-your-organization.md)
-## [Basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields.md)
-## [Windows 10, version 1703 diagnostic data](windows-diagnostic-data.md)
-## [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md)
-## [Manage Wi-Fi Sense in your company](manage-wifi-sense-in-enterprise.md)
-## [Configure kiosk and shared devices running Windows 10 desktop editions](kiosk-shared-pc.md)
-### [Set up a shared or guest PC with Windows 10](set-up-shared-or-guest-pc.md)
-### [Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md)
-### [Guidelines for choosing an app for assigned access (kiosk mode)](guidelines-for-assigned-access-app.md)
-### [Lock down Windows 10 to specific apps (AppLocker)](lock-down-windows-10-to-specific-apps.md)
-## [Configure Windows 10 Mobile devices](configure-mobile.md)
-### [Set up a kiosk on Windows 10 Mobile or Windows 10 Mobile Enterprise](set-up-a-kiosk-for-windows-10-for-mobile-edition.md)
-### [Use Windows Configuration Designer to configure Windows 10 Mobile devices](provisioning-configure-mobile.md)
-#### [NFC-based device provisioning](provisioning-nfc.md)
-#### [Barcode provisioning and the package splitter tool](provisioning-package-splitter.md)
-### [Use the Lockdown Designer app to create a Lockdown XML file](mobile-lockdown-designer.md)
-### [Configure Windows 10 Mobile using Lockdown XML](lockdown-xml.md)
-### [Settings and quick actions that can be locked down in Windows 10 Mobile](settings-that-can-be-locked-down.md)
-### [Product IDs in Windows 10 Mobile](product-ids-in-windows-10-mobile.md)
-### [Start layout XML for mobile editions of Windows 10 (reference)](start-layout-xml-mobile.md)
-## [Configure Start, taskbar, and lock screen](start-taskbar-lockscreen.md)
-### [Configure Windows Spotlight on the lock screen](windows-spotlight.md)
-### [Manage Windows 10 and Windows Store tips, tricks, and suggestions](manage-tips-and-suggestions.md)
-### [Manage Windows 10 Start and taskbar layout](windows-10-start-layout-options-and-policies.md)
-#### [Configure Windows 10 taskbar](configure-windows-10-taskbar.md)
-#### [Customize and export Start layout](customize-and-export-start-layout.md)
-#### [Add image for secondary tiles](start-secondary-tiles.md)
-#### [Start layout XML for desktop editions of Windows 10 (reference)](start-layout-xml-desktop.md)
-#### [Customize Windows 10 Start and taskbar with Group Policy](customize-windows-10-start-screens-by-using-group-policy.md)
-#### [Customize Windows 10 Start and taskbar with provisioning packages](customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md)
-#### [Customize Windows 10 Start and tasbkar with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md)
-#### [Changes to Start policies in Windows 10](changes-to-start-policies-in-windows-10.md)
-## [Cortana integration in your business or enterprise](cortana-at-work-overview.md)
-### [Testing scenarios using Cortana in your business or organization](cortana-at-work-testing-scenarios.md)
-#### [Test scenario 1 - Sign-in to Azure AD and use Cortana to manage the notebook](cortana-at-work-scenario-1.md)
-#### [Test scenario 2 - Perform a quick search with Cortana at work](cortana-at-work-scenario-2.md)
-#### [Test scenario 3 - Set a reminder for a specific location using Cortana at work](cortana-at-work-scenario-3.md)
-#### [Test scenario 4 - Use Cortana at work to find your upcoming meetings](cortana-at-work-scenario-4.md)
-#### [Test scenario 5 - Use Cortana to send email to a co-worker](cortana-at-work-scenario-5.md)
-#### [Test scenario 6 - Review a reminder suggested by Cortana based on what you’ve promised in email](cortana-at-work-scenario-6.md)
-#### [Test scenario 7 - Use Cortana and Windows Information Protection (WIP) to help protect your organization’s data on a device](cortana-at-work-scenario-7.md)
-### [Set up and test Cortana with Office 365 in your organization](cortana-at-work-o365.md)
-### [Set up and test Cortana with Microsoft Dynamics CRM (Preview feature) in your organization](cortana-at-work-crm.md)
-### [Set up and test Cortana for Power BI in your organization](cortana-at-work-powerbi.md)
-### [Set up and test custom voice commands in Cortana for your organization](cortana-at-work-voice-commands.md)
-### [Use Group Policy and mobile device management (MDM) settings to configure Cortana in your organization](cortana-at-work-policy-settings.md)
-### [Send feedback about Cortana at work back to Microsoft](cortana-at-work-feedback.md)
-## [Configure access to Windows Store](stop-employees-from-using-the-windows-store.md)
-## [Provisioning packages for Windows 10](provisioning-packages.md)
-### [How provisioning works in Windows 10](provisioning-how-it-works.md)
-### [Introduction to configuration service providers (CSPs)](how-it-pros-can-use-configuration-service-providers.md)
-### [Install Windows Configuration Designer](provisioning-install-icd.md)
-### [Create a provisioning package](provisioning-create-package.md)
-### [Apply a provisioning package](provisioning-apply-package.md)
-### [Settings changed when you uninstall a provisioning package](provisioning-uninstall-package.md)
-### [Provision PCs with common settings for initial deployment (desktop wizard)](provision-pcs-for-initial-deployment.md)
-### [Provision PCs with apps](provision-pcs-with-apps.md)
-### [Use a script to install a desktop app in provisioning packages](provisioning-script-to-install-app.md)
-### [PowerShell cmdlets for provisioning Windows 10 (reference)](provisioning-powershell.md)
-### [Windows ICD command-line interface (reference)](provisioning-command-line.md)
-### [Create a provisioning package with multivariant settings](provisioning-multivariant.md)
-## [Lockdown features from Windows Embedded 8.1 Industry](lockdown-features-windows-10.md)
-## [Change history for Configure Windows 10](change-history-for-configure-windows-10.md)
diff --git a/windows/configure/provision-pcs-for-initial-deployment.md b/windows/configure/provision-pcs-for-initial-deployment.md
deleted file mode 100644
index c23f3d854c..0000000000
--- a/windows/configure/provision-pcs-for-initial-deployment.md
+++ /dev/null
@@ -1,117 +0,0 @@
----
-title: Provision PCs with common settings (Windows 10)
-description: Create a provisioning package to apply common settings to a PC running Windows 10.
-ms.assetid: 66D14E97-E116-4218-8924-E2A326C9367E
-keywords: ["runtime provisioning", "provisioning package"]
-ms.prod: W10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-author: jdeckerMS
-localizationpriority: high
----
-
-# Provision PCs with common settings for initial deployment (desktop wizard)
-
-
-**Applies to**
-
-- Windows 10
-
-This topic explains how to create and apply a provisioning package that contains common enterprise settings to a device running all desktop editions of Windows 10 except Windows 10 Home.
-
-You can apply a provisioning package on a USB drive to off-the-shelf devices during setup, making it fast and easy to configure new devices.
-
-## Advantages
-- You can configure new devices without reimaging.
-
-- Works on both mobile and desktop devices.
-
-- No network connectivity required.
-
-- Simple to apply.
-
-[Learn more about the benefits and uses of provisioning packages.](provisioning-packages.md)
-
-## What does the desktop wizard do?
-
-The desktop wizard helps you configure the following settings in a provisioning package:
-
-- Set device name
-- Upgrade product edition
-- Configure the device for shared use
-- Remove pre-installed software
-- Configure Wi-Fi network
-- Enroll device in Active Directory or Azure Active Directory
-- Create local administrator account
-- Add applications and certificates
-
->[!WARNING]
->You must run Windows Configuration Designer on Windows 10 to configure Azure Active Directory enrollment using any of the wizards.
-
-Provisioning packages can include management instructions and policies, installation of specific apps, customization of network connections and policies, and more.
-
-> [!TIP]
-> Use the desktop wizard to create a package with the common settings, then switch to the advanced editor to add other settings, apps, policies, etc.
->
->
-
-## Create the provisioning package
-
-Use the Windows Configuration Designer tool to create a provisioning package. [Learn how to install Windows Configuration Designer.](provisioning-install-icd.md)
-
-1. Open Windows Configuration Designer (by default, %windir%\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Imaging and Configuration Designer\x86\ICD.exe).
-
-2. Click **Provision desktop devices**.
-
- 
-
-3. Name your project and click **Finish**. The pages for desktop provisioning will walk you through the following steps.
-
- 
-
-> [!IMPORTANT]
-> When you build a provisioning package, you may include sensitive information in the project files and in the provisioning package (.ppkg) file. Although you have the option to encrypt the .ppkg file, project files are not encrypted. You should store the project files in a secure location and delete the project files when they are no longer needed.
-
-## Configure settings
-
-
-
-
Enter a name for the device.(Optional) Select a license file to upgrade Windows 10 to a different edition. [See the permitted upgrades.](https://technet.microsoft.com/itpro/windows/deploy/windows-10-edition-upgrades)Toggle **Yes** or **No** to **Configure devices for shared use**. This setting optimizes Windows 10 for shared use scenarios. [Learn more about shared PC configuration.](set-up-shared-or-guest-pc.md)You can also select to remove pre-installed software from the device.

-
 Toggle **On** or **Off** for wireless network connectivity. If you select **On**, enter the SSID, the network type (**Open** or **WPA2-Personal**), and (if **WPA2-Personal**) the password for the wireless network.

-
 Enable account management if you want to configure settings on this page. You can enroll the device in Active Directory, enroll in Azure Active Directory, or create a local administrator account on the deviceTo enroll the device in Active Directory, enter the credentials for a least-privileged user account to join the device to the domain.Before you use a Windows Configuration Designer wizard to configure bulk Azure AD enrollment, [set up Azure AD join in your organization](https://docs.microsoft.com/azure/active-directory/active-directory-azureadjoin-setup). The **maximum number of devices per user** setting in your Azure AD tenant determines how many times the bulk token that you get in the wizard can be used. To enroll the device in Azure AD, select that option and enter a friendly name for the bulk token you will get using the wizard. Set an expiration date for the token (maximum is 30 days from the date you get the token). Click **Get bulk token**. In the **Let's get you signed in** window, enter an account that has permissions to join a device to Azure AD, and then the password. Click **Accept** to give Windows Configuration Designer the necessary permissions. To create a local administrator account, select that option and enter a user name and password. **Important:** If you create a local account in the provisioning package, you must change the password using the **Settings** app every 42 days. If the password is not changed during that period, the account might be locked out and unable to sign in.

-
 You can install multiple applications, both Classic Windows (Win32) apps and Universal Windows Platform (UWP) apps, in a provisioning package. The settings in this step vary according to the application that you select. For help with the settings, see [Provision PCs with apps](provision-pcs-with-apps.md).

-
 To provision the device with a certificate, click **Add a certificate**. Enter a name for the certificate, and then browse to and select the certificate to be used.

-
You can set a password to protect your provisioning package. You must enter this password when you apply the provisioning package to a device.

-
-
-After you're done, click **Create**. It only takes a few seconds. When the package is built, the location where the package is stored is displayed as a hyperlink at the bottom of the page.
-
- **Next step**: [How to apply a provisioning package](provisioning-apply-package.md)
-
-
-## Learn more
-
-- Watch the video: [Provisioning Windows 10 Devices with New Tools](https://go.microsoft.com/fwlink/p/?LinkId=615921)
-
-- Watch the video: [Windows 10 for Mobile Devices: Provisioning Is Not Imaging](https://go.microsoft.com/fwlink/p/?LinkId=615922)
-
-
-## Related topics
-
-- [Provisioning packages for Windows 10](provisioning-packages.md)
-- [How provisioning works in Windows 10](provisioning-how-it-works.md)
-- [Install Windows Configuration Designer](provisioning-install-icd.md)
-- [Create a provisioning package](provisioning-create-package.md)
-- [Apply a provisioning package](provisioning-apply-package.md)
-- [Settings changed when you uninstall a provisioning package](provisioning-uninstall-package.md)
-- [Use a script to install a desktop app in provisioning packages](provisioning-script-to-install-app.md)
-- [PowerShell cmdlets for provisioning Windows 10 (reference)](provisioning-powershell.md)
-- [NFC-based device provisioning](provisioning-nfc.md)
-- [Use the package splitter tool](provisioning-package-splitter.md)
-- [Windows Configuration Designer command-line interface (reference)](provisioning-command-line.md)
-- [Create a provisioning package with multivariant settings](provisioning-multivariant.md)
-
-
-
-
-
diff --git a/windows/deploy/TOC.md b/windows/deploy/TOC.md
deleted file mode 100644
index a14e1d9f0d..0000000000
--- a/windows/deploy/TOC.md
+++ /dev/null
@@ -1,157 +0,0 @@
-# [Deploy Windows 10](index.md)
-## [What's new in Windows 10 deployment](deploy-whats-new.md)
-## [Windows 10 deployment scenarios](windows-10-deployment-scenarios.md)
-## [Manage Windows upgrades with Upgrade Readiness](manage-windows-upgrades-with-upgrade-readiness.md)
-### [Upgrade Readiness architecture](upgrade-readiness-architecture.md)
-### [Upgrade Readiness requirements](upgrade-readiness-requirements.md)
-### [Upgrade Readiness release notes](upgrade-readiness-release-notes.md)
-### [Get started with Upgrade Readiness](upgrade-readiness-get-started.md)
-#### [Upgrade Readiness deployment script](upgrade-readiness-deployment-script.md)
-### [Use Upgrade Readiness to manage Windows upgrades](use-upgrade-readiness-to-manage-windows-upgrades.md)
-#### [Upgrade overview](upgrade-readiness-upgrade-overview.md)
-#### [Step 1: Identify apps](upgrade-readiness-identify-apps.md)
-#### [Step 2: Resolve issues](upgrade-readiness-resolve-issues.md)
-#### [Step 3: Deploy Windows](upgrade-readiness-deploy-windows.md)
-#### [Additional insights](upgrade-readiness-additional-insights.md)
-### [Troubleshoot Upgrade Readiness](troubleshoot-upgrade-readiness.md)
-## [Step by step guide: Configure a test lab to deploy Windows 10](windows-10-poc.md)
-### [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md)
-### [Deploy Windows 10 in a test lab using System Center Configuration Manager](windows-10-poc-sc-config-mgr.md)
-## [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md)
-### [Get started with the Microsoft Deployment Toolkit (MDT)](get-started-with-the-microsoft-deployment-toolkit.md)
-#### [Key features in MDT](key-features-in-mdt.md)
-#### [MDT Lite Touch components](mdt-lite-touch-components.md)
-#### [Prepare for deployment with MDT](prepare-for-windows-deployment-with-mdt.md)
-### [Create a Windows 10 reference image](create-a-windows-10-reference-image.md)
-### [Deploy a Windows 10 image using MDT](deploy-a-windows-10-image-using-mdt.md)
-### [Build a distributed environment for Windows 10 deployment](build-a-distributed-environment-for-windows-10-deployment.md)
-### [Refresh a Windows 7 computer with Windows 10](refresh-a-windows-7-computer-with-windows-10.md)
-### [Replace a Windows 7 computer with a Windows 10 computer](replace-a-windows-7-computer-with-a-windows-10-computer.md)
-### [Perform an in-place upgrade to Windows 10 with MDT](upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md)
-### [Configure MDT settings](configure-mdt-settings.md)
-#### [Set up MDT for BitLocker](set-up-mdt-for-bitlocker.md)
-#### [Configure MDT deployment share rules](configure-mdt-deployment-share-rules.md)
-#### [Configure MDT for UserExit scripts](configure-mdt-for-userexit-scripts.md)
-#### [Simulate a Windows 10 deployment in a test environment](simulate-a-windows-10-deployment-in-a-test-environment.md)
-#### [Use the MDT database to stage Windows 10 deployment information](use-the-mdt-database-to-stage-windows-10-deployment-information.md)
-#### [Assign applications using roles in MDT](assign-applications-using-roles-in-mdt.md)
-#### [Use web services in MDT](use-web-services-in-mdt.md)
-#### [Use Orchestrator runbooks with MDT](use-orchestrator-runbooks-with-mdt.md)
-## [Deploy Windows 10 with System Center 2012 R2 Configuration Manager](deploy-windows-10-with-system-center-2012-r2-configuration-manager.md)
-### [Integrate Configuration Manager with MDT](integrate-configuration-manager-with-mdt.md)
-### [Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
-### [Create a custom Windows PE boot image with Configuration Manager](create-a-custom-windows-pe-boot-image-with-configuration-manager.md)
-### [Add a Windows 10 operating system image using Configuration Manager](add-a-windows-10-operating-system-image-using-configuration-manager.md)
-### [Create an application to deploy with Windows 10 using Configuration Manager](create-an-application-to-deploy-with-windows-10-using-configuration-manager.md)
-### [Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-### [Create a task sequence with Configuration Manager and MDT](create-a-task-sequence-with-configuration-manager-and-mdt.md)
-### [Finalize the operating system configuration for Windows 10 deployment with Configuration Manager](finalize-the-os-configuration-for-windows-10-deployment-with-configuration-manager.md)
-### [Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-10-using-pxe-and-configuration-manager.md)
-### [Monitor the Windows 10 deployment with Configuration Manager](monitor-windows-10-deployment-with-configuration-manager.md)
-### [Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-### [Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-### [Perform an in-place upgrade to Windows 10 using Configuration Manager](upgrade-to-windows-10-with-system-center-configuraton-manager.md)
-## [Resolve Windows 10 upgrade errors](resolve-windows-10-upgrade-errors.md)
-## [Convert MBR partition to GPT](mbr-to-gpt.md)
-## [Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md)
-## [Windows 10 upgrade paths](windows-10-upgrade-paths.md)
-## [Windows 10 edition upgrade](windows-10-edition-upgrades.md)
-## [Deploy Windows To Go in your organization](deploy-windows-to-go.md)
-## [Upgrade a Windows Phone 8.1 to Windows 10 Mobile with Mobile Device Management](upgrade-windows-phone-8-1-to-10.md)
-## [Sideload apps in Windows 10](sideload-apps-in-windows-10.md)
-## [Volume Activation [client]](volume-activation-windows-10.md)
-### [Plan for volume activation [client]](plan-for-volume-activation-client.md)
-### [Activate using Key Management Service [client]](activate-using-key-management-service-vamt.md)
-### [Activate using Active Directory-based activation [client]](activate-using-active-directory-based-activation-client.md)
-### [Activate clients running Windows 10](activate-windows-10-clients-vamt.md)
-### [Monitor activation [client]](monitor-activation-client.md)
-### [Use the Volume Activation Management Tool [client]](use-the-volume-activation-management-tool-client.md)
-### [Appendix: Information sent to Microsoft during activation [client]](appendix-information-sent-to-microsoft-during-activation-client.md)
-## [Windows 10 Enterprise E3 in CSP Overview](windows-10-enterprise-e3-overview.md)
-## [Windows 10 deployment tools reference](windows-10-deployment-tools-reference.md)
-### [Windows 10 deployment tools](windows-deployment-scenarios-and-tools.md)
-### [Windows ADK for Windows 10 scenarios for IT Pros](windows-adk-scenarios-for-it-pros.md)
-### [Volume Activation Management Tool (VAMT) Technical Reference](volume-activation-management-tool.md)
-#### [Introduction to VAMT](introduction-vamt.md)
-#### [Active Directory-Based Activation Overview](active-directory-based-activation-overview.md)
-#### [Install and Configure VAMT](install-configure-vamt.md)
-##### [VAMT Requirements](vamt-requirements.md)
-##### [Install VAMT](install-vamt.md)
-##### [Configure Client Computers](configure-client-computers-vamt.md)
-#### [Add and Manage Products](add-manage-products-vamt.md)
-##### [Add and Remove Computers](add-remove-computers-vamt.md)
-##### [Update Product Status](update-product-status-vamt.md)
-##### [Remove Products](remove-products-vamt.md)
-#### [Manage Product Keys](manage-product-keys-vamt.md)
-##### [Add and Remove a Product Key](add-remove-product-key-vamt.md)
-##### [Install a Product Key](install-product-key-vamt.md)
-##### [Install a KMS Client Key](install-kms-client-key-vamt.md)
-#### [Manage Activations](manage-activations-vamt.md)
-##### [Perform Online Activation](online-activation-vamt.md)
-##### [Perform Proxy Activation](proxy-activation-vamt.md)
-##### [Perform KMS Activation](kms-activation-vamt.md)
-##### [Perform Local Reactivation](local-reactivation-vamt.md)
-##### [Activate an Active Directory Forest Online](activate-forest-vamt.md)
-##### [Activate by Proxy an Active Directory Forest](activate-forest-by-proxy-vamt.md)
-#### [Manage VAMT Data](manage-vamt-data.md)
-##### [Import and Export VAMT Data](import-export-vamt-data.md)
-##### [Use VAMT in Windows PowerShell](use-vamt-in-windows-powershell.md)
-#### [VAMT Step-by-Step Scenarios](vamt-step-by-step.md)
-##### [Scenario 1: Online Activation](scenario-online-activation-vamt.md)
-##### [Scenario 2: Proxy Activation](scenario-proxy-activation-vamt.md)
-##### [Scenario 3: KMS Client Activation](scenario-kms-activation-vamt.md)
-#### [VAMT Known Issues](vamt-known-issues.md)
-### [User State Migration Tool (USMT) Technical Reference](usmt-technical-reference.md)
-#### [User State Migration Tool (USMT) Overview Topics](usmt-topics.md)
-##### [User State Migration Tool (USMT) Overview](usmt-overview.md)
-##### [Getting Started with the User State Migration Tool (USMT)](getting-started-with-the-user-state-migration-tool.md)
-##### [Windows Upgrade and Migration Considerations](windows-upgrade-and-migration-considerations.md)
-#### [User State Migration Tool (USMT) How-to topics](usmt-how-to.md)
-##### [Exclude Files and Settings](usmt-exclude-files-and-settings.md)
-##### [Extract Files from a Compressed USMT Migration Store](usmt-extract-files-from-a-compressed-migration-store.md)
-##### [Include Files and Settings](usmt-include-files-and-settings.md)
-##### [Migrate Application Settings](migrate-application-settings.md)
-##### [Migrate EFS Files and Certificates](usmt-migrate-efs-files-and-certificates.md)
-##### [Migrate User Accounts](usmt-migrate-user-accounts.md)
-##### [Reroute Files and Settings](usmt-reroute-files-and-settings.md)
-##### [Verify the Condition of a Compressed Migration Store](verify-the-condition-of-a-compressed-migration-store.md)
-#### [User State Migration Tool (USMT) Troubleshooting](usmt-troubleshooting.md)
-##### [Common Issues](usmt-common-issues.md)
-##### [Frequently Asked Questions](usmt-faq.md)
-##### [Log Files](usmt-log-files.md)
-##### [Return Codes](usmt-return-codes.md)
-##### [USMT Resources](usmt-resources.md)
-#### [User State Migration Toolkit (USMT) Reference](usmt-reference.md)
-##### [USMT Requirements](usmt-requirements.md)
-##### [USMT Best Practices](usmt-best-practices.md)
-##### [How USMT Works](usmt-how-it-works.md)
-##### [Plan Your Migration](usmt-plan-your-migration.md)
-###### [Common Migration Scenarios](usmt-common-migration-scenarios.md)
-###### [What Does USMT Migrate?](usmt-what-does-usmt-migrate.md)
-###### [Choose a Migration Store Type](usmt-choose-migration-store-type.md)
-####### [Migration Store Types Overview](migration-store-types-overview.md)
-####### [Estimate Migration Store Size](usmt-estimate-migration-store-size.md)
-####### [Hard-Link Migration Store](usmt-hard-link-migration-store.md)
-####### [Migration Store Encryption](usmt-migration-store-encryption.md)
-###### [Determine What to Migrate](usmt-determine-what-to-migrate.md)
-####### [Identify Users](usmt-identify-users.md)
-####### [Identify Applications Settings](usmt-identify-application-settings.md)
-####### [Identify Operating System Settings](usmt-identify-operating-system-settings.md)
-####### [Identify File Types, Files, and Folders](usmt-identify-file-types-files-and-folders.md)
-###### [Test Your Migration](usmt-test-your-migration.md)
-##### [User State Migration Tool (USMT) Command-line Syntax](usmt-command-line-syntax.md)
-###### [ScanState Syntax](usmt-scanstate-syntax.md)
-###### [LoadState Syntax](usmt-loadstate-syntax.md)
-###### [UsmtUtils Syntax](usmt-utilities.md)
-##### [USMT XML Reference](usmt-xml-reference.md)
-###### [Understanding Migration XML Files](understanding-migration-xml-files.md)
-###### [Config.xml File](usmt-configxml-file.md)
-###### [Customize USMT XML Files](usmt-customize-xml-files.md)
-###### [Custom XML Examples](usmt-custom-xml-examples.md)
-###### [Conflicts and Precedence](usmt-conflicts-and-precedence.md)
-###### [General Conventions](usmt-general-conventions.md)
-###### [XML File Requirements](xml-file-requirements.md)
-###### [Recognized Environment Variables](usmt-recognized-environment-variables.md)
-###### [XML Elements Library](usmt-xml-elements-library.md)
-##### [Offline Migration Reference](offline-migration-reference.md)
-## [Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md)
\ No newline at end of file
diff --git a/windows/deploy/change-history-for-deploy-windows-10.md b/windows/deploy/change-history-for-deploy-windows-10.md
deleted file mode 100644
index 22008ff62d..0000000000
--- a/windows/deploy/change-history-for-deploy-windows-10.md
+++ /dev/null
@@ -1,128 +0,0 @@
----
-title: Change history for Deploy Windows 10 (Windows 10)
-description: This topic lists new and updated topics in the Deploy Windows 10 documentation for Windows 10 and Windows 10 Mobile.
-ms.assetid: 19C50373-6B25-4F5C-A6EF-643D36904349
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-author: greg-lindsay
----
-
-# Change history for Deploy Windows 10
-This topic lists new and updated topics in the [Deploy Windows 10](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md).
-
-
-## April 2017
-| New or changed topic | Description |
-|----------------------|-------------|
-| [Deploy Windows 10 in a test lab using System Center Configuration Manager](windows-10-poc-sc-config-mgr.md) | Updated: The "refresh" and "replace" procedures were swapped in order so that it would not be necessary to save and restore VMs. Also a missing step was added to include the State migration point role. |
-| [Step by step guide: Configure a test lab to deploy Windows 10](windows-10-poc.md)| Updated with minor fixes. |
-| [Manage Windows upgrades with Upgrade Readiness](manage-windows-upgrades-with-upgrade-readiness.md)| Updated child topics under this node to include new feature and user interface changes. |
-
-## RELEASE: Windows 10, version 1703
-The topics in this library have been updated for Windows 10, version 1703 (also known as the Creators Update). The provisioning topics have been moved to [Configure Windows 10](../configure/index.md).
-
-## March 2017
-| New or changed topic | Description |
-|----------------------|-------------|
-| [What's new in Windows 10 deployment](deploy-whats-new.md) | New |
-| [Upgrade to Windows 10 with the Microsoft Deployment Toolkit](upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md) | Topic moved under [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md) in the table of contents and title adjusted to clarify in-place upgrade. |
-| [Upgrade to Windows 10 with System Center Configuration Manager](upgrade-to-windows-10-with-system-center-configuraton-manager.md) | Topic moved under [Deploy Windows 10 with System Center 2012 R2 Configuration Manager](deploy-windows-10-with-system-center-2012-r2-configuration-manager.md) in the table of contents and title adjusted to clarify in-place upgrade. |
-| [Convert MBR partition to GPT](mbr-to-gpt.md) | New |
-
-
-## February 2017
-| New or changed topic | Description |
-|----------------------|-------------|
-| [Manage Windows upgrades with Upgrade Readiness](manage-windows-upgrades-with-upgrade-readiness.md) | Multiple topics updated, name changed from Upgrade Analytics to Upgrade Readiness, and other content updates. |
-| [USMT Requirements](usmt-requirements.md) | Updated: Vista support removed and other minor changes |
-| [Get started with Upgrade Analytics](upgrade-analytics-get-started.md) | Updated structure and content |
-| [Upgrade Analytics deployment script](upgrade-analytics-deployment-script.md) | Added as a separate page from get started |
-| [Use Upgrade Analytics to manage Windows upgrades](use-upgrade-analytics-to-manage-windows-upgrades.md) | Updated with links to new content and information about the target OS setting |
-| [Upgrade Analytics - Upgrade overview](upgrade-analytics-upgrade-overview.md) | New |
-| [Upgrade Analytics - Step 1: Identify important apps](upgrade-analytics-identify-apps.md) | Updated topic title and content |
-| [Upgrade Analytics - Step 2: Resolve app and driver issues](upgrade-analytics-resolve-issues.md) | New |
-| [Upgrade Analytics - Step 3: Deploy Windows](upgrade-analytics-deploy-windows.md) | New |
-| [Upgrade Analytics - Additional insights](upgrade-analytics-additional-insights.md) | New |
-
-## January 2017
-| New or changed topic | Description |
-|----------------------|-------------|
-| [Step by step guide: Configure a test lab to deploy Windows 10](windows-10-poc.md) | New |
-| [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md) | New |
-| [Deploy Windows 10 in a test lab using System Center Configuration Manager](windows-10-poc-sc-config-mgr.md) | New |
-| [Apply a provisioning package](provisioning-apply-package.md) | New (previously published in other topics) |
-| [Create a provisioning package for Windows 10](provisioning-create-package.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [Create a provisioning package with multivariant settings](provisioning-multivariant.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [How provisioning works in Windows 10](provisioning-how-it-works.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [Install Windows Imaging and Configuration Designer](provisioning-install-icd.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [NFC-based device provisioning](provisioning-nfc.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [Settings changed when you uninstall a provisioning package](provisioning-uninstall-package.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [Use a script to install a desktop app in provisioning packages](provisioning-script-to-install-app.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [Windows ICD command-line interface (reference)](provisioning-command-line.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [Get started with Upgrade Analytics](upgrade-analytics-get-started.md) | Updated exit code table with suggested fixes, and added link to the Upgrade Analytics blog |
-| [Provision PCs with common settings for initial deployment (simple provisioning)](provision-pcs-for-initial-deployment.md) | Instructions for applying the provisioning package moved to [Apply a provisioning package](provisioning-apply-package.md) |
-| [Provision PCs with apps and certificates for initial deployments (advanced provisioning)](provision-pcs-with-apps-and-certificates.md) | Instructions for applying the provisioning package moved to [Apply a provisioning package](provisioning-apply-package.md) |
-
-
-## October 2016
-| New or changed topic | Description |
-|----------------------|-------------|
-| [Resolve Windows 10 upgrade errors](resolve-windows-10-upgrade-errors.md) | New |
-
-## September 2016
-| New or changed topic | Description |
-|----------------------|-------------|
-| [Windows 10 Enterprise E3 in CSP Overview](windows-10-enterprise-e3-overview.md) | New |
-| [Get started with Upgrade Analytics](upgrade-analytics-get-started.md) | Updated with prerequisites for site discovery |
-| [Resolve application and driver issues](upgrade-analytics-resolve-issues.md) | Updated with app status info for Ready For Windows |
-| [Review site discovery](upgrade-analytics-review-site-discovery.md) | New |
-
-## RELEASE: Windows 10, version 1607
-
-The topics in this library have been updated for Windows 10, version 1607 (also known as the Anniversary Update). The following new topics have been added:
-
-- [Provisioning packages for Windows 10](provisioning-packages.md)
-- [Provision PCs with apps and certificates for initial deployment](provision-pcs-with-apps-and-certificates.md)
-- [Provision PCs with common settings for initial deployment](provision-pcs-for-initial-deployment.md)
-
-=======
-
-## August 2016
-| New or changed topic | Description |
-|----------------------|-------------|
-| [Windows 10 edition upgrade](windows-10-edition-upgrades.md) | Updated with reboot requirements |
-
-## July 2016
-| New or changed topic | Description |
-|----------------------|-------------|
-| [Manage Windows upgrades with Upgrade Analytics](manage-windows-upgrades-with-upgrade-analytics.md) | New |
-
-## June 2016
-| New or changed topic | Description |
-|----------------------|-------------|
-| [Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md) | New |
-| [User State Migration Tool Technical Reference](usmt-technical-reference.md) | Updated support statement for Office 2016 |
-| [Windows 10 upgrade paths](windows-10-upgrade-paths.md) | New |
-
-## May 2016
-| New or changed topic | Description |
-|----------------------|-------------|
-| [Upgrade a Windows Phone 8.1 to Windows 10 Mobile with Mobile Device Management](upgrade-windows-phone-8-1-to-10.md) | New |
-
-## December 2015
-| New or changed topic | Description |
-|----------------------|-------------|
-| [Activate using Key Management Service](activate-using-key-management-service-vamt.md) | Updated |
-| [Windows 10 edition upgrade](windows-10-edition-upgrades.md) | Updated |
-
-## November 2015
-| New or changed topic | Description |
-|----------------------|-------------|
-| [Windows 10 edition upgrade](windows-10-edition-upgrades.md) | New |
-
-## Related topics
-- [Change history for What's new in Windows 10](../whats-new/change-history-for-what-s-new-in-windows-10.md)
-- [Change history for Plan for Windows 10 deployment](../plan/change-history-for-plan-for-windows-10-deployment.md)
-- [Change history for Keep Windows 10 secure](../keep-secure/change-history-for-keep-windows-10-secure.md)
-- [Change history for Manage and update Windows 10](../manage/change-history-for-manage-and-update-windows-10.md)
diff --git a/windows/deploy/index.md b/windows/deploy/index.md
deleted file mode 100644
index 8058cf8890..0000000000
--- a/windows/deploy/index.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-title: Deploy Windows 10 (Windows 10)
-description: Learn about deploying Windows 10 for IT professionals.
-ms.assetid: E9E2DED5-DBA7-4300-B411-BA0FD39BE18C
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-localizationpriority: high
-author: greg-lindsay
----
-
-# Deploy Windows 10
-Learn about deploying Windows 10 for IT professionals.
-
-## In this section
-
-|Topic |Description |
-|------|------------|
-|[What's new in Windows 10 deployment](deploy-whats-new.md) |See this topic for a summary of new features and some recent changes related to deploying Windows 10 in your organization. |
-|[Windows 10 deployment scenarios](windows-10-deployment-scenarios.md) |To successfully deploy the Windows 10 operating system in your organization, it is important to understand the different ways that it can be deployed, especially now that there are new scenarios to consider. Choosing among these scenarios, and understanding the key capabilities and limitations of each, is a key task. |
-|[Manage Windows upgrades with Upgrade Readiness](manage-windows-upgrades-with-upgrade-readiness.md) |With Upgrade Readiness, enterprises now have the tools to plan and manage the upgrade process end to end, allowing them to adopt new Windows releases more quickly. With Windows telemetry enabled, Upgrade Readiness collects system, application, and driver data for analysis. We then identify compatibility issues that can block an upgrade and suggest fixes when they are known to Microsoft. The Upgrade Readiness workflow steps you through the discovery and rationalization process until you have a list of computers that are ready to be upgraded. |
-|[Step by step guide: Configure a test lab to deploy Windows 10](windows-10-poc.md) |This guide contains instructions to configure a proof of concept (PoC) environment requiring a minimum amount of resources. The guide makes extensive use of Windows PowerShell and Hyper-V. Subsequent companion guides contain steps to deploy Windows 10 using the PoC environment. After completing this guide, see the following Windows 10 PoC deployment guides: [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md), [Deploy Windows 10 in a test lab using System Center Configuration Manager](windows-10-poc-sc-config-mgr.md). |
-|[Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md) |This guide will walk you through the process of deploying Windows 10 in an enterprise environment using the Microsoft Deployment Toolkit (MDT). |
-|[Deploy Windows 10 with System Center 2012 R2 Configuration Manager](deploy-windows-10-with-system-center-2012-r2-configuration-manager.md) |If you have Microsoft System Center 2012 R2 Configuration Manager in your environment, you will most likely want to use it to deploy Windows 10. This topic will show you how to set up Configuration Manager for operating system deployment and how to integrate Configuration Manager with the Microsoft Deployment Toolkit (MDT) or. |
-|[Resolve Windows 10 upgrade errors](resolve-windows-10-upgrade-errors.md) |This topic provides a brief introduction to Windows 10 installation processes, and provides resolution procedures that IT administrators can use to resolve issues with Windows 10 upgrade. |
-|[Convert MBR partition to GPT](mbr-to-gpt.md) |This topic provides detailed instructions for using the MBR2GPT partition conversion tool. |
-|[Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md) |This guide describes how to configure a PXE server to load Windows PE by booting a client computer from the network. |
-|[Windows 10 edition upgrade](windows-10-edition-upgrades.md) |With Windows 10, you can quickly upgrade from one edition of Windows 10 to another, provided the upgrade path is supported. |
-|[Windows 10 upgrade paths](windows-10-upgrade-paths.md) |You can upgrade directly to Windows 10 from a previous operating system. |
-|[Deploy Windows To Go in your organization](deploy-windows-to-go.md) |This topic helps you to deploy Windows To Go in your organization. Before you begin deployment, make sure that you have reviewed the topics [Windows To Go: feature overview](../plan/windows-to-go-overview.md) and [Prepare your organization for Windows To Go](../plan/prepare-your-organization-for-windows-to-go.md) to ensure that you have the correct hardware and are prepared to complete the deployment. You can then use the steps in this topic to start your Windows To Go deployment. |
-|[Upgrade a Windows Phone 8.1 to Windows 10 Mobile with Mobile Device Management](upgrade-windows-phone-8-1-to-10.md) |This topic describes how to upgrade eligible Windows Phone 8.1 devices to Windows 10 Mobile. |
-|[Sideload apps in Windows 10](sideload-apps-in-windows-10.md) |Sideload line-of-business apps in Windows 10. |
-|[Volume Activation [client]](volume-activation-windows-10.md) |This guide is designed to help organizations that are planning to use volume activation to deploy and activate Windows 10, including organizations that have used volume activation for earlier versions of Windows. |
-|[Windows 10 deployment tools reference](windows-10-deployment-tools-reference.md) |Learn about the tools available to deploy Windows 10. |
-|[Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md) |This topic lists new and updated topics in the Deploy Windows 10 documentation for [Windows 10 and Windows 10 Mobile](../index.md). |
-
-## Related topics
-- [Windows 10 and Windows 10 Mobile](../index.md)
-
-
-
-
-
-
-
-
-
diff --git a/windows/deployment/TOC.md b/windows/deployment/TOC.md
new file mode 100644
index 0000000000..33c1697c0f
--- /dev/null
+++ b/windows/deployment/TOC.md
@@ -0,0 +1,221 @@
+# [Deploy Windows 10](index.md)
+## [What's new in Windows 10 deployment](deploy-whats-new.md)
+## [Plan for Windows 10 deployment](planning/index.md)
+### [Windows 10 Enterprise FAQ for IT Pros](planning/windows-10-enterprise-faq-itpro.md)
+### [Windows 10 deployment considerations](planning/windows-10-deployment-considerations.md)
+### [Windows 10 compatibility](planning/windows-10-compatibility.md)
+### [Windows 10 infrastructure requirements](planning/windows-10-infrastructure-requirements.md)
+### [Windows To Go: feature overview](planning/windows-to-go-overview.md)
+#### [Best practice recommendations for Windows To Go](planning/best-practice-recommendations-for-windows-to-go.md)
+#### [Deployment considerations for Windows To Go](planning/deployment-considerations-for-windows-to-go.md)
+#### [Prepare your organization for Windows To Go](planning/prepare-your-organization-for-windows-to-go.md)
+#### [Security and data protection considerations for Windows To Go](planning/security-and-data-protection-considerations-for-windows-to-go.md)
+#### [Windows To Go: frequently asked questions](planning/windows-to-go-frequently-asked-questions.md)
+### [Application Compatibility Toolkit (ACT) Technical Reference](planning/act-technical-reference.md)
+#### [SUA User's Guide](planning/sua-users-guide.md)
+##### [Using the SUA Wizard](planning/using-the-sua-wizard.md)
+##### [Using the SUA Tool](planning/using-the-sua-tool.md)
+###### [Tabs on the SUA Tool Interface](planning/tabs-on-the-sua-tool-interface.md)
+###### [Showing Messages Generated by the SUA Tool](planning/showing-messages-generated-by-the-sua-tool.md)
+###### [Applying Filters to Data in the SUA Tool](planning/applying-filters-to-data-in-the-sua-tool.md)
+###### [Fixing Applications by Using the SUA Tool](planning/fixing-applications-by-using-the-sua-tool.md)
+#### [Compatibility Administrator User's Guide](planning/compatibility-administrator-users-guide.md)
+##### [Using the Compatibility Administrator Tool](planning/using-the-compatibility-administrator-tool.md)
+###### [Available Data Types and Operators in Compatibility Administrator](planning/available-data-types-and-operators-in-compatibility-administrator.md)
+###### [Searching for Fixed Applications in Compatibility Administrator](planning/searching-for-fixed-applications-in-compatibility-administrator.md)
+###### [Searching for Installed Compatibility Fixes with the Query Tool in Compatibility Administrator](planning/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md)
+###### [Creating a Custom Compatibility Fix in Compatibility Administrator](planning/creating-a-custom-compatibility-fix-in-compatibility-administrator.md)
+###### [Creating a Custom Compatibility Mode in Compatibility Administrator](planning/creating-a-custom-compatibility-mode-in-compatibility-administrator.md)
+###### [Creating an AppHelp Message in Compatibility Administrator](planning/creating-an-apphelp-message-in-compatibility-administrator.md)
+###### [Viewing the Events Screen in Compatibility Administrator](planning/viewing-the-events-screen-in-compatibility-administrator.md)
+###### [Enabling and Disabling Compatibility Fixes in Compatibility Administrator](planning/enabling-and-disabling-compatibility-fixes-in-compatibility-administrator.md)
+###### [Installing and Uninstalling Custom Compatibility Databases in Compatibility Administrator](planning/installing-and-uninstalling-custom-compatibility-databases-in-compatibility-administrator.md)
+##### [Managing Application-Compatibility Fixes and Custom Fix Databases](planning/managing-application-compatibility-fixes-and-custom-fix-databases.md)
+###### [Understanding and Using Compatibility Fixes](planning/understanding-and-using-compatibility-fixes.md)
+###### [Compatibility Fix Database Management Strategies and Deployment](planning/compatibility-fix-database-management-strategies-and-deployment.md)
+###### [Testing Your Application Mitigation Packages](planning/testing-your-application-mitigation-packages.md)
+##### [Using the Sdbinst.exe Command-Line Tool](planning/using-the-sdbinstexe-command-line-tool.md)
+#### [Compatibility Fixes for Windows 10, Windows 8, Windows 7, and Windows Vista](planning/compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md)
+### [Change history for Plan for Windows 10 deployment](planning/change-history-for-plan-for-windows-10-deployment.md)
+## [Windows 10 deployment scenarios](windows-10-deployment-scenarios.md)
+## Upgrade Windows
+### [Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md)
+### [Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md)
+### [Deploy Windows To Go in your organization](deploy-windows-to-go.md)
+### [Upgrade a Windows Phone 8.1 to Windows 10 Mobile with Mobile Device Management](upgrade/upgrade-windows-phone-8-1-to-10.md)
+### [Manage Windows upgrades with Upgrade Readiness](upgrade/manage-windows-upgrades-with-upgrade-readiness.md)
+#### [Upgrade Readiness architecture](upgrade/upgrade-readiness-architecture.md)
+#### [Upgrade Readiness requirements](upgrade/upgrade-readiness-requirements.md)
+#### [Upgrade Readiness release notes](upgrade/upgrade-readiness-release-notes.md)
+#### [Get started with Upgrade Readiness](upgrade/upgrade-readiness-get-started.md)
+##### [Upgrade Readiness deployment script](upgrade/upgrade-readiness-deployment-script.md)
+#### [Use Upgrade Readiness to manage Windows upgrades](upgrade/use-upgrade-readiness-to-manage-windows-upgrades.md)
+##### [Upgrade overview](upgrade/upgrade-readiness-upgrade-overview.md)
+##### [Step 1: Identify apps](upgrade/upgrade-readiness-identify-apps.md)
+##### [Step 2: Resolve issues](upgrade/upgrade-readiness-resolve-issues.md)
+##### [Step 3: Deploy Windows](upgrade/upgrade-readiness-deploy-windows.md)
+##### [Additional insights](upgrade/upgrade-readiness-additional-insights.md)
+#### [Troubleshoot Upgrade Readiness](upgrade/troubleshoot-upgrade-readiness.md)
+## [Step by step guide: Configure a test lab to deploy Windows 10](windows-10-poc.md)
+### [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md)
+### [Deploy Windows 10 in a test lab using System Center Configuration Manager](windows-10-poc-sc-config-mgr.md)
+## [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md)
+### [Get started with the Microsoft Deployment Toolkit (MDT)](deploy-windows-mdt/get-started-with-the-microsoft-deployment-toolkit.md)
+#### [Key features in MDT](deploy-windows-mdt/key-features-in-mdt.md)
+#### [MDT Lite Touch components](deploy-windows-mdt/mdt-lite-touch-components.md)
+#### [Prepare for deployment with MDT](deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md)
+### [Create a Windows 10 reference image](deploy-windows-mdt/create-a-windows-10-reference-image.md)
+### [Deploy a Windows 10 image using MDT](deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md)
+### [Build a distributed environment for Windows 10 deployment](deploy-windows-mdt/build-a-distributed-environment-for-windows-10-deployment.md)
+### [Refresh a Windows 7 computer with Windows 10](deploy-windows-mdt/refresh-a-windows-7-computer-with-windows-10.md)
+### [Replace a Windows 7 computer with a Windows 10 computer](deploy-windows-mdt/replace-a-windows-7-computer-with-a-windows-10-computer.md)
+### [Perform an in-place upgrade to Windows 10 with MDT](upgrade/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md)
+### [Configure MDT settings](deploy-windows-mdt/configure-mdt-settings.md)
+#### [Set up MDT for BitLocker](deploy-windows-mdt/set-up-mdt-for-bitlocker.md)
+#### [Configure MDT deployment share rules](deploy-windows-mdt/configure-mdt-deployment-share-rules.md)
+#### [Configure MDT for UserExit scripts](deploy-windows-mdt/configure-mdt-for-userexit-scripts.md)
+#### [Simulate a Windows 10 deployment in a test environment](deploy-windows-mdt/simulate-a-windows-10-deployment-in-a-test-environment.md)
+#### [Use the MDT database to stage Windows 10 deployment information](deploy-windows-mdt/use-the-mdt-database-to-stage-windows-10-deployment-information.md)
+#### [Assign applications using roles in MDT](deploy-windows-mdt/assign-applications-using-roles-in-mdt.md)
+#### [Use web services in MDT](deploy-windows-mdt/use-web-services-in-mdt.md)
+#### [Use Orchestrator runbooks with MDT](deploy-windows-mdt/use-orchestrator-runbooks-with-mdt.md)
+## [Deploy Windows 10 with System Center 2012 R2 Configuration Manager](deploy-windows-sccm/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md)
+### [Integrate Configuration Manager with MDT](deploy-windows-mdt/integrate-configuration-manager-with-mdt.md)
+### [Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](deploy-windows-sccm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
+### [Create a custom Windows PE boot image with Configuration Manager](deploy-windows-sccm/create-a-custom-windows-pe-boot-image-with-configuration-manager.md)
+### [Add a Windows 10 operating system image using Configuration Manager](deploy-windows-sccm/add-a-windows-10-operating-system-image-using-configuration-manager.md)
+### [Create an application to deploy with Windows 10 using Configuration Manager](deploy-windows-sccm/create-an-application-to-deploy-with-windows-10-using-configuration-manager.md)
+### [Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](deploy-windows-sccm/add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
+### [Create a task sequence with Configuration Manager and MDT](deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
+### [Finalize the operating system configuration for Windows 10 deployment with Configuration Manager](deploy-windows-sccm/finalize-the-os-configuration-for-windows-10-deployment-with-configuration-manager.md)
+### [Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-sccm/deploy-windows-10-using-pxe-and-configuration-manager.md)
+### [Monitor the Windows 10 deployment with Configuration Manager](deploy-windows-sccm/monitor-windows-10-deployment-with-configuration-manager.md)
+### [Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](deploy-windows-sccm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)
+### [Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](deploy-windows-sccm/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
+### [Perform an in-place upgrade to Windows 10 using Configuration Manager](upgrade/upgrade-to-windows-10-with-system-center-configuraton-manager.md)
+## [Resolve Windows 10 upgrade errors](upgrade/resolve-windows-10-upgrade-errors.md)
+## [Convert MBR partition to GPT](mbr-to-gpt.md)
+## [Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md)
+## [Sideload apps in Windows 10](/windows/application-management/sideload-apps-in-windows-10)
+## [Update Windows 10](update/index.md)
+### [Quick guide to Windows as a service](update/waas-quick-start.md)
+### [Overview of Windows as a service](update/waas-overview.md)
+### [Prepare servicing strategy for Windows 10 updates](update/waas-servicing-strategy-windows-10-updates.md)
+### [Build deployment rings for Windows 10 updates](update/waas-deployment-rings-windows-10-updates.md)
+### [Assign devices to servicing branches for Windows 10 updates](update/waas-servicing-branches-windows-10-updates.md)
+### [Monitor Windows Updates with Update Compliance](update/update-compliance-monitor.md)
+#### [Get started with Update Compliance](update/update-compliance-get-started.md)
+#### [Use Update Compliance](update/update-compliance-using.md)
+### [Optimize Windows 10 update delivery](update/waas-optimize-windows-10-updates.md)
+#### [Configure Delivery Optimization for Windows 10 updates](update/waas-delivery-optimization.md)
+#### [Configure BranchCache for Windows 10 updates](update/waas-branchcache.md)
+### [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](update/waas-mobile-updates.md)
+### [Deploy updates using Windows Update for Business](update/waas-manage-updates-wufb.md)
+#### [Configure Windows Update for Business](update/waas-configure-wufb.md)
+#### [Integrate Windows Update for Business with management solutions](update/waas-integrate-wufb.md)
+#### [Walkthrough: use Group Policy to configure Windows Update for Business](update/waas-wufb-group-policy.md)
+#### [Walkthrough: use Intune to configure Windows Update for Business](update/waas-wufb-intune.md)
+### [Deploy Windows 10 updates using Windows Server Update Services](update/waas-manage-updates-wsus.md)
+### [Deploy Windows 10 updates using System Center Configuration Manager](update/waas-manage-updates-configuration-manager.md)
+### [Manage device restarts after updates](update/waas-restart.md)
+### [Windows Insider Program for Business](update/waas-windows-insider-for-business.md)
+#### [Windows Insider Program for Business using Azure Active Directory](update/waas-windows-insider-for-business-aad.md)
+#### [Windows Insider Program for Business Frequently Asked Questions](update/waas-windows-insider-for-business-faq.md)
+### [Change history for Update Windows 10](update/change-history-for-update-windows-10.md)
+
+## [Volume Activation [client]](volume-activation/volume-activation-windows-10.md)
+### [Plan for volume activation [client]](volume-activation/plan-for-volume-activation-client.md)
+### [Activate using Key Management Service [client]](volume-activation/activate-using-key-management-service-vamt.md)
+### [Activate using Active Directory-based activation [client]](volume-activation/activate-using-active-directory-based-activation-client.md)
+### [Activate clients running Windows 10](volume-activation/activate-windows-10-clients-vamt.md)
+### [Monitor activation [client]](volume-activation/monitor-activation-client.md)
+### [Use the Volume Activation Management Tool [client]](volume-activation/use-the-volume-activation-management-tool-client.md)
+### [Appendix: Information sent to Microsoft during activation [client]](volume-activation/appendix-information-sent-to-microsoft-during-activation-client.md)
+## [Windows 10 Enterprise E3 in CSP Overview](windows-10-enterprise-e3-overview.md)
+## [Windows 10 deployment tools reference](windows-10-deployment-tools-reference.md)
+### [Windows 10 deployment tools](windows-deployment-scenarios-and-tools.md)
+### [Windows ADK for Windows 10 scenarios for IT Pros](windows-adk-scenarios-for-it-pros.md)
+### [Volume Activation Management Tool (VAMT) Technical Reference](volume-activation/volume-activation-management-tool.md)
+#### [Introduction to VAMT](volume-activation/introduction-vamt.md)
+#### [Active Directory-Based Activation Overview](volume-activation/active-directory-based-activation-overview.md)
+#### [Install and Configure VAMT](volume-activation/install-configure-vamt.md)
+##### [VAMT Requirements](volume-activation/vamt-requirements.md)
+##### [Install VAMT](volume-activation/install-vamt.md)
+##### [Configure Client Computers](volume-activation/configure-client-computers-vamt.md)
+#### [Add and Manage Products](volume-activation/add-manage-products-vamt.md)
+##### [Add and Remove Computers](volume-activation/add-remove-computers-vamt.md)
+##### [Update Product Status](volume-activation/update-product-status-vamt.md)
+##### [Remove Products](volume-activation/remove-products-vamt.md)
+#### [Manage Product Keys](volume-activation/manage-product-keys-vamt.md)
+##### [Add and Remove a Product Key](volume-activation/add-remove-product-key-vamt.md)
+##### [Install a Product Key](volume-activation/install-product-key-vamt.md)
+##### [Install a KMS Client Key](volume-activation/install-kms-client-key-vamt.md)
+#### [Manage Activations](volume-activation/manage-activations-vamt.md)
+##### [Perform Online Activation](volume-activation/online-activation-vamt.md)
+##### [Perform Proxy Activation](volume-activation/proxy-activation-vamt.md)
+##### [Perform KMS Activation](volume-activation/kms-activation-vamt.md)
+##### [Perform Local Reactivation](volume-activation/local-reactivation-vamt.md)
+##### [Activate an Active Directory Forest Online](volume-activation/activate-forest-vamt.md)
+##### [Activate by Proxy an Active Directory Forest](volume-activation/activate-forest-by-proxy-vamt.md)
+#### [Manage VAMT Data](volume-activation/manage-vamt-data.md)
+##### [Import and Export VAMT Data](volume-activation/import-export-vamt-data.md)
+##### [Use VAMT in Windows PowerShell](volume-activation/use-vamt-in-windows-powershell.md)
+#### [VAMT Step-by-Step Scenarios](volume-activation/vamt-step-by-step.md)
+##### [Scenario 1: Online Activation](volume-activation/scenario-online-activation-vamt.md)
+##### [Scenario 2: Proxy Activation](volume-activation/scenario-proxy-activation-vamt.md)
+##### [Scenario 3: KMS Client Activation](volume-activation/scenario-kms-activation-vamt.md)
+#### [VAMT Known Issues](volume-activation/vamt-known-issues.md)
+### [User State Migration Tool (USMT) Technical Reference](usmt/usmt-technical-reference.md)
+#### [User State Migration Tool (USMT) Overview Topics](usmt/usmt-topics.md)
+##### [User State Migration Tool (USMT) Overview](usmt/usmt-overview.md)
+##### [Getting Started with the User State Migration Tool (USMT)](usmt/getting-started-with-the-user-state-migration-tool.md)
+##### [Windows Upgrade and Migration Considerations](upgrade/windows-upgrade-and-migration-considerations.md)
+#### [User State Migration Tool (USMT) How-to topics](usmt/usmt-how-to.md)
+##### [Exclude Files and Settings](usmt/usmt-exclude-files-and-settings.md)
+##### [Extract Files from a Compressed USMT Migration Store](usmt/usmt-extract-files-from-a-compressed-migration-store.md)
+##### [Include Files and Settings](usmt/usmt-include-files-and-settings.md)
+##### [Migrate Application Settings](usmt/migrate-application-settings.md)
+##### [Migrate EFS Files and Certificates](usmt/usmt-migrate-efs-files-and-certificates.md)
+##### [Migrate User Accounts](usmt/usmt-migrate-user-accounts.md)
+##### [Reroute Files and Settings](usmt/usmt-reroute-files-and-settings.md)
+##### [Verify the Condition of a Compressed Migration Store](usmt/verify-the-condition-of-a-compressed-migration-store.md)
+#### [User State Migration Tool (USMT) Troubleshooting](usmt/usmt-troubleshooting.md)
+##### [Common Issues](usmt/usmt-common-issues.md)
+##### [Frequently Asked Questions](usmt/usmt-faq.md)
+##### [Log Files](usmt/usmt-log-files.md)
+##### [Return Codes](usmt/usmt-return-codes.md)
+##### [USMT Resources](usmt/usmt-resources.md)
+#### [User State Migration Toolkit (USMT) Reference](usmt/usmt-reference.md)
+##### [USMT Requirements](usmt/usmt-requirements.md)
+##### [USMT Best Practices](usmt/usmt-best-practices.md)
+##### [How USMT Works](usmt/usmt-how-it-works.md)
+##### [Plan Your Migration](usmt/usmt-plan-your-migration.md)
+###### [Common Migration Scenarios](usmt/usmt-common-migration-scenarios.md)
+###### [What Does USMT Migrate?](usmt/usmt-what-does-usmt-migrate.md)
+###### [Choose a Migration Store Type](usmt/usmt-choose-migration-store-type.md)
+####### [Migration Store Types Overview](usmt/migration-store-types-overview.md)
+####### [Estimate Migration Store Size](usmt/usmt-estimate-migration-store-size.md)
+####### [Hard-Link Migration Store](usmt/usmt-hard-link-migration-store.md)
+####### [Migration Store Encryption](usmt/usmt-migration-store-encryption.md)
+###### [Determine What to Migrate](usmt/usmt-determine-what-to-migrate.md)
+####### [Identify Users](usmt/usmt-identify-users.md)
+####### [Identify Applications Settings](usmt/usmt-identify-application-settings.md)
+####### [Identify Operating System Settings](usmt/usmt-identify-operating-system-settings.md)
+####### [Identify File Types, Files, and Folders](usmt/usmt-identify-file-types-files-and-folders.md)
+###### [Test Your Migration](usmt/usmt-test-your-migration.md)
+##### [User State Migration Tool (USMT) Command-line Syntax](usmt/usmt-command-line-syntax.md)
+###### [ScanState Syntax](usmt/usmt-scanstate-syntax.md)
+###### [LoadState Syntax](usmt/usmt-loadstate-syntax.md)
+###### [UsmtUtils Syntax](usmt/usmt-utilities.md)
+##### [USMT XML Reference](usmt/usmt-xml-reference.md)
+###### [Understanding Migration XML Files](usmt/understanding-migration-xml-files.md)
+###### [Config.xml File](usmt/usmt-configxml-file.md)
+###### [Customize USMT XML Files](usmt/usmt-customize-xml-files.md)
+###### [Custom XML Examples](usmt/usmt-custom-xml-examples.md)
+###### [Conflicts and Precedence](usmt/usmt-conflicts-and-precedence.md)
+###### [General Conventions](usmt/usmt-general-conventions.md)
+###### [XML File Requirements](usmt/xml-file-requirements.md)
+###### [Recognized Environment Variables](usmt/usmt-recognized-environment-variables.md)
+###### [XML Elements Library](usmt/usmt-xml-elements-library.md)
+##### [Offline Migration Reference](usmt/offline-migration-reference.md)
+## [Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md)
\ No newline at end of file
diff --git a/windows/deployment/change-history-for-deploy-windows-10.md b/windows/deployment/change-history-for-deploy-windows-10.md
new file mode 100644
index 0000000000..c6d22274f0
--- /dev/null
+++ b/windows/deployment/change-history-for-deploy-windows-10.md
@@ -0,0 +1,128 @@
+---
+title: Change history for Deploy Windows 10 (Windows 10)
+description: This topic lists new and updated topics in the Deploy Windows 10 documentation for Windows 10 and Windows 10 Mobile.
+ms.assetid: 19C50373-6B25-4F5C-A6EF-643D36904349
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+author: greg-lindsay
+---
+
+# Change history for Deploy Windows 10
+This topic lists new and updated topics in the [Deploy Windows 10](index.md) documentation for [Windows 10 and Windows 10 Mobile](/windows/windows-10).
+
+## April 2017
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Deploy Windows 10 in a test lab using System Center Configuration Manager](windows-10-poc-sc-config-mgr.md) | Updated: The "refresh" and "replace" procedures were swapped in order so that it would not be necessary to save and restore VMs. Also a missing step was added to include the State migration point role. |
+| [Step by step guide: Configure a test lab to deploy Windows 10](windows-10-poc.md)| Updated with minor fixes. |
+| [Manage Windows upgrades with Upgrade Readiness](upgrade/manage-windows-upgrades-with-upgrade-readiness.md)| Updated child topics under this node to include new feature and user interface changes. |
+| [Get started with Upgrade Readiness](upgrade/upgrade-readiness-get-started.md)| Added a table summarizing connection scenarios under the Enable data sharing topic. |
+
+
+## RELEASE: Windows 10, version 1703
+The topics in this library have been updated for Windows 10, version 1703 (also known as the Creators Update). The provisioning topics have been moved to [Configure Windows 10](../configuration/index.md).
+
+
+## March 2017
+| New or changed topic | Description |
+|----------------------|-------------|
+| [What's new in Windows 10 deployment](deploy-whats-new.md) | New |
+| [Upgrade to Windows 10 with the Microsoft Deployment Toolkit](upgrade/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md) | Topic moved under [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md) in the table of contents and title adjusted to clarify in-place upgrade. |
+| [Upgrade to Windows 10 with System Center Configuration Manager](upgrade/upgrade-to-windows-10-with-system-center-configuraton-manager.md) | Topic moved under [Deploy Windows 10 with System Center 2012 R2 Configuration Manager](deploy-windows-sccm/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md) in the table of contents and title adjusted to clarify in-place upgrade. |
+| [Convert MBR partition to GPT](mbr-to-gpt.md) | New |
+
+## February 2017
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Manage Windows upgrades with Upgrade Readiness](upgrade/manage-windows-upgrades-with-upgrade-readiness.md) | Multiple topics updated, name changed from Upgrade Analytics to Upgrade Readiness, and other content updates. |
+| [USMT Requirements](usmt/usmt-requirements.md) | Updated: Vista support removed and other minor changes |
+| [Get started with Upgrade Analytics](upgrade/upgrade-analytics-get-started.md) | Updated structure and content |
+| [Upgrade Analytics deployment script](upgrade/upgrade-analytics-deployment-script.md) | Added as a separate page from get started |
+| [Use Upgrade Analytics to manage Windows upgrades](upgrade/use-upgrade-analytics-to-manage-windows-upgrades.md) | Updated with links to new content and information about the target OS setting |
+| [Upgrade Analytics - Upgrade overview](upgrade/upgrade-analytics-upgrade-overview.md) | New |
+| [Upgrade Analytics - Step 1: Identify important apps](upgrade/upgrade-analytics-identify-apps.md) | Updated topic title and content |
+| [Upgrade Analytics - Step 2: Resolve app and driver issues](upgrade/upgrade-analytics-resolve-issues.md) | New |
+| [Upgrade Analytics - Step 3: Deploy Windows](upgrade/upgrade-analytics-deploy-windows.md) | New |
+| [Upgrade Analytics - Additional insights](upgrade/upgrade-analytics-additional-insights.md) | New |
+
+
+## January 2017
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Step by step guide: Configure a test lab to deploy Windows 10](windows-10-poc.md) | New |
+| [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md) | New |
+| [Deploy Windows 10 in a test lab using System Center Configuration Manager](windows-10-poc-sc-config-mgr.md) | New |
+| [Apply a provisioning package](../configuration/provisioning-packages/provisioning-apply-package.md) | New (previously published in other topics) |
+| [Create a provisioning package for Windows 10](../configuration/provisioning-packages/provisioning-create-package.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [Create a provisioning package with multivariant settings](../configuration/provisioning-packages/provisioning-multivariant.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [How provisioning works in Windows 10](../configuration/provisioning-packages/provisioning-how-it-works.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [Install Windows Imaging and Configuration Designer](../configuration/provisioning-packages/provisioning-install-icd.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [NFC-based device provisioning](../configuration/mobile-devices/provisioning-nfc.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [Settings changed when you uninstall a provisioning package](../configuration/provisioning-packages/provisioning-uninstall-package.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [Use a script to install a desktop app in provisioning packages](../configuration/provisioning-packages/provisioning-script-to-install-app.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [Windows ICD command-line interface (reference)](../configuration/provisioning-packages/provisioning-command-line.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [Get started with Upgrade Analytics](upgrade/upgrade-analytics-get-started.md) | Updated exit code table with suggested fixes, and added link to the Upgrade Analytics blog |
+| [Provision PCs with common settings for initial deployment (simple provisioning)](../configuration/provisioning-packages/provision-pcs-for-initial-deployment.md) | Instructions for applying the provisioning package moved to [Apply a provisioning package](../configuration/provisioning-packages/provisioning-apply-package.md) |
+| [Provision PCs with apps and certificates for initial deployments (advanced provisioning)](../configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md) | Instructions for applying the provisioning package moved to [Apply a provisioning package](../configuration/provisioning-packages/provisioning-apply-package.md) |
+
+
+## October 2016
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Resolve Windows 10 upgrade errors](upgrade/resolve-windows-10-upgrade-errors.md) | New |
+
+## September 2016
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Windows 10 Enterprise E3 in CSP Overview](windows-10-enterprise-e3-overview.md) | New |
+| [Get started with Upgrade Analytics](upgrade/upgrade-analytics-get-started.md) | Updated with prerequisites for site discovery |
+| [Resolve application and driver issues](upgrade/upgrade-analytics-resolve-issues.md) | Updated with app status info for Ready For Windows |
+| [Review site discovery](upgrade/upgrade-analytics-additional-insights.md) | New |
+
+## RELEASE: Windows 10, version 1607
+
+The topics in this library have been updated for Windows 10, version 1607 (also known as the Anniversary Update). The following new topics have been added:
+
+- [Provisioning packages for Windows 10](../configuration/provisioning-packages/provisioning-packages.md)
+- [Provision PCs with apps and certificates for initial deployment](../configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md)
+- [Provision PCs with common settings for initial deployment](../configuration/provisioning-packages/provision-pcs-for-initial-deployment.md)
+
+## August 2016
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md) | Updated with reboot requirements |
+
+## July 2016
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Manage Windows upgrades with Upgrade Analytics](upgrade/manage-windows-upgrades-with-upgrade-analytics.md) | New |
+
+## June 2016
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md) | New |
+| [User State Migration Tool Technical Reference](usmt/usmt-technical-reference.md) | Updated support statement for Office 2016 |
+| [Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md) | New |
+
+## May 2016
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Upgrade a Windows Phone 8.1 to Windows 10 Mobile with Mobile Device Management](upgrade/upgrade-windows-phone-8-1-to-10.md) | New |
+
+## December 2015
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Activate using Key Management Service](volume-activation/activate-using-key-management-service-vamt.md) | Updated |
+| [Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md) | Updated |
+
+## November 2015
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md) | New |
+
+## Related topics
+- [Change history for Plan for Windows 10 deployment](/windows/deployment/planning/change-history-for-plan-for-windows-10-deployment)
+- [Change history for Access Protection](/windows/access-protection/change-history-for-access-protection)
+- [Change history for Access Protection](/windows/device-security/change-history-for-device-security)
+- [Change history for Access Protection](/windows/threat-protection/change-history-for-threat-protection)
diff --git a/windows/deploy/configure-a-pxe-server-to-load-windows-pe.md b/windows/deployment/configure-a-pxe-server-to-load-windows-pe.md
similarity index 100%
rename from windows/deploy/configure-a-pxe-server-to-load-windows-pe.md
rename to windows/deployment/configure-a-pxe-server-to-load-windows-pe.md
diff --git a/windows/deploy/deploy-whats-new.md b/windows/deployment/deploy-whats-new.md
similarity index 84%
rename from windows/deploy/deploy-whats-new.md
rename to windows/deployment/deploy-whats-new.md
index 9d6a1b0d15..a4e547e904 100644
--- a/windows/deploy/deploy-whats-new.md
+++ b/windows/deployment/deploy-whats-new.md
@@ -44,7 +44,7 @@ The development of Upgrade Readiness has been heavily influenced by input from t
For more information about Upgrade Readiness, see the following topics:
- [Windows Analytics blog](https://blogs.technet.microsoft.com/upgradeanalytics/)
-- [Manage Windows upgrades with Upgrade Readiness](manage-windows-upgrades-with-upgrade-readiness.md)
+- [Manage Windows upgrades with Upgrade Readiness](upgrade/manage-windows-upgrades-with-upgrade-readiness.md)
### Update Compliance
@@ -53,7 +53,7 @@ Update Compliance helps you to keep Windows 10 devices in your organization secu
Update Compliance is a solution built using OMS Logs and Analytics that provides information about installation status of monthly quality and feature updates. Details are provided about the deployment progress of existing updates and the status of future updates. Information is also provided about devices that might need attention to resolve issues.
-For more information about Update Compliance, see [Monitor Windows Updates with Update Compliance](../manage/update-compliance-monitor.md).
+For more information about Update Compliance, see [Monitor Windows Updates with Update Compliance](update/update-compliance-monitor.md).
### MBR2GPT
@@ -98,7 +98,7 @@ For more information, see the following guides:
## Troubleshooting guidance
-[Resolve Windows 10 upgrade errors](resolve-windows-10-upgrade-errors.md) was published in October of 2016 and will continue to be updated with new fixes. The topic provides a detailed explanation of the Windows 10 upgrade process and instructions on how to locate, interpret, and resolve specific errors that can be encountered during the upgrade process.
+[Resolve Windows 10 upgrade errors](upgrade/resolve-windows-10-upgrade-errors.md) was published in October of 2016 and will continue to be updated with new fixes. The topic provides a detailed explanation of the Windows 10 upgrade process and instructions on how to locate, interpret, and resolve specific errors that can be encountered during the upgrade process.
## Online content change history
@@ -106,18 +106,18 @@ For more information, see the following guides:
The following topics provide a change history for Windows 10 ITPro TechNet library content related to deploying and using Windows 10.
[Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md)
- [Change history for Plan for Windows 10 deployment](../plan/change-history-for-plan-for-windows-10-deployment.md)
- [Change history for Manage and update Windows 10](../manage/change-history-for-manage-and-update-windows-10.md)
- [Change history for Keep Windows 10 secure](../keep-secure/change-history-for-keep-windows-10-secure.md)
+[Change history for Access Protection](/windows/access-protection/change-history-for-access-protection)
+[Change history for Device Security](/windows/device-security/change-history-for-device-security)
+[Change history for Threat Protection](/windows/threat-protection/change-history-for-threat-protection)
## Related topics
-[Overview of Windows as a service](../manage/waas-overview.md)
- [Windows 10 deployment considerations](../plan/windows-10-deployment-considerations.md)
+[Overview of Windows as a service](update/waas-overview.md)
+ [Windows 10 deployment considerations](planning/windows-10-deployment-considerations.md)
[Windows 10 release information](https://technet.microsoft.com/en-us/windows/release-info.aspx)
[Windows 10 Specifications & Systems Requirements](https://www.microsoft.com/en-us/windows/windows-10-specifications)
- [Windows 10 upgrade paths](windows-10-upgrade-paths.md)
+ [Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md)
[Windows 10 deployment tools](windows-deployment-scenarios-and-tools.md)
\ No newline at end of file
diff --git a/windows/deploy/assign-applications-using-roles-in-mdt-2013.md b/windows/deployment/deploy-windows-mdt/assign-applications-using-roles-in-mdt-2013.md
similarity index 100%
rename from windows/deploy/assign-applications-using-roles-in-mdt-2013.md
rename to windows/deployment/deploy-windows-mdt/assign-applications-using-roles-in-mdt-2013.md
diff --git a/windows/deploy/assign-applications-using-roles-in-mdt.md b/windows/deployment/deploy-windows-mdt/assign-applications-using-roles-in-mdt.md
similarity index 97%
rename from windows/deploy/assign-applications-using-roles-in-mdt.md
rename to windows/deployment/deploy-windows-mdt/assign-applications-using-roles-in-mdt.md
index c2d8ed9f1b..7fbd9c8386 100644
--- a/windows/deploy/assign-applications-using-roles-in-mdt.md
+++ b/windows/deployment/deploy-windows-mdt/assign-applications-using-roles-in-mdt.md
@@ -23,7 +23,7 @@ This topic will show you how to add applications to a role in the MDT database a
2. Applications / Lite Touch Applications:
3. Install - Adobe Reader XI - x86
-
+
Figure 12. The Standard PC role with the application added
@@ -34,7 +34,7 @@ After creating the role, you can associate it with one or more computer entries.
2. In the **Computers** node, double-click the **PC00075** entry, and add the following setting:
- Roles: Standard PC
-
+
Figure 13. The Standard PC role added to PC00075 (having ID 1 in the database).
@@ -115,7 +115,7 @@ When the database is populated, you can use the MDT simulation environment to si
```
-
+
Figure 14. ZTIGather.log displaying the application GUID belonging to the Adobe Reader XI application that would have been installed if you deployed this machine.
diff --git a/windows/deploy/build-a-distributed-environment-for-windows-10-deployment.md b/windows/deployment/deploy-windows-mdt/build-a-distributed-environment-for-windows-10-deployment.md
similarity index 97%
rename from windows/deploy/build-a-distributed-environment-for-windows-10-deployment.md
rename to windows/deployment/deploy-windows-mdt/build-a-distributed-environment-for-windows-10-deployment.md
index 5d6bf1b687..c253293a7e 100644
--- a/windows/deploy/build-a-distributed-environment-for-windows-10-deployment.md
+++ b/windows/deployment/deploy-windows-mdt/build-a-distributed-environment-for-windows-10-deployment.md
@@ -20,7 +20,7 @@ In this topic, you will learn how to replicate your Windows 10 deployment share
We will use four machines for this topic: DC01, MDT01, MDT02, and PC0006. DC01 is a domain controller, MDT01 is a Windows Server 2012 R2 standard server, and PC0006 is a blank machine to which you will deploy Windows 10. You will configure a second deployment server (MDT02) for a remote site (Stockholm) by replicating the deployment share in the original site (New York). MDT01, MDT02, and PC0006 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md#proof).
-
+
Figure 1. The machines used in this topic.
@@ -50,7 +50,7 @@ Setting up DFS-R for replication is a quick and straightforward process. You pre
4. On the **Select server roles** page, expand **File and Storage Services (Installed)** and expand **File and iSCSI Services (Installed)**.
5. In the **Roles** list, select **DFS Replication**. In the **Add Roles and Features Wizard** dialog box, select **Add Features**, and then click **Next**.
- 
+ 
Figure 2. Adding the DFS Replication role to MDT01.
@@ -74,7 +74,7 @@ Setting up DFS-R for replication is a quick and straightforward process. You pre
1. On MDT02, using File Explorer, create the **E:\\MDTProduction** folder.
2. Share the **E:\\MDTProduction** folder as **MDTProduction$**. Use the default permissions.
- 
+ 
Figure 3. Sharing the **E:\\MDTProduction folder** on MDT02.
@@ -104,14 +104,14 @@ When you have multiple deployment servers sharing the same content, you need to
2. Save the Bootstrap.ini file.
3. Using the Deployment Workbench, right-click the **MDT Production** deployment share and select **Update Deployment Share**.
- 
+ 
Figure 4. Updating the MDT Production deployment share.
4. Use the default settings for the Update Deployment Share Wizard.
5. After the update is complete, use the Windows Deployment Services console. In the **Boot Images** node, right-click the **MDT Production x64** boot image and select **Replace Image**.
- 
+ 
Figure 5. Replacing the updated boot image in WDS.
@@ -124,7 +124,7 @@ Once the MDT01 and MDT02 servers are prepared, you are ready to configure the ac
3. On the **Name and Domain** page, assign the **MDTProduction** name, and click **Next**.
4. On the **Replication Group Members** page, click **Add**, add **MDT01** and **MDT02**, and then click **Next**.
- 
+ 
Figure 6. Adding the Replication Group Members.
@@ -135,7 +135,7 @@ Once the MDT01 and MDT02 servers are prepared, you are ready to configure the ac
9. On the **Local Path of MDTProduction** on the **Other Members** page, select **MDT02**, and click **Edit**.
10. On the **Edit** page, select the **Enabled** option, type in **E:\\MDTProduction** as the local path of folder, select the **Make the selected replicated folder on this member read-only** check box, click **OK**, and then click **Next**.
- 
+ 
Figure 7. Configure the MDT02 member.
@@ -153,7 +153,7 @@ Once the MDT01 and MDT02 servers are prepared, you are ready to configure the ac
(Get-ChildItem E:\MDTProduction -Recurse | Sort-Object Length -Descending | Select-Object -First 16 | Measure-Object -Property Length -Sum).Sum /1GB
```
- 
+ 
Figure 8. Configure the Staging settings.
@@ -175,7 +175,7 @@ It will take some time for the replication configuration to be picked up by the
7. On the **Review Settings and Create Report** page, click **Create**.
8. Open the report in Internet Explorer, and if necessary, select the **Allow blocked content** option.
-
+
Figure 9. The DFS Replication Health Report.
diff --git a/windows/deploy/configure-mdt-2013-for-userexit-scripts.md b/windows/deployment/deploy-windows-mdt/configure-mdt-2013-for-userexit-scripts.md
similarity index 100%
rename from windows/deploy/configure-mdt-2013-for-userexit-scripts.md
rename to windows/deployment/deploy-windows-mdt/configure-mdt-2013-for-userexit-scripts.md
diff --git a/windows/deploy/configure-mdt-2013-settings.md b/windows/deployment/deploy-windows-mdt/configure-mdt-2013-settings.md
similarity index 100%
rename from windows/deploy/configure-mdt-2013-settings.md
rename to windows/deployment/deploy-windows-mdt/configure-mdt-2013-settings.md
diff --git a/windows/deploy/configure-mdt-deployment-share-rules.md b/windows/deployment/deploy-windows-mdt/configure-mdt-deployment-share-rules.md
similarity index 100%
rename from windows/deploy/configure-mdt-deployment-share-rules.md
rename to windows/deployment/deploy-windows-mdt/configure-mdt-deployment-share-rules.md
diff --git a/windows/deploy/configure-mdt-for-userexit-scripts.md b/windows/deployment/deploy-windows-mdt/configure-mdt-for-userexit-scripts.md
similarity index 100%
rename from windows/deploy/configure-mdt-for-userexit-scripts.md
rename to windows/deployment/deploy-windows-mdt/configure-mdt-for-userexit-scripts.md
diff --git a/windows/deploy/configure-mdt-settings.md b/windows/deployment/deploy-windows-mdt/configure-mdt-settings.md
similarity index 98%
rename from windows/deploy/configure-mdt-settings.md
rename to windows/deployment/deploy-windows-mdt/configure-mdt-settings.md
index f5e67fc5c6..b01d3341c6 100644
--- a/windows/deploy/configure-mdt-settings.md
+++ b/windows/deployment/deploy-windows-mdt/configure-mdt-settings.md
@@ -16,7 +16,7 @@ author: mtniehaus
One of the most powerful features in Microsoft Deployment Toolkit (MDT) is its extension capabilities; there is virtually no limitation to what you can do in terms of customization. In this topic, you learn about configuring customizations for your environment.
For the purposes of this topic, we will use four machines: DC01, MDT01, HV01, and PC0001. DC01 is a domain controller, MDT01 is a Windows Server 2012 R2 Standard server, and PC0001 is a Windows 10 Enterprise x64 client used for the MDT simulation environment. OR01 has Microsoft System Center 2012 R2 Orchestrator installed. MDT01, OR01, and PC0001 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md#proof).
-
+
Figure 1. The machines used in this topic.
diff --git a/windows/deploy/create-a-task-sequence-with-configuration-manager-and-mdt.md b/windows/deployment/deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md
similarity index 87%
rename from windows/deploy/create-a-task-sequence-with-configuration-manager-and-mdt.md
rename to windows/deployment/deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md
index 98e1ddb768..123fe228b3 100644
--- a/windows/deploy/create-a-task-sequence-with-configuration-manager-and-mdt.md
+++ b/windows/deployment/deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md
@@ -110,7 +110,7 @@ After you create the task sequence, we recommend that you configure the task seq
>[!NOTE]
>You also can add a Query WMI condition with the following query: SELECT \* FROM Win32\_ComputerSystem WHERE Model LIKE '%HP EliteBook 8560w%'
- 
+ 
*Figure 24. The driver package options*
@@ -118,7 +118,7 @@ After you create the task sequence, we recommend that you configure the task seq
8. Select the **Install the following applications** option, and add the OSD / Adobe Reader XI - OSD Install application to the list.
- 
+ 
*Figure 25. Add an application to the Configuration Manager task sequence*
@@ -169,27 +169,18 @@ While creating the task sequence with the MDT wizard, a few operating system dep
[Integrate Configuration Manager with MDT](integrate-configuration-manager-with-mdt.md)
-[Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
+[Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](../deploy-windows-sccm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
-[Create a custom Windows PE boot image with Configuration Manager](create-a-custom-windows-pe-boot-image-with-configuration-manager.md)
+[Create a custom Windows PE boot image with Configuration Manager](../deploy-windows-sccm/create-a-custom-windows-pe-boot-image-with-configuration-manager.md)
-[Add a Windows 10 operating system image using Configuration Manager](add-a-windows-10-operating-system-image-using-configuration-manager.md)
-
-[Create an application to deploy with Windows 10 using Configuration Manager](create-an-application-to-deploy-with-windows-10-using-configuration-manager.md)
-
-[Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-
-[Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-10-using-pxe-and-configuration-manager.md)
-
-[Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-
-[Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-
-
-
-
+[Add a Windows 10 operating system image using Configuration Manager](../deploy-windows-sccm/add-a-windows-10-operating-system-image-using-configuration-manager.md)
+[Create an application to deploy with Windows 10 using Configuration Manager](../deploy-windows-sccm/create-an-application-to-deploy-with-windows-10-using-configuration-manager.md)
+[Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](../deploy-windows-sccm/add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
+[Deploy Windows 10 using PXE and Configuration Manager](../deploy-windows-sccm/deploy-windows-10-using-pxe-and-configuration-manager.md)
+[Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](../deploy-windows-sccm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)
+[Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](../deploy-windows-sccm/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
diff --git a/windows/deploy/create-a-windows-10-reference-image.md b/windows/deployment/deploy-windows-mdt/create-a-windows-10-reference-image.md
similarity index 98%
rename from windows/deploy/create-a-windows-10-reference-image.md
rename to windows/deployment/deploy-windows-mdt/create-a-windows-10-reference-image.md
index 03ce967435..128b74d5b1 100644
--- a/windows/deploy/create-a-windows-10-reference-image.md
+++ b/windows/deployment/deploy-windows-mdt/create-a-windows-10-reference-image.md
@@ -22,7 +22,7 @@ For the purposes of this topic, we will use four machines: DC01, MDT01, HV01, an
**Note**
For important details about the setup for the steps outlined in this article, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md#proof).
-
+
Figure 1. The machines used in this topic.
@@ -49,7 +49,7 @@ With Windows 10, there is no hard requirement to create reference images; howev
- <default>
- Verify that you can access the \\\\MDT01\\MDTBuildLab$ share.
-
+
Figure 2. The Deployment Workbench with the MDT Build Lab deployment share created.
@@ -63,7 +63,7 @@ In order to write the reference image back to the deployment share, you need to
icacls E:\MDTBuildLab\Captures /grant '"MDT_BA":(OI)(CI)(M)'
```
-
+
Figure 3. Permissions configured for the MDT\_BA user.
@@ -91,7 +91,7 @@ In these steps we assume that you have copied the content of a Windows 10 Enter
7. Destination directory name: W10EX64RTM
8. After adding the operating system, in the **Operating Systems / Windows 10** folder, double-click the added operating system name in the **Operating System** node and change the name to the following: **Windows 10 Enterprise x64 RTM Default Image**
-
+
Figure 4. The imported Windows 10 operating system after renaming it.
@@ -129,7 +129,7 @@ You also can customize the Office installation using a Config.xml file. But we r
1. Using the Deployment Workbench in the MDT Build Lab deployment share, expand the **Applications / Microsoft** node, and double-click **Install - Microsoft Office 2013 Pro Plus x86**.
2. In the **Office Products** tab, click **Office Customization Tool**, and click **OK** in the **Information** dialog box.
- 
+ 
Figure 5. The Install - Microsoft Office 2013 Pro Plus - x86 application properties.
@@ -145,7 +145,7 @@ You also can customize the Office installation using a Config.xml file. But we r
2. Select I accept the terms in the License Agreement.
3. Select Display level: None
- 
+ 
Figure 6. The licensing and user interface screen in the Microsoft Office Customization Tool
@@ -335,7 +335,7 @@ The steps below walk you through the process of editing the Windows 10 referenc
**Important**
This is probably the most important step when creating a reference image. Many applications need the .NET Framework, and we strongly recommend having it available in the image. The one thing that makes this different from other components is that .NET Framework 3.5.1 is not included in the WIM file. It is installed from the **Sources\\SxS** folder on the media, and that makes it more difficult to add after the image has been deployed.
- 
+ 
Figure 7. The task sequence after creating the Custom Tasks (Pre-Windows Update) group and adding the Install - Microsoft NET Framework 3.5.1 action.
@@ -359,11 +359,11 @@ The steps below walk you through the process of editing the Windows 10 referenc
The goal when creating a reference image is of course to automate everything. But sometimes you have a special configuration or application setup that is too time-consuming to automate. If you need to do some manual configuration, you can add a little-known feature called Lite Touch Installation (LTI) Suspend. If you add the LTISuspend.wsf script as a custom action in the task sequence, it will suspend the task sequence until you click the Resume Task Sequence shortcut icon on the desktop. In addition to using the LTI Suspend feature for manual configuration or installation, you can also use it simply for verifying a reference image before you allow the task sequence to continue and use Sysprep and capture the virtual machine.
-
+
Figure 8. A task sequence with optional Suspend action (LTISuspend.wsf) added.
-
+
Figure 9. The Windows 10 desktop with the Resume Task Sequence shortcut.
@@ -384,7 +384,7 @@ Follow these steps to configure Internet Explorer settings in Unattend.xml for t
5. Save the Unattend.xml file, and close Windows SIM.
6. On the Windows 10 Enterprise x64 RTM Default Image Properties, click **OK**.
-
+
Figure 10. Windows System Image Manager with the Windows 10 Unattend.xml.
@@ -431,7 +431,7 @@ For that reason, add only a minimal set of rules to Bootstrap.ini, such as which
SkipFinalSummary=YES
```
- 
+ 
Figure 11. The server-side rules for the MDT Build Lab deployment share.
@@ -448,7 +448,7 @@ For that reason, add only a minimal set of rules to Bootstrap.ini, such as which
SkipBDDWelcome=YES
```
- 
+ 
Figure 12. The boot image rules for the MDT Build Lab deployment share.
@@ -614,7 +614,7 @@ This steps below outline the process used to boot a virtual machine using an ISO
- Location: \\\\MDT01\\MDTBuildLab$\\Captures
3. File name: REFW10X64-001.wim
- 
+ 
Figure 13. The Windows Deployment Wizard for the Windows 10 reference image.
diff --git a/windows/deploy/deploy-a-windows-10-image-using-mdt.md b/windows/deployment/deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md
similarity index 98%
rename from windows/deploy/deploy-a-windows-10-image-using-mdt.md
rename to windows/deployment/deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md
index d7f9b691ff..7249255dfd 100644
--- a/windows/deploy/deploy-a-windows-10-image-using-mdt.md
+++ b/windows/deployment/deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md
@@ -23,7 +23,7 @@ For the purposes of this topic, we will use three machines: DC01, MDT01, and PC0
**Note**
For important details about the setup for the steps outlined in this article, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
-
+
Figure 1. The machines used in this topic.
@@ -93,7 +93,7 @@ In these steps, we assume that you have completed the steps in the [Create a Win
**Note**
The reason for adding the setup files has changed since earlier versions of MDT. MDT 2010 used the setup files to install Windows. MDT uses DISM to apply the image; however, you still need the setup files because some components in roles and features are stored outside the main image.
-
+
Figure 2. The imported operating system after renaming it.
@@ -113,7 +113,7 @@ In this example, we assume that you have downloaded the Adobe Reader XI installa
7. On the **Destination** page, in the **Specify the name of the directory that should be created** text box, type **Install - Adobe Reader XI - x86** and click **Next**.
8. On the **Command Details** page, in the **Command Line** text box, type **msiexec /i AdbeRdr11000\_eu\_ES.msi /q**, click **Next** twice, and then click **Finish**.
-
+
Figure 3. The Adobe Reader application added to the Deployment Workbench.
@@ -180,7 +180,7 @@ wmic csproduct get name
If you want a more standardized naming convention, try the ModelAliasExit.vbs script from the Deployment Guys blog post entitled [Using and Extending Model Aliases for Hardware Specific Application Installation](https://go.microsoft.com/fwlink/p/?LinkId=619536).
-
+
Figure 4. The Out-of-Box Drivers structure in Deployment Workbench.
@@ -197,7 +197,7 @@ The drivers that are used for the boot images (Windows PE) are Windows 10 driver
1. Selection Profile name: WinPE x64
2. Folders: Select the WinPE x64 folder in Out-of-Box Drivers.
-
+
Figure 5. Creating the WinPE x64 selection profile.
@@ -290,7 +290,7 @@ This section will show you how to create the task sequence used to deploy your p
4. State Restore. Enable the **Windows Update (Post-Application Installation)** action.
3. Click **OK**.
-
+
Figure 6. The task sequence for production deployment.
@@ -374,7 +374,7 @@ In this section, you will learn how to configure the MDT Build Lab deployment sh
It will take a while for the Deployment Workbench to create the monitoring database and web service.
-
+
Figure 7. The Windows PE tab for the x64 boot image.
@@ -463,7 +463,7 @@ In these steps, we assume that you downloaded MDOP 2015 R1 and copied DaRT 10 to
6. In the **Windows PE** tab, in the **Platform** drop-down list, make sure **x86** is selected.
7. In the **Features** sub tab, select the **Microsoft Diagnostics and Recovery Toolkit (DaRT)** check box.
- 
+ 
Figure 8. Selecting the DaRT 10 feature in the deployment share.
@@ -490,7 +490,7 @@ You need to add the MDT Production Lite Touch x64 Boot image to WDS in preparati
1. Using the WDS console, right-click **Boot Images** and select **Add Boot Image**.
2. Browse to the E:\\MDTProduction\\Boot\\LiteTouchPE\_x64.wim file and add the image with the default settings.
-
+
Figure 9. The boot image added to the WDS console.
@@ -505,7 +505,7 @@ At this point, you should have a solution ready for deploying the Windows 10 cl
5. Hard disk: 60 GB (dynamic disk)
2. Start the PC0005 virtual machine, and press **Enter** to start the PXE boot. The machine will now load the Windows PE boot image from the WDS server.
- 
+ 
Figure 10. The initial PXE boot process of PC0005.
@@ -527,7 +527,7 @@ Now that you have enabled the monitoring on the MDT Production deployment share,
2. Select the **Monitoring** node, and wait until you see PC0005.
3. Double-click PC0005, and review the information.
-
+
Figure 11. The Monitoring node, showing the deployment progress of PC0005.
@@ -535,7 +535,7 @@ Figure 11. The Monitoring node, showing the deployment progress of PC0005.
When monitoring is enabled, MDT also writes information to the event viewer on MDT01. This information can be used to trigger notifications via scheduled tasks when deployment is completed. For example, you can configure scheduled tasks to send an email when a certain event is created in the event log.
-
+
Figure 12. The Event Viewer showing a successful deployment of PC0005.
@@ -557,7 +557,7 @@ Setting up MDT for multicast is straightforward. You enable multicast on the dep
3. Right-click the **MDT Production** deployment share folder and select **Update Deployment Share**.
4. After updating the deployment share, use the Windows Deployment Services console to, verify that the multicast namespace was created.
-
+
Figure 13. The newly created multicast namespace.
@@ -635,7 +635,7 @@ Follow these steps to create a bootable USB stick from the offline media content
As referenced in [Windows 10 deployment tools](https://go.microsoft.com/fwlink/p/?LinkId=619546), Unified Extensible Firmware Interface (UEFI)-based deployments are becoming more common. In fact, when you create a generation 2 virtual machine in Hyper-V, you get a UEFI-based computer. During deployment, MDT automatically detects that you have an UEFI-based machine and creates the partitions UEFI requires. You do not need to update or change your task sequences in any way to accommodate UFEI.
-
+
Figure 14. The partitions when deploying an UEFI-based machine.
diff --git a/windows/deploy/deploy-windows-10-with-the-microsoft-deployment-toolkit.md b/windows/deployment/deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md
similarity index 90%
rename from windows/deploy/deploy-windows-10-with-the-microsoft-deployment-toolkit.md
rename to windows/deployment/deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md
index 3cdcb17cd1..def335f1b1 100644
--- a/windows/deploy/deploy-windows-10-with-the-microsoft-deployment-toolkit.md
+++ b/windows/deployment/deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md
@@ -37,13 +37,13 @@ To download the latest version of MDT, visit the [MDT resource page](https://go.
For the purposes of this guide, and the topics discussed herein, we will use the following servers and client machines: DC01, MDT01, CM01, PC0001, and PC0002.
-
+
Figure 1. The servers and machines used for examples in this guide.
DC01 is a domain controller; the other servers and client machines are members of the domain contoso.com for the fictitious Contoso Corporation.
-
+
Figure 2. The organizational unit (OU) structure used in this guide.
@@ -80,14 +80,14 @@ The information in this guide is designed to help you deploy Windows 10. In ord
[Microsoft Deployment Toolkit downloads and resources](https://go.microsoft.com/fwlink/p/?LinkId=618117)
-[Windows 10 deployment scenarios](windows-10-deployment-scenarios.md)
+[Windows 10 deployment scenarios](../windows-10-deployment-scenarios.md)
-[Windows 10 deployment tools](windows-deployment-scenarios-and-tools.md)
+[Windows 10 deployment tools](../windows-deployment-scenarios-and-tools.md)
-[Deploy Windows 10 with System Center 2012 R2 Configuration Manager](deploy-windows-10-with-system-center-2012-r2-configuration-manager.md)
+[Deploy Windows 10 with System Center 2012 R2 Configuration Manager](../deploy-windows-sccm/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md)
-[Deploy Windows To Go in your organization](deploy-windows-to-go.md)
+[Deploy Windows To Go in your organization](../deploy-windows-to-go.md)
-[Sideload apps in Windows 10](sideload-apps-in-windows-10.md)
+[Sideload apps in Windows 10](/windows/application-management/sideload-apps-in-windows-10)
-[Volume Activation for Windows 10](volume-activation-windows-10.md)
+[Volume Activation for Windows 10](../volume-activation/volume-activation-windows-10.md)
diff --git a/windows/deploy/get-started-with-the-microsoft-deployment-toolkit.md b/windows/deployment/deploy-windows-mdt/get-started-with-the-microsoft-deployment-toolkit.md
similarity index 98%
rename from windows/deploy/get-started-with-the-microsoft-deployment-toolkit.md
rename to windows/deployment/deploy-windows-mdt/get-started-with-the-microsoft-deployment-toolkit.md
index 7e5bf105f1..b27fa998b0 100644
--- a/windows/deploy/get-started-with-the-microsoft-deployment-toolkit.md
+++ b/windows/deployment/deploy-windows-mdt/get-started-with-the-microsoft-deployment-toolkit.md
@@ -23,7 +23,7 @@ In addition to familiarizing you with the features and options available in MDT,
For the purposes of this topic, we will use two machines: DC01 and MDT01. DC01 is a domain controller and MDT01 is a Windows Server 2012 R2 standard server. MDT01 is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see
[Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md#proof).
-
+
Figure 1. The machines used in this topic.
diff --git a/windows/deploy/integrate-configuration-manager-with-mdt-2013.md b/windows/deployment/deploy-windows-mdt/integrate-configuration-manager-with-mdt-2013.md
similarity index 100%
rename from windows/deploy/integrate-configuration-manager-with-mdt-2013.md
rename to windows/deployment/deploy-windows-mdt/integrate-configuration-manager-with-mdt-2013.md
diff --git a/windows/deploy/integrate-configuration-manager-with-mdt.md b/windows/deployment/deploy-windows-mdt/integrate-configuration-manager-with-mdt.md
similarity index 85%
rename from windows/deploy/integrate-configuration-manager-with-mdt.md
rename to windows/deployment/deploy-windows-mdt/integrate-configuration-manager-with-mdt.md
index 2b4560ff12..859c8043e2 100644
--- a/windows/deploy/integrate-configuration-manager-with-mdt.md
+++ b/windows/deployment/deploy-windows-mdt/integrate-configuration-manager-with-mdt.md
@@ -54,7 +54,7 @@ The task sequence uses instructions that allow you to reduce the number of task
MachineObjectOU=ou=desktops,ou=Contoso,dc=contoso,dc=com
```
-
+
Figure 2. The Gather action in the task sequence is reading the rules.
@@ -62,7 +62,7 @@ Figure 2. The Gather action in the task sequence is reading the rules.
When testing a deployment, it is important to be able to quickly test any changes you make to the deployment without needing to run through an entire deployment. MDT rules can be tested very quickly, saving significant testing time in a deployment project. For more information, see [Configure MDT settings](configure-mdt-settings.md).
-
+
Figure 3. The folder that contains the rules, a few scripts from MDT, and a custom script (Gather.ps1).
@@ -70,7 +70,7 @@ Figure 3. The folder that contains the rules, a few scripts from MDT, and a cust
With MDT integration, you can follow your deployments in real time, and if you have access to Microsoft Diagnostics and Recovery Toolkit (DaRT), you can even remote into Windows Preinstallation Environment (Windows PE) during deployment. The real-time monitoring data can be viewed from within the MDT Deployment Workbench, via a web browser, Windows PowerShell, the Event Viewer, or Microsoft Excel 2013. In fact, any script or app that can read an Open Data (OData) feed can read the information.
-
+
Figure 4. View the real-time monitoring data with PowerShell.
@@ -78,7 +78,7 @@ Figure 4. View the real-time monitoring data with PowerShell.
For some deployment scenarios, you may need to prompt the user for information during deployment such as the computer name, the correct organizational unit (OU) for the computer, or which applications should be installed by the task sequence. With MDT integration, you can enable the User-Driven Installation (UDI) wizard to gather the required information, and customize the wizard using the UDI Wizard Designer.
-
+
Figure 5. The optional UDI wizard open in the UDI Wizard Designer.
@@ -96,21 +96,21 @@ You can create reference images for Configuration Manager in Configuration Manag
## Related topics
-[Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
+[Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](../deploy-windows-sccm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
-[Create a custom Windows PE boot image with Configuration Manager](create-a-custom-windows-pe-boot-image-with-configuration-manager.md)
+[Create a custom Windows PE boot image with Configuration Manager](../deploy-windows-sccm/create-a-custom-windows-pe-boot-image-with-configuration-manager.md)
-[Add a Windows 10 operating system image using Configuration Manager](add-a-windows-10-operating-system-image-using-configuration-manager.md)
+[Add a Windows 10 operating system image using Configuration Manager](../deploy-windows-sccm/add-a-windows-10-operating-system-image-using-configuration-manager.md)
-[Create an application to deploy with Windows 10 using Configuration Manager](create-an-application-to-deploy-with-windows-10-using-configuration-manager.md)
+[Create an application to deploy with Windows 10 using Configuration Manager](../deploy-windows-sccm/create-an-application-to-deploy-with-windows-10-using-configuration-manager.md)
-[Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
+[Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](../deploy-windows-sccm/add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-[Create a task sequence with Configuration Manager and MDT](create-a-task-sequence-with-configuration-manager-and-mdt.md)
+[Create a task sequence with Configuration Manager and MDT](../deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
-[Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-10-using-pxe-and-configuration-manager.md)
+[Deploy Windows 10 using PXE and Configuration Manager](../deploy-windows-sccm/deploy-windows-10-using-pxe-and-configuration-manager.md)
-[Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)
+[Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](../deploy-windows-sccm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-[Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
+[Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](../deploy-windows-sccm/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
diff --git a/windows/deploy/key-features-in-mdt-2013.md b/windows/deployment/deploy-windows-mdt/key-features-in-mdt-2013.md
similarity index 100%
rename from windows/deploy/key-features-in-mdt-2013.md
rename to windows/deployment/deploy-windows-mdt/key-features-in-mdt-2013.md
diff --git a/windows/deploy/key-features-in-mdt.md b/windows/deployment/deploy-windows-mdt/key-features-in-mdt.md
similarity index 98%
rename from windows/deploy/key-features-in-mdt.md
rename to windows/deployment/deploy-windows-mdt/key-features-in-mdt.md
index faeb651733..b7b5b506bc 100644
--- a/windows/deploy/key-features-in-mdt.md
+++ b/windows/deployment/deploy-windows-mdt/key-features-in-mdt.md
@@ -26,7 +26,7 @@ MDT has many useful features, the most important of which are:
- **GPT support.** Supports deployment to machines that require the new GUID (globally unique identifier) partition table (GPT) format. This is related to UEFI.
- **Enhanced Windows PowerShell support.** Provides support for running PowerShell scripts.
- 
+ 
Figure 2. The deployment share mounted as a standard PSDrive allows for administration using PowerShell.
@@ -41,7 +41,7 @@ MDT has many useful features, the most important of which are:
- **Offline BitLocker.** Provides the capability to have BitLocker enabled during the Windows Preinstallation Environment (Windows PE) phase, thus saving hours of encryption time.
- **USMT offline user-state migration.** Provides support for running the User State Migration Tool (USMT) capture offline, during the Windows PE phase of the deployment.
- 
+ 
Figure 3. The offline USMT backup in action.
diff --git a/windows/deploy/mdt-2013-lite-touch-components.md b/windows/deployment/deploy-windows-mdt/mdt-2013-lite-touch-components.md
similarity index 100%
rename from windows/deploy/mdt-2013-lite-touch-components.md
rename to windows/deployment/deploy-windows-mdt/mdt-2013-lite-touch-components.md
diff --git a/windows/deploy/mdt-lite-touch-components.md b/windows/deployment/deploy-windows-mdt/mdt-lite-touch-components.md
similarity index 99%
rename from windows/deploy/mdt-lite-touch-components.md
rename to windows/deployment/deploy-windows-mdt/mdt-lite-touch-components.md
index 2b004d7fbb..f4e26d87e0 100644
--- a/windows/deploy/mdt-lite-touch-components.md
+++ b/windows/deployment/deploy-windows-mdt/mdt-lite-touch-components.md
@@ -19,7 +19,7 @@ author: mtniehaus
This topic provides an overview of the features in the Microsoft Deployment Toolkit (MDT) that support Lite Touch Installation (LTI) for Windows 10. An LTI deployment strategy requires very little infrastructure or user interaction, and can be used to deploy an operating system from a network share or from a physical media, such as a USB flash drive or disc.
When deploying the Windows operating system using MDT, most of the administration and configuration is done through the Deployment Workbench, but you also can perform many of the tasks using Windows PowerShell. The easiest way to find out how to use PowerShell in MDT is to use the Deployment Workbench to perform an operation and at the end of that task, click View Script. That will give you the PowerShell command.
-
+
Figure 4. If you click **View Script** on the right side, you will get the PowerShell code that was used to perform the task.
@@ -36,7 +36,7 @@ The rules (CustomSettings.ini and Bootstrap.ini) make up the brain of MDT. The r
- Regional settings
You can manage hundreds of settings in the rules. For more information, see the [Microsoft Deployment Toolkit resource center](https://go.microsoft.com/fwlink/p/?LinkId=618117).
-
+
Figure 5. Example of a MDT rule. In this example, the new computer name is being calculated based on PC- plus the first seven (Left) characters from the serial number
diff --git a/windows/deploy/prepare-for-windows-deployment-with-mdt-2013.md b/windows/deployment/deploy-windows-mdt/prepare-for-windows-deployment-with-mdt-2013.md
similarity index 100%
rename from windows/deploy/prepare-for-windows-deployment-with-mdt-2013.md
rename to windows/deployment/deploy-windows-mdt/prepare-for-windows-deployment-with-mdt-2013.md
diff --git a/windows/deploy/prepare-for-windows-deployment-with-mdt.md b/windows/deployment/deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md
similarity index 97%
rename from windows/deploy/prepare-for-windows-deployment-with-mdt.md
rename to windows/deployment/deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md
index 9274e2a90d..31098f8dce 100644
--- a/windows/deploy/prepare-for-windows-deployment-with-mdt.md
+++ b/windows/deployment/deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md
@@ -70,7 +70,7 @@ If you do not have an organizational unit (OU) structure in your Active Director
5. In the **Contoso / Groups** OU, create the following OU:
- Security Groups
-
+
Figure 6. A sample of how the OU structure will look after all the OUs are created.
@@ -99,7 +99,7 @@ By default MDT stores the log files locally on the client. In order to capture a
icacls E:\Logs /grant '"MDT_BA":(OI)(CI)(M)'
```
-
+
Figure 7. The Sharing tab of the E:\\Logs folder after sharing it with PowerShell.
@@ -107,11 +107,11 @@ Figure 7. The Sharing tab of the E:\\Logs folder after sharing it with PowerShel
The log files in MDT Lite Touch are formatted to be read by Configuration Manager Trace (CMTrace), which is available as part [of Microsoft System Center 2012 R2 Configuration Manager Toolkit](https://go.microsoft.com/fwlink/p/?LinkId=734717). You can use Notepad, but CMTrace formatting makes the logs easier to read.
-
+
Figure 8. An MDT log file opened in Notepad.
-
+
Figure 9. The same log file, opened in CMTrace, is much easier to read.
diff --git a/windows/deploy/refresh-a-windows-7-computer-with-windows-10.md b/windows/deployment/deploy-windows-mdt/refresh-a-windows-7-computer-with-windows-10.md
similarity index 97%
rename from windows/deploy/refresh-a-windows-7-computer-with-windows-10.md
rename to windows/deployment/deploy-windows-mdt/refresh-a-windows-7-computer-with-windows-10.md
index 671ef7c573..b2f30e6e6d 100644
--- a/windows/deploy/refresh-a-windows-7-computer-with-windows-10.md
+++ b/windows/deployment/deploy-windows-mdt/refresh-a-windows-7-computer-with-windows-10.md
@@ -20,7 +20,7 @@ This topic will show you how to use MDT Lite Touch Installation (LTI) to upgrade
For the purposes of this topic, we will use three machines: DC01, MDT01, and PC0001. DC01 is a domain controller and MDT01 is a Windows Server 2012 R2 Standard server. PC0001 is a machine with Windows 7 Service Pack 1 (SP1) that is going to be refreshed into a Windows 10 machine, with data and settings restored. MDT01 and PC0001 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md#proof).
-
+
Figure 1. The machines used in this topic.
@@ -109,7 +109,7 @@ After adding the additional USMT template and configuring the CustomSettings.ini
* Updates the operating system via your local Windows Server Update Services (WSUS) server.
* Restores user settings and data using USMT.
-
+
Figure 2. Starting the computer refresh from the running Windows 7 SP1 client.
diff --git a/windows/deploy/replace-a-windows-7-computer-with-a-windows-10-computer.md b/windows/deployment/deploy-windows-mdt/replace-a-windows-7-computer-with-a-windows-10-computer.md
similarity index 93%
rename from windows/deploy/replace-a-windows-7-computer-with-a-windows-10-computer.md
rename to windows/deployment/deploy-windows-mdt/replace-a-windows-7-computer-with-a-windows-10-computer.md
index 28c9c32005..aeae4e9b05 100644
--- a/windows/deploy/replace-a-windows-7-computer-with-a-windows-10-computer.md
+++ b/windows/deployment/deploy-windows-mdt/replace-a-windows-7-computer-with-a-windows-10-computer.md
@@ -19,7 +19,7 @@ author: mtniehaus
A computer replace scenario for Windows 10 is quite similar to a computer refresh for Windows 10; however, because you are replacing a machine, you cannot store the backup on the old computer. Instead you need to store the backup to a location where the new computer can read it.
For the purposes of this topic, we will use four machines: DC01, MDT01, PC0002, and PC0007. DC01 is a domain controller and MDT01 is a Windows Server 2012 R2 standard server. PC0002 is an old machine running Windows 7 SP1. It is going to be replaced by a new Windows 10 machine, PC0007. User State Migration Tool (USMT) will be used to backup and restore data and settings. MDT01, PC0002, and PC0007 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md#proof).
-
+
Figure 1. The machines used in this topic.
@@ -57,7 +57,7 @@ When preparing for the computer replace, you need to create a folder in which to
3. In the **Other** folder, double-click **Backup Only Task Sequence**, and then in the **Task Sequence** tab, review the sequence. Notice that it only contains a subset of the normal client task sequence actions.
- 
+ 
Figure 2. The Backup Only Task Sequence action list.
@@ -91,13 +91,13 @@ During a computer replace, these are the high-level steps that occur:
The task sequence will now run USMT (Scanstate.exe) to capture user data and settings of the machine.
- 
+ 
Figure 3. The new task sequence running the Capture User State action on PC0002.
5. On MDT01, verify that you have an USMT.MIG compressed backup file in the **E:\\MigData\\PC0002\\USMT** folder.
- 
+ 
Figure 4. The USMT backup of PC0002.
@@ -113,7 +113,7 @@ During a computer replace, these are the high-level steps that occur:
2. Start the PC0007 virtual machine, and press **Enter** to start the Pre-Boot Execution Environment (PXE) boot. The machine will now load the Windows PE boot image from the WDS server.
- 
+ 
Figure 5. The initial PXE boot process of PC0005.
diff --git a/windows/deploy/set-up-mdt-2013-for-bitlocker.md b/windows/deployment/deploy-windows-mdt/set-up-mdt-2013-for-bitlocker.md
similarity index 100%
rename from windows/deploy/set-up-mdt-2013-for-bitlocker.md
rename to windows/deployment/deploy-windows-mdt/set-up-mdt-2013-for-bitlocker.md
diff --git a/windows/deploy/set-up-mdt-for-bitlocker.md b/windows/deployment/deploy-windows-mdt/set-up-mdt-for-bitlocker.md
similarity index 98%
rename from windows/deploy/set-up-mdt-for-bitlocker.md
rename to windows/deployment/deploy-windows-mdt/set-up-mdt-for-bitlocker.md
index 5047b0b791..48879c632c 100644
--- a/windows/deploy/set-up-mdt-for-bitlocker.md
+++ b/windows/deployment/deploy-windows-mdt/set-up-mdt-for-bitlocker.md
@@ -38,7 +38,7 @@ Depending on the Active Directory Schema version, you might need to update the S
In Windows Server 2012 R2 (as well as in Windows Server 2008 R2 and Windows Server 2012), you have access to the BitLocker Drive Encryption Administration Utilities features, which will help you manage BitLocker. When you install the features, the BitLocker Active Directory Recovery Password Viewer is included, and it extends Active Directory Users and Computers with BitLocker Recovery information.
-
+
Figure 2. The BitLocker Recovery information on a computer object in the contoso.com domain.
@@ -57,7 +57,7 @@ The BitLocker Drive Encryption Administration Utilities are added as features vi
3. BitLocker Recovery Password Viewer
7. On the **Confirm installation selections** page, click **Install** and then click **Close**.
-
+
Figure 3. Selecting the BitLocker Drive Encryption Administration Utilities.
@@ -90,7 +90,7 @@ In addition to the Group Policy created previously, you need to configure permis
cscript C:\Setup\Scripts\Add-TPMSelfWriteACE.vbs
```
-
+
Figure 4. Running the Add-TPMSelfWriteACE.vbs script on DC01.
diff --git a/windows/deploy/simulate-a-windows-10-deployment-in-a-test-environment.md b/windows/deployment/deploy-windows-mdt/simulate-a-windows-10-deployment-in-a-test-environment.md
similarity index 97%
rename from windows/deploy/simulate-a-windows-10-deployment-in-a-test-environment.md
rename to windows/deployment/deploy-windows-mdt/simulate-a-windows-10-deployment-in-a-test-environment.md
index ba135d788d..815df1eb56 100644
--- a/windows/deploy/simulate-a-windows-10-deployment-in-a-test-environment.md
+++ b/windows/deployment/deploy-windows-mdt/simulate-a-windows-10-deployment-in-a-test-environment.md
@@ -30,7 +30,7 @@ For the purposes of this topic, you already will have either downloaded and inst
8. In the **C:\\MDT** folder, create a subfolder named **X64**.
9. From the **\\\\MDT01\\MDTProduction$\\Tools\\X64** folder, copy the Microsoft.BDD.Utility.dll file to **C:\\MDT\\X64**.
- 
+ 
Figure 6. The C:\\MDT folder with the files added for the simulation environment.
@@ -44,7 +44,7 @@ For the purposes of this topic, you already will have either downloaded and inst
Warnings or errors with regard to the Wizard.hta are expected. If the log file looks okay, you are ready to try a real deployment.
-
+
Figure 7. The ZTIGather.log file from PC0001, displaying some of its hardware capabilities.
diff --git a/windows/deploy/use-orchestrator-runbooks-with-mdt-2013.md b/windows/deployment/deploy-windows-mdt/use-orchestrator-runbooks-with-mdt-2013.md
similarity index 100%
rename from windows/deploy/use-orchestrator-runbooks-with-mdt-2013.md
rename to windows/deployment/deploy-windows-mdt/use-orchestrator-runbooks-with-mdt-2013.md
diff --git a/windows/deploy/use-orchestrator-runbooks-with-mdt.md b/windows/deployment/deploy-windows-mdt/use-orchestrator-runbooks-with-mdt.md
similarity index 95%
rename from windows/deploy/use-orchestrator-runbooks-with-mdt.md
rename to windows/deployment/deploy-windows-mdt/use-orchestrator-runbooks-with-mdt.md
index ceb7766904..7b7aedc7f7 100644
--- a/windows/deploy/use-orchestrator-runbooks-with-mdt.md
+++ b/windows/deployment/deploy-windows-mdt/use-orchestrator-runbooks-with-mdt.md
@@ -42,13 +42,13 @@ This section assumes you have Orchestrator 2012 R2 installed on a server named O
**Note**
Make sure File Explorer is configured to show known file extensions so the file is not named DeployLog.txt.txt.
- 
+ 
Figure 23. The DeployLog.txt file.
3. Using System Center 2012 R2 Orchestrator Runbook Designer, in the **Runbooks** node, create the **1.0 MDT** folder.
- 
+ 
Figure 24. Folder created in the Runbooks node.
@@ -60,14 +60,14 @@ This section assumes you have Orchestrator 2012 R2 installed on a server named O
2. Text File Management / Append Line
8. Connect **Initialize Data** to **Append Line**.
- 
+ 
Figure 25. Activities added and connected.
9. Right-click the **Initialize Data** activity, and select **Properties**
10. On **the Initialize Data Properties** page, click **Add**, change **Parameter 1** to **OSDComputerName**, and then click **Finish**.
- 
+ 
Figure 26. The Initialize Data Properties window.
@@ -76,13 +76,13 @@ This section assumes you have Orchestrator 2012 R2 installed on a server named O
13. In the **File** encoding drop-down list, select **ASCII**.
14. In the **Append** area, right-click inside the **Text** text box and select **Expand**.
- 
+ 
Figure 27. Expanding the Text area.
15. In the blank text box, right-click and select **Subscribe / Published Data**.
- 
+ 
Figure 28. Subscribing to data.
@@ -90,7 +90,7 @@ This section assumes you have Orchestrator 2012 R2 installed on a server named O
17. After the **{OSDComputerName from "Initialize Data"}** text, type in **has been deployed at** and, once again, right-click and select **Subscribe / Published Data**.
18. In the **Published Data** window, select the **Show common Published Data** check box, select the **Activity end time** item, and click **OK**.
- 
+ 
Figure 29. The expanded text box after all subscriptions have been added.
@@ -104,7 +104,7 @@ After the runbook is created, you are ready to test it.
4. Close the **Runbook Tester**.
5. On the ribbon bar, click **Check In**.
-
+
Figure 30. All tests completed.
@@ -128,7 +128,7 @@ Figure 30. All tests completed.
2. Use Browse to select **1.0 MDT / MDT Sample**.
8. Click **OK**.
-
+
Figure 31. The ready-made task sequence.
@@ -152,7 +152,7 @@ Make sure the account you are using has permissions to run runbooks on the Orche
3. Domain: CONTOSO
4. Wait until the task sequence is completed and then verify that the DeployLog.txt file in the E:\\Logfile folder on OR01 was updated.
-
+
Figure 32. The ready-made task sequence.
diff --git a/windows/deploy/use-the-mdt-database-to-stage-windows-10-deployment-information.md b/windows/deployment/deploy-windows-mdt/use-the-mdt-database-to-stage-windows-10-deployment-information.md
similarity index 96%
rename from windows/deploy/use-the-mdt-database-to-stage-windows-10-deployment-information.md
rename to windows/deployment/deploy-windows-mdt/use-the-mdt-database-to-stage-windows-10-deployment-information.md
index b2bed4243a..8c3f5e61f8 100644
--- a/windows/deploy/use-the-mdt-database-to-stage-windows-10-deployment-information.md
+++ b/windows/deployment/deploy-windows-mdt/use-the-mdt-database-to-stage-windows-10-deployment-information.md
@@ -38,7 +38,7 @@ Since SQL Server 2012 SP1 Express runs by default on a separate instance (SQLEXP
3. On the **Database** page, select **Create a new database**; in the **Database** field, type **MDT** and click **Next**.
4. On the **SQL Share** page, in the **SQL Share** field, type **Logs$** and click **Next**. Click **Next** again and then click **Finish**.
-
+
Figure 8. The MDT database added to MDT01.
@@ -49,7 +49,7 @@ After creating the database, you need to assign permissions to it. In MDT, the a
2. In the **Connect to Server** dialog box, in the **Server name** list, select **MDT01\\SQLEXPRESS** and click **Connect**.
3. In the **Object Explorer** pane, expand the top-level **Security** node, right-click **Logins**, and select **New Login**.
- 
+ 
Figure 9. The top-level Security node.
@@ -58,7 +58,7 @@ After creating the database, you need to assign permissions to it. In MDT, the a
2. public (default)
5. Click **OK**, and close SQL Server Management Studio.
-
+
Figure 10. Creating the login and settings permissions to the MDT database.
@@ -71,7 +71,7 @@ To start using the database, you add a computer entry and assign a description a
2. MacAddress: <PC00075 MAC Address in the 00:00:00:00:00:00 format>
3. Details Tab / OSDComputerName: PC00075
-
+
Figure 11. Adding the PC00075 computer to the database.
diff --git a/windows/deploy/use-web-services-in-mdt-2013.md b/windows/deployment/deploy-windows-mdt/use-web-services-in-mdt-2013.md
similarity index 100%
rename from windows/deploy/use-web-services-in-mdt-2013.md
rename to windows/deployment/deploy-windows-mdt/use-web-services-in-mdt-2013.md
diff --git a/windows/deploy/use-web-services-in-mdt.md b/windows/deployment/deploy-windows-mdt/use-web-services-in-mdt.md
similarity index 94%
rename from windows/deploy/use-web-services-in-mdt.md
rename to windows/deployment/deploy-windows-mdt/use-web-services-in-mdt.md
index a7f2ce0996..73848f2618 100644
--- a/windows/deploy/use-web-services-in-mdt.md
+++ b/windows/deployment/deploy-windows-mdt/use-web-services-in-mdt.md
@@ -28,7 +28,7 @@ In these steps we assume you have installed Microsoft Visual Studio Express 2013
1. Web.config
2. mdtsample.asmx
-
+
Figure 15. The sample project in Microsoft Visual Studio Express 2013 for Web.
@@ -44,7 +44,7 @@ This section assumes that you have enabled the Web Server (IIS) role on MDT01.
4. Select the **Start application pool immediately** check box.
5. Click **OK**.
-
+
Figure 16. The new MDTSample application.
@@ -55,7 +55,7 @@ Figure 16. The new MDTSample application.
2. Application pool: MDTSample
3. Physical Path: E:\\MDTSample
- 
+ 
Figure 17. Adding the MDTSample web application.
@@ -63,7 +63,7 @@ Figure 16. The new MDTSample application.
1. Anonymous Authentication: Enabled
2. ASP.NET Impersonation: Disabled
-
+
Figure 18. Configuring Authentication for the MDTSample web service.
@@ -72,14 +72,14 @@ Figure 18. Configuring Authentication for the MDTSample web service.
1. On PC0001, using Internet Explorer, navigate to: **http://MDT01/MDTSample/mdtsample.asmx**.
2. Click the **GetComputerName** link.
- 
+ 
Figure 19. The MDT Sample web service.
3. On the **GetComputerName** page, type in the following settings, and click **Invoke**:
1. Model: Hewlett-Packard
2. SerialNumber: 123456789
-
+
Figure 20. The result from the MDT Sample web service.
@@ -98,7 +98,7 @@ After verifying the web service using Internet Explorer, you are ready to do the
Parameters=Model,SerialNumber
OSDComputerName=string
```
- 
+ 
Figure 21. The updated CustomSettings.ini file.
@@ -110,7 +110,7 @@ After verifying the web service using Internet Explorer, you are ready to do the
```
4. Review the ZTIGather.log in the **C:\\MININT\\SMSOSD\\OSDLOGS** folder.
-
+
Figure 22. The OSDCOMPUTERNAME value obtained from the web service.
diff --git a/windows/deploy/add-a-windows-10-operating-system-image-using-configuration-manager.md b/windows/deployment/deploy-windows-sccm/add-a-windows-10-operating-system-image-using-configuration-manager.md
similarity index 85%
rename from windows/deploy/add-a-windows-10-operating-system-image-using-configuration-manager.md
rename to windows/deployment/deploy-windows-sccm/add-a-windows-10-operating-system-image-using-configuration-manager.md
index 47176515eb..5bc508fcfb 100644
--- a/windows/deploy/add-a-windows-10-operating-system-image-using-configuration-manager.md
+++ b/windows/deployment/deploy-windows-sccm/add-a-windows-10-operating-system-image-using-configuration-manager.md
@@ -19,13 +19,13 @@ author: mtniehaus
Operating system images are typically the production image used for deployment throughout the organization. This topic shows you how to add a Windows 10 operating system image created with Microsoft System Center 2012 R2 Configuration Manager, and how to distribute the image to a distribution point.
-For the purposes of this topic, we will use CM01, a machine running Windows Server 2012 R2 Standard, as the distribution point. CM01 is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md). Our image is named REFW10-X64-001.wim. For details on building this image, please see [Create a Windows 10 reference image](create-a-windows-10-reference-image.md).
+For the purposes of this topic, we will use CM01, a machine running Windows Server 2012 R2 Standard, as the distribution point. CM01 is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md). Our image is named REFW10-X64-001.wim. For details on building this image, please see [Create a Windows 10 reference image](../deploy-windows-mdt/create-a-windows-10-reference-image.md).
1. Using File Explorer, in the **E:\\Sources\\OSD\\OS** folder, create a subfolder named **Windows 10 Enterprise x64 RTM**.
2. Copy the REFW10-X64-001.wim file to the **E:\\Sources\\OSD\\OS\\Windows 10 Enterprise x64 RTM** folder.
- 
+ 
Figure 17. The Windows 10 image copied to the Sources folder structure.
@@ -41,14 +41,14 @@ For the purposes of this topic, we will use CM01, a machine running Windows Serv
8. View the content status for the Windows 10 Enterprise x64 RTM package. Do not continue until the distribution is completed. You also can review the E:\\Program Files\\Microsoft Configuration Manager\\Logs\\distmgr.log file and look for the **STATMSG: ID=2301** line.
- 
+ 
Figure 18. The distributed Windows 10 Enterprise x64 RTM package.
## Related topics
-[Integrate Configuration Manager with MDT](integrate-configuration-manager-with-mdt.md)
+[Integrate Configuration Manager with MDT](../deploy-windows-mdt/integrate-configuration-manager-with-mdt.md)
[Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
@@ -58,19 +58,10 @@ For the purposes of this topic, we will use CM01, a machine running Windows Serv
[Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-[Create a task sequence with Configuration Manager and MDT](create-a-task-sequence-with-configuration-manager-and-mdt.md)
+[Create a task sequence with Configuration Manager and MDT](../deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
[Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-10-using-pxe-and-configuration-manager.md)
[Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-[Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-
-
-
-
-
-
-
-
-
+[Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
\ No newline at end of file
diff --git a/windows/deploy/add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md b/windows/deployment/deploy-windows-sccm/add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md
similarity index 88%
rename from windows/deploy/add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md
rename to windows/deployment/deploy-windows-sccm/add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md
index 5be734a75b..26edb53a36 100644
--- a/windows/deploy/add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md
+++ b/windows/deployment/deploy-windows-sccm/add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md
@@ -19,7 +19,7 @@ author: mtniehaus
In this topic, you will learn how to configure the Windows Preinstallation Environment (Windows PE) to include the network drivers required to connect to the deployment share and the storage drivers required to see the local storage on machines. Even though the Windows PE boot image and the Windows 10 operating system contain many out-of-the-box drivers, it is likely you will have to add new or updated drivers to support all your hardware. In this section, you import drivers for both Windows PE and the full Windows 10 operating system.
-For the purposes of this topic, we will use CM01, a machine running Windows Server 2012 R2 Standard that is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
+For the purposes of this topic, we will use CM01, a machine running Windows Server 2012 R2 Standard that is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
## Add drivers for Windows PE
@@ -36,7 +36,7 @@ This section will show you how to import some network and storage drivers for Wi
5. On the **Select drivers to include in the boot image** page, select the **Zero Touch WinPE x64** boot image. Also select the **Update distribution points when finished** check box, and click **Next** twice.
-
+
*Figure 21. Add drivers to Windows PE*
@@ -55,7 +55,7 @@ This section illustrates how to add drivers for Windows 10 through an example in
3. On the **Specify the details for the imported driver** page, click **Categories**, create a category named Windows 10 x64 - HP EliteBook 8560w, and then click **Next**.
- 
+ 
*Figure 22. Create driver categories*
@@ -74,14 +74,15 @@ This section illustrates how to add drivers for Windows 10 through an example in
>[!NOTE]
>If you want to monitor the driver import process more closely, you can open the SMSProv.log file during driver import.
- 
+ 
*Figure 23. Drivers imported and a new driver package created*
## Related topics
-[Integrate Configuration Manager with MDT](integrate-configuration-manager-with-mdt.md)
+[Integrate Configuration Manager with MDT](../deploy-windows-mdt/integrate-configuration-manager-with-mdt.md)
+
[Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
@@ -91,19 +92,10 @@ This section illustrates how to add drivers for Windows 10 through an example in
[Create an application to deploy with Windows 10 using Configuration Manager](create-an-application-to-deploy-with-windows-10-using-configuration-manager.md)
-[Create a task sequence with Configuration Manager and MDT](create-a-task-sequence-with-configuration-manager-and-mdt.md)
+[Create a task sequence with Configuration Manager and MDT](../deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
[Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-10-using-pxe-and-configuration-manager.md)
[Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-[Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-
-
-
-
-
-
-
-
-
+[Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
\ No newline at end of file
diff --git a/windows/deploy/create-a-custom-windows-pe-boot-image-with-configuration-manager.md b/windows/deployment/deploy-windows-sccm/create-a-custom-windows-pe-boot-image-with-configuration-manager.md
similarity index 91%
rename from windows/deploy/create-a-custom-windows-pe-boot-image-with-configuration-manager.md
rename to windows/deployment/deploy-windows-sccm/create-a-custom-windows-pe-boot-image-with-configuration-manager.md
index acdd78a794..8f39c84fb0 100644
--- a/windows/deploy/create-a-custom-windows-pe-boot-image-with-configuration-manager.md
+++ b/windows/deployment/deploy-windows-sccm/create-a-custom-windows-pe-boot-image-with-configuration-manager.md
@@ -19,7 +19,7 @@ author: mtniehaus
In Microsoft System Center 2012 R2 Configuration Manager, you can create custom Windows Preinstallation Environment (Windows PE) boot images that include extra components and features. This topic shows you how to create a custom Windows PE 5.0 boot image with the Microsoft Deployment Toolkit (MDT) wizard. You can also add the Microsoft Diagnostics and Recovery Toolset (DaRT) 10 to the boot image as part of the boot image creation process.
-For the purposes of this topic, we will use two machines: DC01 and CM01. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. Both are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
+For the purposes of this topic, we will use two machines: DC01 and CM01. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. Both are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
## Add DaRT 10 files and prepare to brand the boot image
@@ -56,7 +56,7 @@ By using the MDT wizard to create the boot image in Configuration Manager, you g
5. On the **Components** page, in addition to the default selected **Microsoft Data Access Components (MDAC/ADO)** support, select the **Microsoft Diagnostics and Recovery Toolkit (DaRT)** check box.
- 
+ 
Figure 15. Add the DaRT component to the Configuration Manager boot image.
@@ -71,7 +71,7 @@ By using the MDT wizard to create the boot image in Configuration Manager, you g
9. Using Configuration Manager Trace, review the E:\\Program Files\\Microsoft Configuration Manager\\Logs\\distmgr.log file. Do not continue until you can see that the boot image is distributed. Look for the line that reads STATMSG: ID=2301. You also can view Content Status in the Configuration Manager Console by selecting **the Zero Touch WinPE x86** boot image.
- 
+ 
Figure 16. Content status for the Zero Touch WinPE x64 boot image
@@ -86,7 +86,7 @@ By using the MDT wizard to create the boot image in Configuration Manager, you g
## Related topics
-[Integrate Configuration Manager with MDT](integrate-configuration-manager-with-mdt.md)
+[Integrate Configuration Manager with MDT](../deploy-windows-mdt/integrate-configuration-manager-with-mdt.md)
[Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
@@ -96,7 +96,7 @@ By using the MDT wizard to create the boot image in Configuration Manager, you g
[Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-[Create a task sequence with Configuration Manager and MDT](create-a-task-sequence-with-configuration-manager-and-mdt.md)
+[Create a task sequence with Configuration Manager and MDT](../deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
[Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-10-using-pxe-and-configuration-manager.md)
@@ -106,9 +106,4 @@ By using the MDT wizard to create the boot image in Configuration Manager, you g
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/windows/deploy/create-an-application-to-deploy-with-windows-10-using-configuration-manager.md b/windows/deployment/deploy-windows-sccm/create-an-application-to-deploy-with-windows-10-using-configuration-manager.md
similarity index 88%
rename from windows/deploy/create-an-application-to-deploy-with-windows-10-using-configuration-manager.md
rename to windows/deployment/deploy-windows-sccm/create-an-application-to-deploy-with-windows-10-using-configuration-manager.md
index 7bbe55f078..74a433d179 100644
--- a/windows/deploy/create-an-application-to-deploy-with-windows-10-using-configuration-manager.md
+++ b/windows/deployment/deploy-windows-sccm/create-an-application-to-deploy-with-windows-10-using-configuration-manager.md
@@ -19,7 +19,7 @@ author: mtniehaus
Microsoft System Center 2012 R2 Configuration Manager supports deploying applications as part of the Windows 10 deployment process. In this section, you create an application in System Center 2012 R2 Configuration Manager that you later configure the task sequence to use.
-For the purposes of this topic, we will use CM01, a machine running Windows Server 2012 R2 Standard that is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
+For the purposes of this topic, we will use CM01, a machine running Windows Server 2012 R2 Standard that is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
>[!NOTE]
>Even though the new application model is fully supported to deploy via the task sequence, the most reliable way to deploy software via the task sequence is still the legacy packages, especially if you deploy many applications.
@@ -47,7 +47,7 @@ The following steps show you how to create the Adobe Reader XI application. This
* \\AdbeRdr11000\_en\_US.msi
- 
+ 
*Figure 19. The Create Application Wizard*
@@ -60,7 +60,7 @@ The following steps show you how to create the Adobe Reader XI application. This
>[!NOTE]
>Because it is not possible to reference an application deployment type in the task sequence, you should have a single deployment type for applications deployed by the task sequence. If you are deploying applications via both the task sequence and normal application deployment, and you have multiple deployment types, you should have two applications of the same software. In this section, you add the "OSD Install" suffix to applications that are deployed via the task sequence. If using packages, you can still reference both package and program in the task sequence.
- 
+ 
*Figure 20. Add the "OSD Install" suffix to the application name*
@@ -71,7 +71,7 @@ The following steps show you how to create the Adobe Reader XI application. This
## Related topics
-[Integrate Configuration Manager with MDT](integrate-configuration-manager-with-mdt.md)
+[Integrate Configuration Manager with MDT](../deploy-windows-mdt/integrate-configuration-manager-with-mdt.md)
[Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
@@ -81,7 +81,7 @@ The following steps show you how to create the Adobe Reader XI application. This
[Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-[Create a task sequence with Configuration Manager and MDT](create-a-task-sequence-with-configuration-manager-and-mdt.md)
+[Create a task sequence with Configuration Manager and MDT](../deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
[Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-10-using-pxe-and-configuration-manager.md)
diff --git a/windows/deploy/deploy-windows-10-using-pxe-and-configuration-manager.md b/windows/deployment/deploy-windows-sccm/deploy-windows-10-using-pxe-and-configuration-manager.md
similarity index 87%
rename from windows/deploy/deploy-windows-10-using-pxe-and-configuration-manager.md
rename to windows/deployment/deploy-windows-sccm/deploy-windows-10-using-pxe-and-configuration-manager.md
index 3994cbff66..f79fad1745 100644
--- a/windows/deploy/deploy-windows-10-using-pxe-and-configuration-manager.md
+++ b/windows/deployment/deploy-windows-sccm/deploy-windows-10-using-pxe-and-configuration-manager.md
@@ -19,11 +19,11 @@ author: mtniehaus
In this topic, you will learn how to deploy Windows 10 using Microsoft System Center 2012 R2 Configuration Manager deployment packages and task sequences. This topic will walk you through the process of deploying the Windows 10 Enterprise image to a Unified Extensible Firmware Interface (UEFI) machine named PC0001.
-For the purposes of this topic, we will use two additional machines: DC01 and CM01. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. DC01, CM01, and PC0001 are all members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
+For the purposes of this topic, we will use two additional machines: DC01 and CM01. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. DC01, CM01, and PC0001 are all members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
1. Start the PC0001 machine. At the Pre-Boot Execution Environment (PXE) boot menu, press **Enter** to allow it to PXE boot.
- 
+ 
Figure 31. PXE booting PC0001.
@@ -33,14 +33,14 @@ For the purposes of this topic, we will use two additional machines: DC01 and CM
4. On the **Edit Task Sequence Variables** page, double-click the **OSDComputerName** variable, and in the **Value** field, type **PC0001** and click **OK**. Then click **Next**.
-
+
Figure 32. Typing in the computer name.
## Related topics
-[Integrate Configuration Manager with MDT](integrate-configuration-manager-with-mdt.md)
+[Integrate Configuration Manager with MDT](../deploy-windows-mdt/integrate-configuration-manager-with-mdt.md)
[Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
@@ -52,7 +52,7 @@ Figure 32. Typing in the computer name.
[Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-[Create a task sequence with Configuration Manager and MDT](create-a-task-sequence-with-configuration-manager-and-mdt.md)
+[Create a task sequence with Configuration Manager and MDT](../deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
[Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)
diff --git a/windows/deploy/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md b/windows/deployment/deploy-windows-sccm/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md
similarity index 88%
rename from windows/deploy/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md
rename to windows/deployment/deploy-windows-sccm/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md
index 29ef0d6793..cad56a0160 100644
--- a/windows/deploy/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md
+++ b/windows/deployment/deploy-windows-sccm/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md
@@ -19,16 +19,16 @@ author: mtniehaus
If you have Microsoft System Center 2012 R2 Configuration Manager in your environment, you will most likely want to use it to deploy Windows 10. This topic will show you how to set up Configuration Manager for operating system deployment and how to integrate Configuration Manager with the Microsoft Deployment Toolkit (MDT).
-For the purposes of this topic, we will use four machines: DC01, CM01, PC0003, and PC0004. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 standard. PC0003 and PC0004 are machines with Windows 7 SP1, on which Windows 10 will be deployed via both refresh and replace scenarios. In addition to these four ready-made machines, you could also include a few blank virtual machines to be used for bare-metal deployments. DC01, CM01, PC003, and PC0004 are all members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
+For the purposes of this topic, we will use four machines: DC01, CM01, PC0003, and PC0004. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 standard. PC0003 and PC0004 are machines with Windows 7 SP1, on which Windows 10 will be deployed via both refresh and replace scenarios. In addition to these four ready-made machines, you could also include a few blank virtual machines to be used for bare-metal deployments. DC01, CM01, PC003, and PC0004 are all members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
-
+
Figure 1. The machines used in this topic.
## In this section
-- [Integrate Configuration Manager with MDT](integrate-configuration-manager-with-mdt.md)
+- [Integrate Configuration Manager with MDT](../deploy-windows-mdt/integrate-configuration-manager-with-mdt.md)
- [Prepare for Zero Touch Installation of Windows with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
@@ -40,7 +40,7 @@ Figure 1. The machines used in this topic.
- [Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-- [Create a task sequence with Configuration Manager and MDT](create-a-task-sequence-with-configuration-manager-and-mdt.md)
+- [Create a task sequence with Configuration Manager and MDT](../deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
- [Finalize the operating system configuration for Windows 10 deployment with Configuration Manager](finalize-the-os-configuration-for-windows-10-deployment-with-configuration-manager.md)
@@ -69,7 +69,7 @@ Operating system deployment with Configuration Manager is part of the normal sof
- **Operating system images.** The operating system image package contains only one file, the custom .wim image. This is typically the production deployment image.
-- **Operating system installers.** The operating system installers were originally added to create reference images using Configuration Manager. Instead, we recommend that you use MDT Lite Touch to create your reference images. For more information on how to create a reference image, see [Create a Windows 10 reference image](create-a-windows-10-reference-image.md).
+- **Operating system installers.** The operating system installers were originally added to create reference images using Configuration Manager. Instead, we recommend that you use MDT Lite Touch to create your reference images. For more information on how to create a reference image, see [Create a Windows 10 reference image](../deploy-windows-mdt/create-a-windows-10-reference-image.md).
- **Drivers.** Like MDT Lite Touch, Configuration Manager also provides a repository (catalog) of managed device drivers.
@@ -84,13 +84,13 @@ Operating system deployment with Configuration Manager is part of the normal sof
- [Microsoft Deployment Toolkit downloads and resources](https://go.microsoft.com/fwlink/p/?LinkId=618117)
-- [Windows deployment tools](windows-deployment-scenarios-and-tools.md)
+- [Windows deployment tools](../windows-deployment-scenarios-and-tools.md)
-- [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md)
+- [Deploy Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md)
-- [Upgrade to Windows 10 with the Microsoft Deployment Toolkit](upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md)
+- [Upgrade to Windows 10 with the Microsoft Deployment Toolkit](../upgrade/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md)
-- [Deploy Windows To Go in your organization](deploy-windows-to-go.md)
+- [Deploy Windows To Go in your organization](../deploy-windows-to-go.md)
- [Sideload Windows Store apps](http://technet.microsoft.com/library/dn613831.aspx)
diff --git a/windows/deploy/finalize-the-os-configuration-for-windows-10-deployment-with-configuration-manager.md b/windows/deployment/deploy-windows-sccm/finalize-the-os-configuration-for-windows-10-deployment-with-configuration-manager.md
similarity index 91%
rename from windows/deploy/finalize-the-os-configuration-for-windows-10-deployment-with-configuration-manager.md
rename to windows/deployment/deploy-windows-sccm/finalize-the-os-configuration-for-windows-10-deployment-with-configuration-manager.md
index 1cd99cefee..5534680f26 100644
--- a/windows/deploy/finalize-the-os-configuration-for-windows-10-deployment-with-configuration-manager.md
+++ b/windows/deployment/deploy-windows-sccm/finalize-the-os-configuration-for-windows-10-deployment-with-configuration-manager.md
@@ -19,7 +19,7 @@ author: mtniehaus
This topic walks you through the steps to finalize the configuration of your Windows 10 operating deployment, which includes enablement of the optional Microsoft Deployment Toolkit (MDT) monitoring for Microsoft System Center 2012 R2 Configuration Manager, logs folder creation, rules configuration, content distribution, and deployment of the previously created task sequence.
-For the purposes of this topic, we will use two machines: DC01 and CM01. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. Both are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
+For the purposes of this topic, we will use two machines: DC01 and CM01. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. Both are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
## Enable MDT monitoring
@@ -38,7 +38,7 @@ This section will walk you through the process of creating the E:\\MDTProduction
2. Right-click the **MDT Production** deployment share, and select **Properties**. In the **Monitoring** tab, select the **Enable monitoring for this deployment share** check box, and click **OK**.
- 
+ 
*Figure 26. Enable MDT monitoring for Configuration Manager*
@@ -82,7 +82,7 @@ This section will show you how to configure the rules (the Windows 10 x64 Settin
ApplyGPOPack=NO
```
- 
+ 
*Figure 27. The Settings package, holding the rules and the Unattend.xml template used during deployment*
@@ -119,7 +119,7 @@ This sections provides steps to help you create a deployment for the task sequen
* Make available to the following: Only media and PXE
- 
+ 
*Figure 28. Configure the deployment settings*
@@ -131,14 +131,14 @@ This sections provides steps to help you create a deployment for the task sequen
7. On the **Distribution Points** page, accept the default settings, click **Next** twice, and then click **Close**.
- 
+ 
*Figure 29. The Windows 10 Enterprise x64 RTM task sequence deployed to the All Unknown Computers collections available for media and PXE*
## Configure Configuration Manager to prompt for the computer name during deployment (optional)
-You can have Configuration Manager prompt you for a computer name or you can use rules to generate a computer name. For more details on how to do this, see [Configure MDT settings](configure-mdt-settings.md).
+You can have Configuration Manager prompt you for a computer name or you can use rules to generate a computer name. For more details on how to do this, see [Configure MDT settings](../deploy-windows-mdt/configure-mdt-settings.md).
This section provides steps to help you configure the All Unknown Computers collection to have Configuration Manager prompt for computer names.
@@ -155,14 +155,14 @@ This section provides steps to help you configure the All Unknown Computers coll
>[!NOTE]
>Configuration Manager can prompt for information in many ways. Using a collection variable with an empty value is just one of them. Another option is the User-Driven Installation (UDI) wizard.
- 
+ 
*Figure 30. Configure a collection variable*
## Related topics
-[Integrate Configuration Manager with MDT](integrate-configuration-manager-with-mdt.md)
+[Integrate Configuration Manager with MDT](../deploy-windows-mdt/integrate-configuration-manager-with-mdt.md)
[Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
@@ -174,7 +174,7 @@ This section provides steps to help you configure the All Unknown Computers coll
[Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-[Create a task sequence with Configuration Manager and MDT](create-a-task-sequence-with-configuration-manager-and-mdt.md)
+[Create a task sequence with Configuration Manager and MDT](../deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
[Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-10-using-pxe-and-configuration-manager.md)
@@ -182,11 +182,4 @@ This section provides steps to help you configure the All Unknown Computers coll
[Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/windows/deploy/monitor-windows-10-deployment-with-configuration-manager.md b/windows/deployment/deploy-windows-sccm/monitor-windows-10-deployment-with-configuration-manager.md
similarity index 89%
rename from windows/deploy/monitor-windows-10-deployment-with-configuration-manager.md
rename to windows/deployment/deploy-windows-sccm/monitor-windows-10-deployment-with-configuration-manager.md
index ecb875e202..1f778d1399 100644
--- a/windows/deploy/monitor-windows-10-deployment-with-configuration-manager.md
+++ b/windows/deployment/deploy-windows-sccm/monitor-windows-10-deployment-with-configuration-manager.md
@@ -19,7 +19,7 @@ author: mtniehaus
In this topic, you will learn how to monitor a Windows 10 deployment that was started previously using Microsoft System Center 2012 R2 Configuration Manager and the Microsoft Deployment Toolkit (MDT) Deployment Workbench. You will also use the Deployment Workbench to access the computer remotely via the Microsoft Diagnostics and Recovery Toolkit (DaRT) Remote Connection feature.
-For the purposes of this topic, we will use four machines: DC01, CM01, and PC0001. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. PC0001 is a Unified Extensible Firmware Interface (UEFI) machine to which Windows 10 Enterprise has been deployed. DC01, CM01, and PC0001 are all members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
+For the purposes of this topic, we will use four machines: DC01, CM01, and PC0001. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. PC0001 is a Unified Extensible Firmware Interface (UEFI) machine to which Windows 10 Enterprise has been deployed. DC01, CM01, and PC0001 are all members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
To monitor an operating system deployment conducted through System Center 2012 R2 Configuration Manager, you will use the Deployment Workbench in MDT as follows:
@@ -28,7 +28,7 @@ To monitor an operating system deployment conducted through System Center 2012 R
>[!NOTE]
>It takes a little while for the task sequence to start reporting monitor information, so if PC0001 does not appear when you press F5 the first time, wait 20 seconds and try again.
- 
+ 
*Figure 33. PC0001 being deployed by Configuration Manager*
@@ -52,7 +52,7 @@ To monitor an operating system deployment conducted through System Center 2012 R
## Related topics
-[Integrate Configuration Manager with MDT](integrate-configuration-manager-with-mdt.md)
+[Integrate Configuration Manager with MDT](../deploy-windows-mdt/integrate-configuration-manager-with-mdt.md)
[Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
@@ -64,7 +64,7 @@ To monitor an operating system deployment conducted through System Center 2012 R
[Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-[Create a task sequence with Configuration Manager and MDT](create-a-task-sequence-with-configuration-manager-and-mdt.md)
+[Create a task sequence with Configuration Manager and MDT](../deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
[Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)
diff --git a/windows/deploy/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md b/windows/deployment/deploy-windows-sccm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md
similarity index 93%
rename from windows/deploy/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md
rename to windows/deployment/deploy-windows-sccm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md
index 7e6facd287..5d3fafb49e 100644
--- a/windows/deploy/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md
+++ b/windows/deployment/deploy-windows-sccm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md
@@ -38,7 +38,7 @@ In this topic, you will use an existing Configuration Manager server structure t
- System Center 2012 R2 Configuration Manager SP1 and any additional Windows 10 prerequisites are installed.
-For the purposes of this topic, we will use two machines: DC01 and CM01. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. DC01 and CM01 are both members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
+For the purposes of this topic, we will use two machines: DC01 and CM01. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. DC01 and CM01 are both members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
## Create the Configuration Manager service accounts
@@ -69,7 +69,7 @@ To configure permissions for the various service accounts needed for operating s
* CM\_NAA: Configuration Manager Network Access Account
-
+
Figure 6. The Configuration Manager service accounts used for operating system deployment.
@@ -147,7 +147,7 @@ To support the packages you create in this section, the following folder structu
- E:\\Sources\\Software\\Microsoft
-
+
Figure 7. The E:\\Sources\\OSD folder structure.
@@ -170,7 +170,7 @@ To extend the Configuration Manager console with MDT wizards and templates, you
* Site code: PS1
-
+
Figure 8. Set up the MDT integration with Configuration Manager.
@@ -185,11 +185,11 @@ Most organizations want to display their name during deployment. In this section
3. In the **Computer Agent** node, in the **Organization name displayed in Software Center** text box, type in **Contoso** and click **OK**.
-
+
Figure 9. Configure the organization name in client settings.
-
+
Figure 10. The Contoso organization name displayed during deployment.
@@ -204,7 +204,7 @@ Configuration Manager uses the Network Access account during the Windows 10 depl
3. In the **Network Access Account** tab, configure the **CONTOSO\\CM\_NAA** user account (select New Account) as the Network Access account. Use the new **Verify** option to verify that the account can connect to the **\\\\DC01\\sysvol** network share.
-
+
Figure 11. Test the connection for the Network Access account.
@@ -229,26 +229,26 @@ Configuration Manager has many options for starting a deployment, but starting v
* Password and Confirm password: Passw0rd!
- 
+ 
Figure 12. Configure the CM01 distribution point for PXE.
4. Using the Configuration Manager Trace Log Tool, review the E:\\Program Files\\Microsoft Configuration Manager\\Logs\\distmgr.log file. Look for ConfigurePXE and CcmInstallPXE lines.
- 
+ 
Figure 13. The distmgr.log displays a successful configuration of PXE on the distribution point.
5. Verify that you have seven files in each of the folders **E:\\RemoteInstall\\SMSBoot\\x86** and **E:\\RemoteInstall\\SMSBoot\\x64**.
- 
+ 
Figure 14. The contents of the E:\\RemoteInstall\\SMSBoot\\x64 folder after you enable PXE.
## Related topics
-[Integrate Configuration Manager with MDT](integrate-configuration-manager-with-mdt.md)
+[Integrate Configuration Manager with MDT](../deploy-windows-mdt/integrate-configuration-manager-with-mdt.md)
[Create a custom Windows PE boot image with Configuration Manager](create-a-custom-windows-pe-boot-image-with-configuration-manager.md)
@@ -258,7 +258,7 @@ Configuration Manager has many options for starting a deployment, but starting v
[Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-[Create a task sequence with Configuration Manager and MDT](create-a-task-sequence-with-configuration-manager-and-mdt.md)
+[Create a task sequence with Configuration Manager and MDT](../deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
[Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-10-using-pxe-and-configuration-manager.md)
diff --git a/windows/deploy/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md b/windows/deployment/deploy-windows-sccm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md
similarity index 92%
rename from windows/deploy/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md
rename to windows/deployment/deploy-windows-sccm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md
index 9e7878aea9..f8e6e98777 100644
--- a/windows/deploy/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md
+++ b/windows/deployment/deploy-windows-sccm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md
@@ -17,7 +17,7 @@ author: mtniehaus
- Windows 10
-This topic will show you how to use a previously created task sequence to refresh a Windows 7 SP1 client with Windows 10 using Microsoft System Center 2012 R2 Configuration Manager and Microsoft Deployment Toolkit (MDT) 2013 Update 2. When refreshing a machine to a later version, it appears as an upgrade to the end user, but technically it is not an in-place upgrade. A computer refresh also involves taking care of user data and settings from the old installation and making sure to restore those at the end of the installation. For more information, see [Refresh a Windows 7 computer with Windows 10](refresh-a-windows-7-computer-with-windows-10.md).
+This topic will show you how to use a previously created task sequence to refresh a Windows 7 SP1 client with Windows 10 using Microsoft System Center 2012 R2 Configuration Manager and Microsoft Deployment Toolkit (MDT) 2013 Update 2. When refreshing a machine to a later version, it appears as an upgrade to the end user, but technically it is not an in-place upgrade. A computer refresh also involves taking care of user data and settings from the old installation and making sure to restore those at the end of the installation. For more information, see [Refresh a Windows 7 computer with Windows 10](../deploy-windows-mdt/refresh-a-windows-7-computer-with-windows-10.md).
A computer refresh with System Center 2012 R2 Configuration Manager works the same as it does with MDT Lite Touch installation. Configuration Manager also uses the User State Migration Tool (USMT) from the Windows Assessment and Deployment Kit (Windows ADK) 10 in the background. A computer refresh with Configuration Manager involves the following steps:
@@ -31,7 +31,7 @@ A computer refresh with System Center 2012 R2 Configuration Manager works the sa
5. Data and settings are restored.
-For the purposes of this topic, we will use three machines: DC01, CM01, and PC0003. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. PC0003 is a machine with Windows 7 SP1, on which Windows 10 will be deployed. DC01, CM01, and PC003 are all members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
+For the purposes of this topic, we will use three machines: DC01, CM01, and PC0003. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. PC0003 is a machine with Windows 7 SP1, on which Windows 10 will be deployed. DC01, CM01, and PC003 are all members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
In this topic, we assume that you have a Windows 7 SP1 client named PC0003 with the Configuration Manager client installed.
@@ -120,7 +120,7 @@ Now you can start the computer refresh on PC0003.
## Related topics
-[Integrate Configuration Manager with MDT](integrate-configuration-manager-with-mdt.md)
+[Integrate Configuration Manager with MDT](../deploy-windows-mdt/integrate-configuration-manager-with-mdt.md)
[Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
@@ -132,17 +132,8 @@ Now you can start the computer refresh on PC0003.
[Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-[Create a task sequence with Configuration Manager and MDT](create-a-task-sequence-with-configuration-manager-and-mdt.md)
+[Create a task sequence with Configuration Manager and MDT](../deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
[Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-10-using-pxe-and-configuration-manager.md)
-[Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
-
-
-
-
-
-
-
-
-
+[Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](replace-a-windows-7-client-with-windows-10-using-configuration-manager.md)
\ No newline at end of file
diff --git a/windows/deploy/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md b/windows/deployment/deploy-windows-sccm/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md
similarity index 93%
rename from windows/deploy/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md
rename to windows/deployment/deploy-windows-sccm/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md
index 18d714b7ee..a30798b35b 100644
--- a/windows/deploy/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md
+++ b/windows/deployment/deploy-windows-sccm/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md
@@ -19,9 +19,9 @@ author: mtniehaus
In this topic, you will learn how to replacing a Windows 7 SP1 computer using Microsoft System Center 2012 R2 Configuration Manager. This process is similar to refreshing a computer, but since you are replacing the machine, you have to run the backup job separately from the deployment of Windows 10.
-For the purposes of this topic, we will use three machines: DC01, CM01, and PC0004. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. PC0004 is a machine with Windows 7 SP1 that will be replaced with a new machine running Windows 10. DC01, CM01, and PC0004 are all members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
+For the purposes of this topic, we will use three machines: DC01, CM01, and PC0004. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. PC0004 is a machine with Windows 7 SP1 that will be replaced with a new machine running Windows 10. DC01, CM01, and PC0004 are all members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md).
-In this topic, you will create a backup-only task sequence that you run on PC0004, the machine you are replacing. For more information, see [Replace a Windows 7 computer with a Windows 10 computer](replace-a-windows-7-computer-with-a-windows-10-computer.md).
+In this topic, you will create a backup-only task sequence that you run on PC0004, the machine you are replacing. For more information, see [Replace a Windows 7 computer with a Windows 10 computer](../deploy-windows-mdt/replace-a-windows-7-computer-with-a-windows-10-computer.md).
## Create a replace task sequence
@@ -52,7 +52,7 @@ In this topic, you will create a backup-only task sequence that you run on PC000
>[!NOTE]
>This task sequence has many fewer actions than the normal client task sequence. If it doesn't seem different, make sure you selected the Client Replace Task Sequence template when creating the task sequence.
-
+
Figure 34. The backup-only task sequence (named Replace Task Sequence).
@@ -75,7 +75,7 @@ This section walks you through the process of associating a blank machine, PC000
* Source Computer: PC0004
- 
+ 
Figure 35. Creating the computer association between PC0004 and PC0006.
@@ -204,7 +204,7 @@ When the process is complete, you will have a new Windows 10 machine in your dom
## Related topics
-[Integrate Configuration Manager with MDT](integrate-configuration-manager-with-mdt.md)
+[Integrate Configuration Manager with MDT](../deploy-windows-mdt/integrate-configuration-manager-with-mdt.md)
[Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
@@ -216,7 +216,7 @@ When the process is complete, you will have a new Windows 10 machine in your dom
[Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-[Create a task sequence with Configuration Manager and MDT](create-a-task-sequence-with-configuration-manager-and-mdt.md)
+[Create a task sequence with Configuration Manager and MDT](../deploy-windows-mdt/create-a-task-sequence-with-configuration-manager-and-mdt.md)
[Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-10-using-pxe-and-configuration-manager.md)
diff --git a/windows/deploy/deploy-windows-to-go.md b/windows/deployment/deploy-windows-to-go.md
similarity index 98%
rename from windows/deploy/deploy-windows-to-go.md
rename to windows/deployment/deploy-windows-to-go.md
index 4b8717343e..9cc9bc4c12 100644
--- a/windows/deploy/deploy-windows-to-go.md
+++ b/windows/deployment/deploy-windows-to-go.md
@@ -17,7 +17,7 @@ author: mtniehaus
- Windows 10
-This topic helps you to deploy Windows To Go in your organization. Before you begin deployment, make sure that you have reviewed the topics [Windows To Go: feature overview](../plan/windows-to-go-overview.md) and [Prepare your organization for Windows To Go](../plan/prepare-your-organization-for-windows-to-go.md) to ensure that you have the correct hardware and are prepared to complete the deployment. You can then use the steps in this topic to start your Windows To Go deployment.
+This topic helps you to deploy Windows To Go in your organization. Before you begin deployment, make sure that you have reviewed the topics [Windows To Go: feature overview](planning/windows-to-go-overview.md) and [Prepare your organization for Windows To Go](planning/prepare-your-organization-for-windows-to-go.md) to ensure that you have the correct hardware and are prepared to complete the deployment. You can then use the steps in this topic to start your Windows To Go deployment.
>[!NOTE]
>This topic includes sample Windows PowerShell cmdlets that you can use to automate some of the procedures described. For more information, see [Using Cmdlets](http://go.microsoft.com/fwlink/p/?linkid=230693).
@@ -26,7 +26,7 @@ This topic helps you to deploy Windows To Go in your organization. Before you be
The following is a list of items that you should be aware of before you start the deployment process:
-* Only use recommended USB drives for Windows To Go. Use of other drives is not supported. Check the list at [Windows To Go: feature overview](../plan/windows-to-go-overview.md) for the latest USB drives certified for use as Windows To Go drives.
+* Only use recommended USB drives for Windows To Go. Use of other drives is not supported. Check the list at [Windows To Go: feature overview](planning/windows-to-go-overview.md) for the latest USB drives certified for use as Windows To Go drives.
* After you provision a new workspace, always eject a Windows To Go drive using the **Safely Remove Hardware and Eject Media** control that can be found in the notification area or in Windows Explorer. Removing the drive from the USB port without ejecting it first can cause the drive to become corrupted.
@@ -978,15 +978,15 @@ In the PowerShell provisioning script, after the image has been applied, you can
## Related topics
-[Windows To Go: feature overview](../plan/windows-to-go-overview.md)
+[Windows To Go: feature overview](planning/windows-to-go-overview.md)
[Windows 10 forums](https://go.microsoft.com/fwlink/p/?LinkId=618949)
-[Prepare your organization for Windows To Go](../plan/prepare-your-organization-for-windows-to-go.md)
+[Prepare your organization for Windows To Go](planning//prepare-your-organization-for-windows-to-go.md)
-[Deployment considerations for Windows To Go](../plan/deployment-considerations-for-windows-to-go.md)
+[Deployment considerations for Windows To Go](planning//deployment-considerations-for-windows-to-go.md)
-[Security and data protection considerations for Windows To Go](../plan/security-and-data-protection-considerations-for-windows-to-go.md)
+[Security and data protection considerations for Windows To Go](planning/security-and-data-protection-considerations-for-windows-to-go.md)
[BitLocker overview](https://go.microsoft.com/fwlink/p/?LinkId=619173)
diff --git a/windows/deploy/images/ICD.png b/windows/deployment/images/ICD.png
similarity index 100%
rename from windows/deploy/images/ICD.png
rename to windows/deployment/images/ICD.png
diff --git a/windows/deploy/images/ICDstart-option.PNG b/windows/deployment/images/ICDstart-option.PNG
similarity index 100%
rename from windows/deploy/images/ICDstart-option.PNG
rename to windows/deployment/images/ICDstart-option.PNG
diff --git a/windows/deploy/images/ISE.PNG b/windows/deployment/images/ISE.PNG
similarity index 100%
rename from windows/deploy/images/ISE.PNG
rename to windows/deployment/images/ISE.PNG
diff --git a/windows/deploy/images/PoC-big.png b/windows/deployment/images/PoC-big.png
similarity index 100%
rename from windows/deploy/images/PoC-big.png
rename to windows/deployment/images/PoC-big.png
diff --git a/windows/deploy/images/PoC.png b/windows/deployment/images/PoC.png
similarity index 100%
rename from windows/deploy/images/PoC.png
rename to windows/deployment/images/PoC.png
diff --git a/windows/deploy/images/adk-install.png b/windows/deployment/images/adk-install.png
similarity index 100%
rename from windows/deploy/images/adk-install.png
rename to windows/deployment/images/adk-install.png
diff --git a/windows/deploy/images/azureadjoined.png b/windows/deployment/images/azureadjoined.png
similarity index 100%
rename from windows/deploy/images/azureadjoined.png
rename to windows/deployment/images/azureadjoined.png
diff --git a/windows/deploy/images/check_blu.png b/windows/deployment/images/check_blu.png
similarity index 100%
rename from windows/deploy/images/check_blu.png
rename to windows/deployment/images/check_blu.png
diff --git a/windows/deploy/images/check_grn.png b/windows/deployment/images/check_grn.png
similarity index 100%
rename from windows/deploy/images/check_grn.png
rename to windows/deployment/images/check_grn.png
diff --git a/windows/manage/images/checkmark.png b/windows/deployment/images/checkmark.png
similarity index 100%
rename from windows/manage/images/checkmark.png
rename to windows/deployment/images/checkmark.png
diff --git a/windows/deploy/images/choose-package.png b/windows/deployment/images/choose-package.png
similarity index 100%
rename from windows/deploy/images/choose-package.png
rename to windows/deployment/images/choose-package.png
diff --git a/windows/deploy/images/connect-aad.png b/windows/deployment/images/connect-aad.png
similarity index 100%
rename from windows/deploy/images/connect-aad.png
rename to windows/deployment/images/connect-aad.png
diff --git a/windows/deploy/images/convert.png b/windows/deployment/images/convert.png
similarity index 100%
rename from windows/deploy/images/convert.png
rename to windows/deployment/images/convert.png
diff --git a/windows/manage/images/crossmark.png b/windows/deployment/images/crossmark.png
similarity index 100%
rename from windows/manage/images/crossmark.png
rename to windows/deployment/images/crossmark.png
diff --git a/windows/deploy/images/deploy-finish.PNG b/windows/deployment/images/deploy-finish.PNG
similarity index 100%
rename from windows/deploy/images/deploy-finish.PNG
rename to windows/deployment/images/deploy-finish.PNG
diff --git a/windows/deploy/images/disk2vhd-convert.PNG b/windows/deployment/images/disk2vhd-convert.PNG
similarity index 100%
rename from windows/deploy/images/disk2vhd-convert.PNG
rename to windows/deployment/images/disk2vhd-convert.PNG
diff --git a/windows/deploy/images/disk2vhd-gen2.PNG b/windows/deployment/images/disk2vhd-gen2.PNG
similarity index 100%
rename from windows/deploy/images/disk2vhd-gen2.PNG
rename to windows/deployment/images/disk2vhd-gen2.PNG
diff --git a/windows/deploy/images/disk2vhd.PNG b/windows/deployment/images/disk2vhd.PNG
similarity index 100%
rename from windows/deploy/images/disk2vhd.PNG
rename to windows/deployment/images/disk2vhd.PNG
diff --git a/windows/deploy/images/disk2vhd4.PNG b/windows/deployment/images/disk2vhd4.PNG
similarity index 100%
rename from windows/deploy/images/disk2vhd4.PNG
rename to windows/deployment/images/disk2vhd4.PNG
diff --git a/windows/deploy/images/download_vhd.png b/windows/deployment/images/download_vhd.png
similarity index 100%
rename from windows/deploy/images/download_vhd.png
rename to windows/deployment/images/download_vhd.png
diff --git a/windows/deploy/images/e3-activated.png b/windows/deployment/images/e3-activated.png
similarity index 100%
rename from windows/deploy/images/e3-activated.png
rename to windows/deployment/images/e3-activated.png
diff --git a/windows/deploy/images/enterprise-e3-ad-connect.png b/windows/deployment/images/enterprise-e3-ad-connect.png
similarity index 100%
rename from windows/deploy/images/enterprise-e3-ad-connect.png
rename to windows/deployment/images/enterprise-e3-ad-connect.png
diff --git a/windows/deploy/images/enterprise-e3-choose-how.png b/windows/deployment/images/enterprise-e3-choose-how.png
similarity index 100%
rename from windows/deploy/images/enterprise-e3-choose-how.png
rename to windows/deployment/images/enterprise-e3-choose-how.png
diff --git a/windows/deploy/images/enterprise-e3-connect-to-work-or-school.png b/windows/deployment/images/enterprise-e3-connect-to-work-or-school.png
similarity index 100%
rename from windows/deploy/images/enterprise-e3-connect-to-work-or-school.png
rename to windows/deployment/images/enterprise-e3-connect-to-work-or-school.png
diff --git a/windows/deploy/images/enterprise-e3-lets-get-2.png b/windows/deployment/images/enterprise-e3-lets-get-2.png
similarity index 100%
rename from windows/deploy/images/enterprise-e3-lets-get-2.png
rename to windows/deployment/images/enterprise-e3-lets-get-2.png
diff --git a/windows/deploy/images/enterprise-e3-lets-get.png b/windows/deployment/images/enterprise-e3-lets-get.png
similarity index 100%
rename from windows/deploy/images/enterprise-e3-lets-get.png
rename to windows/deployment/images/enterprise-e3-lets-get.png
diff --git a/windows/deploy/images/enterprise-e3-set-up-work-or-school.png b/windows/deployment/images/enterprise-e3-set-up-work-or-school.png
similarity index 100%
rename from windows/deploy/images/enterprise-e3-set-up-work-or-school.png
rename to windows/deployment/images/enterprise-e3-set-up-work-or-school.png
diff --git a/windows/deploy/images/enterprise-e3-sign-in.png b/windows/deployment/images/enterprise-e3-sign-in.png
similarity index 100%
rename from windows/deploy/images/enterprise-e3-sign-in.png
rename to windows/deployment/images/enterprise-e3-sign-in.png
diff --git a/windows/deploy/images/enterprise-e3-who-owns.png b/windows/deployment/images/enterprise-e3-who-owns.png
similarity index 100%
rename from windows/deploy/images/enterprise-e3-who-owns.png
rename to windows/deployment/images/enterprise-e3-who-owns.png
diff --git a/windows/deploy/images/enterprise-e3-win-10-activated-enterprise-subscription-active.png b/windows/deployment/images/enterprise-e3-win-10-activated-enterprise-subscription-active.png
similarity index 100%
rename from windows/deploy/images/enterprise-e3-win-10-activated-enterprise-subscription-active.png
rename to windows/deployment/images/enterprise-e3-win-10-activated-enterprise-subscription-active.png
diff --git a/windows/deploy/images/enterprise-e3-win-10-activated-enterprise-subscription-not-active.png b/windows/deployment/images/enterprise-e3-win-10-activated-enterprise-subscription-not-active.png
similarity index 100%
rename from windows/deploy/images/enterprise-e3-win-10-activated-enterprise-subscription-not-active.png
rename to windows/deployment/images/enterprise-e3-win-10-activated-enterprise-subscription-not-active.png
diff --git a/windows/deploy/images/enterprise-e3-win-10-not-activated-enterprise-subscription-active.png b/windows/deployment/images/enterprise-e3-win-10-not-activated-enterprise-subscription-active.png
similarity index 100%
rename from windows/deploy/images/enterprise-e3-win-10-not-activated-enterprise-subscription-active.png
rename to windows/deployment/images/enterprise-e3-win-10-not-activated-enterprise-subscription-active.png
diff --git a/windows/deploy/images/enterprise-e3-win-10-not-activated-enterprise-subscription-not-active.png b/windows/deployment/images/enterprise-e3-win-10-not-activated-enterprise-subscription-not-active.png
similarity index 100%
rename from windows/deploy/images/enterprise-e3-win-10-not-activated-enterprise-subscription-not-active.png
rename to windows/deployment/images/enterprise-e3-win-10-not-activated-enterprise-subscription-not-active.png
diff --git a/windows/deploy/images/express-settings.png b/windows/deployment/images/express-settings.png
similarity index 100%
rename from windows/deploy/images/express-settings.png
rename to windows/deployment/images/express-settings.png
diff --git a/windows/deploy/images/fig10-contosoinstall.png b/windows/deployment/images/fig10-contosoinstall.png
similarity index 100%
rename from windows/deploy/images/fig10-contosoinstall.png
rename to windows/deployment/images/fig10-contosoinstall.png
diff --git a/windows/deploy/images/fig10-unattend.png b/windows/deployment/images/fig10-unattend.png
similarity index 100%
rename from windows/deploy/images/fig10-unattend.png
rename to windows/deployment/images/fig10-unattend.png
diff --git a/windows/deploy/images/fig13-captureimage.png b/windows/deployment/images/fig13-captureimage.png
similarity index 100%
rename from windows/deploy/images/fig13-captureimage.png
rename to windows/deployment/images/fig13-captureimage.png
diff --git a/windows/deploy/images/fig16-contentstatus.png b/windows/deployment/images/fig16-contentstatus.png
similarity index 100%
rename from windows/deploy/images/fig16-contentstatus.png
rename to windows/deployment/images/fig16-contentstatus.png
diff --git a/windows/deploy/images/fig17-win10image.png b/windows/deployment/images/fig17-win10image.png
similarity index 100%
rename from windows/deploy/images/fig17-win10image.png
rename to windows/deployment/images/fig17-win10image.png
diff --git a/windows/deploy/images/fig18-distwindows.png b/windows/deployment/images/fig18-distwindows.png
similarity index 100%
rename from windows/deploy/images/fig18-distwindows.png
rename to windows/deployment/images/fig18-distwindows.png
diff --git a/windows/deploy/images/fig2-gather.png b/windows/deployment/images/fig2-gather.png
similarity index 100%
rename from windows/deploy/images/fig2-gather.png
rename to windows/deployment/images/fig2-gather.png
diff --git a/windows/deploy/images/fig2-importedos.png b/windows/deployment/images/fig2-importedos.png
similarity index 100%
rename from windows/deploy/images/fig2-importedos.png
rename to windows/deployment/images/fig2-importedos.png
diff --git a/windows/deploy/images/fig2-taskseq.png b/windows/deployment/images/fig2-taskseq.png
similarity index 100%
rename from windows/deploy/images/fig2-taskseq.png
rename to windows/deployment/images/fig2-taskseq.png
diff --git a/windows/deploy/images/fig21-add-drivers.png b/windows/deployment/images/fig21-add-drivers.png
similarity index 100%
rename from windows/deploy/images/fig21-add-drivers.png
rename to windows/deployment/images/fig21-add-drivers.png
diff --git a/windows/deploy/images/fig22-createcategories.png b/windows/deployment/images/fig22-createcategories.png
similarity index 100%
rename from windows/deploy/images/fig22-createcategories.png
rename to windows/deployment/images/fig22-createcategories.png
diff --git a/windows/deploy/images/fig27-driverpackage.png b/windows/deployment/images/fig27-driverpackage.png
similarity index 100%
rename from windows/deploy/images/fig27-driverpackage.png
rename to windows/deployment/images/fig27-driverpackage.png
diff --git a/windows/deploy/images/fig28-addapp.png b/windows/deployment/images/fig28-addapp.png
similarity index 100%
rename from windows/deploy/images/fig28-addapp.png
rename to windows/deployment/images/fig28-addapp.png
diff --git a/windows/deploy/images/fig30-settingspack.png b/windows/deployment/images/fig30-settingspack.png
similarity index 100%
rename from windows/deploy/images/fig30-settingspack.png
rename to windows/deployment/images/fig30-settingspack.png
diff --git a/windows/deploy/images/fig32-deploywiz.png b/windows/deployment/images/fig32-deploywiz.png
similarity index 100%
rename from windows/deploy/images/fig32-deploywiz.png
rename to windows/deployment/images/fig32-deploywiz.png
diff --git a/windows/deploy/images/fig4-oob-drivers.png b/windows/deployment/images/fig4-oob-drivers.png
similarity index 100%
rename from windows/deploy/images/fig4-oob-drivers.png
rename to windows/deployment/images/fig4-oob-drivers.png
diff --git a/windows/deploy/images/fig5-selectprofile.png b/windows/deployment/images/fig5-selectprofile.png
similarity index 100%
rename from windows/deploy/images/fig5-selectprofile.png
rename to windows/deployment/images/fig5-selectprofile.png
diff --git a/windows/deploy/images/fig6-taskseq.png b/windows/deployment/images/fig6-taskseq.png
similarity index 100%
rename from windows/deploy/images/fig6-taskseq.png
rename to windows/deployment/images/fig6-taskseq.png
diff --git a/windows/deploy/images/fig8-cust-tasks.png b/windows/deployment/images/fig8-cust-tasks.png
similarity index 100%
rename from windows/deploy/images/fig8-cust-tasks.png
rename to windows/deployment/images/fig8-cust-tasks.png
diff --git a/windows/deploy/images/fig8-suspend.png b/windows/deployment/images/fig8-suspend.png
similarity index 100%
rename from windows/deploy/images/fig8-suspend.png
rename to windows/deployment/images/fig8-suspend.png
diff --git a/windows/deploy/images/fig9-resumetaskseq.png b/windows/deployment/images/fig9-resumetaskseq.png
similarity index 100%
rename from windows/deploy/images/fig9-resumetaskseq.png
rename to windows/deployment/images/fig9-resumetaskseq.png
diff --git a/windows/deploy/images/figure4-deployment-workbench.png b/windows/deployment/images/figure4-deployment-workbench.png
similarity index 100%
rename from windows/deploy/images/figure4-deployment-workbench.png
rename to windows/deployment/images/figure4-deployment-workbench.png
diff --git a/windows/deploy/images/five.png b/windows/deployment/images/five.png
similarity index 100%
rename from windows/deploy/images/five.png
rename to windows/deployment/images/five.png
diff --git a/windows/deploy/images/four.png b/windows/deployment/images/four.png
similarity index 100%
rename from windows/deploy/images/four.png
rename to windows/deployment/images/four.png
diff --git a/windows/deploy/images/hyper-v-feature.png b/windows/deployment/images/hyper-v-feature.png
similarity index 100%
rename from windows/deploy/images/hyper-v-feature.png
rename to windows/deployment/images/hyper-v-feature.png
diff --git a/windows/deploy/images/icd-create-options-1703.PNG b/windows/deployment/images/icd-create-options-1703.PNG
similarity index 100%
rename from windows/deploy/images/icd-create-options-1703.PNG
rename to windows/deployment/images/icd-create-options-1703.PNG
diff --git a/windows/deploy/images/icd-create-options.PNG b/windows/deployment/images/icd-create-options.PNG
similarity index 100%
rename from windows/deploy/images/icd-create-options.PNG
rename to windows/deployment/images/icd-create-options.PNG
diff --git a/windows/deploy/images/icd-export-menu.png b/windows/deployment/images/icd-export-menu.png
similarity index 100%
rename from windows/deploy/images/icd-export-menu.png
rename to windows/deployment/images/icd-export-menu.png
diff --git a/windows/deploy/images/icd-install.PNG b/windows/deployment/images/icd-install.PNG
similarity index 100%
rename from windows/deploy/images/icd-install.PNG
rename to windows/deployment/images/icd-install.PNG
diff --git a/windows/deploy/images/icd-multi-target-true.png b/windows/deployment/images/icd-multi-target-true.png
similarity index 100%
rename from windows/deploy/images/icd-multi-target-true.png
rename to windows/deployment/images/icd-multi-target-true.png
diff --git a/windows/deploy/images/icd-multi-targetstate-true.png b/windows/deployment/images/icd-multi-targetstate-true.png
similarity index 100%
rename from windows/deploy/images/icd-multi-targetstate-true.png
rename to windows/deployment/images/icd-multi-targetstate-true.png
diff --git a/windows/deploy/images/icd-runtime.PNG b/windows/deployment/images/icd-runtime.PNG
similarity index 100%
rename from windows/deploy/images/icd-runtime.PNG
rename to windows/deployment/images/icd-runtime.PNG
diff --git a/windows/deploy/images/icd-script1.png b/windows/deployment/images/icd-script1.png
similarity index 100%
rename from windows/deploy/images/icd-script1.png
rename to windows/deployment/images/icd-script1.png
diff --git a/windows/deploy/images/icd-script2.png b/windows/deployment/images/icd-script2.png
similarity index 100%
rename from windows/deploy/images/icd-script2.png
rename to windows/deployment/images/icd-script2.png
diff --git a/windows/deploy/images/icd-setting-help.PNG b/windows/deployment/images/icd-setting-help.PNG
similarity index 100%
rename from windows/deploy/images/icd-setting-help.PNG
rename to windows/deployment/images/icd-setting-help.PNG
diff --git a/windows/deploy/images/icd-settings.PNG b/windows/deployment/images/icd-settings.PNG
similarity index 100%
rename from windows/deploy/images/icd-settings.PNG
rename to windows/deployment/images/icd-settings.PNG
diff --git a/windows/deploy/images/icd-simple-edit.png b/windows/deployment/images/icd-simple-edit.png
similarity index 100%
rename from windows/deploy/images/icd-simple-edit.png
rename to windows/deployment/images/icd-simple-edit.png
diff --git a/windows/deploy/images/icd-simple.PNG b/windows/deployment/images/icd-simple.PNG
similarity index 100%
rename from windows/deploy/images/icd-simple.PNG
rename to windows/deployment/images/icd-simple.PNG
diff --git a/windows/deploy/images/icd-step1.PNG b/windows/deployment/images/icd-step1.PNG
similarity index 100%
rename from windows/deploy/images/icd-step1.PNG
rename to windows/deployment/images/icd-step1.PNG
diff --git a/windows/deploy/images/icd-step2.PNG b/windows/deployment/images/icd-step2.PNG
similarity index 100%
rename from windows/deploy/images/icd-step2.PNG
rename to windows/deployment/images/icd-step2.PNG
diff --git a/windows/deploy/images/icd-step3.PNG b/windows/deployment/images/icd-step3.PNG
similarity index 100%
rename from windows/deploy/images/icd-step3.PNG
rename to windows/deployment/images/icd-step3.PNG
diff --git a/windows/deploy/images/icd-step4.PNG b/windows/deployment/images/icd-step4.PNG
similarity index 100%
rename from windows/deploy/images/icd-step4.PNG
rename to windows/deployment/images/icd-step4.PNG
diff --git a/windows/deploy/images/icd-step5.PNG b/windows/deployment/images/icd-step5.PNG
similarity index 100%
rename from windows/deploy/images/icd-step5.PNG
rename to windows/deployment/images/icd-step5.PNG
diff --git a/windows/deploy/images/icd-switch.PNG b/windows/deployment/images/icd-switch.PNG
similarity index 100%
rename from windows/deploy/images/icd-switch.PNG
rename to windows/deployment/images/icd-switch.PNG
diff --git a/windows/deploy/images/image.PNG b/windows/deployment/images/image.PNG
similarity index 100%
rename from windows/deploy/images/image.PNG
rename to windows/deployment/images/image.PNG
diff --git a/windows/deploy/images/installing-drivers.png b/windows/deployment/images/installing-drivers.png
similarity index 100%
rename from windows/deploy/images/installing-drivers.png
rename to windows/deployment/images/installing-drivers.png
diff --git a/windows/deploy/images/license-terms.png b/windows/deployment/images/license-terms.png
similarity index 100%
rename from windows/deploy/images/license-terms.png
rename to windows/deployment/images/license-terms.png
diff --git a/windows/deploy/images/mbr2gpt-volume.PNG b/windows/deployment/images/mbr2gpt-volume.PNG
similarity index 100%
rename from windows/deploy/images/mbr2gpt-volume.PNG
rename to windows/deployment/images/mbr2gpt-volume.PNG
diff --git a/windows/deploy/images/mbr2gpt-workflow.png b/windows/deployment/images/mbr2gpt-workflow.png
similarity index 100%
rename from windows/deploy/images/mbr2gpt-workflow.png
rename to windows/deployment/images/mbr2gpt-workflow.png
diff --git a/windows/deploy/images/mdt-01-fig01.png b/windows/deployment/images/mdt-01-fig01.png
similarity index 100%
rename from windows/deploy/images/mdt-01-fig01.png
rename to windows/deployment/images/mdt-01-fig01.png
diff --git a/windows/deploy/images/mdt-01-fig02.jpg b/windows/deployment/images/mdt-01-fig02.jpg
similarity index 100%
rename from windows/deploy/images/mdt-01-fig02.jpg
rename to windows/deployment/images/mdt-01-fig02.jpg
diff --git a/windows/deploy/images/mdt-03-fig01.png b/windows/deployment/images/mdt-03-fig01.png
similarity index 100%
rename from windows/deploy/images/mdt-03-fig01.png
rename to windows/deployment/images/mdt-03-fig01.png
diff --git a/windows/deploy/images/mdt-03-fig02.png b/windows/deployment/images/mdt-03-fig02.png
similarity index 100%
rename from windows/deploy/images/mdt-03-fig02.png
rename to windows/deployment/images/mdt-03-fig02.png
diff --git a/windows/deploy/images/mdt-03-fig03.png b/windows/deployment/images/mdt-03-fig03.png
similarity index 100%
rename from windows/deploy/images/mdt-03-fig03.png
rename to windows/deployment/images/mdt-03-fig03.png
diff --git a/windows/deploy/images/mdt-03-fig04.png b/windows/deployment/images/mdt-03-fig04.png
similarity index 100%
rename from windows/deploy/images/mdt-03-fig04.png
rename to windows/deployment/images/mdt-03-fig04.png
diff --git a/windows/deploy/images/mdt-03-fig05.png b/windows/deployment/images/mdt-03-fig05.png
similarity index 100%
rename from windows/deploy/images/mdt-03-fig05.png
rename to windows/deployment/images/mdt-03-fig05.png
diff --git a/windows/deploy/images/mdt-04-fig01.png b/windows/deployment/images/mdt-04-fig01.png
similarity index 100%
rename from windows/deploy/images/mdt-04-fig01.png
rename to windows/deployment/images/mdt-04-fig01.png
diff --git a/windows/deploy/images/mdt-05-fig01.png b/windows/deployment/images/mdt-05-fig01.png
similarity index 100%
rename from windows/deploy/images/mdt-05-fig01.png
rename to windows/deployment/images/mdt-05-fig01.png
diff --git a/windows/deploy/images/mdt-05-fig02.png b/windows/deployment/images/mdt-05-fig02.png
similarity index 100%
rename from windows/deploy/images/mdt-05-fig02.png
rename to windows/deployment/images/mdt-05-fig02.png
diff --git a/windows/deploy/images/mdt-05-fig03.png b/windows/deployment/images/mdt-05-fig03.png
similarity index 100%
rename from windows/deploy/images/mdt-05-fig03.png
rename to windows/deployment/images/mdt-05-fig03.png
diff --git a/windows/deploy/images/mdt-05-fig04.png b/windows/deployment/images/mdt-05-fig04.png
similarity index 100%
rename from windows/deploy/images/mdt-05-fig04.png
rename to windows/deployment/images/mdt-05-fig04.png
diff --git a/windows/deploy/images/mdt-05-fig05.png b/windows/deployment/images/mdt-05-fig05.png
similarity index 100%
rename from windows/deploy/images/mdt-05-fig05.png
rename to windows/deployment/images/mdt-05-fig05.png
diff --git a/windows/deploy/images/mdt-05-fig07.png b/windows/deployment/images/mdt-05-fig07.png
similarity index 100%
rename from windows/deploy/images/mdt-05-fig07.png
rename to windows/deployment/images/mdt-05-fig07.png
diff --git a/windows/deploy/images/mdt-05-fig08.png b/windows/deployment/images/mdt-05-fig08.png
similarity index 100%
rename from windows/deploy/images/mdt-05-fig08.png
rename to windows/deployment/images/mdt-05-fig08.png
diff --git a/windows/deploy/images/mdt-05-fig09.png b/windows/deployment/images/mdt-05-fig09.png
similarity index 100%
rename from windows/deploy/images/mdt-05-fig09.png
rename to windows/deployment/images/mdt-05-fig09.png
diff --git a/windows/deploy/images/mdt-05-fig10.png b/windows/deployment/images/mdt-05-fig10.png
similarity index 100%
rename from windows/deploy/images/mdt-05-fig10.png
rename to windows/deployment/images/mdt-05-fig10.png
diff --git a/windows/deploy/images/mdt-06-fig01.png b/windows/deployment/images/mdt-06-fig01.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig01.png
rename to windows/deployment/images/mdt-06-fig01.png
diff --git a/windows/deploy/images/mdt-06-fig03.png b/windows/deployment/images/mdt-06-fig03.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig03.png
rename to windows/deployment/images/mdt-06-fig03.png
diff --git a/windows/deploy/images/mdt-06-fig04.png b/windows/deployment/images/mdt-06-fig04.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig04.png
rename to windows/deployment/images/mdt-06-fig04.png
diff --git a/windows/deploy/images/mdt-06-fig05.png b/windows/deployment/images/mdt-06-fig05.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig05.png
rename to windows/deployment/images/mdt-06-fig05.png
diff --git a/windows/deploy/images/mdt-06-fig06.png b/windows/deployment/images/mdt-06-fig06.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig06.png
rename to windows/deployment/images/mdt-06-fig06.png
diff --git a/windows/deploy/images/mdt-06-fig07.png b/windows/deployment/images/mdt-06-fig07.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig07.png
rename to windows/deployment/images/mdt-06-fig07.png
diff --git a/windows/deploy/images/mdt-06-fig08.png b/windows/deployment/images/mdt-06-fig08.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig08.png
rename to windows/deployment/images/mdt-06-fig08.png
diff --git a/windows/deploy/images/mdt-06-fig10.png b/windows/deployment/images/mdt-06-fig10.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig10.png
rename to windows/deployment/images/mdt-06-fig10.png
diff --git a/windows/deploy/images/mdt-06-fig12.png b/windows/deployment/images/mdt-06-fig12.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig12.png
rename to windows/deployment/images/mdt-06-fig12.png
diff --git a/windows/deploy/images/mdt-06-fig13.png b/windows/deployment/images/mdt-06-fig13.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig13.png
rename to windows/deployment/images/mdt-06-fig13.png
diff --git a/windows/deploy/images/mdt-06-fig14.png b/windows/deployment/images/mdt-06-fig14.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig14.png
rename to windows/deployment/images/mdt-06-fig14.png
diff --git a/windows/deploy/images/mdt-06-fig15.png b/windows/deployment/images/mdt-06-fig15.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig15.png
rename to windows/deployment/images/mdt-06-fig15.png
diff --git a/windows/deploy/images/mdt-06-fig16.png b/windows/deployment/images/mdt-06-fig16.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig16.png
rename to windows/deployment/images/mdt-06-fig16.png
diff --git a/windows/deploy/images/mdt-06-fig20.png b/windows/deployment/images/mdt-06-fig20.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig20.png
rename to windows/deployment/images/mdt-06-fig20.png
diff --git a/windows/deploy/images/mdt-06-fig21.png b/windows/deployment/images/mdt-06-fig21.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig21.png
rename to windows/deployment/images/mdt-06-fig21.png
diff --git a/windows/deploy/images/mdt-06-fig26.png b/windows/deployment/images/mdt-06-fig26.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig26.png
rename to windows/deployment/images/mdt-06-fig26.png
diff --git a/windows/deploy/images/mdt-06-fig31.png b/windows/deployment/images/mdt-06-fig31.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig31.png
rename to windows/deployment/images/mdt-06-fig31.png
diff --git a/windows/deploy/images/mdt-06-fig33.png b/windows/deployment/images/mdt-06-fig33.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig33.png
rename to windows/deployment/images/mdt-06-fig33.png
diff --git a/windows/deploy/images/mdt-06-fig35.png b/windows/deployment/images/mdt-06-fig35.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig35.png
rename to windows/deployment/images/mdt-06-fig35.png
diff --git a/windows/deploy/images/mdt-06-fig36.png b/windows/deployment/images/mdt-06-fig36.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig36.png
rename to windows/deployment/images/mdt-06-fig36.png
diff --git a/windows/deploy/images/mdt-06-fig37.png b/windows/deployment/images/mdt-06-fig37.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig37.png
rename to windows/deployment/images/mdt-06-fig37.png
diff --git a/windows/deploy/images/mdt-06-fig39.png b/windows/deployment/images/mdt-06-fig39.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig39.png
rename to windows/deployment/images/mdt-06-fig39.png
diff --git a/windows/deploy/images/mdt-06-fig42.png b/windows/deployment/images/mdt-06-fig42.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig42.png
rename to windows/deployment/images/mdt-06-fig42.png
diff --git a/windows/deploy/images/mdt-06-fig43.png b/windows/deployment/images/mdt-06-fig43.png
similarity index 100%
rename from windows/deploy/images/mdt-06-fig43.png
rename to windows/deployment/images/mdt-06-fig43.png
diff --git a/windows/deploy/images/mdt-07-fig01.png b/windows/deployment/images/mdt-07-fig01.png
similarity index 100%
rename from windows/deploy/images/mdt-07-fig01.png
rename to windows/deployment/images/mdt-07-fig01.png
diff --git a/windows/deploy/images/mdt-07-fig03.png b/windows/deployment/images/mdt-07-fig03.png
similarity index 100%
rename from windows/deploy/images/mdt-07-fig03.png
rename to windows/deployment/images/mdt-07-fig03.png
diff --git a/windows/deploy/images/mdt-07-fig08.png b/windows/deployment/images/mdt-07-fig08.png
similarity index 100%
rename from windows/deploy/images/mdt-07-fig08.png
rename to windows/deployment/images/mdt-07-fig08.png
diff --git a/windows/deploy/images/mdt-07-fig09.png b/windows/deployment/images/mdt-07-fig09.png
similarity index 100%
rename from windows/deploy/images/mdt-07-fig09.png
rename to windows/deployment/images/mdt-07-fig09.png
diff --git a/windows/deploy/images/mdt-07-fig10.png b/windows/deployment/images/mdt-07-fig10.png
similarity index 100%
rename from windows/deploy/images/mdt-07-fig10.png
rename to windows/deployment/images/mdt-07-fig10.png
diff --git a/windows/deploy/images/mdt-07-fig11.png b/windows/deployment/images/mdt-07-fig11.png
similarity index 100%
rename from windows/deploy/images/mdt-07-fig11.png
rename to windows/deployment/images/mdt-07-fig11.png
diff --git a/windows/deploy/images/mdt-07-fig13.png b/windows/deployment/images/mdt-07-fig13.png
similarity index 100%
rename from windows/deploy/images/mdt-07-fig13.png
rename to windows/deployment/images/mdt-07-fig13.png
diff --git a/windows/deploy/images/mdt-07-fig14.png b/windows/deployment/images/mdt-07-fig14.png
similarity index 100%
rename from windows/deploy/images/mdt-07-fig14.png
rename to windows/deployment/images/mdt-07-fig14.png
diff --git a/windows/deploy/images/mdt-07-fig15.png b/windows/deployment/images/mdt-07-fig15.png
similarity index 100%
rename from windows/deploy/images/mdt-07-fig15.png
rename to windows/deployment/images/mdt-07-fig15.png
diff --git a/windows/deploy/images/mdt-07-fig16.png b/windows/deployment/images/mdt-07-fig16.png
similarity index 100%
rename from windows/deploy/images/mdt-07-fig16.png
rename to windows/deployment/images/mdt-07-fig16.png
diff --git a/windows/deploy/images/mdt-08-fig01.png b/windows/deployment/images/mdt-08-fig01.png
similarity index 100%
rename from windows/deploy/images/mdt-08-fig01.png
rename to windows/deployment/images/mdt-08-fig01.png
diff --git a/windows/deploy/images/mdt-08-fig02.png b/windows/deployment/images/mdt-08-fig02.png
similarity index 100%
rename from windows/deploy/images/mdt-08-fig02.png
rename to windows/deployment/images/mdt-08-fig02.png
diff --git a/windows/deploy/images/mdt-08-fig03.png b/windows/deployment/images/mdt-08-fig03.png
similarity index 100%
rename from windows/deploy/images/mdt-08-fig03.png
rename to windows/deployment/images/mdt-08-fig03.png
diff --git a/windows/deploy/images/mdt-08-fig05.png b/windows/deployment/images/mdt-08-fig05.png
similarity index 100%
rename from windows/deploy/images/mdt-08-fig05.png
rename to windows/deployment/images/mdt-08-fig05.png
diff --git a/windows/deploy/images/mdt-08-fig06.png b/windows/deployment/images/mdt-08-fig06.png
similarity index 100%
rename from windows/deploy/images/mdt-08-fig06.png
rename to windows/deployment/images/mdt-08-fig06.png
diff --git a/windows/deploy/images/mdt-08-fig14.png b/windows/deployment/images/mdt-08-fig14.png
similarity index 100%
rename from windows/deploy/images/mdt-08-fig14.png
rename to windows/deployment/images/mdt-08-fig14.png
diff --git a/windows/deploy/images/mdt-08-fig15.png b/windows/deployment/images/mdt-08-fig15.png
similarity index 100%
rename from windows/deploy/images/mdt-08-fig15.png
rename to windows/deployment/images/mdt-08-fig15.png
diff --git a/windows/deploy/images/mdt-09-fig01.png b/windows/deployment/images/mdt-09-fig01.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig01.png
rename to windows/deployment/images/mdt-09-fig01.png
diff --git a/windows/deploy/images/mdt-09-fig02.png b/windows/deployment/images/mdt-09-fig02.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig02.png
rename to windows/deployment/images/mdt-09-fig02.png
diff --git a/windows/deploy/images/mdt-09-fig03.png b/windows/deployment/images/mdt-09-fig03.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig03.png
rename to windows/deployment/images/mdt-09-fig03.png
diff --git a/windows/deploy/images/mdt-09-fig04.png b/windows/deployment/images/mdt-09-fig04.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig04.png
rename to windows/deployment/images/mdt-09-fig04.png
diff --git a/windows/deploy/images/mdt-09-fig06.png b/windows/deployment/images/mdt-09-fig06.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig06.png
rename to windows/deployment/images/mdt-09-fig06.png
diff --git a/windows/deploy/images/mdt-09-fig07.png b/windows/deployment/images/mdt-09-fig07.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig07.png
rename to windows/deployment/images/mdt-09-fig07.png
diff --git a/windows/deploy/images/mdt-09-fig08.png b/windows/deployment/images/mdt-09-fig08.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig08.png
rename to windows/deployment/images/mdt-09-fig08.png
diff --git a/windows/deploy/images/mdt-09-fig09.png b/windows/deployment/images/mdt-09-fig09.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig09.png
rename to windows/deployment/images/mdt-09-fig09.png
diff --git a/windows/deploy/images/mdt-09-fig10.png b/windows/deployment/images/mdt-09-fig10.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig10.png
rename to windows/deployment/images/mdt-09-fig10.png
diff --git a/windows/deploy/images/mdt-09-fig11.png b/windows/deployment/images/mdt-09-fig11.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig11.png
rename to windows/deployment/images/mdt-09-fig11.png
diff --git a/windows/deploy/images/mdt-09-fig12.png b/windows/deployment/images/mdt-09-fig12.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig12.png
rename to windows/deployment/images/mdt-09-fig12.png
diff --git a/windows/deploy/images/mdt-09-fig13.png b/windows/deployment/images/mdt-09-fig13.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig13.png
rename to windows/deployment/images/mdt-09-fig13.png
diff --git a/windows/deploy/images/mdt-09-fig14.png b/windows/deployment/images/mdt-09-fig14.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig14.png
rename to windows/deployment/images/mdt-09-fig14.png
diff --git a/windows/deploy/images/mdt-09-fig15.png b/windows/deployment/images/mdt-09-fig15.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig15.png
rename to windows/deployment/images/mdt-09-fig15.png
diff --git a/windows/deploy/images/mdt-09-fig16.png b/windows/deployment/images/mdt-09-fig16.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig16.png
rename to windows/deployment/images/mdt-09-fig16.png
diff --git a/windows/deploy/images/mdt-09-fig17.png b/windows/deployment/images/mdt-09-fig17.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig17.png
rename to windows/deployment/images/mdt-09-fig17.png
diff --git a/windows/deploy/images/mdt-09-fig18.png b/windows/deployment/images/mdt-09-fig18.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig18.png
rename to windows/deployment/images/mdt-09-fig18.png
diff --git a/windows/deploy/images/mdt-09-fig19.png b/windows/deployment/images/mdt-09-fig19.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig19.png
rename to windows/deployment/images/mdt-09-fig19.png
diff --git a/windows/deploy/images/mdt-09-fig20.png b/windows/deployment/images/mdt-09-fig20.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig20.png
rename to windows/deployment/images/mdt-09-fig20.png
diff --git a/windows/deploy/images/mdt-09-fig21.png b/windows/deployment/images/mdt-09-fig21.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig21.png
rename to windows/deployment/images/mdt-09-fig21.png
diff --git a/windows/deploy/images/mdt-09-fig22.png b/windows/deployment/images/mdt-09-fig22.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig22.png
rename to windows/deployment/images/mdt-09-fig22.png
diff --git a/windows/deploy/images/mdt-09-fig23.png b/windows/deployment/images/mdt-09-fig23.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig23.png
rename to windows/deployment/images/mdt-09-fig23.png
diff --git a/windows/deploy/images/mdt-09-fig24.png b/windows/deployment/images/mdt-09-fig24.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig24.png
rename to windows/deployment/images/mdt-09-fig24.png
diff --git a/windows/deploy/images/mdt-09-fig25.png b/windows/deployment/images/mdt-09-fig25.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig25.png
rename to windows/deployment/images/mdt-09-fig25.png
diff --git a/windows/deploy/images/mdt-09-fig26.png b/windows/deployment/images/mdt-09-fig26.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig26.png
rename to windows/deployment/images/mdt-09-fig26.png
diff --git a/windows/deploy/images/mdt-09-fig27.png b/windows/deployment/images/mdt-09-fig27.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig27.png
rename to windows/deployment/images/mdt-09-fig27.png
diff --git a/windows/deploy/images/mdt-09-fig28.png b/windows/deployment/images/mdt-09-fig28.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig28.png
rename to windows/deployment/images/mdt-09-fig28.png
diff --git a/windows/deploy/images/mdt-09-fig29.png b/windows/deployment/images/mdt-09-fig29.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig29.png
rename to windows/deployment/images/mdt-09-fig29.png
diff --git a/windows/deploy/images/mdt-09-fig30.png b/windows/deployment/images/mdt-09-fig30.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig30.png
rename to windows/deployment/images/mdt-09-fig30.png
diff --git a/windows/deploy/images/mdt-09-fig31.png b/windows/deployment/images/mdt-09-fig31.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig31.png
rename to windows/deployment/images/mdt-09-fig31.png
diff --git a/windows/deploy/images/mdt-09-fig32.png b/windows/deployment/images/mdt-09-fig32.png
similarity index 100%
rename from windows/deploy/images/mdt-09-fig32.png
rename to windows/deployment/images/mdt-09-fig32.png
diff --git a/windows/deploy/images/mdt-10-fig01.png b/windows/deployment/images/mdt-10-fig01.png
similarity index 100%
rename from windows/deploy/images/mdt-10-fig01.png
rename to windows/deployment/images/mdt-10-fig01.png
diff --git a/windows/deploy/images/mdt-10-fig02.png b/windows/deployment/images/mdt-10-fig02.png
similarity index 100%
rename from windows/deploy/images/mdt-10-fig02.png
rename to windows/deployment/images/mdt-10-fig02.png
diff --git a/windows/deploy/images/mdt-10-fig03.png b/windows/deployment/images/mdt-10-fig03.png
similarity index 100%
rename from windows/deploy/images/mdt-10-fig03.png
rename to windows/deployment/images/mdt-10-fig03.png
diff --git a/windows/deploy/images/mdt-10-fig04.png b/windows/deployment/images/mdt-10-fig04.png
similarity index 100%
rename from windows/deploy/images/mdt-10-fig04.png
rename to windows/deployment/images/mdt-10-fig04.png
diff --git a/windows/deploy/images/mdt-10-fig05.png b/windows/deployment/images/mdt-10-fig05.png
similarity index 100%
rename from windows/deploy/images/mdt-10-fig05.png
rename to windows/deployment/images/mdt-10-fig05.png
diff --git a/windows/deploy/images/mdt-10-fig06.png b/windows/deployment/images/mdt-10-fig06.png
similarity index 100%
rename from windows/deploy/images/mdt-10-fig06.png
rename to windows/deployment/images/mdt-10-fig06.png
diff --git a/windows/deploy/images/mdt-10-fig07.png b/windows/deployment/images/mdt-10-fig07.png
similarity index 100%
rename from windows/deploy/images/mdt-10-fig07.png
rename to windows/deployment/images/mdt-10-fig07.png
diff --git a/windows/deploy/images/mdt-10-fig08.png b/windows/deployment/images/mdt-10-fig08.png
similarity index 100%
rename from windows/deploy/images/mdt-10-fig08.png
rename to windows/deployment/images/mdt-10-fig08.png
diff --git a/windows/deploy/images/mdt-10-fig09.png b/windows/deployment/images/mdt-10-fig09.png
similarity index 100%
rename from windows/deploy/images/mdt-10-fig09.png
rename to windows/deployment/images/mdt-10-fig09.png
diff --git a/windows/deploy/images/mdt-11-fig05.png b/windows/deployment/images/mdt-11-fig05.png
similarity index 100%
rename from windows/deploy/images/mdt-11-fig05.png
rename to windows/deployment/images/mdt-11-fig05.png
diff --git a/windows/deploy/images/mdt-11-fig06.png b/windows/deployment/images/mdt-11-fig06.png
similarity index 100%
rename from windows/deploy/images/mdt-11-fig06.png
rename to windows/deployment/images/mdt-11-fig06.png
diff --git a/windows/deploy/images/mdt-11-fig07.png b/windows/deployment/images/mdt-11-fig07.png
similarity index 100%
rename from windows/deploy/images/mdt-11-fig07.png
rename to windows/deployment/images/mdt-11-fig07.png
diff --git a/windows/deploy/images/mdt-11-fig08.png b/windows/deployment/images/mdt-11-fig08.png
similarity index 100%
rename from windows/deploy/images/mdt-11-fig08.png
rename to windows/deployment/images/mdt-11-fig08.png
diff --git a/windows/deploy/images/mdt-11-fig09.png b/windows/deployment/images/mdt-11-fig09.png
similarity index 100%
rename from windows/deploy/images/mdt-11-fig09.png
rename to windows/deployment/images/mdt-11-fig09.png
diff --git a/windows/deploy/images/mdt-11-fig10.png b/windows/deployment/images/mdt-11-fig10.png
similarity index 100%
rename from windows/deploy/images/mdt-11-fig10.png
rename to windows/deployment/images/mdt-11-fig10.png
diff --git a/windows/deploy/images/mdt-11-fig11.png b/windows/deployment/images/mdt-11-fig11.png
similarity index 100%
rename from windows/deploy/images/mdt-11-fig11.png
rename to windows/deployment/images/mdt-11-fig11.png
diff --git a/windows/deploy/images/mdt-11-fig12.png b/windows/deployment/images/mdt-11-fig12.png
similarity index 100%
rename from windows/deploy/images/mdt-11-fig12.png
rename to windows/deployment/images/mdt-11-fig12.png
diff --git a/windows/deploy/images/mdt-11-fig13.png b/windows/deployment/images/mdt-11-fig13.png
similarity index 100%
rename from windows/deploy/images/mdt-11-fig13.png
rename to windows/deployment/images/mdt-11-fig13.png
diff --git a/windows/deploy/images/mdt-11-fig14.png b/windows/deployment/images/mdt-11-fig14.png
similarity index 100%
rename from windows/deploy/images/mdt-11-fig14.png
rename to windows/deployment/images/mdt-11-fig14.png
diff --git a/windows/deploy/images/mdt-11-fig15.png b/windows/deployment/images/mdt-11-fig15.png
similarity index 100%
rename from windows/deploy/images/mdt-11-fig15.png
rename to windows/deployment/images/mdt-11-fig15.png
diff --git a/windows/deploy/images/mdt-11-fig16.png b/windows/deployment/images/mdt-11-fig16.png
similarity index 100%
rename from windows/deploy/images/mdt-11-fig16.png
rename to windows/deployment/images/mdt-11-fig16.png
diff --git a/windows/deploy/images/multi-target.png b/windows/deployment/images/multi-target.png
similarity index 100%
rename from windows/deploy/images/multi-target.png
rename to windows/deployment/images/multi-target.png
diff --git a/windows/deploy/images/nfc.png b/windows/deployment/images/nfc.png
similarity index 100%
rename from windows/deploy/images/nfc.png
rename to windows/deployment/images/nfc.png
diff --git a/windows/deploy/images/one.png b/windows/deployment/images/one.png
similarity index 100%
rename from windows/deploy/images/one.png
rename to windows/deployment/images/one.png
diff --git a/windows/deploy/images/oobe.jpg b/windows/deployment/images/oobe.jpg
similarity index 100%
rename from windows/deploy/images/oobe.jpg
rename to windows/deployment/images/oobe.jpg
diff --git a/windows/deploy/images/package-trust.png b/windows/deployment/images/package-trust.png
similarity index 100%
rename from windows/deploy/images/package-trust.png
rename to windows/deployment/images/package-trust.png
diff --git a/windows/deploy/images/package.png b/windows/deployment/images/package.png
similarity index 100%
rename from windows/deploy/images/package.png
rename to windows/deployment/images/package.png
diff --git a/windows/deploy/images/packages-mobile.png b/windows/deployment/images/packages-mobile.png
similarity index 100%
rename from windows/deploy/images/packages-mobile.png
rename to windows/deployment/images/packages-mobile.png
diff --git a/windows/deploy/images/poc-computers.png b/windows/deployment/images/poc-computers.png
similarity index 100%
rename from windows/deploy/images/poc-computers.png
rename to windows/deployment/images/poc-computers.png
diff --git a/windows/deploy/images/prov.jpg b/windows/deployment/images/prov.jpg
similarity index 100%
rename from windows/deploy/images/prov.jpg
rename to windows/deployment/images/prov.jpg
diff --git a/windows/deploy/images/scanos.PNG b/windows/deployment/images/scanos.PNG
similarity index 100%
rename from windows/deploy/images/scanos.PNG
rename to windows/deployment/images/scanos.PNG
diff --git a/windows/deploy/images/sccm-asset.PNG b/windows/deployment/images/sccm-asset.PNG
similarity index 100%
rename from windows/deploy/images/sccm-asset.PNG
rename to windows/deployment/images/sccm-asset.PNG
diff --git a/windows/deploy/images/sccm-assets.PNG b/windows/deployment/images/sccm-assets.PNG
similarity index 100%
rename from windows/deploy/images/sccm-assets.PNG
rename to windows/deployment/images/sccm-assets.PNG
diff --git a/windows/deploy/images/sccm-client.PNG b/windows/deployment/images/sccm-client.PNG
similarity index 100%
rename from windows/deploy/images/sccm-client.PNG
rename to windows/deployment/images/sccm-client.PNG
diff --git a/windows/deploy/images/sccm-collection.PNG b/windows/deployment/images/sccm-collection.PNG
similarity index 100%
rename from windows/deploy/images/sccm-collection.PNG
rename to windows/deployment/images/sccm-collection.PNG
diff --git a/windows/deploy/images/sccm-install-os.PNG b/windows/deployment/images/sccm-install-os.PNG
similarity index 100%
rename from windows/deploy/images/sccm-install-os.PNG
rename to windows/deployment/images/sccm-install-os.PNG
diff --git a/windows/deploy/images/sccm-post-refresh.PNG b/windows/deployment/images/sccm-post-refresh.PNG
similarity index 100%
rename from windows/deploy/images/sccm-post-refresh.PNG
rename to windows/deployment/images/sccm-post-refresh.PNG
diff --git a/windows/deploy/images/sccm-pxe.PNG b/windows/deployment/images/sccm-pxe.PNG
similarity index 100%
rename from windows/deploy/images/sccm-pxe.PNG
rename to windows/deployment/images/sccm-pxe.PNG
diff --git a/windows/deploy/images/sccm-site.PNG b/windows/deployment/images/sccm-site.PNG
similarity index 100%
rename from windows/deploy/images/sccm-site.PNG
rename to windows/deployment/images/sccm-site.PNG
diff --git a/windows/deploy/images/sccm-software-cntr.PNG b/windows/deployment/images/sccm-software-cntr.PNG
similarity index 100%
rename from windows/deploy/images/sccm-software-cntr.PNG
rename to windows/deployment/images/sccm-software-cntr.PNG
diff --git a/windows/deploy/images/sec-bios.png b/windows/deployment/images/sec-bios.png
similarity index 100%
rename from windows/deploy/images/sec-bios.png
rename to windows/deployment/images/sec-bios.png
diff --git a/windows/deploy/images/setupmsg.jpg b/windows/deployment/images/setupmsg.jpg
similarity index 100%
rename from windows/deploy/images/setupmsg.jpg
rename to windows/deployment/images/setupmsg.jpg
diff --git a/windows/deploy/images/sign-in-prov.png b/windows/deployment/images/sign-in-prov.png
similarity index 100%
rename from windows/deploy/images/sign-in-prov.png
rename to windows/deployment/images/sign-in-prov.png
diff --git a/windows/deploy/images/six.png b/windows/deployment/images/six.png
similarity index 100%
rename from windows/deploy/images/six.png
rename to windows/deployment/images/six.png
diff --git a/windows/deploy/images/svr_mgr2.png b/windows/deployment/images/svr_mgr2.png
similarity index 100%
rename from windows/deploy/images/svr_mgr2.png
rename to windows/deployment/images/svr_mgr2.png
diff --git a/windows/deploy/images/three.png b/windows/deployment/images/three.png
similarity index 100%
rename from windows/deploy/images/three.png
rename to windows/deployment/images/three.png
diff --git a/windows/deploy/images/trust-package.png b/windows/deployment/images/trust-package.png
similarity index 100%
rename from windows/deploy/images/trust-package.png
rename to windows/deployment/images/trust-package.png
diff --git a/windows/deploy/images/two.png b/windows/deployment/images/two.png
similarity index 100%
rename from windows/deploy/images/two.png
rename to windows/deployment/images/two.png
diff --git a/windows/deploy/images/ua-cg-01.png b/windows/deployment/images/ua-cg-01.png
similarity index 100%
rename from windows/deploy/images/ua-cg-01.png
rename to windows/deployment/images/ua-cg-01.png
diff --git a/windows/deploy/images/ua-cg-02.png b/windows/deployment/images/ua-cg-02.png
similarity index 100%
rename from windows/deploy/images/ua-cg-02.png
rename to windows/deployment/images/ua-cg-02.png
diff --git a/windows/deploy/images/ua-cg-03.png b/windows/deployment/images/ua-cg-03.png
similarity index 100%
rename from windows/deploy/images/ua-cg-03.png
rename to windows/deployment/images/ua-cg-03.png
diff --git a/windows/deploy/images/ua-cg-04.png b/windows/deployment/images/ua-cg-04.png
similarity index 100%
rename from windows/deploy/images/ua-cg-04.png
rename to windows/deployment/images/ua-cg-04.png
diff --git a/windows/deploy/images/ua-cg-05.png b/windows/deployment/images/ua-cg-05.png
similarity index 100%
rename from windows/deploy/images/ua-cg-05.png
rename to windows/deployment/images/ua-cg-05.png
diff --git a/windows/deploy/images/ua-cg-06.png b/windows/deployment/images/ua-cg-06.png
similarity index 100%
rename from windows/deploy/images/ua-cg-06.png
rename to windows/deployment/images/ua-cg-06.png
diff --git a/windows/deploy/images/ua-cg-07.png b/windows/deployment/images/ua-cg-07.png
similarity index 100%
rename from windows/deploy/images/ua-cg-07.png
rename to windows/deployment/images/ua-cg-07.png
diff --git a/windows/deploy/images/ua-cg-08.png b/windows/deployment/images/ua-cg-08.png
similarity index 100%
rename from windows/deploy/images/ua-cg-08.png
rename to windows/deployment/images/ua-cg-08.png
diff --git a/windows/deploy/images/ua-cg-09-old.png b/windows/deployment/images/ua-cg-09-old.png
similarity index 100%
rename from windows/deploy/images/ua-cg-09-old.png
rename to windows/deployment/images/ua-cg-09-old.png
diff --git a/windows/deploy/images/ua-cg-09.png b/windows/deployment/images/ua-cg-09.png
similarity index 100%
rename from windows/deploy/images/ua-cg-09.png
rename to windows/deployment/images/ua-cg-09.png
diff --git a/windows/deploy/images/ua-cg-10.png b/windows/deployment/images/ua-cg-10.png
similarity index 100%
rename from windows/deploy/images/ua-cg-10.png
rename to windows/deployment/images/ua-cg-10.png
diff --git a/windows/deploy/images/ua-cg-11.png b/windows/deployment/images/ua-cg-11.png
similarity index 100%
rename from windows/deploy/images/ua-cg-11.png
rename to windows/deployment/images/ua-cg-11.png
diff --git a/windows/deploy/images/ua-cg-12.png b/windows/deployment/images/ua-cg-12.png
similarity index 100%
rename from windows/deploy/images/ua-cg-12.png
rename to windows/deployment/images/ua-cg-12.png
diff --git a/windows/deploy/images/ua-cg-13.png b/windows/deployment/images/ua-cg-13.png
similarity index 100%
rename from windows/deploy/images/ua-cg-13.png
rename to windows/deployment/images/ua-cg-13.png
diff --git a/windows/deploy/images/ua-cg-14.png b/windows/deployment/images/ua-cg-14.png
similarity index 100%
rename from windows/deploy/images/ua-cg-14.png
rename to windows/deployment/images/ua-cg-14.png
diff --git a/windows/deploy/images/ua-cg-15.png b/windows/deployment/images/ua-cg-15.png
similarity index 100%
rename from windows/deploy/images/ua-cg-15.png
rename to windows/deployment/images/ua-cg-15.png
diff --git a/windows/deploy/images/ua-cg-16.png b/windows/deployment/images/ua-cg-16.png
similarity index 100%
rename from windows/deploy/images/ua-cg-16.png
rename to windows/deployment/images/ua-cg-16.png
diff --git a/windows/deploy/images/ua-cg-17.png b/windows/deployment/images/ua-cg-17.png
similarity index 100%
rename from windows/deploy/images/ua-cg-17.png
rename to windows/deployment/images/ua-cg-17.png
diff --git a/windows/deploy/images/upgrade-analytics-apps-known-issues.png b/windows/deployment/images/upgrade-analytics-apps-known-issues.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-apps-known-issues.png
rename to windows/deployment/images/upgrade-analytics-apps-known-issues.png
diff --git a/windows/deploy/images/upgrade-analytics-apps-no-known-issues.png b/windows/deployment/images/upgrade-analytics-apps-no-known-issues.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-apps-no-known-issues.png
rename to windows/deployment/images/upgrade-analytics-apps-no-known-issues.png
diff --git a/windows/deploy/images/upgrade-analytics-architecture.png b/windows/deployment/images/upgrade-analytics-architecture.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-architecture.png
rename to windows/deployment/images/upgrade-analytics-architecture.png
diff --git a/windows/deploy/images/upgrade-analytics-create-iedataoptin.png b/windows/deployment/images/upgrade-analytics-create-iedataoptin.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-create-iedataoptin.png
rename to windows/deployment/images/upgrade-analytics-create-iedataoptin.png
diff --git a/windows/deploy/images/upgrade-analytics-deploy-eligible.png b/windows/deployment/images/upgrade-analytics-deploy-eligible.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-deploy-eligible.png
rename to windows/deployment/images/upgrade-analytics-deploy-eligible.png
diff --git a/windows/deploy/images/upgrade-analytics-drivers-known.png b/windows/deployment/images/upgrade-analytics-drivers-known.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-drivers-known.png
rename to windows/deployment/images/upgrade-analytics-drivers-known.png
diff --git a/windows/deploy/images/upgrade-analytics-most-active-sites.png b/windows/deployment/images/upgrade-analytics-most-active-sites.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-most-active-sites.png
rename to windows/deployment/images/upgrade-analytics-most-active-sites.png
diff --git a/windows/deploy/images/upgrade-analytics-namepub-rollup.PNG b/windows/deployment/images/upgrade-analytics-namepub-rollup.PNG
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-namepub-rollup.PNG
rename to windows/deployment/images/upgrade-analytics-namepub-rollup.PNG
diff --git a/windows/deploy/images/upgrade-analytics-overview.png b/windows/deployment/images/upgrade-analytics-overview.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-overview.png
rename to windows/deployment/images/upgrade-analytics-overview.png
diff --git a/windows/deploy/images/upgrade-analytics-pilot.png b/windows/deployment/images/upgrade-analytics-pilot.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-pilot.png
rename to windows/deployment/images/upgrade-analytics-pilot.png
diff --git a/windows/deploy/images/upgrade-analytics-prioritize.png b/windows/deployment/images/upgrade-analytics-prioritize.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-prioritize.png
rename to windows/deployment/images/upgrade-analytics-prioritize.png
diff --git a/windows/deploy/images/upgrade-analytics-query-activex-name.png b/windows/deployment/images/upgrade-analytics-query-activex-name.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-query-activex-name.png
rename to windows/deployment/images/upgrade-analytics-query-activex-name.png
diff --git a/windows/deploy/images/upgrade-analytics-ready-for-windows-status-guidance-precedence.PNG b/windows/deployment/images/upgrade-analytics-ready-for-windows-status-guidance-precedence.PNG
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-ready-for-windows-status-guidance-precedence.PNG
rename to windows/deployment/images/upgrade-analytics-ready-for-windows-status-guidance-precedence.PNG
diff --git a/windows/deploy/images/upgrade-analytics-ready-for-windows-status.PNG b/windows/deployment/images/upgrade-analytics-ready-for-windows-status.PNG
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-ready-for-windows-status.PNG
rename to windows/deployment/images/upgrade-analytics-ready-for-windows-status.PNG
diff --git a/windows/deploy/images/upgrade-analytics-site-activity-by-doc-mode.png b/windows/deployment/images/upgrade-analytics-site-activity-by-doc-mode.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-site-activity-by-doc-mode.png
rename to windows/deployment/images/upgrade-analytics-site-activity-by-doc-mode.png
diff --git a/windows/deploy/images/upgrade-analytics-site-domain-detail.png b/windows/deployment/images/upgrade-analytics-site-domain-detail.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-site-domain-detail.png
rename to windows/deployment/images/upgrade-analytics-site-domain-detail.png
diff --git a/windows/deploy/images/upgrade-analytics-telemetry.png b/windows/deployment/images/upgrade-analytics-telemetry.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-telemetry.png
rename to windows/deployment/images/upgrade-analytics-telemetry.png
diff --git a/windows/deploy/images/upgrade-analytics-unsubscribe.png b/windows/deployment/images/upgrade-analytics-unsubscribe.png
similarity index 100%
rename from windows/deploy/images/upgrade-analytics-unsubscribe.png
rename to windows/deployment/images/upgrade-analytics-unsubscribe.png
diff --git a/windows/deploy/images/upgrade-process.png b/windows/deployment/images/upgrade-process.png
similarity index 100%
rename from windows/deploy/images/upgrade-process.png
rename to windows/deployment/images/upgrade-process.png
diff --git a/windows/deploy/images/upgradecfg-fig2-upgrading.png b/windows/deployment/images/upgradecfg-fig2-upgrading.png
similarity index 100%
rename from windows/deploy/images/upgradecfg-fig2-upgrading.png
rename to windows/deployment/images/upgradecfg-fig2-upgrading.png
diff --git a/windows/deploy/images/upgradecfg-fig3-upgrade.png b/windows/deployment/images/upgradecfg-fig3-upgrade.png
similarity index 100%
rename from windows/deploy/images/upgradecfg-fig3-upgrade.png
rename to windows/deployment/images/upgradecfg-fig3-upgrade.png
diff --git a/windows/deploy/images/upgrademdt-fig1-machines.png b/windows/deployment/images/upgrademdt-fig1-machines.png
similarity index 100%
rename from windows/deploy/images/upgrademdt-fig1-machines.png
rename to windows/deployment/images/upgrademdt-fig1-machines.png
diff --git a/windows/deploy/images/upgrademdt-fig2-importedos.png b/windows/deployment/images/upgrademdt-fig2-importedos.png
similarity index 100%
rename from windows/deploy/images/upgrademdt-fig2-importedos.png
rename to windows/deployment/images/upgrademdt-fig2-importedos.png
diff --git a/windows/deploy/images/upgrademdt-fig3-tasksequence.png b/windows/deployment/images/upgrademdt-fig3-tasksequence.png
similarity index 100%
rename from windows/deploy/images/upgrademdt-fig3-tasksequence.png
rename to windows/deployment/images/upgrademdt-fig3-tasksequence.png
diff --git a/windows/deploy/images/upgrademdt-fig4-selecttask.png b/windows/deployment/images/upgrademdt-fig4-selecttask.png
similarity index 100%
rename from windows/deploy/images/upgrademdt-fig4-selecttask.png
rename to windows/deployment/images/upgrademdt-fig4-selecttask.png
diff --git a/windows/deploy/images/upgrademdt-fig5-winupgrade.png b/windows/deployment/images/upgrademdt-fig5-winupgrade.png
similarity index 100%
rename from windows/deploy/images/upgrademdt-fig5-winupgrade.png
rename to windows/deployment/images/upgrademdt-fig5-winupgrade.png
diff --git a/windows/deploy/images/ur-arch-diagram.png b/windows/deployment/images/ur-arch-diagram.png
similarity index 100%
rename from windows/deploy/images/ur-arch-diagram.png
rename to windows/deployment/images/ur-arch-diagram.png
diff --git a/windows/deploy/images/ur-overview.PNG b/windows/deployment/images/ur-overview.PNG
similarity index 100%
rename from windows/deploy/images/ur-overview.PNG
rename to windows/deployment/images/ur-overview.PNG
diff --git a/windows/deploy/images/ur-settings.PNG b/windows/deployment/images/ur-settings.PNG
similarity index 100%
rename from windows/deploy/images/ur-settings.PNG
rename to windows/deployment/images/ur-settings.PNG
diff --git a/windows/deploy/images/ur-target-version.png b/windows/deployment/images/ur-target-version.png
similarity index 100%
rename from windows/deploy/images/ur-target-version.png
rename to windows/deployment/images/ur-target-version.png
diff --git a/windows/deploy/images/uwp-dependencies.PNG b/windows/deployment/images/uwp-dependencies.PNG
similarity index 100%
rename from windows/deploy/images/uwp-dependencies.PNG
rename to windows/deployment/images/uwp-dependencies.PNG
diff --git a/windows/deploy/images/uwp-family.PNG b/windows/deployment/images/uwp-family.PNG
similarity index 100%
rename from windows/deploy/images/uwp-family.PNG
rename to windows/deployment/images/uwp-family.PNG
diff --git a/windows/deploy/images/uwp-license.PNG b/windows/deployment/images/uwp-license.PNG
similarity index 100%
rename from windows/deploy/images/uwp-license.PNG
rename to windows/deployment/images/uwp-license.PNG
diff --git a/windows/deploy/images/volumeactivationforwindows81-01.jpg b/windows/deployment/images/volumeactivationforwindows81-01.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-01.jpg
rename to windows/deployment/images/volumeactivationforwindows81-01.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-02.jpg b/windows/deployment/images/volumeactivationforwindows81-02.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-02.jpg
rename to windows/deployment/images/volumeactivationforwindows81-02.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-03.jpg b/windows/deployment/images/volumeactivationforwindows81-03.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-03.jpg
rename to windows/deployment/images/volumeactivationforwindows81-03.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-04.jpg b/windows/deployment/images/volumeactivationforwindows81-04.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-04.jpg
rename to windows/deployment/images/volumeactivationforwindows81-04.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-05.jpg b/windows/deployment/images/volumeactivationforwindows81-05.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-05.jpg
rename to windows/deployment/images/volumeactivationforwindows81-05.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-06.jpg b/windows/deployment/images/volumeactivationforwindows81-06.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-06.jpg
rename to windows/deployment/images/volumeactivationforwindows81-06.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-07.jpg b/windows/deployment/images/volumeactivationforwindows81-07.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-07.jpg
rename to windows/deployment/images/volumeactivationforwindows81-07.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-08.jpg b/windows/deployment/images/volumeactivationforwindows81-08.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-08.jpg
rename to windows/deployment/images/volumeactivationforwindows81-08.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-09.jpg b/windows/deployment/images/volumeactivationforwindows81-09.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-09.jpg
rename to windows/deployment/images/volumeactivationforwindows81-09.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-10.jpg b/windows/deployment/images/volumeactivationforwindows81-10.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-10.jpg
rename to windows/deployment/images/volumeactivationforwindows81-10.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-11.jpg b/windows/deployment/images/volumeactivationforwindows81-11.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-11.jpg
rename to windows/deployment/images/volumeactivationforwindows81-11.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-12.jpg b/windows/deployment/images/volumeactivationforwindows81-12.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-12.jpg
rename to windows/deployment/images/volumeactivationforwindows81-12.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-13.jpg b/windows/deployment/images/volumeactivationforwindows81-13.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-13.jpg
rename to windows/deployment/images/volumeactivationforwindows81-13.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-14.jpg b/windows/deployment/images/volumeactivationforwindows81-14.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-14.jpg
rename to windows/deployment/images/volumeactivationforwindows81-14.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-15.jpg b/windows/deployment/images/volumeactivationforwindows81-15.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-15.jpg
rename to windows/deployment/images/volumeactivationforwindows81-15.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-16.jpg b/windows/deployment/images/volumeactivationforwindows81-16.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-16.jpg
rename to windows/deployment/images/volumeactivationforwindows81-16.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-17.jpg b/windows/deployment/images/volumeactivationforwindows81-17.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-17.jpg
rename to windows/deployment/images/volumeactivationforwindows81-17.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-18.jpg b/windows/deployment/images/volumeactivationforwindows81-18.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-18.jpg
rename to windows/deployment/images/volumeactivationforwindows81-18.jpg
diff --git a/windows/deploy/images/volumeactivationforwindows81-19.jpg b/windows/deployment/images/volumeactivationforwindows81-19.jpg
similarity index 100%
rename from windows/deploy/images/volumeactivationforwindows81-19.jpg
rename to windows/deployment/images/volumeactivationforwindows81-19.jpg
diff --git a/windows/deploy/images/who-owns-pc.png b/windows/deployment/images/who-owns-pc.png
similarity index 100%
rename from windows/deploy/images/who-owns-pc.png
rename to windows/deployment/images/who-owns-pc.png
diff --git a/windows/deploy/images/win-10-adk-select.png b/windows/deployment/images/win-10-adk-select.png
similarity index 100%
rename from windows/deploy/images/win-10-adk-select.png
rename to windows/deployment/images/win-10-adk-select.png
diff --git a/windows/deploy/images/win10-set-up-work-or-school.png b/windows/deployment/images/win10-set-up-work-or-school.png
similarity index 100%
rename from windows/deploy/images/win10-set-up-work-or-school.png
rename to windows/deployment/images/win10-set-up-work-or-school.png
diff --git a/windows/deploy/images/windows-icd.png b/windows/deployment/images/windows-icd.png
similarity index 100%
rename from windows/deploy/images/windows-icd.png
rename to windows/deployment/images/windows-icd.png
diff --git a/windows/deploy/images/x_blk.png b/windows/deployment/images/x_blk.png
similarity index 100%
rename from windows/deploy/images/x_blk.png
rename to windows/deployment/images/x_blk.png
diff --git a/windows/deployment/index.md b/windows/deployment/index.md
new file mode 100644
index 0000000000..2ef5fbaf96
--- /dev/null
+++ b/windows/deployment/index.md
@@ -0,0 +1,47 @@
+---
+title: Deploy Windows 10 (Windows 10)
+description: Learn about deploying Windows 10 for IT professionals.
+ms.assetid: E9E2DED5-DBA7-4300-B411-BA0FD39BE18C
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+localizationpriority: high
+author: greg-lindsay
+---
+
+# Deploy Windows 10
+Learn about deploying Windows 10 for IT professionals.
+
+## In this section
+
+|Topic |Description |
+|------|------------|
+|[What's new in Windows 10 deployment](deploy-whats-new.md) |See this topic for a summary of new features and some recent changes related to deploying Windows 10 in your organization. |
+|[Windows 10 deployment scenarios](windows-10-deployment-scenarios.md) |To successfully deploy the Windows 10 operating system in your organization, it is important to understand the different ways that it can be deployed, especially now that there are new scenarios to consider. Choosing among these scenarios, and understanding the key capabilities and limitations of each, is a key task. |
+|[Manage Windows upgrades with Upgrade Readiness](upgrade/manage-windows-upgrades-with-upgrade-readiness.md) |With Upgrade Readiness, enterprises now have the tools to plan and manage the upgrade process end to end, allowing them to adopt new Windows releases more quickly. With Windows telemetry enabled, Upgrade Readiness collects system, application, and driver data for analysis. We then identify compatibility issues that can block an upgrade and suggest fixes when they are known to Microsoft. The Upgrade Readiness workflow steps you through the discovery and rationalization process until you have a list of computers that are ready to be upgraded. |
+|[Step by step guide: Configure a test lab to deploy Windows 10](windows-10-poc.md) |This guide contains instructions to configure a proof of concept (PoC) environment requiring a minimum amount of resources. The guide makes extensive use of Windows PowerShell and Hyper-V. Subsequent companion guides contain steps to deploy Windows 10 using the PoC environment. After completing this guide, see the following Windows 10 PoC deployment guides: [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md), [Deploy Windows 10 in a test lab using System Center Configuration Manager](windows-10-poc-sc-config-mgr.md). |
+|[Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md) |This guide will walk you through the process of deploying Windows 10 in an enterprise environment using the Microsoft Deployment Toolkit (MDT). |
+|[Deploy Windows 10 with System Center 2012 R2 Configuration Manager](deploy-windows-sccm/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md) |If you have Microsoft System Center 2012 R2 Configuration Manager in your environment, you will most likely want to use it to deploy Windows 10. This topic will show you how to set up Configuration Manager for operating system deployment and how to integrate Configuration Manager with the Microsoft Deployment Toolkit (MDT) or. |
+|[Resolve Windows 10 upgrade errors](upgrade/resolve-windows-10-upgrade-errors.md) |This topic provides a brief introduction to Windows 10 installation processes, and provides resolution procedures that IT administrators can use to resolve issues with Windows 10 upgrade. |
+|[Convert MBR partition to GPT](mbr-to-gpt.md) |This topic provides detailed instructions for using the MBR2GPT partition conversion tool. |
+|[Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md) |This guide describes how to configure a PXE server to load Windows PE by booting a client computer from the network. |
+|[Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md) |With Windows 10, you can quickly upgrade from one edition of Windows 10 to another, provided the upgrade path is supported. |
+|[Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md) |You can upgrade directly to Windows 10 from a previous operating system. |
+|[Deploy Windows To Go in your organization](deploy-windows-to-go.md) |This topic helps you to deploy Windows To Go in your organization. Before you begin deployment, make sure that you have reviewed the topics [Windows To Go: feature overview](planning/windows-to-go-overview.md) and [Prepare your organization for Windows To Go](planning/prepare-your-organization-for-windows-to-go.md) to ensure that you have the correct hardware and are prepared to complete the deployment. You can then use the steps in this topic to start your Windows To Go deployment. |
+|[Upgrade a Windows Phone 8.1 to Windows 10 Mobile with Mobile Device Management](upgrade/upgrade-windows-phone-8-1-to-10.md) |This topic describes how to upgrade eligible Windows Phone 8.1 devices to Windows 10 Mobile. |
+|[Sideload apps in Windows 10](/windows/application-management/sideload-apps-in-windows-10) |Sideload line-of-business apps in Windows 10. |
+|[Volume Activation [client]](volume-activation/volume-activation-windows-10.md) |This guide is designed to help organizations that are planning to use volume activation to deploy and activate Windows 10, including organizations that have used volume activation for earlier versions of Windows. |
+|[Windows 10 deployment tools reference](windows-10-deployment-tools-reference.md) |Learn about the tools available to deploy Windows 10. |
+|[Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md) |This topic lists new and updated topics in the Deploy Windows 10 documentation for [Windows 10 and Windows 10 Mobile](/windows/windows-10). |
+
+## Related topics
+- [Windows 10 and Windows 10 Mobile](/windows/windows-10)
+
+
+
+
+
+
+
+
+
diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deployment/mbr-to-gpt.md
similarity index 100%
rename from windows/deploy/mbr-to-gpt.md
rename to windows/deployment/mbr-to-gpt.md
diff --git a/windows/plan/TOC.md b/windows/deployment/planning/TOC.md
similarity index 100%
rename from windows/plan/TOC.md
rename to windows/deployment/planning/TOC.md
diff --git a/windows/plan/act-technical-reference.md b/windows/deployment/planning/act-technical-reference.md
similarity index 100%
rename from windows/plan/act-technical-reference.md
rename to windows/deployment/planning/act-technical-reference.md
diff --git a/windows/plan/applying-filters-to-data-in-the-sua-tool.md b/windows/deployment/planning/applying-filters-to-data-in-the-sua-tool.md
similarity index 100%
rename from windows/plan/applying-filters-to-data-in-the-sua-tool.md
rename to windows/deployment/planning/applying-filters-to-data-in-the-sua-tool.md
diff --git a/windows/plan/available-data-types-and-operators-in-compatibility-administrator.md b/windows/deployment/planning/available-data-types-and-operators-in-compatibility-administrator.md
similarity index 100%
rename from windows/plan/available-data-types-and-operators-in-compatibility-administrator.md
rename to windows/deployment/planning/available-data-types-and-operators-in-compatibility-administrator.md
diff --git a/windows/plan/best-practice-recommendations-for-windows-to-go.md b/windows/deployment/planning/best-practice-recommendations-for-windows-to-go.md
similarity index 100%
rename from windows/plan/best-practice-recommendations-for-windows-to-go.md
rename to windows/deployment/planning/best-practice-recommendations-for-windows-to-go.md
diff --git a/windows/plan/change-history-for-plan-for-windows-10-deployment.md b/windows/deployment/planning/change-history-for-plan-for-windows-10-deployment.md
similarity index 74%
rename from windows/plan/change-history-for-plan-for-windows-10-deployment.md
rename to windows/deployment/planning/change-history-for-plan-for-windows-10-deployment.md
index e8814f6869..8c0f4c791f 100644
--- a/windows/plan/change-history-for-plan-for-windows-10-deployment.md
+++ b/windows/deployment/planning/change-history-for-plan-for-windows-10-deployment.md
@@ -11,7 +11,7 @@ author: TrudyHa
# Change history for Plan for Windows 10 deployment
-This topic lists new and updated topics in the [Plan for Windows 10 deployment](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md).
+This topic lists new and updated topics in the [Plan for Windows 10 deployment](index.md) documentation for [Windows 10 and Windows 10 Mobile](/windows/windows-10).
## RELEASE: Windows 10, version 1703
@@ -42,8 +42,8 @@ The topics in this library have been updated for Windows 10, version 1607 (also
| New or changed topic | Description |
|--------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
-|[Application Compatibility Toolkit (ACT) Technical Reference](act-technical-reference.md) (multiple topics) |Redirected deprecated content to the [Upgrade Analytics](../deploy/manage-windows-upgrades-with-upgrade-analytics.md) content. Only Standard User Analyzer and Compatibility Administrator continue to be supported.|
-| [Windows 10 servicing overview](windows-10-servicing-options.md) | Content on this page was summarized. Detailed content about servicing branches was moved to the [Windows 10 servicing options](../manage/introduction-to-windows-10-servicing.md) page. |
+|[Application Compatibility Toolkit (ACT) Technical Reference](act-technical-reference.md) (multiple topics) |Redirected deprecated content to the [Upgrade Analytics](../upgrade/manage-windows-upgrades-with-upgrade-analytics.md) content. Only Standard User Analyzer and Compatibility Administrator continue to be supported.|
+| [Windows 10 servicing overview](../update/waas-overview.md) | Content on this page was summarized. Detailed content about servicing branches was moved to the [Windows 10 servicing options](../update/waas-servicing-strategy-windows-10-updates.md) page. |
## May 2016
@@ -51,7 +51,7 @@ The topics in this library have been updated for Windows 10, version 1607 (also
| New or changed topic | Description |
|--------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
-| [Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md) | New|
+| [Deploy Windows 10 in a school](/education/windows/deploy-windows-10-in-a-school) | New|
## December 2015
@@ -66,8 +66,8 @@ The topics in this library have been updated for Windows 10, version 1607 (also
| New or changed topic | Description |
|--------------------------------------------------------------------------------------------------|-------------|
-| [Chromebook migration guide](chromebook-migration-guide.md) | New |
-| [Windows Update for Business](windows-update-for-business.md) (multiple topics) | New |
+| [Chromebook migration guide](/education/windows/chromebook-migration-guide) | New |
+| [Windows Update for Business](../update/waas-manage-updates-wufb.md) (multiple topics) | New |
| [Windows To Go: feature overview](windows-to-go-overview.md) (multiple topics) | Updated |
@@ -75,13 +75,10 @@ The topics in this library have been updated for Windows 10, version 1607 (also
## Related topics
-[Change history for What's new in Windows 10](../whats-new/change-history-for-what-s-new-in-windows-10.md)
+[Change history for What's new in Windows 10](/windows/whats-new/change-history-for-what-s-new-in-windows-10.md)
-[Change history for Deploy Windows 10](../deploy/change-history-for-deploy-windows-10.md)
+[Change history for Deploy Windows 10](../change-history-for-deploy-windows-10.md)
-[Change history for Keep Windows 10 secure](../keep-secure/change-history-for-keep-windows-10-secure.md)
-
-[Change history for Manage and update Windows 10](../manage/change-history-for-manage-and-update-windows-10.md)
diff --git a/windows/plan/compatibility-administrator-users-guide.md b/windows/deployment/planning/compatibility-administrator-users-guide.md
similarity index 100%
rename from windows/plan/compatibility-administrator-users-guide.md
rename to windows/deployment/planning/compatibility-administrator-users-guide.md
diff --git a/windows/plan/compatibility-fix-database-management-strategies-and-deployment.md b/windows/deployment/planning/compatibility-fix-database-management-strategies-and-deployment.md
similarity index 100%
rename from windows/plan/compatibility-fix-database-management-strategies-and-deployment.md
rename to windows/deployment/planning/compatibility-fix-database-management-strategies-and-deployment.md
diff --git a/windows/plan/compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md b/windows/deployment/planning/compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md
similarity index 100%
rename from windows/plan/compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md
rename to windows/deployment/planning/compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md
diff --git a/windows/plan/creating-a-custom-compatibility-fix-in-compatibility-administrator.md b/windows/deployment/planning/creating-a-custom-compatibility-fix-in-compatibility-administrator.md
similarity index 100%
rename from windows/plan/creating-a-custom-compatibility-fix-in-compatibility-administrator.md
rename to windows/deployment/planning/creating-a-custom-compatibility-fix-in-compatibility-administrator.md
diff --git a/windows/plan/creating-a-custom-compatibility-mode-in-compatibility-administrator.md b/windows/deployment/planning/creating-a-custom-compatibility-mode-in-compatibility-administrator.md
similarity index 100%
rename from windows/plan/creating-a-custom-compatibility-mode-in-compatibility-administrator.md
rename to windows/deployment/planning/creating-a-custom-compatibility-mode-in-compatibility-administrator.md
diff --git a/windows/plan/creating-an-apphelp-message-in-compatibility-administrator.md b/windows/deployment/planning/creating-an-apphelp-message-in-compatibility-administrator.md
similarity index 100%
rename from windows/plan/creating-an-apphelp-message-in-compatibility-administrator.md
rename to windows/deployment/planning/creating-an-apphelp-message-in-compatibility-administrator.md
diff --git a/windows/plan/deployment-considerations-for-windows-to-go.md b/windows/deployment/planning/deployment-considerations-for-windows-to-go.md
similarity index 100%
rename from windows/plan/deployment-considerations-for-windows-to-go.md
rename to windows/deployment/planning/deployment-considerations-for-windows-to-go.md
diff --git a/windows/plan/device-dialog-box.md b/windows/deployment/planning/device-dialog-box.md
similarity index 100%
rename from windows/plan/device-dialog-box.md
rename to windows/deployment/planning/device-dialog-box.md
diff --git a/windows/plan/enabling-and-disabling-compatibility-fixes-in-compatibility-administrator.md b/windows/deployment/planning/enabling-and-disabling-compatibility-fixes-in-compatibility-administrator.md
similarity index 100%
rename from windows/plan/enabling-and-disabling-compatibility-fixes-in-compatibility-administrator.md
rename to windows/deployment/planning/enabling-and-disabling-compatibility-fixes-in-compatibility-administrator.md
diff --git a/windows/plan/fixing-applications-by-using-the-sua-tool.md b/windows/deployment/planning/fixing-applications-by-using-the-sua-tool.md
similarity index 100%
rename from windows/plan/fixing-applications-by-using-the-sua-tool.md
rename to windows/deployment/planning/fixing-applications-by-using-the-sua-tool.md
diff --git a/windows/plan/images/branch.png b/windows/deployment/planning/images/branch.png
similarity index 100%
rename from windows/plan/images/branch.png
rename to windows/deployment/planning/images/branch.png
diff --git a/windows/plan/images/chromebook-fig1-googleadmin.png b/windows/deployment/planning/images/chromebook-fig1-googleadmin.png
similarity index 100%
rename from windows/plan/images/chromebook-fig1-googleadmin.png
rename to windows/deployment/planning/images/chromebook-fig1-googleadmin.png
diff --git a/windows/plan/images/dep-win8-e-act-addissue.gif b/windows/deployment/planning/images/dep-win8-e-act-addissue.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-addissue.gif
rename to windows/deployment/planning/images/dep-win8-e-act-addissue.gif
diff --git a/windows/plan/images/dep-win8-e-act-addsolution.gif b/windows/deployment/planning/images/dep-win8-e-act-addsolution.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-addsolution.gif
rename to windows/deployment/planning/images/dep-win8-e-act-addsolution.gif
diff --git a/windows/plan/images/dep-win8-e-act-categorize.gif b/windows/deployment/planning/images/dep-win8-e-act-categorize.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-categorize.gif
rename to windows/deployment/planning/images/dep-win8-e-act-categorize.gif
diff --git a/windows/plan/images/dep-win8-e-act-communityexample.gif b/windows/deployment/planning/images/dep-win8-e-act-communityexample.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-communityexample.gif
rename to windows/deployment/planning/images/dep-win8-e-act-communityexample.gif
diff --git a/windows/plan/images/dep-win8-e-act-createnewdcp.gif b/windows/deployment/planning/images/dep-win8-e-act-createnewdcp.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-createnewdcp.gif
rename to windows/deployment/planning/images/dep-win8-e-act-createnewdcp.gif
diff --git a/windows/plan/images/dep-win8-e-act-delete.gif b/windows/deployment/planning/images/dep-win8-e-act-delete.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-delete.gif
rename to windows/deployment/planning/images/dep-win8-e-act-delete.gif
diff --git a/windows/plan/images/dep-win8-e-act-deploymentstatus.gif b/windows/deployment/planning/images/dep-win8-e-act-deploymentstatus.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-deploymentstatus.gif
rename to windows/deployment/planning/images/dep-win8-e-act-deploymentstatus.gif
diff --git a/windows/plan/images/dep-win8-e-act-doesnotwork64icon.gif b/windows/deployment/planning/images/dep-win8-e-act-doesnotwork64icon.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-doesnotwork64icon.gif
rename to windows/deployment/planning/images/dep-win8-e-act-doesnotwork64icon.gif
diff --git a/windows/plan/images/dep-win8-e-act-doesnotworkicon.gif b/windows/deployment/planning/images/dep-win8-e-act-doesnotworkicon.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-doesnotworkicon.gif
rename to windows/deployment/planning/images/dep-win8-e-act-doesnotworkicon.gif
diff --git a/windows/plan/images/dep-win8-e-act-exportdcp.gif b/windows/deployment/planning/images/dep-win8-e-act-exportdcp.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-exportdcp.gif
rename to windows/deployment/planning/images/dep-win8-e-act-exportdcp.gif
diff --git a/windows/plan/images/dep-win8-e-act-exportreportdata.gif b/windows/deployment/planning/images/dep-win8-e-act-exportreportdata.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-exportreportdata.gif
rename to windows/deployment/planning/images/dep-win8-e-act-exportreportdata.gif
diff --git a/windows/plan/images/dep-win8-e-act-filterdata.gif b/windows/deployment/planning/images/dep-win8-e-act-filterdata.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-filterdata.gif
rename to windows/deployment/planning/images/dep-win8-e-act-filterdata.gif
diff --git a/windows/plan/images/dep-win8-e-act-filterexampleallapps0activeissues.gif b/windows/deployment/planning/images/dep-win8-e-act-filterexampleallapps0activeissues.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-filterexampleallapps0activeissues.gif
rename to windows/deployment/planning/images/dep-win8-e-act-filterexampleallapps0activeissues.gif
diff --git a/windows/plan/images/dep-win8-e-act-filterexampleallapps0issues.gif b/windows/deployment/planning/images/dep-win8-e-act-filterexampleallapps0issues.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-filterexampleallapps0issues.gif
rename to windows/deployment/planning/images/dep-win8-e-act-filterexampleallapps0issues.gif
diff --git a/windows/plan/images/dep-win8-e-act-filterexampleallappswissues.gif b/windows/deployment/planning/images/dep-win8-e-act-filterexampleallappswissues.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-filterexampleallappswissues.gif
rename to windows/deployment/planning/images/dep-win8-e-act-filterexampleallappswissues.gif
diff --git a/windows/plan/images/dep-win8-e-act-filterexamplecategory.gif b/windows/deployment/planning/images/dep-win8-e-act-filterexamplecategory.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-filterexamplecategory.gif
rename to windows/deployment/planning/images/dep-win8-e-act-filterexamplecategory.gif
diff --git a/windows/plan/images/dep-win8-e-act-filterexampleforissueswsolutions.gif b/windows/deployment/planning/images/dep-win8-e-act-filterexampleforissueswsolutions.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-filterexampleforissueswsolutions.gif
rename to windows/deployment/planning/images/dep-win8-e-act-filterexampleforissueswsolutions.gif
diff --git a/windows/plan/images/dep-win8-e-act-filterexampleforspecificsolutions.gif b/windows/deployment/planning/images/dep-win8-e-act-filterexampleforspecificsolutions.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-filterexampleforspecificsolutions.gif
rename to windows/deployment/planning/images/dep-win8-e-act-filterexampleforspecificsolutions.gif
diff --git a/windows/plan/images/dep-win8-e-act-greenworks64icon.gif b/windows/deployment/planning/images/dep-win8-e-act-greenworks64icon.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-greenworks64icon.gif
rename to windows/deployment/planning/images/dep-win8-e-act-greenworks64icon.gif
diff --git a/windows/plan/images/dep-win8-e-act-greenworksicon.gif b/windows/deployment/planning/images/dep-win8-e-act-greenworksicon.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-greenworksicon.gif
rename to windows/deployment/planning/images/dep-win8-e-act-greenworksicon.gif
diff --git a/windows/plan/images/dep-win8-e-act-help.gif b/windows/deployment/planning/images/dep-win8-e-act-help.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-help.gif
rename to windows/deployment/planning/images/dep-win8-e-act-help.gif
diff --git a/windows/plan/images/dep-win8-e-act-home.gif b/windows/deployment/planning/images/dep-win8-e-act-home.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-home.gif
rename to windows/deployment/planning/images/dep-win8-e-act-home.gif
diff --git a/windows/plan/images/dep-win8-e-act-info64icon.gif b/windows/deployment/planning/images/dep-win8-e-act-info64icon.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-info64icon.gif
rename to windows/deployment/planning/images/dep-win8-e-act-info64icon.gif
diff --git a/windows/plan/images/dep-win8-e-act-infoicon.gif b/windows/deployment/planning/images/dep-win8-e-act-infoicon.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-infoicon.gif
rename to windows/deployment/planning/images/dep-win8-e-act-infoicon.gif
diff --git a/windows/plan/images/dep-win8-e-act-minorissues64icon.gif b/windows/deployment/planning/images/dep-win8-e-act-minorissues64icon.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-minorissues64icon.gif
rename to windows/deployment/planning/images/dep-win8-e-act-minorissues64icon.gif
diff --git a/windows/plan/images/dep-win8-e-act-minorissuesicon.png b/windows/deployment/planning/images/dep-win8-e-act-minorissuesicon.png
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-minorissuesicon.png
rename to windows/deployment/planning/images/dep-win8-e-act-minorissuesicon.png
diff --git a/windows/plan/images/dep-win8-e-act-moveupanddown.gif b/windows/deployment/planning/images/dep-win8-e-act-moveupanddown.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-moveupanddown.gif
rename to windows/deployment/planning/images/dep-win8-e-act-moveupanddown.gif
diff --git a/windows/plan/images/dep-win8-e-act-open.gif b/windows/deployment/planning/images/dep-win8-e-act-open.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-open.gif
rename to windows/deployment/planning/images/dep-win8-e-act-open.gif
diff --git a/windows/plan/images/dep-win8-e-act-prioritize.gif b/windows/deployment/planning/images/dep-win8-e-act-prioritize.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-prioritize.gif
rename to windows/deployment/planning/images/dep-win8-e-act-prioritize.gif
diff --git a/windows/plan/images/dep-win8-e-act-reactivate-resolved-issue.gif b/windows/deployment/planning/images/dep-win8-e-act-reactivate-resolved-issue.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-reactivate-resolved-issue.gif
rename to windows/deployment/planning/images/dep-win8-e-act-reactivate-resolved-issue.gif
diff --git a/windows/plan/images/dep-win8-e-act-refresh.gif b/windows/deployment/planning/images/dep-win8-e-act-refresh.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-refresh.gif
rename to windows/deployment/planning/images/dep-win8-e-act-refresh.gif
diff --git a/windows/plan/images/dep-win8-e-act-riskassessment.gif b/windows/deployment/planning/images/dep-win8-e-act-riskassessment.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-riskassessment.gif
rename to windows/deployment/planning/images/dep-win8-e-act-riskassessment.gif
diff --git a/windows/plan/images/dep-win8-e-act-save.gif b/windows/deployment/planning/images/dep-win8-e-act-save.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-save.gif
rename to windows/deployment/planning/images/dep-win8-e-act-save.gif
diff --git a/windows/plan/images/dep-win8-e-act-savereport.gif b/windows/deployment/planning/images/dep-win8-e-act-savereport.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-savereport.gif
rename to windows/deployment/planning/images/dep-win8-e-act-savereport.gif
diff --git a/windows/plan/images/dep-win8-e-act-sendandreceive.gif b/windows/deployment/planning/images/dep-win8-e-act-sendandreceive.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-sendandreceive.gif
rename to windows/deployment/planning/images/dep-win8-e-act-sendandreceive.gif
diff --git a/windows/plan/images/dep-win8-e-act-sendandreceiveicon.gif b/windows/deployment/planning/images/dep-win8-e-act-sendandreceiveicon.gif
similarity index 100%
rename from windows/plan/images/dep-win8-e-act-sendandreceiveicon.gif
rename to windows/deployment/planning/images/dep-win8-e-act-sendandreceiveicon.gif
diff --git a/windows/plan/images/dep-win8-l-act-appcallosthroughiat.jpg b/windows/deployment/planning/images/dep-win8-l-act-appcallosthroughiat.jpg
similarity index 100%
rename from windows/plan/images/dep-win8-l-act-appcallosthroughiat.jpg
rename to windows/deployment/planning/images/dep-win8-l-act-appcallosthroughiat.jpg
diff --git a/windows/plan/images/dep-win8-l-act-appredirectwithcompatfix.jpg b/windows/deployment/planning/images/dep-win8-l-act-appredirectwithcompatfix.jpg
similarity index 100%
rename from windows/plan/images/dep-win8-l-act-appredirectwithcompatfix.jpg
rename to windows/deployment/planning/images/dep-win8-l-act-appredirectwithcompatfix.jpg
diff --git a/windows/plan/images/dep-win8-l-act-communityworkflowdiagram.jpg b/windows/deployment/planning/images/dep-win8-l-act-communityworkflowdiagram.jpg
similarity index 100%
rename from windows/plan/images/dep-win8-l-act-communityworkflowdiagram.jpg
rename to windows/deployment/planning/images/dep-win8-l-act-communityworkflowdiagram.jpg
diff --git a/windows/plan/images/dep-win8-l-act-compatadminflowchart.jpg b/windows/deployment/planning/images/dep-win8-l-act-compatadminflowchart.jpg
similarity index 100%
rename from windows/plan/images/dep-win8-l-act-compatadminflowchart.jpg
rename to windows/deployment/planning/images/dep-win8-l-act-compatadminflowchart.jpg
diff --git a/windows/plan/images/dep-win8-l-act-suaflowchart.jpg b/windows/deployment/planning/images/dep-win8-l-act-suaflowchart.jpg
similarity index 100%
rename from windows/plan/images/dep-win8-l-act-suaflowchart.jpg
rename to windows/deployment/planning/images/dep-win8-l-act-suaflowchart.jpg
diff --git a/windows/plan/images/dep-win8-l-act-suawizardflowchart.jpg b/windows/deployment/planning/images/dep-win8-l-act-suawizardflowchart.jpg
similarity index 100%
rename from windows/plan/images/dep-win8-l-act-suawizardflowchart.jpg
rename to windows/deployment/planning/images/dep-win8-l-act-suawizardflowchart.jpg
diff --git a/windows/plan/images/dep-win8-l-act-supportedtopologies.jpg b/windows/deployment/planning/images/dep-win8-l-act-supportedtopologies.jpg
similarity index 100%
rename from windows/plan/images/dep-win8-l-act-supportedtopologies.jpg
rename to windows/deployment/planning/images/dep-win8-l-act-supportedtopologies.jpg
diff --git a/windows/plan/images/deploy-win-10-school-figure1.png b/windows/deployment/planning/images/deploy-win-10-school-figure1.png
similarity index 100%
rename from windows/plan/images/deploy-win-10-school-figure1.png
rename to windows/deployment/planning/images/deploy-win-10-school-figure1.png
diff --git a/windows/plan/images/deploy-win-10-school-figure2.png b/windows/deployment/planning/images/deploy-win-10-school-figure2.png
similarity index 100%
rename from windows/plan/images/deploy-win-10-school-figure2.png
rename to windows/deployment/planning/images/deploy-win-10-school-figure2.png
diff --git a/windows/plan/images/deploy-win-10-school-figure3.png b/windows/deployment/planning/images/deploy-win-10-school-figure3.png
similarity index 100%
rename from windows/plan/images/deploy-win-10-school-figure3.png
rename to windows/deployment/planning/images/deploy-win-10-school-figure3.png
diff --git a/windows/plan/images/deploy-win-10-school-figure4.png b/windows/deployment/planning/images/deploy-win-10-school-figure4.png
similarity index 100%
rename from windows/plan/images/deploy-win-10-school-figure4.png
rename to windows/deployment/planning/images/deploy-win-10-school-figure4.png
diff --git a/windows/plan/images/deploy-win-10-school-figure5.png b/windows/deployment/planning/images/deploy-win-10-school-figure5.png
similarity index 100%
rename from windows/plan/images/deploy-win-10-school-figure5.png
rename to windows/deployment/planning/images/deploy-win-10-school-figure5.png
diff --git a/windows/plan/images/deploy-win-10-school-figure6.png b/windows/deployment/planning/images/deploy-win-10-school-figure6.png
similarity index 100%
rename from windows/plan/images/deploy-win-10-school-figure6.png
rename to windows/deployment/planning/images/deploy-win-10-school-figure6.png
diff --git a/windows/plan/images/deploy-win-10-school-figure7.png b/windows/deployment/planning/images/deploy-win-10-school-figure7.png
similarity index 100%
rename from windows/plan/images/deploy-win-10-school-figure7.png
rename to windows/deployment/planning/images/deploy-win-10-school-figure7.png
diff --git a/windows/plan/images/fig2-locallyconfig.png b/windows/deployment/planning/images/fig2-locallyconfig.png
similarity index 100%
rename from windows/plan/images/fig2-locallyconfig.png
rename to windows/deployment/planning/images/fig2-locallyconfig.png
diff --git a/windows/plan/images/fig4-wsuslist.png b/windows/deployment/planning/images/fig4-wsuslist.png
similarity index 100%
rename from windows/plan/images/fig4-wsuslist.png
rename to windows/deployment/planning/images/fig4-wsuslist.png
diff --git a/windows/plan/images/wtg-first-boot-home.gif b/windows/deployment/planning/images/wtg-first-boot-home.gif
similarity index 100%
rename from windows/plan/images/wtg-first-boot-home.gif
rename to windows/deployment/planning/images/wtg-first-boot-home.gif
diff --git a/windows/plan/images/wtg-first-boot-work.gif b/windows/deployment/planning/images/wtg-first-boot-work.gif
similarity index 100%
rename from windows/plan/images/wtg-first-boot-work.gif
rename to windows/deployment/planning/images/wtg-first-boot-work.gif
diff --git a/windows/plan/images/wtg-gpt-uefi.gif b/windows/deployment/planning/images/wtg-gpt-uefi.gif
similarity index 100%
rename from windows/plan/images/wtg-gpt-uefi.gif
rename to windows/deployment/planning/images/wtg-gpt-uefi.gif
diff --git a/windows/plan/images/wtg-image-deployment.gif b/windows/deployment/planning/images/wtg-image-deployment.gif
similarity index 100%
rename from windows/plan/images/wtg-image-deployment.gif
rename to windows/deployment/planning/images/wtg-image-deployment.gif
diff --git a/windows/plan/images/wtg-mbr-bios.gif b/windows/deployment/planning/images/wtg-mbr-bios.gif
similarity index 100%
rename from windows/plan/images/wtg-mbr-bios.gif
rename to windows/deployment/planning/images/wtg-mbr-bios.gif
diff --git a/windows/plan/images/wtg-mbr-firmware-roaming.gif b/windows/deployment/planning/images/wtg-mbr-firmware-roaming.gif
similarity index 100%
rename from windows/plan/images/wtg-mbr-firmware-roaming.gif
rename to windows/deployment/planning/images/wtg-mbr-firmware-roaming.gif
diff --git a/windows/plan/images/wtg-startup-options.gif b/windows/deployment/planning/images/wtg-startup-options.gif
similarity index 100%
rename from windows/plan/images/wtg-startup-options.gif
rename to windows/deployment/planning/images/wtg-startup-options.gif
diff --git a/windows/plan/images/wuforbus-fig1-manuallyset.png b/windows/deployment/planning/images/wuforbus-fig1-manuallyset.png
similarity index 100%
rename from windows/plan/images/wuforbus-fig1-manuallyset.png
rename to windows/deployment/planning/images/wuforbus-fig1-manuallyset.png
diff --git a/windows/plan/images/wuforbusiness-fig10-sccmconsole.png b/windows/deployment/planning/images/wuforbusiness-fig10-sccmconsole.png
similarity index 100%
rename from windows/plan/images/wuforbusiness-fig10-sccmconsole.png
rename to windows/deployment/planning/images/wuforbusiness-fig10-sccmconsole.png
diff --git a/windows/plan/images/wuforbusiness-fig11-intune.png b/windows/deployment/planning/images/wuforbusiness-fig11-intune.png
similarity index 100%
rename from windows/plan/images/wuforbusiness-fig11-intune.png
rename to windows/deployment/planning/images/wuforbusiness-fig11-intune.png
diff --git a/windows/plan/images/wuforbusiness-fig12a-updates.png b/windows/deployment/planning/images/wuforbusiness-fig12a-updates.png
similarity index 100%
rename from windows/plan/images/wuforbusiness-fig12a-updates.png
rename to windows/deployment/planning/images/wuforbusiness-fig12a-updates.png
diff --git a/windows/plan/images/wuforbusiness-fig13a-upgrades.png b/windows/deployment/planning/images/wuforbusiness-fig13a-upgrades.png
similarity index 100%
rename from windows/plan/images/wuforbusiness-fig13a-upgrades.png
rename to windows/deployment/planning/images/wuforbusiness-fig13a-upgrades.png
diff --git a/windows/plan/images/wuforbusiness-fig2-gp.png b/windows/deployment/planning/images/wuforbusiness-fig2-gp.png
similarity index 100%
rename from windows/plan/images/wuforbusiness-fig2-gp.png
rename to windows/deployment/planning/images/wuforbusiness-fig2-gp.png
diff --git a/windows/plan/images/wuforbusiness-fig3-mdm.png b/windows/deployment/planning/images/wuforbusiness-fig3-mdm.png
similarity index 100%
rename from windows/plan/images/wuforbusiness-fig3-mdm.png
rename to windows/deployment/planning/images/wuforbusiness-fig3-mdm.png
diff --git a/windows/plan/images/wuforbusiness-fig4-localpoleditor.png b/windows/deployment/planning/images/wuforbusiness-fig4-localpoleditor.png
similarity index 100%
rename from windows/plan/images/wuforbusiness-fig4-localpoleditor.png
rename to windows/deployment/planning/images/wuforbusiness-fig4-localpoleditor.png
diff --git a/windows/plan/images/wuforbusiness-fig5-deferupgrade.png b/windows/deployment/planning/images/wuforbusiness-fig5-deferupgrade.png
similarity index 100%
rename from windows/plan/images/wuforbusiness-fig5-deferupgrade.png
rename to windows/deployment/planning/images/wuforbusiness-fig5-deferupgrade.png
diff --git a/windows/plan/images/wuforbusiness-fig6-pause.png b/windows/deployment/planning/images/wuforbusiness-fig6-pause.png
similarity index 100%
rename from windows/plan/images/wuforbusiness-fig6-pause.png
rename to windows/deployment/planning/images/wuforbusiness-fig6-pause.png
diff --git a/windows/plan/images/wuforbusiness-fig7-validationgroup.png b/windows/deployment/planning/images/wuforbusiness-fig7-validationgroup.png
similarity index 100%
rename from windows/plan/images/wuforbusiness-fig7-validationgroup.png
rename to windows/deployment/planning/images/wuforbusiness-fig7-validationgroup.png
diff --git a/windows/plan/images/wuforbusiness-fig8a-chooseupdates.png b/windows/deployment/planning/images/wuforbusiness-fig8a-chooseupdates.png
similarity index 100%
rename from windows/plan/images/wuforbusiness-fig8a-chooseupdates.png
rename to windows/deployment/planning/images/wuforbusiness-fig8a-chooseupdates.png
diff --git a/windows/plan/images/wuforbusiness-fig9-dosettings.jpg b/windows/deployment/planning/images/wuforbusiness-fig9-dosettings.jpg
similarity index 100%
rename from windows/plan/images/wuforbusiness-fig9-dosettings.jpg
rename to windows/deployment/planning/images/wuforbusiness-fig9-dosettings.jpg
diff --git a/windows/plan/index.md b/windows/deployment/planning/index.md
similarity index 74%
rename from windows/plan/index.md
rename to windows/deployment/planning/index.md
index 125db28968..2448b16d8b 100644
--- a/windows/plan/index.md
+++ b/windows/deployment/planning/index.md
@@ -22,22 +22,12 @@ Windows 10 provides new deployment capabilities, scenarios, and tools by buildi
|[Windows 10 infrastructure requirements](windows-10-infrastructure-requirements.md) |There are specific infrastructure requirements to deploy and manage Windows 10 that should be in place prior to significant Windows 10 deployments within your organization. |
|[Windows To Go: feature overview](windows-to-go-overview.md) |Windows To Go is a feature in Windows 10 Enterprise and Windows 10 Education that enables the creation of a Windows To Go workspace that can be booted from a USB-connected external drive on PCs. |
|[Application Compatibility Toolkit (ACT) Technical Reference](act-technical-reference.md) |The Microsoft® Application Compatibility Toolkit (ACT) helps you determine whether the applications, devices, and computers in your organization are compatible with versions of the Windows® operating system. |
-|[Change history for Plan for Windows 10 deployment](change-history-for-plan-for-windows-10-deployment.md) |This topic lists new and updated topics in the Plan for Windows 10 deployment documentation for [Windows 10 and Windows 10 Mobile](../index.md). |
## Related topics
-- [Windows 10 servicing options for updates and upgrades](../manage/introduction-to-windows-10-servicing.md)
-- [Deploy Windows 10 with MDT 2013 Update 1](../deploy/deploy-windows-10-with-the-microsoft-deployment-toolkit.md)
-- [Deploy Windows 10 with Configuration Manager and MDT 2013 Update 1](../deploy/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md)
-- [Upgrade to Windows 10 with MDT 2013 Update 1](../deploy/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md)
-- [Upgrade to Windows 10 with Configuration Manager](../deploy/upgrade-to-windows-10-with-system-center-configuraton-manager.md)
+- [Windows 10 servicing options for updates and upgrades](../update/index.md)
+- [Deploy Windows 10 with MDT 2013 Update 1](../deploy-windows-mdt/deploy-windows-10-with-the-microsoft-deployment-toolkit.md)
+- [Deploy Windows 10 with Configuration Manager and MDT 2013 Update 1](../deploy-windows-sccm/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md)
+- [Upgrade to Windows 10 with MDT 2013 Update 1](../upgrade/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md)
+- [Upgrade to Windows 10 with Configuration Manager](../upgrade/upgrade-to-windows-10-with-system-center-configuraton-manager.md)
- [Windows Imaging and Configuration Designer](https://go.microsoft.com/fwlink/p/?LinkId=733911)
-- [Windows 10 and Windows 10 Mobile](../index.md)
-
-
-
-
-
-
-
-
diff --git a/windows/plan/installing-and-uninstalling-custom-compatibility-databases-in-compatibility-administrator.md b/windows/deployment/planning/installing-and-uninstalling-custom-compatibility-databases-in-compatibility-administrator.md
similarity index 100%
rename from windows/plan/installing-and-uninstalling-custom-compatibility-databases-in-compatibility-administrator.md
rename to windows/deployment/planning/installing-and-uninstalling-custom-compatibility-databases-in-compatibility-administrator.md
diff --git a/windows/plan/managing-application-compatibility-fixes-and-custom-fix-databases.md b/windows/deployment/planning/managing-application-compatibility-fixes-and-custom-fix-databases.md
similarity index 100%
rename from windows/plan/managing-application-compatibility-fixes-and-custom-fix-databases.md
rename to windows/deployment/planning/managing-application-compatibility-fixes-and-custom-fix-databases.md
diff --git a/windows/plan/prepare-your-organization-for-windows-to-go.md b/windows/deployment/planning/prepare-your-organization-for-windows-to-go.md
similarity index 100%
rename from windows/plan/prepare-your-organization-for-windows-to-go.md
rename to windows/deployment/planning/prepare-your-organization-for-windows-to-go.md
diff --git a/windows/plan/searching-for-fixed-applications-in-compatibility-administrator.md b/windows/deployment/planning/searching-for-fixed-applications-in-compatibility-administrator.md
similarity index 100%
rename from windows/plan/searching-for-fixed-applications-in-compatibility-administrator.md
rename to windows/deployment/planning/searching-for-fixed-applications-in-compatibility-administrator.md
diff --git a/windows/plan/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md b/windows/deployment/planning/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md
similarity index 100%
rename from windows/plan/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md
rename to windows/deployment/planning/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md
diff --git a/windows/plan/security-and-data-protection-considerations-for-windows-to-go.md b/windows/deployment/planning/security-and-data-protection-considerations-for-windows-to-go.md
similarity index 100%
rename from windows/plan/security-and-data-protection-considerations-for-windows-to-go.md
rename to windows/deployment/planning/security-and-data-protection-considerations-for-windows-to-go.md
diff --git a/windows/plan/showing-messages-generated-by-the-sua-tool.md b/windows/deployment/planning/showing-messages-generated-by-the-sua-tool.md
similarity index 100%
rename from windows/plan/showing-messages-generated-by-the-sua-tool.md
rename to windows/deployment/planning/showing-messages-generated-by-the-sua-tool.md
diff --git a/windows/plan/sua-users-guide.md b/windows/deployment/planning/sua-users-guide.md
similarity index 100%
rename from windows/plan/sua-users-guide.md
rename to windows/deployment/planning/sua-users-guide.md
diff --git a/windows/plan/tabs-on-the-sua-tool-interface.md b/windows/deployment/planning/tabs-on-the-sua-tool-interface.md
similarity index 100%
rename from windows/plan/tabs-on-the-sua-tool-interface.md
rename to windows/deployment/planning/tabs-on-the-sua-tool-interface.md
diff --git a/windows/plan/testing-your-application-mitigation-packages.md b/windows/deployment/planning/testing-your-application-mitigation-packages.md
similarity index 100%
rename from windows/plan/testing-your-application-mitigation-packages.md
rename to windows/deployment/planning/testing-your-application-mitigation-packages.md
diff --git a/windows/plan/understanding-and-using-compatibility-fixes.md b/windows/deployment/planning/understanding-and-using-compatibility-fixes.md
similarity index 100%
rename from windows/plan/understanding-and-using-compatibility-fixes.md
rename to windows/deployment/planning/understanding-and-using-compatibility-fixes.md
diff --git a/windows/plan/using-the-compatibility-administrator-tool.md b/windows/deployment/planning/using-the-compatibility-administrator-tool.md
similarity index 100%
rename from windows/plan/using-the-compatibility-administrator-tool.md
rename to windows/deployment/planning/using-the-compatibility-administrator-tool.md
diff --git a/windows/plan/using-the-sdbinstexe-command-line-tool.md b/windows/deployment/planning/using-the-sdbinstexe-command-line-tool.md
similarity index 100%
rename from windows/plan/using-the-sdbinstexe-command-line-tool.md
rename to windows/deployment/planning/using-the-sdbinstexe-command-line-tool.md
diff --git a/windows/plan/using-the-sua-tool.md b/windows/deployment/planning/using-the-sua-tool.md
similarity index 100%
rename from windows/plan/using-the-sua-tool.md
rename to windows/deployment/planning/using-the-sua-tool.md
diff --git a/windows/plan/using-the-sua-wizard.md b/windows/deployment/planning/using-the-sua-wizard.md
similarity index 100%
rename from windows/plan/using-the-sua-wizard.md
rename to windows/deployment/planning/using-the-sua-wizard.md
diff --git a/windows/plan/viewing-the-events-screen-in-compatibility-administrator.md b/windows/deployment/planning/viewing-the-events-screen-in-compatibility-administrator.md
similarity index 100%
rename from windows/plan/viewing-the-events-screen-in-compatibility-administrator.md
rename to windows/deployment/planning/viewing-the-events-screen-in-compatibility-administrator.md
diff --git a/windows/plan/windows-10-compatibility.md b/windows/deployment/planning/windows-10-compatibility.md
similarity index 97%
rename from windows/plan/windows-10-compatibility.md
rename to windows/deployment/planning/windows-10-compatibility.md
index 013a715282..2ce0b1abdd 100644
--- a/windows/plan/windows-10-compatibility.md
+++ b/windows/deployment/planning/windows-10-compatibility.md
@@ -40,7 +40,7 @@ Historically, organizations have performed extensive, and often exhaustive, test
## Related topics
-[Windows 10 servicing options](windows-10-servicing-options.md)
+[Windows 10 servicing options](../update/waas-servicing-strategy-windows-10-updates.md)
[Windows 10 deployment considerations](windows-10-deployment-considerations.md)
diff --git a/windows/plan/windows-10-deployment-considerations.md b/windows/deployment/planning/windows-10-deployment-considerations.md
similarity index 99%
rename from windows/plan/windows-10-deployment-considerations.md
rename to windows/deployment/planning/windows-10-deployment-considerations.md
index 9c2cb27ef4..9ddd7ab954 100644
--- a/windows/plan/windows-10-deployment-considerations.md
+++ b/windows/deployment/planning/windows-10-deployment-considerations.md
@@ -126,8 +126,6 @@ Over time, this upgrade process will be optimized to reduce the overall time and
## Related topics
-[Windows 10 servicing options](windows-10-servicing-options.md)
-
[Windows 10 compatibility](windows-10-compatibility.md)
[Windows 10 infrastructure requirements](windows-10-infrastructure-requirements.md)
diff --git a/windows/plan/windows-10-enterprise-faq-itpro.md b/windows/deployment/planning/windows-10-enterprise-faq-itpro.md
similarity index 100%
rename from windows/plan/windows-10-enterprise-faq-itpro.md
rename to windows/deployment/planning/windows-10-enterprise-faq-itpro.md
diff --git a/windows/plan/windows-10-infrastructure-requirements.md b/windows/deployment/planning/windows-10-infrastructure-requirements.md
similarity index 97%
rename from windows/plan/windows-10-infrastructure-requirements.md
rename to windows/deployment/planning/windows-10-infrastructure-requirements.md
index ff50a10a6c..f886d6391f 100644
--- a/windows/plan/windows-10-infrastructure-requirements.md
+++ b/windows/deployment/planning/windows-10-infrastructure-requirements.md
@@ -47,7 +47,7 @@ For System Center Configuration Manager, Windows 10 support is offered with var
>Note: Configuration Manager 2012 supports Windows 10 version 1507 (build 10.0.10240) and 1511 (build 10.0.10586) for the lifecycle of these builds. Future releases of Windows 10 CB/CBB are not supported With Configuration Manager 2012, and will require System Center Configuration Manager current branch for supported management.
-For more details about System Center Configuration Manager support for Windows 10, see [Deploy Windows 10 with System Center 2012 R2 Configuration Manager](../deploy/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md).
+For more details about System Center Configuration Manager support for Windows 10, see [Deploy Windows 10 with System Center 2012 R2 Configuration Manager](../deploy-windows-sccm/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md).
## Management tools
@@ -115,7 +115,7 @@ Note that Windows 10 Enterprise and Windows 10 Enterprise LTSB installations u
## Related topics
-[Windows 10 servicing options](windows-10-servicing-options.md)
+[Windows 10 servicing options](../update/waas-servicing-strategy-windows-10-updates.md)
[Windows 10 deployment considerations](windows-10-deployment-considerations.md)
[Windows 10 compatibility](windows-10-compatibility.md)
diff --git a/windows/plan/windows-to-go-frequently-asked-questions.md b/windows/deployment/planning/windows-to-go-frequently-asked-questions.md
similarity index 100%
rename from windows/plan/windows-to-go-frequently-asked-questions.md
rename to windows/deployment/planning/windows-to-go-frequently-asked-questions.md
diff --git a/windows/plan/windows-to-go-overview.md b/windows/deployment/planning/windows-to-go-overview.md
similarity index 100%
rename from windows/plan/windows-to-go-overview.md
rename to windows/deployment/planning/windows-to-go-overview.md
diff --git a/windows/update/change-history-for-update-windows-10.md b/windows/deployment/update/change-history-for-update-windows-10.md
similarity index 100%
rename from windows/update/change-history-for-update-windows-10.md
rename to windows/deployment/update/change-history-for-update-windows-10.md
diff --git a/windows/manage/images/ActionCenterXML.jpg b/windows/deployment/update/images/ActionCenterXML.jpg
similarity index 100%
rename from windows/manage/images/ActionCenterXML.jpg
rename to windows/deployment/update/images/ActionCenterXML.jpg
diff --git a/windows/manage/images/AppsXML.jpg b/windows/deployment/update/images/AppsXML.jpg
similarity index 100%
rename from windows/manage/images/AppsXML.jpg
rename to windows/deployment/update/images/AppsXML.jpg
diff --git a/windows/manage/images/AppsXML.png b/windows/deployment/update/images/AppsXML.png
similarity index 100%
rename from windows/manage/images/AppsXML.png
rename to windows/deployment/update/images/AppsXML.png
diff --git a/windows/manage/images/ButtonsXML.jpg b/windows/deployment/update/images/ButtonsXML.jpg
similarity index 100%
rename from windows/manage/images/ButtonsXML.jpg
rename to windows/deployment/update/images/ButtonsXML.jpg
diff --git a/windows/manage/images/CSPRunnerXML.jpg b/windows/deployment/update/images/CSPRunnerXML.jpg
similarity index 100%
rename from windows/manage/images/CSPRunnerXML.jpg
rename to windows/deployment/update/images/CSPRunnerXML.jpg
diff --git a/windows/manage/images/ICDstart-option.PNG b/windows/deployment/update/images/ICDstart-option.PNG
similarity index 100%
rename from windows/manage/images/ICDstart-option.PNG
rename to windows/deployment/update/images/ICDstart-option.PNG
diff --git a/windows/manage/images/MenuItemsXML.png b/windows/deployment/update/images/MenuItemsXML.png
similarity index 100%
rename from windows/manage/images/MenuItemsXML.png
rename to windows/deployment/update/images/MenuItemsXML.png
diff --git a/windows/manage/images/SettingsXML.png b/windows/deployment/update/images/SettingsXML.png
similarity index 100%
rename from windows/manage/images/SettingsXML.png
rename to windows/deployment/update/images/SettingsXML.png
diff --git a/windows/manage/images/StartGrid.jpg b/windows/deployment/update/images/StartGrid.jpg
similarity index 100%
rename from windows/manage/images/StartGrid.jpg
rename to windows/deployment/update/images/StartGrid.jpg
diff --git a/windows/manage/images/StartGridPinnedApps.jpg b/windows/deployment/update/images/StartGridPinnedApps.jpg
similarity index 100%
rename from windows/manage/images/StartGridPinnedApps.jpg
rename to windows/deployment/update/images/StartGridPinnedApps.jpg
diff --git a/windows/manage/images/TilesXML.png b/windows/deployment/update/images/TilesXML.png
similarity index 100%
rename from windows/manage/images/TilesXML.png
rename to windows/deployment/update/images/TilesXML.png
diff --git a/windows/update/images/admin-tools-folder.png b/windows/deployment/update/images/admin-tools-folder.png
similarity index 100%
rename from windows/update/images/admin-tools-folder.png
rename to windows/deployment/update/images/admin-tools-folder.png
diff --git a/windows/update/images/admin-tools.png b/windows/deployment/update/images/admin-tools.png
similarity index 100%
rename from windows/update/images/admin-tools.png
rename to windows/deployment/update/images/admin-tools.png
diff --git a/windows/update/images/allow-rdp.png b/windows/deployment/update/images/allow-rdp.png
similarity index 100%
rename from windows/update/images/allow-rdp.png
rename to windows/deployment/update/images/allow-rdp.png
diff --git a/windows/update/images/app-v-in-adk.png b/windows/deployment/update/images/app-v-in-adk.png
similarity index 100%
rename from windows/update/images/app-v-in-adk.png
rename to windows/deployment/update/images/app-v-in-adk.png
diff --git a/windows/manage/images/apprule.png b/windows/deployment/update/images/apprule.png
similarity index 100%
rename from windows/manage/images/apprule.png
rename to windows/deployment/update/images/apprule.png
diff --git a/windows/manage/images/appwarning.png b/windows/deployment/update/images/appwarning.png
similarity index 100%
rename from windows/manage/images/appwarning.png
rename to windows/deployment/update/images/appwarning.png
diff --git a/windows/manage/images/backicon.png b/windows/deployment/update/images/backicon.png
similarity index 100%
rename from windows/manage/images/backicon.png
rename to windows/deployment/update/images/backicon.png
diff --git a/windows/update/images/checklistbox.gif b/windows/deployment/update/images/checklistbox.gif
similarity index 100%
rename from windows/update/images/checklistbox.gif
rename to windows/deployment/update/images/checklistbox.gif
diff --git a/windows/manage/images/checklistdone.png b/windows/deployment/update/images/checklistdone.png
similarity index 100%
rename from windows/manage/images/checklistdone.png
rename to windows/deployment/update/images/checklistdone.png
diff --git a/windows/update/images/checkmark.png b/windows/deployment/update/images/checkmark.png
similarity index 100%
rename from windows/update/images/checkmark.png
rename to windows/deployment/update/images/checkmark.png
diff --git a/windows/manage/images/choose-package.png b/windows/deployment/update/images/choose-package.png
similarity index 100%
rename from windows/manage/images/choose-package.png
rename to windows/deployment/update/images/choose-package.png
diff --git a/windows/manage/images/config-policy.png b/windows/deployment/update/images/config-policy.png
similarity index 100%
rename from windows/manage/images/config-policy.png
rename to windows/deployment/update/images/config-policy.png
diff --git a/windows/manage/images/config-source.png b/windows/deployment/update/images/config-source.png
similarity index 100%
rename from windows/manage/images/config-source.png
rename to windows/deployment/update/images/config-source.png
diff --git a/windows/manage/images/configconflict.png b/windows/deployment/update/images/configconflict.png
similarity index 100%
rename from windows/manage/images/configconflict.png
rename to windows/deployment/update/images/configconflict.png
diff --git a/windows/manage/images/connect-aad.png b/windows/deployment/update/images/connect-aad.png
similarity index 100%
rename from windows/manage/images/connect-aad.png
rename to windows/deployment/update/images/connect-aad.png
diff --git a/windows/update/images/copy-to-change.png b/windows/deployment/update/images/copy-to-change.png
similarity index 100%
rename from windows/update/images/copy-to-change.png
rename to windows/deployment/update/images/copy-to-change.png
diff --git a/windows/update/images/copy-to-path.png b/windows/deployment/update/images/copy-to-path.png
similarity index 100%
rename from windows/update/images/copy-to-path.png
rename to windows/deployment/update/images/copy-to-path.png
diff --git a/windows/update/images/copy-to.PNG b/windows/deployment/update/images/copy-to.PNG
similarity index 100%
rename from windows/update/images/copy-to.PNG
rename to windows/deployment/update/images/copy-to.PNG
diff --git a/windows/update/images/cortana-about-me.png b/windows/deployment/update/images/cortana-about-me.png
similarity index 100%
rename from windows/update/images/cortana-about-me.png
rename to windows/deployment/update/images/cortana-about-me.png
diff --git a/windows/update/images/cortana-add-reminder.png b/windows/deployment/update/images/cortana-add-reminder.png
similarity index 100%
rename from windows/update/images/cortana-add-reminder.png
rename to windows/deployment/update/images/cortana-add-reminder.png
diff --git a/windows/update/images/cortana-chicago-weather.png b/windows/deployment/update/images/cortana-chicago-weather.png
similarity index 100%
rename from windows/update/images/cortana-chicago-weather.png
rename to windows/deployment/update/images/cortana-chicago-weather.png
diff --git a/windows/update/images/cortana-complete-send-email-coworker-mic.png b/windows/deployment/update/images/cortana-complete-send-email-coworker-mic.png
similarity index 100%
rename from windows/update/images/cortana-complete-send-email-coworker-mic.png
rename to windows/deployment/update/images/cortana-complete-send-email-coworker-mic.png
diff --git a/windows/update/images/cortana-connect-crm.png b/windows/deployment/update/images/cortana-connect-crm.png
similarity index 100%
rename from windows/update/images/cortana-connect-crm.png
rename to windows/deployment/update/images/cortana-connect-crm.png
diff --git a/windows/update/images/cortana-connect-o365.png b/windows/deployment/update/images/cortana-connect-o365.png
similarity index 100%
rename from windows/update/images/cortana-connect-o365.png
rename to windows/deployment/update/images/cortana-connect-o365.png
diff --git a/windows/update/images/cortana-connect-uber.png b/windows/deployment/update/images/cortana-connect-uber.png
similarity index 100%
rename from windows/update/images/cortana-connect-uber.png
rename to windows/deployment/update/images/cortana-connect-uber.png
diff --git a/windows/update/images/cortana-crm-screen.png b/windows/deployment/update/images/cortana-crm-screen.png
similarity index 100%
rename from windows/update/images/cortana-crm-screen.png
rename to windows/deployment/update/images/cortana-crm-screen.png
diff --git a/windows/update/images/cortana-feedback.png b/windows/deployment/update/images/cortana-feedback.png
similarity index 100%
rename from windows/update/images/cortana-feedback.png
rename to windows/deployment/update/images/cortana-feedback.png
diff --git a/windows/update/images/cortana-final-reminder.png b/windows/deployment/update/images/cortana-final-reminder.png
similarity index 100%
rename from windows/update/images/cortana-final-reminder.png
rename to windows/deployment/update/images/cortana-final-reminder.png
diff --git a/windows/update/images/cortana-meeting-specific-time.png b/windows/deployment/update/images/cortana-meeting-specific-time.png
similarity index 100%
rename from windows/update/images/cortana-meeting-specific-time.png
rename to windows/deployment/update/images/cortana-meeting-specific-time.png
diff --git a/windows/update/images/cortana-meeting-tomorrow.png b/windows/deployment/update/images/cortana-meeting-tomorrow.png
similarity index 100%
rename from windows/update/images/cortana-meeting-tomorrow.png
rename to windows/deployment/update/images/cortana-meeting-tomorrow.png
diff --git a/windows/update/images/cortana-newyork-weather.png b/windows/deployment/update/images/cortana-newyork-weather.png
similarity index 100%
rename from windows/update/images/cortana-newyork-weather.png
rename to windows/deployment/update/images/cortana-newyork-weather.png
diff --git a/windows/update/images/cortana-o365-screen.png b/windows/deployment/update/images/cortana-o365-screen.png
similarity index 100%
rename from windows/update/images/cortana-o365-screen.png
rename to windows/deployment/update/images/cortana-o365-screen.png
diff --git a/windows/update/images/cortana-place-reminder.png b/windows/deployment/update/images/cortana-place-reminder.png
similarity index 100%
rename from windows/update/images/cortana-place-reminder.png
rename to windows/deployment/update/images/cortana-place-reminder.png
diff --git a/windows/update/images/cortana-powerbi-create-report.png b/windows/deployment/update/images/cortana-powerbi-create-report.png
similarity index 100%
rename from windows/update/images/cortana-powerbi-create-report.png
rename to windows/deployment/update/images/cortana-powerbi-create-report.png
diff --git a/windows/update/images/cortana-powerbi-expand-nav.png b/windows/deployment/update/images/cortana-powerbi-expand-nav.png
similarity index 100%
rename from windows/update/images/cortana-powerbi-expand-nav.png
rename to windows/deployment/update/images/cortana-powerbi-expand-nav.png
diff --git a/windows/update/images/cortana-powerbi-field-selection.png b/windows/deployment/update/images/cortana-powerbi-field-selection.png
similarity index 100%
rename from windows/update/images/cortana-powerbi-field-selection.png
rename to windows/deployment/update/images/cortana-powerbi-field-selection.png
diff --git a/windows/update/images/cortana-powerbi-getdata-samples.png b/windows/deployment/update/images/cortana-powerbi-getdata-samples.png
similarity index 100%
rename from windows/update/images/cortana-powerbi-getdata-samples.png
rename to windows/deployment/update/images/cortana-powerbi-getdata-samples.png
diff --git a/windows/update/images/cortana-powerbi-getdata.png b/windows/deployment/update/images/cortana-powerbi-getdata.png
similarity index 100%
rename from windows/update/images/cortana-powerbi-getdata.png
rename to windows/deployment/update/images/cortana-powerbi-getdata.png
diff --git a/windows/update/images/cortana-powerbi-myreport.png b/windows/deployment/update/images/cortana-powerbi-myreport.png
similarity index 100%
rename from windows/update/images/cortana-powerbi-myreport.png
rename to windows/deployment/update/images/cortana-powerbi-myreport.png
diff --git a/windows/update/images/cortana-powerbi-pagesize.png b/windows/deployment/update/images/cortana-powerbi-pagesize.png
similarity index 100%
rename from windows/update/images/cortana-powerbi-pagesize.png
rename to windows/deployment/update/images/cortana-powerbi-pagesize.png
diff --git a/windows/update/images/cortana-powerbi-report-qna.png b/windows/deployment/update/images/cortana-powerbi-report-qna.png
similarity index 100%
rename from windows/update/images/cortana-powerbi-report-qna.png
rename to windows/deployment/update/images/cortana-powerbi-report-qna.png
diff --git a/windows/update/images/cortana-powerbi-retail-analysis-dashboard.png b/windows/deployment/update/images/cortana-powerbi-retail-analysis-dashboard.png
similarity index 100%
rename from windows/update/images/cortana-powerbi-retail-analysis-dashboard.png
rename to windows/deployment/update/images/cortana-powerbi-retail-analysis-dashboard.png
diff --git a/windows/update/images/cortana-powerbi-retail-analysis-dataset.png b/windows/deployment/update/images/cortana-powerbi-retail-analysis-dataset.png
similarity index 100%
rename from windows/update/images/cortana-powerbi-retail-analysis-dataset.png
rename to windows/deployment/update/images/cortana-powerbi-retail-analysis-dataset.png
diff --git a/windows/update/images/cortana-powerbi-retail-analysis-sample.png b/windows/deployment/update/images/cortana-powerbi-retail-analysis-sample.png
similarity index 100%
rename from windows/update/images/cortana-powerbi-retail-analysis-sample.png
rename to windows/deployment/update/images/cortana-powerbi-retail-analysis-sample.png
diff --git a/windows/update/images/cortana-powerbi-search.png b/windows/deployment/update/images/cortana-powerbi-search.png
similarity index 100%
rename from windows/update/images/cortana-powerbi-search.png
rename to windows/deployment/update/images/cortana-powerbi-search.png
diff --git a/windows/update/images/cortana-powerbi-settings.png b/windows/deployment/update/images/cortana-powerbi-settings.png
similarity index 100%
rename from windows/update/images/cortana-powerbi-settings.png
rename to windows/deployment/update/images/cortana-powerbi-settings.png
diff --git a/windows/update/images/cortana-redmond-weather.png b/windows/deployment/update/images/cortana-redmond-weather.png
similarity index 100%
rename from windows/update/images/cortana-redmond-weather.png
rename to windows/deployment/update/images/cortana-redmond-weather.png
diff --git a/windows/update/images/cortana-reminder-edit.png b/windows/deployment/update/images/cortana-reminder-edit.png
similarity index 100%
rename from windows/update/images/cortana-reminder-edit.png
rename to windows/deployment/update/images/cortana-reminder-edit.png
diff --git a/windows/update/images/cortana-reminder-list.png b/windows/deployment/update/images/cortana-reminder-list.png
similarity index 100%
rename from windows/update/images/cortana-reminder-list.png
rename to windows/deployment/update/images/cortana-reminder-list.png
diff --git a/windows/update/images/cortana-reminder-mic.png b/windows/deployment/update/images/cortana-reminder-mic.png
similarity index 100%
rename from windows/update/images/cortana-reminder-mic.png
rename to windows/deployment/update/images/cortana-reminder-mic.png
diff --git a/windows/update/images/cortana-reminder-pending-mic.png b/windows/deployment/update/images/cortana-reminder-pending-mic.png
similarity index 100%
rename from windows/update/images/cortana-reminder-pending-mic.png
rename to windows/deployment/update/images/cortana-reminder-pending-mic.png
diff --git a/windows/update/images/cortana-reminder-pending.png b/windows/deployment/update/images/cortana-reminder-pending.png
similarity index 100%
rename from windows/update/images/cortana-reminder-pending.png
rename to windows/deployment/update/images/cortana-reminder-pending.png
diff --git a/windows/update/images/cortana-send-email-coworker-mic.png b/windows/deployment/update/images/cortana-send-email-coworker-mic.png
similarity index 100%
rename from windows/update/images/cortana-send-email-coworker-mic.png
rename to windows/deployment/update/images/cortana-send-email-coworker-mic.png
diff --git a/windows/update/images/cortana-send-email-coworker.png b/windows/deployment/update/images/cortana-send-email-coworker.png
similarity index 100%
rename from windows/update/images/cortana-send-email-coworker.png
rename to windows/deployment/update/images/cortana-send-email-coworker.png
diff --git a/windows/update/images/cortana-weather-multipanel.png b/windows/deployment/update/images/cortana-weather-multipanel.png
similarity index 100%
rename from windows/update/images/cortana-weather-multipanel.png
rename to windows/deployment/update/images/cortana-weather-multipanel.png
diff --git a/windows/update/images/crossmark.png b/windows/deployment/update/images/crossmark.png
similarity index 100%
rename from windows/update/images/crossmark.png
rename to windows/deployment/update/images/crossmark.png
diff --git a/windows/manage/images/csp-placeholder.png b/windows/deployment/update/images/csp-placeholder.png
similarity index 100%
rename from windows/manage/images/csp-placeholder.png
rename to windows/deployment/update/images/csp-placeholder.png
diff --git a/windows/manage/images/cspinicd.png b/windows/deployment/update/images/cspinicd.png
similarity index 100%
rename from windows/manage/images/cspinicd.png
rename to windows/deployment/update/images/cspinicd.png
diff --git a/windows/manage/images/csptable.png b/windows/deployment/update/images/csptable.png
similarity index 100%
rename from windows/manage/images/csptable.png
rename to windows/deployment/update/images/csptable.png
diff --git a/windows/manage/images/deploymentworkflow.png b/windows/deployment/update/images/deploymentworkflow.png
similarity index 100%
rename from windows/manage/images/deploymentworkflow.png
rename to windows/deployment/update/images/deploymentworkflow.png
diff --git a/windows/update/images/doneicon.png b/windows/deployment/update/images/doneicon.png
similarity index 100%
rename from windows/update/images/doneicon.png
rename to windows/deployment/update/images/doneicon.png
diff --git a/windows/manage/images/export-mgt-desktop.png b/windows/deployment/update/images/export-mgt-desktop.png
similarity index 100%
rename from windows/manage/images/export-mgt-desktop.png
rename to windows/deployment/update/images/export-mgt-desktop.png
diff --git a/windows/manage/images/export-mgt-mobile.png b/windows/deployment/update/images/export-mgt-mobile.png
similarity index 100%
rename from windows/manage/images/export-mgt-mobile.png
rename to windows/deployment/update/images/export-mgt-mobile.png
diff --git a/windows/manage/images/express-settings.png b/windows/deployment/update/images/express-settings.png
similarity index 100%
rename from windows/manage/images/express-settings.png
rename to windows/deployment/update/images/express-settings.png
diff --git a/windows/manage/images/fig1-deferupgrades.png b/windows/deployment/update/images/fig1-deferupgrades.png
similarity index 100%
rename from windows/manage/images/fig1-deferupgrades.png
rename to windows/deployment/update/images/fig1-deferupgrades.png
diff --git a/windows/manage/images/fig2-deploymenttimeline.png b/windows/deployment/update/images/fig2-deploymenttimeline.png
similarity index 100%
rename from windows/manage/images/fig2-deploymenttimeline.png
rename to windows/deployment/update/images/fig2-deploymenttimeline.png
diff --git a/windows/manage/images/fig3-overlaprelease.png b/windows/deployment/update/images/fig3-overlaprelease.png
similarity index 100%
rename from windows/manage/images/fig3-overlaprelease.png
rename to windows/deployment/update/images/fig3-overlaprelease.png
diff --git a/windows/manage/images/funfacts.png b/windows/deployment/update/images/funfacts.png
similarity index 100%
rename from windows/manage/images/funfacts.png
rename to windows/deployment/update/images/funfacts.png
diff --git a/windows/manage/images/genrule.png b/windows/deployment/update/images/genrule.png
similarity index 100%
rename from windows/manage/images/genrule.png
rename to windows/deployment/update/images/genrule.png
diff --git a/windows/manage/images/gp-branch.png b/windows/deployment/update/images/gp-branch.png
similarity index 100%
rename from windows/manage/images/gp-branch.png
rename to windows/deployment/update/images/gp-branch.png
diff --git a/windows/manage/images/gp-exclude-drivers.png b/windows/deployment/update/images/gp-exclude-drivers.png
similarity index 100%
rename from windows/manage/images/gp-exclude-drivers.png
rename to windows/deployment/update/images/gp-exclude-drivers.png
diff --git a/windows/manage/images/gp-feature.png b/windows/deployment/update/images/gp-feature.png
similarity index 100%
rename from windows/manage/images/gp-feature.png
rename to windows/deployment/update/images/gp-feature.png
diff --git a/windows/manage/images/gp-quality.png b/windows/deployment/update/images/gp-quality.png
similarity index 100%
rename from windows/manage/images/gp-quality.png
rename to windows/deployment/update/images/gp-quality.png
diff --git a/windows/manage/images/icd-adv-shared-pc.PNG b/windows/deployment/update/images/icd-adv-shared-pc.PNG
similarity index 100%
rename from windows/manage/images/icd-adv-shared-pc.PNG
rename to windows/deployment/update/images/icd-adv-shared-pc.PNG
diff --git a/windows/manage/images/icd-school.PNG b/windows/deployment/update/images/icd-school.PNG
similarity index 100%
rename from windows/manage/images/icd-school.PNG
rename to windows/deployment/update/images/icd-school.PNG
diff --git a/windows/manage/images/icd-simple.PNG b/windows/deployment/update/images/icd-simple.PNG
similarity index 100%
rename from windows/manage/images/icd-simple.PNG
rename to windows/deployment/update/images/icd-simple.PNG
diff --git a/windows/manage/images/icdbrowse.png b/windows/deployment/update/images/icdbrowse.png
similarity index 100%
rename from windows/manage/images/icdbrowse.png
rename to windows/deployment/update/images/icdbrowse.png
diff --git a/windows/manage/images/identitychoices.png b/windows/deployment/update/images/identitychoices.png
similarity index 100%
rename from windows/manage/images/identitychoices.png
rename to windows/deployment/update/images/identitychoices.png
diff --git a/windows/manage/images/launchicon.png b/windows/deployment/update/images/launchicon.png
similarity index 100%
rename from windows/manage/images/launchicon.png
rename to windows/deployment/update/images/launchicon.png
diff --git a/windows/manage/images/license-terms.png b/windows/deployment/update/images/license-terms.png
similarity index 100%
rename from windows/manage/images/license-terms.png
rename to windows/deployment/update/images/license-terms.png
diff --git a/windows/manage/images/lockdownapps.png b/windows/deployment/update/images/lockdownapps.png
similarity index 100%
rename from windows/manage/images/lockdownapps.png
rename to windows/deployment/update/images/lockdownapps.png
diff --git a/windows/manage/images/lockscreen.png b/windows/deployment/update/images/lockscreen.png
similarity index 100%
rename from windows/manage/images/lockscreen.png
rename to windows/deployment/update/images/lockscreen.png
diff --git a/windows/manage/images/lockscreenpolicy.png b/windows/deployment/update/images/lockscreenpolicy.png
similarity index 100%
rename from windows/manage/images/lockscreenpolicy.png
rename to windows/deployment/update/images/lockscreenpolicy.png
diff --git a/windows/manage/images/mdm-diag-report-powershell.PNG b/windows/deployment/update/images/mdm-diag-report-powershell.PNG
similarity index 100%
rename from windows/manage/images/mdm-diag-report-powershell.PNG
rename to windows/deployment/update/images/mdm-diag-report-powershell.PNG
diff --git a/windows/manage/images/mdm.png b/windows/deployment/update/images/mdm.png
similarity index 100%
rename from windows/manage/images/mdm.png
rename to windows/deployment/update/images/mdm.png
diff --git a/windows/manage/images/mobile-start-layout.png b/windows/deployment/update/images/mobile-start-layout.png
similarity index 100%
rename from windows/manage/images/mobile-start-layout.png
rename to windows/deployment/update/images/mobile-start-layout.png
diff --git a/windows/manage/images/oma-uri-shared-pc.png b/windows/deployment/update/images/oma-uri-shared-pc.png
similarity index 100%
rename from windows/manage/images/oma-uri-shared-pc.png
rename to windows/deployment/update/images/oma-uri-shared-pc.png
diff --git a/windows/manage/images/oobe.jpg b/windows/deployment/update/images/oobe.jpg
similarity index 100%
rename from windows/manage/images/oobe.jpg
rename to windows/deployment/update/images/oobe.jpg
diff --git a/windows/manage/images/package.png b/windows/deployment/update/images/package.png
similarity index 100%
rename from windows/manage/images/package.png
rename to windows/deployment/update/images/package.png
diff --git a/windows/update/images/packageaddfileandregistrydata-global.png b/windows/deployment/update/images/packageaddfileandregistrydata-global.png
similarity index 100%
rename from windows/update/images/packageaddfileandregistrydata-global.png
rename to windows/deployment/update/images/packageaddfileandregistrydata-global.png
diff --git a/windows/update/images/packageaddfileandregistrydata-stream.png b/windows/deployment/update/images/packageaddfileandregistrydata-stream.png
similarity index 100%
rename from windows/update/images/packageaddfileandregistrydata-stream.png
rename to windows/deployment/update/images/packageaddfileandregistrydata-stream.png
diff --git a/windows/update/images/packageaddfileandregistrydata.png b/windows/deployment/update/images/packageaddfileandregistrydata.png
similarity index 100%
rename from windows/update/images/packageaddfileandregistrydata.png
rename to windows/deployment/update/images/packageaddfileandregistrydata.png
diff --git a/windows/manage/images/phoneprovision.png b/windows/deployment/update/images/phoneprovision.png
similarity index 100%
rename from windows/manage/images/phoneprovision.png
rename to windows/deployment/update/images/phoneprovision.png
diff --git a/windows/manage/images/policytocsp.png b/windows/deployment/update/images/policytocsp.png
similarity index 100%
rename from windows/manage/images/policytocsp.png
rename to windows/deployment/update/images/policytocsp.png
diff --git a/windows/manage/images/powericon.png b/windows/deployment/update/images/powericon.png
similarity index 100%
rename from windows/manage/images/powericon.png
rename to windows/deployment/update/images/powericon.png
diff --git a/windows/manage/images/priv-telemetry-levels.png b/windows/deployment/update/images/priv-telemetry-levels.png
similarity index 100%
rename from windows/manage/images/priv-telemetry-levels.png
rename to windows/deployment/update/images/priv-telemetry-levels.png
diff --git a/windows/manage/images/prov.jpg b/windows/deployment/update/images/prov.jpg
similarity index 100%
rename from windows/manage/images/prov.jpg
rename to windows/deployment/update/images/prov.jpg
diff --git a/windows/manage/images/provisioning-csp-assignedaccess.png b/windows/deployment/update/images/provisioning-csp-assignedaccess.png
similarity index 100%
rename from windows/manage/images/provisioning-csp-assignedaccess.png
rename to windows/deployment/update/images/provisioning-csp-assignedaccess.png
diff --git a/windows/update/images/rdp.png b/windows/deployment/update/images/rdp.png
similarity index 100%
rename from windows/update/images/rdp.png
rename to windows/deployment/update/images/rdp.png
diff --git a/windows/manage/images/resetdevice.png b/windows/deployment/update/images/resetdevice.png
similarity index 100%
rename from windows/manage/images/resetdevice.png
rename to windows/deployment/update/images/resetdevice.png
diff --git a/windows/manage/images/settings-table.png b/windows/deployment/update/images/settings-table.png
similarity index 100%
rename from windows/manage/images/settings-table.png
rename to windows/deployment/update/images/settings-table.png
diff --git a/windows/manage/images/settingsicon.png b/windows/deployment/update/images/settingsicon.png
similarity index 100%
rename from windows/manage/images/settingsicon.png
rename to windows/deployment/update/images/settingsicon.png
diff --git a/windows/manage/images/setupmsg.jpg b/windows/deployment/update/images/setupmsg.jpg
similarity index 100%
rename from windows/manage/images/setupmsg.jpg
rename to windows/deployment/update/images/setupmsg.jpg
diff --git a/windows/manage/images/sign-in-prov.png b/windows/deployment/update/images/sign-in-prov.png
similarity index 100%
rename from windows/manage/images/sign-in-prov.png
rename to windows/deployment/update/images/sign-in-prov.png
diff --git a/windows/manage/images/spotlight.png b/windows/deployment/update/images/spotlight.png
similarity index 100%
rename from windows/manage/images/spotlight.png
rename to windows/deployment/update/images/spotlight.png
diff --git a/windows/manage/images/spotlight2.png b/windows/deployment/update/images/spotlight2.png
similarity index 100%
rename from windows/manage/images/spotlight2.png
rename to windows/deployment/update/images/spotlight2.png
diff --git a/windows/manage/images/start-pinned-app.png b/windows/deployment/update/images/start-pinned-app.png
similarity index 100%
rename from windows/manage/images/start-pinned-app.png
rename to windows/deployment/update/images/start-pinned-app.png
diff --git a/windows/manage/images/startannotated.png b/windows/deployment/update/images/startannotated.png
similarity index 100%
rename from windows/manage/images/startannotated.png
rename to windows/deployment/update/images/startannotated.png
diff --git a/windows/manage/images/starticon.png b/windows/deployment/update/images/starticon.png
similarity index 100%
rename from windows/manage/images/starticon.png
rename to windows/deployment/update/images/starticon.png
diff --git a/windows/manage/images/startlayoutpolicy.jpg b/windows/deployment/update/images/startlayoutpolicy.jpg
similarity index 100%
rename from windows/manage/images/startlayoutpolicy.jpg
rename to windows/deployment/update/images/startlayoutpolicy.jpg
diff --git a/windows/manage/images/starttemplate.jpg b/windows/deployment/update/images/starttemplate.jpg
similarity index 100%
rename from windows/manage/images/starttemplate.jpg
rename to windows/deployment/update/images/starttemplate.jpg
diff --git a/windows/update/images/sysprep-error.png b/windows/deployment/update/images/sysprep-error.png
similarity index 100%
rename from windows/update/images/sysprep-error.png
rename to windows/deployment/update/images/sysprep-error.png
diff --git a/windows/manage/images/taskbar-blank.png b/windows/deployment/update/images/taskbar-blank.png
similarity index 100%
rename from windows/manage/images/taskbar-blank.png
rename to windows/deployment/update/images/taskbar-blank.png
diff --git a/windows/manage/images/taskbar-default-plus.png b/windows/deployment/update/images/taskbar-default-plus.png
similarity index 100%
rename from windows/manage/images/taskbar-default-plus.png
rename to windows/deployment/update/images/taskbar-default-plus.png
diff --git a/windows/manage/images/taskbar-default-removed.png b/windows/deployment/update/images/taskbar-default-removed.png
similarity index 100%
rename from windows/manage/images/taskbar-default-removed.png
rename to windows/deployment/update/images/taskbar-default-removed.png
diff --git a/windows/manage/images/taskbar-default.png b/windows/deployment/update/images/taskbar-default.png
similarity index 100%
rename from windows/manage/images/taskbar-default.png
rename to windows/deployment/update/images/taskbar-default.png
diff --git a/windows/manage/images/taskbar-generic.png b/windows/deployment/update/images/taskbar-generic.png
similarity index 100%
rename from windows/manage/images/taskbar-generic.png
rename to windows/deployment/update/images/taskbar-generic.png
diff --git a/windows/manage/images/taskbar-region-defr.png b/windows/deployment/update/images/taskbar-region-defr.png
similarity index 100%
rename from windows/manage/images/taskbar-region-defr.png
rename to windows/deployment/update/images/taskbar-region-defr.png
diff --git a/windows/manage/images/taskbar-region-other.png b/windows/deployment/update/images/taskbar-region-other.png
similarity index 100%
rename from windows/manage/images/taskbar-region-other.png
rename to windows/deployment/update/images/taskbar-region-other.png
diff --git a/windows/manage/images/taskbar-region-usuk.png b/windows/deployment/update/images/taskbar-region-usuk.png
similarity index 100%
rename from windows/manage/images/taskbar-region-usuk.png
rename to windows/deployment/update/images/taskbar-region-usuk.png
diff --git a/windows/manage/images/taskbarSTARTERBLANK.png b/windows/deployment/update/images/taskbarSTARTERBLANK.png
similarity index 100%
rename from windows/manage/images/taskbarSTARTERBLANK.png
rename to windows/deployment/update/images/taskbarSTARTERBLANK.png
diff --git a/windows/manage/images/trust-package.png b/windows/deployment/update/images/trust-package.png
similarity index 100%
rename from windows/manage/images/trust-package.png
rename to windows/deployment/update/images/trust-package.png
diff --git a/windows/manage/images/twain.png b/windows/deployment/update/images/twain.png
similarity index 100%
rename from windows/manage/images/twain.png
rename to windows/deployment/update/images/twain.png
diff --git a/windows/manage/images/uc-01.png b/windows/deployment/update/images/uc-01.png
similarity index 100%
rename from windows/manage/images/uc-01.png
rename to windows/deployment/update/images/uc-01.png
diff --git a/windows/manage/images/uc-02.png b/windows/deployment/update/images/uc-02.png
similarity index 100%
rename from windows/manage/images/uc-02.png
rename to windows/deployment/update/images/uc-02.png
diff --git a/windows/manage/images/uc-02a.png b/windows/deployment/update/images/uc-02a.png
similarity index 100%
rename from windows/manage/images/uc-02a.png
rename to windows/deployment/update/images/uc-02a.png
diff --git a/windows/manage/images/uc-03.png b/windows/deployment/update/images/uc-03.png
similarity index 100%
rename from windows/manage/images/uc-03.png
rename to windows/deployment/update/images/uc-03.png
diff --git a/windows/manage/images/uc-03a.png b/windows/deployment/update/images/uc-03a.png
similarity index 100%
rename from windows/manage/images/uc-03a.png
rename to windows/deployment/update/images/uc-03a.png
diff --git a/windows/manage/images/uc-04.png b/windows/deployment/update/images/uc-04.png
similarity index 100%
rename from windows/manage/images/uc-04.png
rename to windows/deployment/update/images/uc-04.png
diff --git a/windows/manage/images/uc-04a.png b/windows/deployment/update/images/uc-04a.png
similarity index 100%
rename from windows/manage/images/uc-04a.png
rename to windows/deployment/update/images/uc-04a.png
diff --git a/windows/manage/images/uc-05.png b/windows/deployment/update/images/uc-05.png
similarity index 100%
rename from windows/manage/images/uc-05.png
rename to windows/deployment/update/images/uc-05.png
diff --git a/windows/manage/images/uc-05a.png b/windows/deployment/update/images/uc-05a.png
similarity index 100%
rename from windows/manage/images/uc-05a.png
rename to windows/deployment/update/images/uc-05a.png
diff --git a/windows/manage/images/uc-06.png b/windows/deployment/update/images/uc-06.png
similarity index 100%
rename from windows/manage/images/uc-06.png
rename to windows/deployment/update/images/uc-06.png
diff --git a/windows/manage/images/uc-06a.png b/windows/deployment/update/images/uc-06a.png
similarity index 100%
rename from windows/manage/images/uc-06a.png
rename to windows/deployment/update/images/uc-06a.png
diff --git a/windows/manage/images/uc-07.png b/windows/deployment/update/images/uc-07.png
similarity index 100%
rename from windows/manage/images/uc-07.png
rename to windows/deployment/update/images/uc-07.png
diff --git a/windows/manage/images/uc-07a.png b/windows/deployment/update/images/uc-07a.png
similarity index 100%
rename from windows/manage/images/uc-07a.png
rename to windows/deployment/update/images/uc-07a.png
diff --git a/windows/manage/images/uc-08.png b/windows/deployment/update/images/uc-08.png
similarity index 100%
rename from windows/manage/images/uc-08.png
rename to windows/deployment/update/images/uc-08.png
diff --git a/windows/manage/images/uc-08a.png b/windows/deployment/update/images/uc-08a.png
similarity index 100%
rename from windows/manage/images/uc-08a.png
rename to windows/deployment/update/images/uc-08a.png
diff --git a/windows/manage/images/uc-09.png b/windows/deployment/update/images/uc-09.png
similarity index 100%
rename from windows/manage/images/uc-09.png
rename to windows/deployment/update/images/uc-09.png
diff --git a/windows/manage/images/uc-09a.png b/windows/deployment/update/images/uc-09a.png
similarity index 100%
rename from windows/manage/images/uc-09a.png
rename to windows/deployment/update/images/uc-09a.png
diff --git a/windows/manage/images/uc-10.png b/windows/deployment/update/images/uc-10.png
similarity index 100%
rename from windows/manage/images/uc-10.png
rename to windows/deployment/update/images/uc-10.png
diff --git a/windows/manage/images/uc-10a.png b/windows/deployment/update/images/uc-10a.png
similarity index 100%
rename from windows/manage/images/uc-10a.png
rename to windows/deployment/update/images/uc-10a.png
diff --git a/windows/manage/images/uc-11.png b/windows/deployment/update/images/uc-11.png
similarity index 100%
rename from windows/manage/images/uc-11.png
rename to windows/deployment/update/images/uc-11.png
diff --git a/windows/manage/images/uc-12.png b/windows/deployment/update/images/uc-12.png
similarity index 100%
rename from windows/manage/images/uc-12.png
rename to windows/deployment/update/images/uc-12.png
diff --git a/windows/manage/images/uc-13.png b/windows/deployment/update/images/uc-13.png
similarity index 100%
rename from windows/manage/images/uc-13.png
rename to windows/deployment/update/images/uc-13.png
diff --git a/windows/manage/images/uc-14.png b/windows/deployment/update/images/uc-14.png
similarity index 100%
rename from windows/manage/images/uc-14.png
rename to windows/deployment/update/images/uc-14.png
diff --git a/windows/manage/images/uc-15.png b/windows/deployment/update/images/uc-15.png
similarity index 100%
rename from windows/manage/images/uc-15.png
rename to windows/deployment/update/images/uc-15.png
diff --git a/windows/manage/images/uc-16.png b/windows/deployment/update/images/uc-16.png
similarity index 100%
rename from windows/manage/images/uc-16.png
rename to windows/deployment/update/images/uc-16.png
diff --git a/windows/manage/images/uc-17.png b/windows/deployment/update/images/uc-17.png
similarity index 100%
rename from windows/manage/images/uc-17.png
rename to windows/deployment/update/images/uc-17.png
diff --git a/windows/manage/images/uc-18.png b/windows/deployment/update/images/uc-18.png
similarity index 100%
rename from windows/manage/images/uc-18.png
rename to windows/deployment/update/images/uc-18.png
diff --git a/windows/manage/images/uc-19.png b/windows/deployment/update/images/uc-19.png
similarity index 100%
rename from windows/manage/images/uc-19.png
rename to windows/deployment/update/images/uc-19.png
diff --git a/windows/manage/images/uc-20.png b/windows/deployment/update/images/uc-20.png
similarity index 100%
rename from windows/manage/images/uc-20.png
rename to windows/deployment/update/images/uc-20.png
diff --git a/windows/manage/images/uc-21.png b/windows/deployment/update/images/uc-21.png
similarity index 100%
rename from windows/manage/images/uc-21.png
rename to windows/deployment/update/images/uc-21.png
diff --git a/windows/manage/images/uc-22.png b/windows/deployment/update/images/uc-22.png
similarity index 100%
rename from windows/manage/images/uc-22.png
rename to windows/deployment/update/images/uc-22.png
diff --git a/windows/manage/images/uc-23.png b/windows/deployment/update/images/uc-23.png
similarity index 100%
rename from windows/manage/images/uc-23.png
rename to windows/deployment/update/images/uc-23.png
diff --git a/windows/manage/images/uc-24.png b/windows/deployment/update/images/uc-24.png
similarity index 100%
rename from windows/manage/images/uc-24.png
rename to windows/deployment/update/images/uc-24.png
diff --git a/windows/manage/images/uc-25.png b/windows/deployment/update/images/uc-25.png
similarity index 100%
rename from windows/manage/images/uc-25.png
rename to windows/deployment/update/images/uc-25.png
diff --git a/windows/manage/images/uev-adk-select-uev-feature.png b/windows/deployment/update/images/uev-adk-select-uev-feature.png
similarity index 100%
rename from windows/manage/images/uev-adk-select-uev-feature.png
rename to windows/deployment/update/images/uev-adk-select-uev-feature.png
diff --git a/windows/manage/images/uev-archdiagram.png b/windows/deployment/update/images/uev-archdiagram.png
similarity index 100%
rename from windows/manage/images/uev-archdiagram.png
rename to windows/deployment/update/images/uev-archdiagram.png
diff --git a/windows/manage/images/uev-checklist-box.gif b/windows/deployment/update/images/uev-checklist-box.gif
similarity index 100%
rename from windows/manage/images/uev-checklist-box.gif
rename to windows/deployment/update/images/uev-checklist-box.gif
diff --git a/windows/manage/images/uev-deployment-preparation.png b/windows/deployment/update/images/uev-deployment-preparation.png
similarity index 100%
rename from windows/manage/images/uev-deployment-preparation.png
rename to windows/deployment/update/images/uev-deployment-preparation.png
diff --git a/windows/manage/images/uev-generator-process.png b/windows/deployment/update/images/uev-generator-process.png
similarity index 100%
rename from windows/manage/images/uev-generator-process.png
rename to windows/deployment/update/images/uev-generator-process.png
diff --git a/windows/manage/images/w10servicing-f1-branches.png b/windows/deployment/update/images/w10servicing-f1-branches.png
similarity index 100%
rename from windows/manage/images/w10servicing-f1-branches.png
rename to windows/deployment/update/images/w10servicing-f1-branches.png
diff --git a/windows/manage/images/waas-active-hours-policy.PNG b/windows/deployment/update/images/waas-active-hours-policy.PNG
similarity index 100%
rename from windows/manage/images/waas-active-hours-policy.PNG
rename to windows/deployment/update/images/waas-active-hours-policy.PNG
diff --git a/windows/manage/images/waas-active-hours.PNG b/windows/deployment/update/images/waas-active-hours.PNG
similarity index 100%
rename from windows/manage/images/waas-active-hours.PNG
rename to windows/deployment/update/images/waas-active-hours.PNG
diff --git a/windows/manage/images/waas-auto-update-policy.PNG b/windows/deployment/update/images/waas-auto-update-policy.PNG
similarity index 100%
rename from windows/manage/images/waas-auto-update-policy.PNG
rename to windows/deployment/update/images/waas-auto-update-policy.PNG
diff --git a/windows/manage/images/waas-do-fig1.png b/windows/deployment/update/images/waas-do-fig1.png
similarity index 100%
rename from windows/manage/images/waas-do-fig1.png
rename to windows/deployment/update/images/waas-do-fig1.png
diff --git a/windows/manage/images/waas-do-fig2.png b/windows/deployment/update/images/waas-do-fig2.png
similarity index 100%
rename from windows/manage/images/waas-do-fig2.png
rename to windows/deployment/update/images/waas-do-fig2.png
diff --git a/windows/manage/images/waas-do-fig3.png b/windows/deployment/update/images/waas-do-fig3.png
similarity index 100%
rename from windows/manage/images/waas-do-fig3.png
rename to windows/deployment/update/images/waas-do-fig3.png
diff --git a/windows/manage/images/waas-do-fig4.png b/windows/deployment/update/images/waas-do-fig4.png
similarity index 100%
rename from windows/manage/images/waas-do-fig4.png
rename to windows/deployment/update/images/waas-do-fig4.png
diff --git a/windows/manage/images/waas-overview-patch.png b/windows/deployment/update/images/waas-overview-patch.png
similarity index 100%
rename from windows/manage/images/waas-overview-patch.png
rename to windows/deployment/update/images/waas-overview-patch.png
diff --git a/windows/manage/images/waas-restart-policy.PNG b/windows/deployment/update/images/waas-restart-policy.PNG
similarity index 100%
rename from windows/manage/images/waas-restart-policy.PNG
rename to windows/deployment/update/images/waas-restart-policy.PNG
diff --git a/windows/manage/images/waas-rings.png b/windows/deployment/update/images/waas-rings.png
similarity index 100%
rename from windows/manage/images/waas-rings.png
rename to windows/deployment/update/images/waas-rings.png
diff --git a/windows/manage/images/waas-sccm-fig1.png b/windows/deployment/update/images/waas-sccm-fig1.png
similarity index 100%
rename from windows/manage/images/waas-sccm-fig1.png
rename to windows/deployment/update/images/waas-sccm-fig1.png
diff --git a/windows/manage/images/waas-sccm-fig10.png b/windows/deployment/update/images/waas-sccm-fig10.png
similarity index 100%
rename from windows/manage/images/waas-sccm-fig10.png
rename to windows/deployment/update/images/waas-sccm-fig10.png
diff --git a/windows/manage/images/waas-sccm-fig11.png b/windows/deployment/update/images/waas-sccm-fig11.png
similarity index 100%
rename from windows/manage/images/waas-sccm-fig11.png
rename to windows/deployment/update/images/waas-sccm-fig11.png
diff --git a/windows/manage/images/waas-sccm-fig12.png b/windows/deployment/update/images/waas-sccm-fig12.png
similarity index 100%
rename from windows/manage/images/waas-sccm-fig12.png
rename to windows/deployment/update/images/waas-sccm-fig12.png
diff --git a/windows/manage/images/waas-sccm-fig2.png b/windows/deployment/update/images/waas-sccm-fig2.png
similarity index 100%
rename from windows/manage/images/waas-sccm-fig2.png
rename to windows/deployment/update/images/waas-sccm-fig2.png
diff --git a/windows/manage/images/waas-sccm-fig3.png b/windows/deployment/update/images/waas-sccm-fig3.png
similarity index 100%
rename from windows/manage/images/waas-sccm-fig3.png
rename to windows/deployment/update/images/waas-sccm-fig3.png
diff --git a/windows/manage/images/waas-sccm-fig4.png b/windows/deployment/update/images/waas-sccm-fig4.png
similarity index 100%
rename from windows/manage/images/waas-sccm-fig4.png
rename to windows/deployment/update/images/waas-sccm-fig4.png
diff --git a/windows/manage/images/waas-sccm-fig5.png b/windows/deployment/update/images/waas-sccm-fig5.png
similarity index 100%
rename from windows/manage/images/waas-sccm-fig5.png
rename to windows/deployment/update/images/waas-sccm-fig5.png
diff --git a/windows/manage/images/waas-sccm-fig6.png b/windows/deployment/update/images/waas-sccm-fig6.png
similarity index 100%
rename from windows/manage/images/waas-sccm-fig6.png
rename to windows/deployment/update/images/waas-sccm-fig6.png
diff --git a/windows/manage/images/waas-sccm-fig7.png b/windows/deployment/update/images/waas-sccm-fig7.png
similarity index 100%
rename from windows/manage/images/waas-sccm-fig7.png
rename to windows/deployment/update/images/waas-sccm-fig7.png
diff --git a/windows/manage/images/waas-sccm-fig8.png b/windows/deployment/update/images/waas-sccm-fig8.png
similarity index 100%
rename from windows/manage/images/waas-sccm-fig8.png
rename to windows/deployment/update/images/waas-sccm-fig8.png
diff --git a/windows/manage/images/waas-sccm-fig9.png b/windows/deployment/update/images/waas-sccm-fig9.png
similarity index 100%
rename from windows/manage/images/waas-sccm-fig9.png
rename to windows/deployment/update/images/waas-sccm-fig9.png
diff --git a/windows/manage/images/waas-strategy-fig1a.png b/windows/deployment/update/images/waas-strategy-fig1a.png
similarity index 100%
rename from windows/manage/images/waas-strategy-fig1a.png
rename to windows/deployment/update/images/waas-strategy-fig1a.png
diff --git a/windows/update/images/waas-wipfb-aad-classicaad.png b/windows/deployment/update/images/waas-wipfb-aad-classicaad.png
similarity index 100%
rename from windows/update/images/waas-wipfb-aad-classicaad.png
rename to windows/deployment/update/images/waas-wipfb-aad-classicaad.png
diff --git a/windows/update/images/waas-wipfb-aad-classicenable.png b/windows/deployment/update/images/waas-wipfb-aad-classicenable.png
similarity index 100%
rename from windows/update/images/waas-wipfb-aad-classicenable.png
rename to windows/deployment/update/images/waas-wipfb-aad-classicenable.png
diff --git a/windows/update/images/waas-wipfb-aad-consent.png b/windows/deployment/update/images/waas-wipfb-aad-consent.png
similarity index 100%
rename from windows/update/images/waas-wipfb-aad-consent.png
rename to windows/deployment/update/images/waas-wipfb-aad-consent.png
diff --git a/windows/update/images/waas-wipfb-aad-error.png b/windows/deployment/update/images/waas-wipfb-aad-error.png
similarity index 100%
rename from windows/update/images/waas-wipfb-aad-error.png
rename to windows/deployment/update/images/waas-wipfb-aad-error.png
diff --git a/windows/update/images/waas-wipfb-aad-newaad.png b/windows/deployment/update/images/waas-wipfb-aad-newaad.png
similarity index 100%
rename from windows/update/images/waas-wipfb-aad-newaad.png
rename to windows/deployment/update/images/waas-wipfb-aad-newaad.png
diff --git a/windows/update/images/waas-wipfb-aad-newdirectorybutton.png b/windows/deployment/update/images/waas-wipfb-aad-newdirectorybutton.png
similarity index 100%
rename from windows/update/images/waas-wipfb-aad-newdirectorybutton.png
rename to windows/deployment/update/images/waas-wipfb-aad-newdirectorybutton.png
diff --git a/windows/update/images/waas-wipfb-aad-newenable.png b/windows/deployment/update/images/waas-wipfb-aad-newenable.png
similarity index 100%
rename from windows/update/images/waas-wipfb-aad-newenable.png
rename to windows/deployment/update/images/waas-wipfb-aad-newenable.png
diff --git a/windows/update/images/waas-wipfb-aad-newusersettings.png b/windows/deployment/update/images/waas-wipfb-aad-newusersettings.png
similarity index 100%
rename from windows/update/images/waas-wipfb-aad-newusersettings.png
rename to windows/deployment/update/images/waas-wipfb-aad-newusersettings.png
diff --git a/windows/update/images/waas-wipfb-accounts.png b/windows/deployment/update/images/waas-wipfb-accounts.png
similarity index 100%
rename from windows/update/images/waas-wipfb-accounts.png
rename to windows/deployment/update/images/waas-wipfb-accounts.png
diff --git a/windows/update/images/waas-wipfb-change-user.png b/windows/deployment/update/images/waas-wipfb-change-user.png
similarity index 100%
rename from windows/update/images/waas-wipfb-change-user.png
rename to windows/deployment/update/images/waas-wipfb-change-user.png
diff --git a/windows/update/images/waas-wipfb-work-account.jpg b/windows/deployment/update/images/waas-wipfb-work-account.jpg
similarity index 100%
rename from windows/update/images/waas-wipfb-work-account.jpg
rename to windows/deployment/update/images/waas-wipfb-work-account.jpg
diff --git a/windows/manage/images/waas-wsus-fig1.png b/windows/deployment/update/images/waas-wsus-fig1.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig1.png
rename to windows/deployment/update/images/waas-wsus-fig1.png
diff --git a/windows/manage/images/waas-wsus-fig10.png b/windows/deployment/update/images/waas-wsus-fig10.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig10.png
rename to windows/deployment/update/images/waas-wsus-fig10.png
diff --git a/windows/manage/images/waas-wsus-fig11.png b/windows/deployment/update/images/waas-wsus-fig11.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig11.png
rename to windows/deployment/update/images/waas-wsus-fig11.png
diff --git a/windows/manage/images/waas-wsus-fig12.png b/windows/deployment/update/images/waas-wsus-fig12.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig12.png
rename to windows/deployment/update/images/waas-wsus-fig12.png
diff --git a/windows/manage/images/waas-wsus-fig13.png b/windows/deployment/update/images/waas-wsus-fig13.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig13.png
rename to windows/deployment/update/images/waas-wsus-fig13.png
diff --git a/windows/manage/images/waas-wsus-fig14.png b/windows/deployment/update/images/waas-wsus-fig14.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig14.png
rename to windows/deployment/update/images/waas-wsus-fig14.png
diff --git a/windows/manage/images/waas-wsus-fig15.png b/windows/deployment/update/images/waas-wsus-fig15.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig15.png
rename to windows/deployment/update/images/waas-wsus-fig15.png
diff --git a/windows/manage/images/waas-wsus-fig16.png b/windows/deployment/update/images/waas-wsus-fig16.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig16.png
rename to windows/deployment/update/images/waas-wsus-fig16.png
diff --git a/windows/manage/images/waas-wsus-fig17.png b/windows/deployment/update/images/waas-wsus-fig17.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig17.png
rename to windows/deployment/update/images/waas-wsus-fig17.png
diff --git a/windows/manage/images/waas-wsus-fig18.png b/windows/deployment/update/images/waas-wsus-fig18.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig18.png
rename to windows/deployment/update/images/waas-wsus-fig18.png
diff --git a/windows/manage/images/waas-wsus-fig19.png b/windows/deployment/update/images/waas-wsus-fig19.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig19.png
rename to windows/deployment/update/images/waas-wsus-fig19.png
diff --git a/windows/manage/images/waas-wsus-fig2.png b/windows/deployment/update/images/waas-wsus-fig2.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig2.png
rename to windows/deployment/update/images/waas-wsus-fig2.png
diff --git a/windows/manage/images/waas-wsus-fig20.png b/windows/deployment/update/images/waas-wsus-fig20.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig20.png
rename to windows/deployment/update/images/waas-wsus-fig20.png
diff --git a/windows/manage/images/waas-wsus-fig3.png b/windows/deployment/update/images/waas-wsus-fig3.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig3.png
rename to windows/deployment/update/images/waas-wsus-fig3.png
diff --git a/windows/manage/images/waas-wsus-fig4.png b/windows/deployment/update/images/waas-wsus-fig4.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig4.png
rename to windows/deployment/update/images/waas-wsus-fig4.png
diff --git a/windows/manage/images/waas-wsus-fig5.png b/windows/deployment/update/images/waas-wsus-fig5.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig5.png
rename to windows/deployment/update/images/waas-wsus-fig5.png
diff --git a/windows/manage/images/waas-wsus-fig6.png b/windows/deployment/update/images/waas-wsus-fig6.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig6.png
rename to windows/deployment/update/images/waas-wsus-fig6.png
diff --git a/windows/manage/images/waas-wsus-fig7.png b/windows/deployment/update/images/waas-wsus-fig7.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig7.png
rename to windows/deployment/update/images/waas-wsus-fig7.png
diff --git a/windows/manage/images/waas-wsus-fig8.png b/windows/deployment/update/images/waas-wsus-fig8.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig8.png
rename to windows/deployment/update/images/waas-wsus-fig8.png
diff --git a/windows/manage/images/waas-wsus-fig9.png b/windows/deployment/update/images/waas-wsus-fig9.png
similarity index 100%
rename from windows/manage/images/waas-wsus-fig9.png
rename to windows/deployment/update/images/waas-wsus-fig9.png
diff --git a/windows/manage/images/waas-wufb-gp-broad.png b/windows/deployment/update/images/waas-wufb-gp-broad.png
similarity index 100%
rename from windows/manage/images/waas-wufb-gp-broad.png
rename to windows/deployment/update/images/waas-wufb-gp-broad.png
diff --git a/windows/manage/images/waas-wufb-gp-cb2-settings.png b/windows/deployment/update/images/waas-wufb-gp-cb2-settings.png
similarity index 100%
rename from windows/manage/images/waas-wufb-gp-cb2-settings.png
rename to windows/deployment/update/images/waas-wufb-gp-cb2-settings.png
diff --git a/windows/manage/images/waas-wufb-gp-cb2.png b/windows/deployment/update/images/waas-wufb-gp-cb2.png
similarity index 100%
rename from windows/manage/images/waas-wufb-gp-cb2.png
rename to windows/deployment/update/images/waas-wufb-gp-cb2.png
diff --git a/windows/manage/images/waas-wufb-gp-cbb1-settings.png b/windows/deployment/update/images/waas-wufb-gp-cbb1-settings.png
similarity index 100%
rename from windows/manage/images/waas-wufb-gp-cbb1-settings.png
rename to windows/deployment/update/images/waas-wufb-gp-cbb1-settings.png
diff --git a/windows/manage/images/waas-wufb-gp-cbb2-settings.png b/windows/deployment/update/images/waas-wufb-gp-cbb2-settings.png
similarity index 100%
rename from windows/manage/images/waas-wufb-gp-cbb2-settings.png
rename to windows/deployment/update/images/waas-wufb-gp-cbb2-settings.png
diff --git a/windows/manage/images/waas-wufb-gp-cbb2q-settings.png b/windows/deployment/update/images/waas-wufb-gp-cbb2q-settings.png
similarity index 100%
rename from windows/manage/images/waas-wufb-gp-cbb2q-settings.png
rename to windows/deployment/update/images/waas-wufb-gp-cbb2q-settings.png
diff --git a/windows/manage/images/waas-wufb-gp-create.png b/windows/deployment/update/images/waas-wufb-gp-create.png
similarity index 100%
rename from windows/manage/images/waas-wufb-gp-create.png
rename to windows/deployment/update/images/waas-wufb-gp-create.png
diff --git a/windows/manage/images/waas-wufb-gp-edit-defer.png b/windows/deployment/update/images/waas-wufb-gp-edit-defer.png
similarity index 100%
rename from windows/manage/images/waas-wufb-gp-edit-defer.png
rename to windows/deployment/update/images/waas-wufb-gp-edit-defer.png
diff --git a/windows/manage/images/waas-wufb-gp-edit.png b/windows/deployment/update/images/waas-wufb-gp-edit.png
similarity index 100%
rename from windows/manage/images/waas-wufb-gp-edit.png
rename to windows/deployment/update/images/waas-wufb-gp-edit.png
diff --git a/windows/manage/images/waas-wufb-gp-scope-cb2.png b/windows/deployment/update/images/waas-wufb-gp-scope-cb2.png
similarity index 100%
rename from windows/manage/images/waas-wufb-gp-scope-cb2.png
rename to windows/deployment/update/images/waas-wufb-gp-scope-cb2.png
diff --git a/windows/manage/images/waas-wufb-gp-scope.png b/windows/deployment/update/images/waas-wufb-gp-scope.png
similarity index 100%
rename from windows/manage/images/waas-wufb-gp-scope.png
rename to windows/deployment/update/images/waas-wufb-gp-scope.png
diff --git a/windows/manage/images/waas-wufb-intune-cb2a.png b/windows/deployment/update/images/waas-wufb-intune-cb2a.png
similarity index 100%
rename from windows/manage/images/waas-wufb-intune-cb2a.png
rename to windows/deployment/update/images/waas-wufb-intune-cb2a.png
diff --git a/windows/manage/images/waas-wufb-intune-cbb1a.png b/windows/deployment/update/images/waas-wufb-intune-cbb1a.png
similarity index 100%
rename from windows/manage/images/waas-wufb-intune-cbb1a.png
rename to windows/deployment/update/images/waas-wufb-intune-cbb1a.png
diff --git a/windows/manage/images/waas-wufb-intune-cbb2a.png b/windows/deployment/update/images/waas-wufb-intune-cbb2a.png
similarity index 100%
rename from windows/manage/images/waas-wufb-intune-cbb2a.png
rename to windows/deployment/update/images/waas-wufb-intune-cbb2a.png
diff --git a/windows/manage/images/waas-wufb-intune-step11a.png b/windows/deployment/update/images/waas-wufb-intune-step11a.png
similarity index 100%
rename from windows/manage/images/waas-wufb-intune-step11a.png
rename to windows/deployment/update/images/waas-wufb-intune-step11a.png
diff --git a/windows/manage/images/waas-wufb-intune-step19a.png b/windows/deployment/update/images/waas-wufb-intune-step19a.png
similarity index 100%
rename from windows/manage/images/waas-wufb-intune-step19a.png
rename to windows/deployment/update/images/waas-wufb-intune-step19a.png
diff --git a/windows/manage/images/waas-wufb-intune-step2a.png b/windows/deployment/update/images/waas-wufb-intune-step2a.png
similarity index 100%
rename from windows/manage/images/waas-wufb-intune-step2a.png
rename to windows/deployment/update/images/waas-wufb-intune-step2a.png
diff --git a/windows/manage/images/waas-wufb-intune-step7a.png b/windows/deployment/update/images/waas-wufb-intune-step7a.png
similarity index 100%
rename from windows/manage/images/waas-wufb-intune-step7a.png
rename to windows/deployment/update/images/waas-wufb-intune-step7a.png
diff --git a/windows/update/images/waas-wufb-settings-branch.jpg b/windows/deployment/update/images/waas-wufb-settings-branch.jpg
similarity index 100%
rename from windows/update/images/waas-wufb-settings-branch.jpg
rename to windows/deployment/update/images/waas-wufb-settings-branch.jpg
diff --git a/windows/update/images/waas-wufb-settings-defer.jpg b/windows/deployment/update/images/waas-wufb-settings-defer.jpg
similarity index 100%
rename from windows/update/images/waas-wufb-settings-defer.jpg
rename to windows/deployment/update/images/waas-wufb-settings-defer.jpg
diff --git a/windows/manage/images/waas-wufb-update-compliance.png b/windows/deployment/update/images/waas-wufb-update-compliance.png
similarity index 100%
rename from windows/manage/images/waas-wufb-update-compliance.png
rename to windows/deployment/update/images/waas-wufb-update-compliance.png
diff --git a/windows/manage/images/who-owns-pc.png b/windows/deployment/update/images/who-owns-pc.png
similarity index 100%
rename from windows/manage/images/who-owns-pc.png
rename to windows/deployment/update/images/who-owns-pc.png
diff --git a/windows/manage/images/wifisense-grouppolicy.png b/windows/deployment/update/images/wifisense-grouppolicy.png
similarity index 100%
rename from windows/manage/images/wifisense-grouppolicy.png
rename to windows/deployment/update/images/wifisense-grouppolicy.png
diff --git a/windows/manage/images/wifisense-registry.png b/windows/deployment/update/images/wifisense-registry.png
similarity index 100%
rename from windows/manage/images/wifisense-registry.png
rename to windows/deployment/update/images/wifisense-registry.png
diff --git a/windows/manage/images/wifisense-settingscreens.png b/windows/deployment/update/images/wifisense-settingscreens.png
similarity index 100%
rename from windows/manage/images/wifisense-settingscreens.png
rename to windows/deployment/update/images/wifisense-settingscreens.png
diff --git a/windows/manage/images/win10-mobile-mdm-fig1.png b/windows/deployment/update/images/win10-mobile-mdm-fig1.png
similarity index 100%
rename from windows/manage/images/win10-mobile-mdm-fig1.png
rename to windows/deployment/update/images/win10-mobile-mdm-fig1.png
diff --git a/windows/manage/images/win10servicing-fig2-featureupgrade.png b/windows/deployment/update/images/win10servicing-fig2-featureupgrade.png
similarity index 100%
rename from windows/manage/images/win10servicing-fig2-featureupgrade.png
rename to windows/deployment/update/images/win10servicing-fig2-featureupgrade.png
diff --git a/windows/manage/images/win10servicing-fig3.png b/windows/deployment/update/images/win10servicing-fig3.png
similarity index 100%
rename from windows/manage/images/win10servicing-fig3.png
rename to windows/deployment/update/images/win10servicing-fig3.png
diff --git a/windows/manage/images/win10servicing-fig4-upgradereleases.png b/windows/deployment/update/images/win10servicing-fig4-upgradereleases.png
similarity index 100%
rename from windows/manage/images/win10servicing-fig4-upgradereleases.png
rename to windows/deployment/update/images/win10servicing-fig4-upgradereleases.png
diff --git a/windows/manage/images/win10servicing-fig5.png b/windows/deployment/update/images/win10servicing-fig5.png
similarity index 100%
rename from windows/manage/images/win10servicing-fig5.png
rename to windows/deployment/update/images/win10servicing-fig5.png
diff --git a/windows/manage/images/win10servicing-fig6.png b/windows/deployment/update/images/win10servicing-fig6.png
similarity index 100%
rename from windows/manage/images/win10servicing-fig6.png
rename to windows/deployment/update/images/win10servicing-fig6.png
diff --git a/windows/manage/images/win10servicing-fig7.png b/windows/deployment/update/images/win10servicing-fig7.png
similarity index 100%
rename from windows/manage/images/win10servicing-fig7.png
rename to windows/deployment/update/images/win10servicing-fig7.png
diff --git a/windows/update/images/windows-10-management-cyod-byod-flow.png b/windows/deployment/update/images/windows-10-management-cyod-byod-flow.png
similarity index 100%
rename from windows/update/images/windows-10-management-cyod-byod-flow.png
rename to windows/deployment/update/images/windows-10-management-cyod-byod-flow.png
diff --git a/windows/update/images/windows-10-management-gp-intune-flow.png b/windows/deployment/update/images/windows-10-management-gp-intune-flow.png
similarity index 100%
rename from windows/update/images/windows-10-management-gp-intune-flow.png
rename to windows/deployment/update/images/windows-10-management-gp-intune-flow.png
diff --git a/windows/update/images/windows-10-management-range-of-options.png b/windows/deployment/update/images/windows-10-management-range-of-options.png
similarity index 100%
rename from windows/update/images/windows-10-management-range-of-options.png
rename to windows/deployment/update/images/windows-10-management-range-of-options.png
diff --git a/windows/manage/images/wsfb-distribute.png b/windows/deployment/update/images/wsfb-distribute.png
similarity index 100%
rename from windows/manage/images/wsfb-distribute.png
rename to windows/deployment/update/images/wsfb-distribute.png
diff --git a/windows/manage/images/wsfb-firstrun.png b/windows/deployment/update/images/wsfb-firstrun.png
similarity index 100%
rename from windows/manage/images/wsfb-firstrun.png
rename to windows/deployment/update/images/wsfb-firstrun.png
diff --git a/windows/manage/images/wsfb-inventory-viewlicense.png b/windows/deployment/update/images/wsfb-inventory-viewlicense.png
similarity index 100%
rename from windows/manage/images/wsfb-inventory-viewlicense.png
rename to windows/deployment/update/images/wsfb-inventory-viewlicense.png
diff --git a/windows/manage/images/wsfb-inventory.png b/windows/deployment/update/images/wsfb-inventory.png
similarity index 100%
rename from windows/manage/images/wsfb-inventory.png
rename to windows/deployment/update/images/wsfb-inventory.png
diff --git a/windows/manage/images/wsfb-inventoryaddprivatestore.png b/windows/deployment/update/images/wsfb-inventoryaddprivatestore.png
similarity index 100%
rename from windows/manage/images/wsfb-inventoryaddprivatestore.png
rename to windows/deployment/update/images/wsfb-inventoryaddprivatestore.png
diff --git a/windows/manage/images/wsfb-landing.png b/windows/deployment/update/images/wsfb-landing.png
similarity index 100%
rename from windows/manage/images/wsfb-landing.png
rename to windows/deployment/update/images/wsfb-landing.png
diff --git a/windows/manage/images/wsfb-licenseassign.png b/windows/deployment/update/images/wsfb-licenseassign.png
similarity index 100%
rename from windows/manage/images/wsfb-licenseassign.png
rename to windows/deployment/update/images/wsfb-licenseassign.png
diff --git a/windows/manage/images/wsfb-licensedetails.png b/windows/deployment/update/images/wsfb-licensedetails.png
similarity index 100%
rename from windows/manage/images/wsfb-licensedetails.png
rename to windows/deployment/update/images/wsfb-licensedetails.png
diff --git a/windows/manage/images/wsfb-licensereclaim.png b/windows/deployment/update/images/wsfb-licensereclaim.png
similarity index 100%
rename from windows/manage/images/wsfb-licensereclaim.png
rename to windows/deployment/update/images/wsfb-licensereclaim.png
diff --git a/windows/manage/images/wsfb-manageinventory.png b/windows/deployment/update/images/wsfb-manageinventory.png
similarity index 100%
rename from windows/manage/images/wsfb-manageinventory.png
rename to windows/deployment/update/images/wsfb-manageinventory.png
diff --git a/windows/manage/images/wsfb-offline-distribute-mdm.png b/windows/deployment/update/images/wsfb-offline-distribute-mdm.png
similarity index 100%
rename from windows/manage/images/wsfb-offline-distribute-mdm.png
rename to windows/deployment/update/images/wsfb-offline-distribute-mdm.png
diff --git a/windows/manage/images/wsfb-onboard-1.png b/windows/deployment/update/images/wsfb-onboard-1.png
similarity index 100%
rename from windows/manage/images/wsfb-onboard-1.png
rename to windows/deployment/update/images/wsfb-onboard-1.png
diff --git a/windows/manage/images/wsfb-onboard-2.png b/windows/deployment/update/images/wsfb-onboard-2.png
similarity index 100%
rename from windows/manage/images/wsfb-onboard-2.png
rename to windows/deployment/update/images/wsfb-onboard-2.png
diff --git a/windows/manage/images/wsfb-onboard-3.png b/windows/deployment/update/images/wsfb-onboard-3.png
similarity index 100%
rename from windows/manage/images/wsfb-onboard-3.png
rename to windows/deployment/update/images/wsfb-onboard-3.png
diff --git a/windows/manage/images/wsfb-onboard-4.png b/windows/deployment/update/images/wsfb-onboard-4.png
similarity index 100%
rename from windows/manage/images/wsfb-onboard-4.png
rename to windows/deployment/update/images/wsfb-onboard-4.png
diff --git a/windows/manage/images/wsfb-onboard-5.png b/windows/deployment/update/images/wsfb-onboard-5.png
similarity index 100%
rename from windows/manage/images/wsfb-onboard-5.png
rename to windows/deployment/update/images/wsfb-onboard-5.png
diff --git a/windows/manage/images/wsfb-onboard-7.png b/windows/deployment/update/images/wsfb-onboard-7.png
similarity index 100%
rename from windows/manage/images/wsfb-onboard-7.png
rename to windows/deployment/update/images/wsfb-onboard-7.png
diff --git a/windows/manage/images/wsfb-online-distribute-mdm.png b/windows/deployment/update/images/wsfb-online-distribute-mdm.png
similarity index 100%
rename from windows/manage/images/wsfb-online-distribute-mdm.png
rename to windows/deployment/update/images/wsfb-online-distribute-mdm.png
diff --git a/windows/manage/images/wsfb-paid-app-temp.png b/windows/deployment/update/images/wsfb-paid-app-temp.png
similarity index 100%
rename from windows/manage/images/wsfb-paid-app-temp.png
rename to windows/deployment/update/images/wsfb-paid-app-temp.png
diff --git a/windows/manage/images/wsfb-permissions-assignrole.png b/windows/deployment/update/images/wsfb-permissions-assignrole.png
similarity index 100%
rename from windows/manage/images/wsfb-permissions-assignrole.png
rename to windows/deployment/update/images/wsfb-permissions-assignrole.png
diff --git a/windows/manage/images/wsfb-private-store-gpo.PNG b/windows/deployment/update/images/wsfb-private-store-gpo.PNG
similarity index 100%
rename from windows/manage/images/wsfb-private-store-gpo.PNG
rename to windows/deployment/update/images/wsfb-private-store-gpo.PNG
diff --git a/windows/manage/images/wsfb-privatestore.png b/windows/deployment/update/images/wsfb-privatestore.png
similarity index 100%
rename from windows/manage/images/wsfb-privatestore.png
rename to windows/deployment/update/images/wsfb-privatestore.png
diff --git a/windows/manage/images/wsfb-privatestoreapps.png b/windows/deployment/update/images/wsfb-privatestoreapps.png
similarity index 100%
rename from windows/manage/images/wsfb-privatestoreapps.png
rename to windows/deployment/update/images/wsfb-privatestoreapps.png
diff --git a/windows/manage/images/wsfb-renameprivatestore.png b/windows/deployment/update/images/wsfb-renameprivatestore.png
similarity index 100%
rename from windows/manage/images/wsfb-renameprivatestore.png
rename to windows/deployment/update/images/wsfb-renameprivatestore.png
diff --git a/windows/manage/images/wsfb-settings-mgmt.png b/windows/deployment/update/images/wsfb-settings-mgmt.png
similarity index 100%
rename from windows/manage/images/wsfb-settings-mgmt.png
rename to windows/deployment/update/images/wsfb-settings-mgmt.png
diff --git a/windows/manage/images/wsfb-settings-permissions.png b/windows/deployment/update/images/wsfb-settings-permissions.png
similarity index 100%
rename from windows/manage/images/wsfb-settings-permissions.png
rename to windows/deployment/update/images/wsfb-settings-permissions.png
diff --git a/windows/manage/images/wsfb-wsappaddacct.png b/windows/deployment/update/images/wsfb-wsappaddacct.png
similarity index 100%
rename from windows/manage/images/wsfb-wsappaddacct.png
rename to windows/deployment/update/images/wsfb-wsappaddacct.png
diff --git a/windows/manage/images/wsfb-wsappprivatestore.png b/windows/deployment/update/images/wsfb-wsappprivatestore.png
similarity index 100%
rename from windows/manage/images/wsfb-wsappprivatestore.png
rename to windows/deployment/update/images/wsfb-wsappprivatestore.png
diff --git a/windows/manage/images/wsfb-wsappsignin.png b/windows/deployment/update/images/wsfb-wsappsignin.png
similarity index 100%
rename from windows/manage/images/wsfb-wsappsignin.png
rename to windows/deployment/update/images/wsfb-wsappsignin.png
diff --git a/windows/manage/images/wsfb-wsappworkacct.png b/windows/deployment/update/images/wsfb-wsappworkacct.png
similarity index 100%
rename from windows/manage/images/wsfb-wsappworkacct.png
rename to windows/deployment/update/images/wsfb-wsappworkacct.png
diff --git a/windows/manage/images/wufb-config1a.png b/windows/deployment/update/images/wufb-config1a.png
similarity index 100%
rename from windows/manage/images/wufb-config1a.png
rename to windows/deployment/update/images/wufb-config1a.png
diff --git a/windows/manage/images/wufb-config2.png b/windows/deployment/update/images/wufb-config2.png
similarity index 100%
rename from windows/manage/images/wufb-config2.png
rename to windows/deployment/update/images/wufb-config2.png
diff --git a/windows/manage/images/wufb-config3a.png b/windows/deployment/update/images/wufb-config3a.png
similarity index 100%
rename from windows/manage/images/wufb-config3a.png
rename to windows/deployment/update/images/wufb-config3a.png
diff --git a/windows/manage/images/wufb-do.png b/windows/deployment/update/images/wufb-do.png
similarity index 100%
rename from windows/manage/images/wufb-do.png
rename to windows/deployment/update/images/wufb-do.png
diff --git a/windows/manage/images/wufb-groups.png b/windows/deployment/update/images/wufb-groups.png
similarity index 100%
rename from windows/manage/images/wufb-groups.png
rename to windows/deployment/update/images/wufb-groups.png
diff --git a/windows/manage/images/wufb-pause-feature.png b/windows/deployment/update/images/wufb-pause-feature.png
similarity index 100%
rename from windows/manage/images/wufb-pause-feature.png
rename to windows/deployment/update/images/wufb-pause-feature.png
diff --git a/windows/manage/images/wufb-qual.png b/windows/deployment/update/images/wufb-qual.png
similarity index 100%
rename from windows/manage/images/wufb-qual.png
rename to windows/deployment/update/images/wufb-qual.png
diff --git a/windows/manage/images/wufb-sccm.png b/windows/deployment/update/images/wufb-sccm.png
similarity index 100%
rename from windows/manage/images/wufb-sccm.png
rename to windows/deployment/update/images/wufb-sccm.png
diff --git a/windows/update/index.md b/windows/deployment/update/index.md
similarity index 97%
rename from windows/update/index.md
rename to windows/deployment/update/index.md
index 18f0e7fcdd..e600862575 100644
--- a/windows/update/index.md
+++ b/windows/deployment/update/index.md
@@ -45,4 +45,4 @@ Windows as a service provides a new way to think about building, deploying, and
>[!TIP]
>Windows servicing is changing, but for disaster recovery scenarios and bare-metal deployments of Windows 10, you still can use traditional imaging software such as System Center Configuration Manager or the Microsoft Deployment Toolkit. Using these tools to deploy Windows 10 images is similar to deploying previous versions of Windows.
->With each release of a new feature update for CB, Microsoft makes available new .iso files for use in updating your custom images. Each Windows 10 build has a finite servicing lifetime, so it’s important that images stay up to date with the latest build. For detailed information about how to deploy Windows 10 to bare-metal machines or to upgrade to Windows 10 from previous builds of Windows, see [Deploy Windows 10 with System Center 2012 R2 Configuration Manager](https://technet.microsoft.com/itpro/windows/deploy/deploy-windows-10-with-system-center-2012-r2-configuration-manager).---
+>With each release of a new feature update for CB, Microsoft makes available new .iso files for use in updating your custom images. Each Windows 10 build has a finite servicing lifetime, so it’s important that images stay up to date with the latest build. For detailed information about how to deploy Windows 10 to bare-metal machines or to upgrade to Windows 10 from previous builds of Windows, see [Deploy Windows 10 with System Center 2012 R2 Configuration Manager](../deploy-windows-sccm/deploy-windows-10-with-system-center-2012-r2-configuration-manager.md).
diff --git a/windows/update/update-compliance-get-started.md b/windows/deployment/update/update-compliance-get-started.md
similarity index 97%
rename from windows/update/update-compliance-get-started.md
rename to windows/deployment/update/update-compliance-get-started.md
index ad42d0a9ca..f6c1878943 100644
--- a/windows/update/update-compliance-get-started.md
+++ b/windows/deployment/update/update-compliance-get-started.md
@@ -14,14 +14,14 @@ This topic explains the steps necessary to configure your environment for Window
Steps are provided in sections that follow the recommended setup process:
1. Ensure that [prerequisites](#update-compliance-prerequisites) are met.
-2. [Add Update Compliance](#add-update-compliance-to-microsoft-operatiions-management-suite) to Microsoft Operations Management Suite
+2. [Add Update Compliance](#add-update-compliance-to-microsoft-operations-management-suite) to Microsoft Operations Management Suite
3. [Deploy your Commercial ID](#deploy-your-commercial-id-to-your-windows-10-devices) to your organization’s devices
## Update Compliance Prerequisites
Update Compliance has the following requirements:
1. Update Compliance is currently only compatible with Windows 10 devices. The solution is intended to be used with desktop devices (Windows 10 workstations and laptops).
-2. The solution requires that Windows 10 telemetry is enabled on all devices that are intended to be displayed in the solution. These devices must have at least the [basic level of telemetry](https://technet.microsoft.com/itpro/windows/manage/configure-windows-telemetry-in-your-organization#basic-level) enabled. To learn more about Windows telemetry, see [Configure Windows telemetry in your organization](../configure/configure-windows-telemetry-in-your-organization.md).
+2. The solution requires that Windows 10 telemetry is enabled on all devices that are intended to be displayed in the solution. These devices must have at least the [basic level of telemetry](https://technet.microsoft.com/itpro/windows/manage/configure-windows-telemetry-in-your-organization#basic-level) enabled. To learn more about Windows telemetry, see [Configure Windows telemetry in your organization](/windows/configuration/configure-windows-telemetry-in-your-organization).
3. The telemetry of your organization’s Windows devices must be successfully transmitted to Microsoft. Microsoft has specified [endpoints for different aspects of telemetry](https://technet.microsoft.com/itpro/windows/manage/configure-windows-telemetry-in-your-organization#endpoints), which must be whitelisted by your organization so the data can be transmitted. The following table is taken from the article on telemetry endpoints and summarizes the use of each endpoint:
diff --git a/windows/update/update-compliance-monitor.md b/windows/deployment/update/update-compliance-monitor.md
similarity index 100%
rename from windows/update/update-compliance-monitor.md
rename to windows/deployment/update/update-compliance-monitor.md
diff --git a/windows/update/update-compliance-using.md b/windows/deployment/update/update-compliance-using.md
similarity index 100%
rename from windows/update/update-compliance-using.md
rename to windows/deployment/update/update-compliance-using.md
diff --git a/windows/update/waas-branchcache.md b/windows/deployment/update/waas-branchcache.md
similarity index 95%
rename from windows/update/waas-branchcache.md
rename to windows/deployment/update/waas-branchcache.md
index 605234e7e2..4c15562191 100644
--- a/windows/update/waas-branchcache.md
+++ b/windows/deployment/update/waas-branchcache.md
@@ -55,12 +55,12 @@ In addition to these steps, there is one requirement for WSUS to be able to use
- [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md)
- [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
-- [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
- [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
- [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
-- [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-- [Manage Windows 10 updates using Configuration Manager](waas-manage-updates-configuration-manager.md)
+- [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
+- [Deploy Windows 10 updates using Configuration Manager](waas-manage-updates-configuration-manager.md)
- [Manage device restarts after updates](waas-restart.md)
diff --git a/windows/update/waas-configure-wufb.md b/windows/deployment/update/waas-configure-wufb.md
similarity index 98%
rename from windows/update/waas-configure-wufb.md
rename to windows/deployment/update/waas-configure-wufb.md
index 03aeba51b9..283aaf793a 100644
--- a/windows/update/waas-configure-wufb.md
+++ b/windows/deployment/update/waas-configure-wufb.md
@@ -23,7 +23,7 @@ You can use Group Policy or your mobile device management (MDM) service to confi
>[!IMPORTANT]
>For Windows Update for Business policies to be honored, the Telemetry level of the device must be set to **1 (Basic)** or higher. If it is set to **0 (Security)**, Windows Update for Business policies will have no effect. For instructions, see [Configure the operating system telemetry level](https://technet.microsoft.com/en-us/itpro/windows/manage/configure-windows-telemetry-in-your-organization#configure-the-operating-system-telemetry-level).
-Some Windows Update for Business policies are not applicable or behave differently for devices running Windows 10 Mobile Enterprise. Specifically, policies pertaining to Feature Updates will not be applied to Windows 10 Mobile Enterprise. All Windows 10 Mobile updates are recognized as Quality Updates, and can only be deferred or paused using the Quality Update policy settings. Additional information is provided in this topic and in [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md).
+Some Windows Update for Business policies are not applicable or behave differently for devices running Windows 10 Mobile Enterprise. Specifically, policies pertaining to Feature Updates will not be applied to Windows 10 Mobile Enterprise. All Windows 10 Mobile updates are recognized as Quality Updates, and can only be deferred or paused using the Quality Update policy settings. Additional information is provided in this topic and in [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md).
## Start by grouping devices
@@ -260,11 +260,11 @@ In the Windows Update for Business policies in version 1511, all the deferral ru
- [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
-- [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)
- [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
- [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
-- [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-- [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
+- [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
+- [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
- [Manage device restarts after updates](waas-restart.md)
\ No newline at end of file
diff --git a/windows/update/waas-delivery-optimization.md b/windows/deployment/update/waas-delivery-optimization.md
similarity index 98%
rename from windows/update/waas-delivery-optimization.md
rename to windows/deployment/update/waas-delivery-optimization.md
index ffc4f91f43..070e8de2d1 100644
--- a/windows/update/waas-delivery-optimization.md
+++ b/windows/deployment/update/waas-delivery-optimization.md
@@ -206,12 +206,12 @@ On devices that are not preferred, you can choose to set the following policy to
- [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md)
- [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
-- [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
- [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
- [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
-- [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-- [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
+- [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
+- [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
- [Manage device restarts after updates](waas-restart.md)
diff --git a/windows/update/waas-deployment-rings-windows-10-updates.md b/windows/deployment/update/waas-deployment-rings-windows-10-updates.md
similarity index 73%
rename from windows/update/waas-deployment-rings-windows-10-updates.md
rename to windows/deployment/update/waas-deployment-rings-windows-10-updates.md
index 697b85bf4b..bec102fa51 100644
--- a/windows/update/waas-deployment-rings-windows-10-updates.md
+++ b/windows/deployment/update/waas-deployment-rings-windows-10-updates.md
@@ -51,24 +51,19 @@ As Table 1 shows, each combination of servicing branch and deployment group is t
## Steps to manage updates for Windows 10
-
-

[Learn about updates and servicing branches](waas-overview.md)
-

[Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md)
-

Build deployment rings for Windows 10 updates
-(this topic)
-

[Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md)
-

[Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
-

[Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
-or [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-or [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
-
-
-
+| | |
+| --- | --- |
+|  | [Learn about updates and servicing branches](waas-overview.md) |
+|  | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) |
+|  | Build deployment rings for Windows 10 updates (this topic) |
+|  | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) |
+|  | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |
+|  | [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)or [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)or [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) |
## Related topics
- [Update Windows 10 in the enterprise](index.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
diff --git a/windows/update/waas-integrate-wufb.md b/windows/deployment/update/waas-integrate-wufb.md
similarity index 96%
rename from windows/update/waas-integrate-wufb.md
rename to windows/deployment/update/waas-integrate-wufb.md
index f6058440b0..36bba4f716 100644
--- a/windows/update/waas-integrate-wufb.md
+++ b/windows/deployment/update/waas-integrate-wufb.md
@@ -100,12 +100,12 @@ For Windows 10, version 1607, organizations already managing their systems with
- [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
-- [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
- [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
-- [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-- [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
+- [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
+- [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
- [Manage device restarts after updates](waas-restart.md)
diff --git a/windows/update/waas-manage-updates-configuration-manager.md b/windows/deployment/update/waas-manage-updates-configuration-manager.md
similarity index 92%
rename from windows/update/waas-manage-updates-configuration-manager.md
rename to windows/deployment/update/waas-manage-updates-configuration-manager.md
index 755c3c34a5..d78e5d9504 100644
--- a/windows/update/waas-manage-updates-configuration-manager.md
+++ b/windows/deployment/update/waas-manage-updates-configuration-manager.md
@@ -8,7 +8,7 @@ author: DaniHalfin
localizationpriority: high
---
-# Manage Windows 10 updates using System Center Configuration Manager
+# Deploy Windows 10 updates using System Center Configuration Manager
**Applies to**
@@ -287,32 +287,22 @@ With the task sequence created, you’re ready to deploy it. If you’re using t
12. Click **Close**.
-
-
-
-
## Steps to manage updates for Windows 10
-
-

[Learn about updates and servicing branches](waas-overview.md)
-

[Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md)
-

[Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md)
-

[Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md)
-

[Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
-

[Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
-or [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-or Manage Windows 10 updates using System Center Configuration Manager (this topic)
-
-
+| | |
+| --- | --- |
+|  | [Learn about updates and servicing branches](waas-overview.md) |
+|  | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) |
+|  | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) |
+|  | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) |
+|  | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |
+|  | [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)or [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)or Deploy Windows 10 updates using System Center Configuration Manager (this topic) |
## See also
[Manage Windows as a service using System Center Configuration Manager](https://docs.microsoft.com/sccm/osd/deploy-use/manage-windows-as-a-service)
-
-
-
## Related topics
- [Update Windows 10 in the enterprise](index.md)
@@ -323,11 +313,11 @@ or Manage Windows 10 updates using System Center Configuration Manager (this top
- [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
-- [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
- [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
- [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
-- [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
+- [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
- [Manage device restarts after updates](waas-restart.md)
diff --git a/windows/update/waas-manage-updates-wsus.md b/windows/deployment/update/waas-manage-updates-wsus.md
similarity index 91%
rename from windows/update/waas-manage-updates-wsus.md
rename to windows/deployment/update/waas-manage-updates-wsus.md
index d491319549..afbaf3cfaf 100644
--- a/windows/update/waas-manage-updates-wsus.md
+++ b/windows/deployment/update/waas-manage-updates-wsus.md
@@ -8,7 +8,7 @@ author: DaniHalfin
localizationpriority: high
---
-# Manage Windows 10 updates using Windows Server Update Services (WSUS)
+# Deploy Windows 10 updates using Windows Server Update Services (WSUS)
**Applies to**
@@ -319,17 +319,14 @@ Now that you have the All Windows 10 Upgrades view, complete the following steps
## Steps to manage updates for Windows 10
-
-

[Learn about updates and servicing branches](waas-overview.md)
-

[Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md)
-

[Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md)
-

[Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md)
-

[Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
-

[Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
-or Manage Windows 10 updates using Windows Server Update Services (this topic)
-or [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
-
-
+| | |
+| --- | --- |
+|  | [Learn about updates and servicing branches](waas-overview.md) |
+|  | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) |
+|  | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) |
+|  | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) |
+|  | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |
+|  | [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)or Deploy Windows 10 updates using Windows Server Update Services (this topic)or [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) |
@@ -343,11 +340,11 @@ or [Manage Windows 10 updates using System Center Configuration Manager](waas-ma
- [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
-- [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
- [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
- [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
-- [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
+- [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
- [Manage device restarts after updates](waas-restart.md)
\ No newline at end of file
diff --git a/windows/update/waas-manage-updates-wufb.md b/windows/deployment/update/waas-manage-updates-wufb.md
similarity index 82%
rename from windows/update/waas-manage-updates-wufb.md
rename to windows/deployment/update/waas-manage-updates-wufb.md
index f38ac5333c..75bd5b81d8 100644
--- a/windows/update/waas-manage-updates-wufb.md
+++ b/windows/deployment/update/waas-manage-updates-wufb.md
@@ -8,7 +8,7 @@ author: DaniHalfin
localizationpriority: high
---
-# Manage updates using Windows Update for Business
+# Deploy updates using Windows Update for Business
**Applies to**
@@ -114,17 +114,14 @@ For more information about Update Compliance, see [Monitor Windows Updates using
## Steps to manage updates for Windows 10
-
-

[Learn about updates and servicing branches](waas-overview.md)
-

[Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md)
-

[Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md)
-

[Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md)
-

[Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
-

Manage updates using Windows Update for Business (this topic)
-or [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-or [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
-
-
+| | |
+| --- | --- |
+|  | [Learn about updates and servicing branches](waas-overview.md) |
+|  | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) |
+|  | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) |
+|  | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) |
+|  | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |
+|  | Deploy updates using Windows Update for Business (this topic) or [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)or [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) |
## Related topics
- [Update Windows 10 in the enterprise](index.md)
@@ -135,13 +132,13 @@ or [Manage Windows 10 updates using System Center Configuration Manager](waas-ma
- [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
- [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
- [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
-- [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-- [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
+- [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
+- [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
- [Manage device restarts after updates](waas-restart.md)
diff --git a/windows/update/waas-mobile-updates.md b/windows/deployment/update/waas-mobile-updates.md
similarity index 94%
rename from windows/update/waas-mobile-updates.md
rename to windows/deployment/update/waas-mobile-updates.md
index ce0c446a7a..267cfb37c2 100644
--- a/windows/update/waas-mobile-updates.md
+++ b/windows/deployment/update/waas-mobile-updates.md
@@ -8,7 +8,7 @@ author: DaniHalfin
localizationpriority: high
---
-# Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile
+# Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile
**Applies to**
@@ -71,13 +71,13 @@ If a device running Windows 10 Mobile Enterprise or Windows 10 IoT Mobile, versi
- [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
-- [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
+- [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
- [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
- [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
-- [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-- [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
+- [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
+- [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
- [Manage device restarts after updates](waas-restart.md)
diff --git a/windows/update/waas-optimize-windows-10-updates.md b/windows/deployment/update/waas-optimize-windows-10-updates.md
similarity index 82%
rename from windows/update/waas-optimize-windows-10-updates.md
rename to windows/deployment/update/waas-optimize-windows-10-updates.md
index 0c618399e9..0d6fac4aab 100644
--- a/windows/update/waas-optimize-windows-10-updates.md
+++ b/windows/deployment/update/waas-optimize-windows-10-updates.md
@@ -8,7 +8,7 @@ author: DaniHalfin
localizationpriority: high
---
-# Optimize update delivery for Windows 10 updates
+# Optimize Windows 10 update delivery
**Applies to**
@@ -80,25 +80,21 @@ At this point, the download is complete and the update is ready to be installed.
## Steps to manage updates for Windows 10
-
-

[Learn about updates and servicing branches](waas-overview.md)
-

[Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md)
-

[Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md)
-

[Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md)
-

Optimize update delivery for Windows 10 updates (this topic)
-

[Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
-or [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-or [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
-
-
-
+| | |
+| --- | --- |
+|  | [Learn about updates and servicing branches](waas-overview.md) |
+|  | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) |
+|  | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) |
+|  | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) |
+|  | Optimize update delivery for Windows 10 updates (this topic) |
+|  | [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)or [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)or [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) |
## Related topics
- [Update Windows 10 in the enterprise](index.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
diff --git a/windows/update/waas-overview.md b/windows/deployment/update/waas-overview.md
similarity index 93%
rename from windows/update/waas-overview.md
rename to windows/deployment/update/waas-overview.md
index 0f6ce95d81..764051919e 100644
--- a/windows/update/waas-overview.md
+++ b/windows/deployment/update/waas-overview.md
@@ -159,17 +159,14 @@ With all these options, which an organization chooses depends on the resources,
## Steps to manage updates for Windows 10
-
-

Learn about updates and servicing branches (this topic)
-

[Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md)
-

[Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md)
-

[Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md)
-

[Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
-

[Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
-or [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-or [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
-
-
+| | |
+| --- | --- |
+|  | Learn about updates and servicing branches (this topic) |
+|  | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) |
+|  | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) |
+|  | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) |
+|  | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |
+|  | [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)or [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)or [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) |
@@ -177,7 +174,7 @@ or [Manage Windows 10 updates using System Center Configuration Manager](waas-ma
- [Update Windows 10 in the enterprise](index.md)
- [Quick guide to Windows as a service](waas-quick-start.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
diff --git a/windows/update/waas-quick-start.md b/windows/deployment/update/waas-quick-start.md
similarity index 98%
rename from windows/update/waas-quick-start.md
rename to windows/deployment/update/waas-quick-start.md
index 51827c8f74..917f902b1c 100644
--- a/windows/update/waas-quick-start.md
+++ b/windows/deployment/update/waas-quick-start.md
@@ -64,7 +64,7 @@ See [Build deployment rings for Windows 10 updates](waas-deployment-rings-window
## Related topics
- [Update Windows 10 in the enterprise](index.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
diff --git a/windows/update/waas-restart.md b/windows/deployment/update/waas-restart.md
similarity index 100%
rename from windows/update/waas-restart.md
rename to windows/deployment/update/waas-restart.md
diff --git a/windows/update/waas-servicing-branches-windows-10-updates.md b/windows/deployment/update/waas-servicing-branches-windows-10-updates.md
similarity index 87%
rename from windows/update/waas-servicing-branches-windows-10-updates.md
rename to windows/deployment/update/waas-servicing-branches-windows-10-updates.md
index dec5263d65..d92a5becf5 100644
--- a/windows/update/waas-servicing-branches-windows-10-updates.md
+++ b/windows/deployment/update/waas-servicing-branches-windows-10-updates.md
@@ -182,21 +182,6 @@ During the life of a device, it may be necessary or desirable to switch between
-
-## Steps to manage updates for Windows 10
-
-
-

[Learn about updates and servicing branches](waas-overview.md)
-

[Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md)
-

[Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md)
-

Assign devices to servicing branches for Windows 10 updates (this topic)
-

[Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
-

[Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
-or [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-or [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
-
-
-
## Block user access to Windows Update settings
In Windows 10, administrators can control user access to Windows Update.
@@ -205,10 +190,21 @@ By enabling the Group Policy setting under **Computer Configuration\Administrati
>[!NOTE]
> In Windows 10, any Group Policy user configuration settings for Windows Update were deprecated and are no longer supported on this platform.
+## Steps to manage updates for Windows 10
+
+| | |
+| --- | --- |
+|  | [Learn about updates and servicing branches](waas-overview.md) |
+|  | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) |
+|  | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) |
+|  | Assign devices to servicing branches for Windows 10 updates (this topic) |
+|  | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |
+|  | [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)or [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)or [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) |
+
## Related topics
- [Update Windows 10 in the enterprise](index.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
diff --git a/windows/update/waas-servicing-strategy-windows-10-updates.md b/windows/deployment/update/waas-servicing-strategy-windows-10-updates.md
similarity index 82%
rename from windows/update/waas-servicing-strategy-windows-10-updates.md
rename to windows/deployment/update/waas-servicing-strategy-windows-10-updates.md
index 6996fe3d0f..fa78ac3fc5 100644
--- a/windows/update/waas-servicing-strategy-windows-10-updates.md
+++ b/windows/deployment/update/waas-servicing-strategy-windows-10-updates.md
@@ -30,10 +30,10 @@ Windows 10 spreads the traditional deployment effort of a Windows upgrade, which
- **Identify excluded PCs.** For some organizations, special-purpose devices such as those used to control factory or medical equipment or run ATMs require a stricter, less frequent feature update cycle than CB or Current Branch for Business (CBB) can offer. For those machines, you must install Windows 10 Enterprise LTSB to avoid feature updates for up to 10 years. Identify these PCs, and separate them from the phased deployment and servicing cycles to help remove confusion for your administrators and ensure that devices are handled correctly.
- **Recruit volunteers.** The purpose of testing a deployment is to receive feedback. One effective way to recruit pilot users is to request volunteers. When doing so, clearly state that you’re looking for feedback rather than people to just “try it out” and that there could be occasional issues involved with accepting feature updates right away. With Windows as a service, the expectation is that there should be few issues, but if an issue does arise, you want testers to let you know as soon as possible. When considering whom to recruit for pilot groups, be sure to include members who provide the broadest set of applications and devices to validate the largest number of apps and devices possible.
- **Choose a servicing tool.** Decide which product you’ll use to manage the Windows updates in your environment. If you’re currently using Windows Server Update Services (WSUS) or System Center Configuration Manager to manage your Windows updates, you can continue using those products to manage Windows 10 updates. Alternatively, you can use Windows Update for Business. In addition to which product you’ll use, consider how you’ll deliver the updates. With Windows 10, multiple peer-to-peer options are available to make update distribution faster. For a comparison of tools, see [Servicing tools](waas-overview.md#servicing-tools).
-- **Prioritize applications.** First, create an application portfolio. This list should include everything installed in your organization and any webpages your organization hosts. Next, prioritize this list to identify those that are the most business critical. Because the expectation is that application compatibility with Windows 10 will be high, only the most business critical applications should be tested before the pilot phase; everything else can be tested afterwards. For more information about identifying compatibility issues withe applications, see [Manage Windows upgrades with Upgrade Analytics](https://technet.microsoft.com/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics).
+- **Prioritize applications.** First, create an application portfolio. This list should include everything installed in your organization and any webpages your organization hosts. Next, prioritize this list to identify those that are the most business critical. Because the expectation is that application compatibility with Windows 10 will be high, only the most business critical applications should be tested before the pilot phase; everything else can be tested afterwards. For more information about identifying compatibility issues withe applications, see [Manage Windows upgrades with Upgrade Analytics](../upgrade/manage-windows-upgrades-with-upgrade-analytics.md).
>[!NOTE]
->This strategy is applicable to approaching an environment in which Windows 10 already exists. For information about how to deploy or upgrade to Windows 10 where another version of Windows exists, see [Plan for Windows 10 deployment](https://technet.microsoft.com/itpro/windows/plan/index).
+>This strategy is applicable to approaching an environment in which Windows 10 already exists. For information about how to deploy or upgrade to Windows 10 where another version of Windows exists, see [Plan for Windows 10 deployment](../planning/index.md).
Each time Microsoft releases a Windows 10 feature update, the IT department should use the following high-level process to help ensure that the broad deployment is successful:
@@ -44,23 +44,20 @@ Each time Microsoft releases a Windows 10 feature update, the IT department shou
## Steps to manage updates for Windows 10
-
-

[Learn about updates and servicing branches](waas-overview.md)
-

Prepare servicing strategy for Windows 10 updates (this topic)
-

[Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md)
-

[Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md)
-

[Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
-

[Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
-or [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-or [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
-
-
+| | |
+| --- | --- |
+|  | [Learn about updates and servicing branches](waas-overview.md) |
+|  | Prepare servicing strategy for Windows 10 updates (this topic) |
+|  | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) |
+|  | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) |
+|  | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |
+|  | [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)or [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)or [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) |
## Related topics
- [Update Windows 10 in the enterprise](index.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
diff --git a/windows/update/waas-windows-insider-for-business-aad.md b/windows/deployment/update/waas-windows-insider-for-business-aad.md
similarity index 100%
rename from windows/update/waas-windows-insider-for-business-aad.md
rename to windows/deployment/update/waas-windows-insider-for-business-aad.md
diff --git a/windows/update/waas-windows-insider-for-business-faq.md b/windows/deployment/update/waas-windows-insider-for-business-faq.md
similarity index 100%
rename from windows/update/waas-windows-insider-for-business-faq.md
rename to windows/deployment/update/waas-windows-insider-for-business-faq.md
diff --git a/windows/update/waas-windows-insider-for-business.md b/windows/deployment/update/waas-windows-insider-for-business.md
similarity index 100%
rename from windows/update/waas-windows-insider-for-business.md
rename to windows/deployment/update/waas-windows-insider-for-business.md
diff --git a/windows/update/waas-wufb-group-policy.md b/windows/deployment/update/waas-wufb-group-policy.md
similarity index 98%
rename from windows/update/waas-wufb-group-policy.md
rename to windows/deployment/update/waas-wufb-group-policy.md
index 9346bd5711..4b8c9d6362 100644
--- a/windows/update/waas-wufb-group-policy.md
+++ b/windows/deployment/update/waas-wufb-group-policy.md
@@ -342,11 +342,11 @@ The **Ring 4 Broad business users** deployment ring has now been configured. Fin
- [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
-- [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
- [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
-- [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-- [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
+- [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
+- [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
- [Manage device restarts after updates](waas-restart.md)
\ No newline at end of file
diff --git a/windows/update/waas-wufb-intune.md b/windows/deployment/update/waas-wufb-intune.md
similarity index 98%
rename from windows/update/waas-wufb-intune.md
rename to windows/deployment/update/waas-wufb-intune.md
index 5b610b1336..fd8cb722f8 100644
--- a/windows/update/waas-wufb-intune.md
+++ b/windows/deployment/update/waas-wufb-intune.md
@@ -265,13 +265,13 @@ You have now configured the **Ring 4 Broad business users** deployment ring to r
- [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
- [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
- [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
-- [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
-- [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
+- [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
+- [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)
- [Configure Windows Update for Business](waas-configure-wufb.md)
- [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
- [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-- [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
+- [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
+- [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
- [Manage device restarts after updates](waas-restart.md)
diff --git a/windows/deploy/manage-windows-upgrades-with-upgrade-analytics.md b/windows/deployment/upgrade/manage-windows-upgrades-with-upgrade-analytics.md
similarity index 100%
rename from windows/deploy/manage-windows-upgrades-with-upgrade-analytics.md
rename to windows/deployment/upgrade/manage-windows-upgrades-with-upgrade-analytics.md
diff --git a/windows/deploy/manage-windows-upgrades-with-upgrade-readiness.md b/windows/deployment/upgrade/manage-windows-upgrades-with-upgrade-readiness.md
similarity index 100%
rename from windows/deploy/manage-windows-upgrades-with-upgrade-readiness.md
rename to windows/deployment/upgrade/manage-windows-upgrades-with-upgrade-readiness.md
diff --git a/windows/deploy/resolve-windows-10-upgrade-errors.md b/windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md
similarity index 99%
rename from windows/deploy/resolve-windows-10-upgrade-errors.md
rename to windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md
index e3463993e2..2ec92b3418 100644
--- a/windows/deploy/resolve-windows-10-upgrade-errors.md
+++ b/windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md
@@ -51,7 +51,7 @@ The Windows Setup application is used to upgrade a computer to Windows 10, or to
**Figure 1**: Phases of a successful Windows 10 upgrade (uninstall is not shown):
-
+
DU = Driver/device updates.
OOBE = Out of box experience.
diff --git a/windows/deploy/troubleshoot-upgrade-analytics.md b/windows/deployment/upgrade/troubleshoot-upgrade-analytics.md
similarity index 100%
rename from windows/deploy/troubleshoot-upgrade-analytics.md
rename to windows/deployment/upgrade/troubleshoot-upgrade-analytics.md
diff --git a/windows/deploy/troubleshoot-upgrade-readiness.md b/windows/deployment/upgrade/troubleshoot-upgrade-readiness.md
similarity index 97%
rename from windows/deploy/troubleshoot-upgrade-readiness.md
rename to windows/deployment/upgrade/troubleshoot-upgrade-readiness.md
index 2cc9bf9340..bb0caaf247 100644
--- a/windows/deploy/troubleshoot-upgrade-readiness.md
+++ b/windows/deployment/upgrade/troubleshoot-upgrade-readiness.md
@@ -27,7 +27,7 @@ If you want to stop using Upgrade Readiness and stop sending telemetry data to M
1. Unsubscribe from the Upgrade Readiness solution in the OMS portal. In the OMS portal, go to **Settings** > **Connected Sources** > **Windows Telemetry** and choose the **Unsubscribe** option.
- 
+ 
2. Disable the Commercial Data Opt-in Key on computers running Windows 7 SP1 or 8.1. On computers running Windows 10, set the telemetry level to **Security**:
diff --git a/windows/deploy/upgrade-analytics-additional-insights.md b/windows/deployment/upgrade/upgrade-analytics-additional-insights.md
similarity index 100%
rename from windows/deploy/upgrade-analytics-additional-insights.md
rename to windows/deployment/upgrade/upgrade-analytics-additional-insights.md
diff --git a/windows/deploy/upgrade-analytics-architecture.md b/windows/deployment/upgrade/upgrade-analytics-architecture.md
similarity index 100%
rename from windows/deploy/upgrade-analytics-architecture.md
rename to windows/deployment/upgrade/upgrade-analytics-architecture.md
diff --git a/windows/deploy/upgrade-analytics-deploy-windows.md b/windows/deployment/upgrade/upgrade-analytics-deploy-windows.md
similarity index 100%
rename from windows/deploy/upgrade-analytics-deploy-windows.md
rename to windows/deployment/upgrade/upgrade-analytics-deploy-windows.md
diff --git a/windows/deploy/upgrade-analytics-deployment-script.md b/windows/deployment/upgrade/upgrade-analytics-deployment-script.md
similarity index 100%
rename from windows/deploy/upgrade-analytics-deployment-script.md
rename to windows/deployment/upgrade/upgrade-analytics-deployment-script.md
diff --git a/windows/deploy/upgrade-analytics-get-started.md b/windows/deployment/upgrade/upgrade-analytics-get-started.md
similarity index 100%
rename from windows/deploy/upgrade-analytics-get-started.md
rename to windows/deployment/upgrade/upgrade-analytics-get-started.md
diff --git a/windows/deploy/upgrade-analytics-identify-apps.md b/windows/deployment/upgrade/upgrade-analytics-identify-apps.md
similarity index 100%
rename from windows/deploy/upgrade-analytics-identify-apps.md
rename to windows/deployment/upgrade/upgrade-analytics-identify-apps.md
diff --git a/windows/deploy/upgrade-analytics-requirements.md b/windows/deployment/upgrade/upgrade-analytics-requirements.md
similarity index 100%
rename from windows/deploy/upgrade-analytics-requirements.md
rename to windows/deployment/upgrade/upgrade-analytics-requirements.md
diff --git a/windows/deploy/upgrade-analytics-resolve-issues.md b/windows/deployment/upgrade/upgrade-analytics-resolve-issues.md
similarity index 100%
rename from windows/deploy/upgrade-analytics-resolve-issues.md
rename to windows/deployment/upgrade/upgrade-analytics-resolve-issues.md
diff --git a/windows/deploy/upgrade-analytics-upgrade-overview.md b/windows/deployment/upgrade/upgrade-analytics-upgrade-overview.md
similarity index 100%
rename from windows/deploy/upgrade-analytics-upgrade-overview.md
rename to windows/deployment/upgrade/upgrade-analytics-upgrade-overview.md
diff --git a/windows/deploy/upgrade-readiness-additional-insights.md b/windows/deployment/upgrade/upgrade-readiness-additional-insights.md
similarity index 93%
rename from windows/deploy/upgrade-readiness-additional-insights.md
rename to windows/deployment/upgrade/upgrade-readiness-additional-insights.md
index e7a8b7a54c..8fe0d076bf 100644
--- a/windows/deploy/upgrade-readiness-additional-insights.md
+++ b/windows/deployment/upgrade/upgrade-readiness-additional-insights.md
@@ -46,7 +46,7 @@ Ensure the following prerequisites are met before using site discovery:
For more information about Internet Explorer Security Zones, see [About URL Security Zones](https://msdn.microsoft.com/library/ms537183.aspx).
- 
+ 
### Review most active sites
@@ -54,23 +54,23 @@ This blade indicates the most visited sites by computers in your environment. Re
For each site, the fully qualified domain name will be listed. You can sort the data by domain name or by URL.
-
+
Click the name of any site in the list to drill down into more details about the visits, including the time of each visit and the computer name.
-
+
### Review document modes in use
This blade provides information about which document modes are used in the sites that are visited in your environment. Document modes are used to provide compatibility with older versions of Internet Explorer. Sites that use older technologies may require additional testing and are less likely to be compatible with Microsoft Edge. Counts are based on total page views and not the number of unique devices. For more information about document modes, see [Deprecated document modes](https://technet.microsoft.com/itpro/internet-explorer/ie11-deploy-guide/deprecated-document-modes).
-
+
### Run browser-related queries
You can run predefined queries to capture more info, such as sites that have Enterprise Mode enabled, or the number of unique computers that have visited a site. For example, this query returns the most used ActiveX controls. You can modify and save the predefined queries.
-
+
## Office add-ins
diff --git a/windows/deploy/upgrade-readiness-architecture.md b/windows/deployment/upgrade/upgrade-readiness-architecture.md
similarity index 96%
rename from windows/deploy/upgrade-readiness-architecture.md
rename to windows/deployment/upgrade/upgrade-readiness-architecture.md
index 93a028f925..6bc7492d37 100644
--- a/windows/deploy/upgrade-readiness-architecture.md
+++ b/windows/deployment/upgrade/upgrade-readiness-architecture.md
@@ -13,7 +13,7 @@ Microsoft analyzes system, application, and driver telemetry data to help you de
-->
-
+
After you enable Windows telemetry on user computers and install the compatibility update KB (1), user computers send computer, application and driver telemetry data to a secure Microsoft data center through the Microsoft Data Management Service (2). After you configure Upgrade Readiness, telemetry data is analyzed by the Upgrade Readiness Service (3) and pushed to your OMS workspace (4). You can then use the Upgrade Readiness solution (5) to plan and manage Windows upgrades.
diff --git a/windows/deploy/upgrade-readiness-data-sharing.md b/windows/deployment/upgrade/upgrade-readiness-data-sharing.md
similarity index 100%
rename from windows/deploy/upgrade-readiness-data-sharing.md
rename to windows/deployment/upgrade/upgrade-readiness-data-sharing.md
diff --git a/windows/deploy/upgrade-readiness-deploy-windows.md b/windows/deployment/upgrade/upgrade-readiness-deploy-windows.md
similarity index 95%
rename from windows/deploy/upgrade-readiness-deploy-windows.md
rename to windows/deployment/upgrade/upgrade-readiness-deploy-windows.md
index bb54670f8d..642e0ed67b 100644
--- a/windows/deploy/upgrade-readiness-deploy-windows.md
+++ b/windows/deployment/upgrade/upgrade-readiness-deploy-windows.md
@@ -26,7 +26,7 @@ In this blade, computers grouped by upgrade decision are listed. The upgrade dec
-->
-
+
Select **Export computers** for more details, including computer name, manufacturer and model, and Windows edition currently running on the computer. Sort or further query the data and then select **Export** to generate and save a comma-separated value (csv) list of upgrade-ready computers.
@@ -42,7 +42,7 @@ Query based computer groups are recommended in the initial release of this featu
When you sign in to OMS, you will see a new blade entitled **Computer Groups**. See the following example:
-
+
To create a computer group, open **Log Search** and create a query based on **Type=UAComputer**, for example:
@@ -50,7 +50,7 @@ To create a computer group, open **Log Search** and create a query based on **Ty
Type=UAComputer Manufacturer=DELL
```
-
+
When you are satisfied that the query is returning the intended results, add the following text to your search:
@@ -60,25 +60,25 @@ When you are satisfied that the query is returning the intended results, add the
This will ensure every computer only shows up once. Then, save your group by clicking **Save** and **Yes**. See the following example:
-
+
Your new computer group will now be available in Upgrade Readiness. See the following example:
-
+
### Using Computer Groups
When you drill into a computer group, you will see that computers are categorized by **UpgradeDecision**. For computers with the status **Review in progress** or **Won’t upgrade** you can drill down to view issues that cause a computer to be in each category, or you can simply display a list of the computers in the category. For computers that are designated **Ready to upgrade**, you can go directly to the list of computers that are ready.
-
+
Viewing a list of computers in a certain status is self-explanatory, Let’s look at what happens when you click the details link on **Review in progress**:
-
+
Next, select if you want to see application issues (**UAApp**) or driver issues (**UADriver**). See the following example of selecting **UAApp**:
-
+
A list of apps that require review so that Dell Computers are ready for upgrade to Windows 10 is displayed.
diff --git a/windows/deploy/upgrade-readiness-deployment-script.md b/windows/deployment/upgrade/upgrade-readiness-deployment-script.md
similarity index 100%
rename from windows/deploy/upgrade-readiness-deployment-script.md
rename to windows/deployment/upgrade/upgrade-readiness-deployment-script.md
diff --git a/windows/deploy/upgrade-readiness-get-started.md b/windows/deployment/upgrade/upgrade-readiness-get-started.md
similarity index 99%
rename from windows/deploy/upgrade-readiness-get-started.md
rename to windows/deployment/upgrade/upgrade-readiness-get-started.md
index f8dbb049ab..102fb76463 100644
--- a/windows/deploy/upgrade-readiness-get-started.md
+++ b/windows/deployment/upgrade/upgrade-readiness-get-started.md
@@ -61,7 +61,7 @@ Microsoft uses a unique commercial ID to map information from user computers to
1. On the Settings Dashboard, navigate to the **Windows telemetry** panel.
- 
+ 
2. On the Windows telemetry panel, copy and save your commercial ID key. You’ll need to insert this key into the Upgrade Readiness deployment script later so it can be deployed to user computers.
diff --git a/windows/deploy/upgrade-readiness-identify-apps.md b/windows/deployment/upgrade/upgrade-readiness-identify-apps.md
similarity index 98%
rename from windows/deploy/upgrade-readiness-identify-apps.md
rename to windows/deployment/upgrade/upgrade-readiness-identify-apps.md
index 33b5d248c5..6beb49c163 100644
--- a/windows/deploy/upgrade-readiness-identify-apps.md
+++ b/windows/deployment/upgrade/upgrade-readiness-identify-apps.md
@@ -13,7 +13,7 @@ This is the first step of the Upgrade Readiness workflow. In this step, applicat
-->
-
+
Select **Assign importance** to change an application’s importance level. By default, applications are marked **Not reviewed** or **Low install count** until you assign a different importance level to them.
diff --git a/windows/deploy/upgrade-readiness-release-notes.md b/windows/deployment/upgrade/upgrade-readiness-release-notes.md
similarity index 100%
rename from windows/deploy/upgrade-readiness-release-notes.md
rename to windows/deployment/upgrade/upgrade-readiness-release-notes.md
diff --git a/windows/deploy/upgrade-readiness-requirements.md b/windows/deployment/upgrade/upgrade-readiness-requirements.md
similarity index 100%
rename from windows/deploy/upgrade-readiness-requirements.md
rename to windows/deployment/upgrade/upgrade-readiness-requirements.md
diff --git a/windows/deploy/upgrade-readiness-resolve-issues.md b/windows/deployment/upgrade/upgrade-readiness-resolve-issues.md
similarity index 97%
rename from windows/deploy/upgrade-readiness-resolve-issues.md
rename to windows/deployment/upgrade/upgrade-readiness-resolve-issues.md
index bb0e2c452d..3690e2c75d 100644
--- a/windows/deploy/upgrade-readiness-resolve-issues.md
+++ b/windows/deployment/upgrade/upgrade-readiness-resolve-issues.md
@@ -36,7 +36,7 @@ Applications with issues known to Microsoft are listed, grouped by upgrade asses
-->
-
+
To change an application's upgrade decision:
@@ -75,15 +75,15 @@ For applications assessed as **Fix available**, review the table below for detai
Click **Review Applications With Known Issues** to see the status of applications for Ready for Windows and corresponding guidance. For example:
-
+
If there are known issues with an application, the specific guidance for that known issue takes precedence over the Ready for Windows guidance.
-
+
If you query with RollupLevel="NamePublisher", each version of the application can have a different status for Ready for Windows. In this case, different values appear for Ready for Windows.
-
+
>[!TIP]
>Within the Upgrade Readiness data model, an object of Type **UAApp** refers to a particular application installed on a specific computer.
@@ -109,7 +109,7 @@ The following table lists possible values for **ReadyForWindows** and what they
Applications with no issues known to Microsoft are listed, grouped by upgrade decision.
-
+
Applications with no known issues that are installed on 2% or less of your total computer inventory \[number of computers application is installed on/total number of computers in your inventory\] are automatically marked **Ready to upgrade** and included in the applications reviewed count. Applications with no known issues that are installed on more than 2% of your total computer inventory are automatically marked **Not reviewed**.
@@ -129,7 +129,7 @@ To change an application's upgrade decision:
Drivers that won’t migrate to the new operating system are listed, grouped by availability.
-
+
Availability categories are explained in the table below.
diff --git a/windows/deploy/upgrade-readiness-upgrade-overview.md b/windows/deployment/upgrade/upgrade-readiness-upgrade-overview.md
similarity index 98%
rename from windows/deploy/upgrade-readiness-upgrade-overview.md
rename to windows/deployment/upgrade/upgrade-readiness-upgrade-overview.md
index bf09694a38..bbbb2a155d 100644
--- a/windows/deploy/upgrade-readiness-upgrade-overview.md
+++ b/windows/deployment/upgrade/upgrade-readiness-upgrade-overview.md
@@ -36,7 +36,7 @@ Click on a row to drill down and see details about individual computers. If KBs
In the following example, there is no delay in data processing, less than 4% of computers (6k\294k) have incomplete data, there are no pending user changes, and the currently selected target OS version is the same as the recommended version:
-
+
[Code integrity](https://technet.microsoft.com/library/dd348642.aspx)
-[Protect derived domain credentials with Credential Guard](credential-guard.md)
+[Protect derived domain credentials with Credential Guard](/windows/access-protection/credential-guard/credential-guard)
[Driver compatibility with Device Guard in Windows 10](https://blogs.msdn.microsoft.com/windows_hardware_certification/2015/05/22/driver-compatibility-with-device-guard-in-windows-10)
diff --git a/windows/keep-secure/images/device-guard-gp.png b/windows/device-security/device-guard/images/device-guard-gp.png
similarity index 100%
rename from windows/keep-secure/images/device-guard-gp.png
rename to windows/device-security/device-guard/images/device-guard-gp.png
diff --git a/windows/keep-secure/images/dg-fig1-enableos.png b/windows/device-security/device-guard/images/dg-fig1-enableos.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig1-enableos.png
rename to windows/device-security/device-guard/images/dg-fig1-enableos.png
diff --git a/windows/keep-secure/images/dg-fig10-enablecredentialguard.png b/windows/device-security/device-guard/images/dg-fig10-enablecredentialguard.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig10-enablecredentialguard.png
rename to windows/device-security/device-guard/images/dg-fig10-enablecredentialguard.png
diff --git a/windows/keep-secure/images/dg-fig11-dgproperties.png b/windows/device-security/device-guard/images/dg-fig11-dgproperties.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig11-dgproperties.png
rename to windows/device-security/device-guard/images/dg-fig11-dgproperties.png
diff --git a/windows/keep-secure/images/dg-fig12-verifysigning.png b/windows/device-security/device-guard/images/dg-fig12-verifysigning.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig12-verifysigning.png
rename to windows/device-security/device-guard/images/dg-fig12-verifysigning.png
diff --git a/windows/keep-secure/images/dg-fig13-createnewgpo.png b/windows/device-security/device-guard/images/dg-fig13-createnewgpo.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig13-createnewgpo.png
rename to windows/device-security/device-guard/images/dg-fig13-createnewgpo.png
diff --git a/windows/keep-secure/images/dg-fig14-createnewfile.png b/windows/device-security/device-guard/images/dg-fig14-createnewfile.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig14-createnewfile.png
rename to windows/device-security/device-guard/images/dg-fig14-createnewfile.png
diff --git a/windows/keep-secure/images/dg-fig15-setnewfileprops.png b/windows/device-security/device-guard/images/dg-fig15-setnewfileprops.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig15-setnewfileprops.png
rename to windows/device-security/device-guard/images/dg-fig15-setnewfileprops.png
diff --git a/windows/keep-secure/images/dg-fig16-specifyinfo.png b/windows/device-security/device-guard/images/dg-fig16-specifyinfo.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig16-specifyinfo.png
rename to windows/device-security/device-guard/images/dg-fig16-specifyinfo.png
diff --git a/windows/keep-secure/images/dg-fig17-specifyinfo.png b/windows/device-security/device-guard/images/dg-fig17-specifyinfo.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig17-specifyinfo.png
rename to windows/device-security/device-guard/images/dg-fig17-specifyinfo.png
diff --git a/windows/keep-secure/images/dg-fig18-specifyux.png b/windows/device-security/device-guard/images/dg-fig18-specifyux.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig18-specifyux.png
rename to windows/device-security/device-guard/images/dg-fig18-specifyux.png
diff --git a/windows/keep-secure/images/dg-fig19-customsettings.png b/windows/device-security/device-guard/images/dg-fig19-customsettings.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig19-customsettings.png
rename to windows/device-security/device-guard/images/dg-fig19-customsettings.png
diff --git a/windows/keep-secure/images/dg-fig2-createou.png b/windows/device-security/device-guard/images/dg-fig2-createou.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig2-createou.png
rename to windows/device-security/device-guard/images/dg-fig2-createou.png
diff --git a/windows/keep-secure/images/dg-fig20-setsoftwareinv.png b/windows/device-security/device-guard/images/dg-fig20-setsoftwareinv.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig20-setsoftwareinv.png
rename to windows/device-security/device-guard/images/dg-fig20-setsoftwareinv.png
diff --git a/windows/keep-secure/images/dg-fig21-pathproperties.png b/windows/device-security/device-guard/images/dg-fig21-pathproperties.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig21-pathproperties.png
rename to windows/device-security/device-guard/images/dg-fig21-pathproperties.png
diff --git a/windows/keep-secure/images/dg-fig22-deploycode.png b/windows/device-security/device-guard/images/dg-fig22-deploycode.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig22-deploycode.png
rename to windows/device-security/device-guard/images/dg-fig22-deploycode.png
diff --git a/windows/keep-secure/images/dg-fig23-exceptionstocode.png b/windows/device-security/device-guard/images/dg-fig23-exceptionstocode.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig23-exceptionstocode.png
rename to windows/device-security/device-guard/images/dg-fig23-exceptionstocode.png
diff --git a/windows/keep-secure/images/dg-fig24-creategpo.png b/windows/device-security/device-guard/images/dg-fig24-creategpo.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig24-creategpo.png
rename to windows/device-security/device-guard/images/dg-fig24-creategpo.png
diff --git a/windows/keep-secure/images/dg-fig25-editcode.png b/windows/device-security/device-guard/images/dg-fig25-editcode.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig25-editcode.png
rename to windows/device-security/device-guard/images/dg-fig25-editcode.png
diff --git a/windows/keep-secure/images/dg-fig26-enablecode.png b/windows/device-security/device-guard/images/dg-fig26-enablecode.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig26-enablecode.png
rename to windows/device-security/device-guard/images/dg-fig26-enablecode.png
diff --git a/windows/keep-secure/images/dg-fig27-managecerttemp.png b/windows/device-security/device-guard/images/dg-fig27-managecerttemp.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig27-managecerttemp.png
rename to windows/device-security/device-guard/images/dg-fig27-managecerttemp.png
diff --git a/windows/keep-secure/images/dg-fig29-enableconstraints.png b/windows/device-security/device-guard/images/dg-fig29-enableconstraints.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig29-enableconstraints.png
rename to windows/device-security/device-guard/images/dg-fig29-enableconstraints.png
diff --git a/windows/keep-secure/images/dg-fig3-enablevbs.png b/windows/device-security/device-guard/images/dg-fig3-enablevbs.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig3-enablevbs.png
rename to windows/device-security/device-guard/images/dg-fig3-enablevbs.png
diff --git a/windows/keep-secure/images/dg-fig30-selectnewcert.png b/windows/device-security/device-guard/images/dg-fig30-selectnewcert.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig30-selectnewcert.png
rename to windows/device-security/device-guard/images/dg-fig30-selectnewcert.png
diff --git a/windows/keep-secure/images/dg-fig31-getmoreinfo.png b/windows/device-security/device-guard/images/dg-fig31-getmoreinfo.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig31-getmoreinfo.png
rename to windows/device-security/device-guard/images/dg-fig31-getmoreinfo.png
diff --git a/windows/keep-secure/images/dg-fig5-createnewou.png b/windows/device-security/device-guard/images/dg-fig5-createnewou.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig5-createnewou.png
rename to windows/device-security/device-guard/images/dg-fig5-createnewou.png
diff --git a/windows/keep-secure/images/dg-fig6-enablevbs.png b/windows/device-security/device-guard/images/dg-fig6-enablevbs.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig6-enablevbs.png
rename to windows/device-security/device-guard/images/dg-fig6-enablevbs.png
diff --git a/windows/keep-secure/images/dg-fig7-enablevbsofkmci.png b/windows/device-security/device-guard/images/dg-fig7-enablevbsofkmci.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig7-enablevbsofkmci.png
rename to windows/device-security/device-guard/images/dg-fig7-enablevbsofkmci.png
diff --git a/windows/keep-secure/images/dg-fig8-createoulinked.png b/windows/device-security/device-guard/images/dg-fig8-createoulinked.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig8-createoulinked.png
rename to windows/device-security/device-guard/images/dg-fig8-createoulinked.png
diff --git a/windows/keep-secure/images/dg-fig9-enablevbs.png b/windows/device-security/device-guard/images/dg-fig9-enablevbs.png
similarity index 100%
rename from windows/keep-secure/images/dg-fig9-enablevbs.png
rename to windows/device-security/device-guard/images/dg-fig9-enablevbs.png
diff --git a/windows/keep-secure/introduction-to-device-guard-virtualization-based-security-and-code-integrity-policies.md b/windows/device-security/device-guard/introduction-to-device-guard-virtualization-based-security-and-code-integrity-policies.md
similarity index 90%
rename from windows/keep-secure/introduction-to-device-guard-virtualization-based-security-and-code-integrity-policies.md
rename to windows/device-security/device-guard/introduction-to-device-guard-virtualization-based-security-and-code-integrity-policies.md
index 73592f2841..66956fbb5c 100644
--- a/windows/keep-secure/introduction-to-device-guard-virtualization-based-security-and-code-integrity-policies.md
+++ b/windows/device-security/device-guard/introduction-to-device-guard-virtualization-based-security-and-code-integrity-policies.md
@@ -34,7 +34,7 @@ The following table lists security threats and describes the corresponding Devic
| **DMA-based attacks**, for example, attacks launched from a malicious device that reads secrets from memory, making the enterprise more vulnerable to attack | **Virtualization-based security (VBS) using IOMMUs**: With this type of VBS protection, when the DMA-based attack makes a memory request, input/output memory management units (IOMMUs) will evaluate the request and deny access.
**Specialized hardware required?** Yes, IOMMUs are a hardware feature that supports the hypervisor, and if you choose hardware that includes them, they can help protect against malicious attempts to access memory. |
| **Exposure to boot kits or to a physically present attacker at boot time** | **Universal Extensible Firmware Interface (UEFI) Secure Boot**: Secure Boot and related methods protect the boot process and firmware from tampering. This tampering can come from a physically present attacker or from forms of malware that run early in the boot process or in kernel after startup. UEFI is locked down (Boot order, Boot entries, Secure Boot, Virtualization extensions, IOMMU, Microsoft UEFI CA), so the settings in UEFI cannot be changed to compromise Device Guard security.
**Specialized hardware required?** With UEFI Secure Boot, the requirements are firmware requirements. For more information, see [Hardware, firmware, and software requirements for Device Guard](requirements-and-deployment-planning-guidelines-for-device-guard.md#hardware-firmware-and-software-requirements-for-device-guard). |
-In this guide, you learn about the individual features found within Device Guard as well as how to plan for, configure, and deploy them. Device Guard with configurable code integrity is intended for deployment alongside additional threat-mitigating Windows features such as [Credential Guard](credential-guard.md) and [AppLocker](applocker-overview.md).
+In this guide, you learn about the individual features found within Device Guard as well as how to plan for, configure, and deploy them. Device Guard with configurable code integrity is intended for deployment alongside additional threat-mitigating Windows features such as [Credential Guard](/windows/access-protection/credential-guard/credential-guard) and [AppLocker](/windows/device-security/applocker/applocker-overview).
## New and changed functionality
@@ -67,7 +67,7 @@ For more information about the deployment of Device Guard features, see:
### Device Guard with AppLocker
-Although [AppLocker](applocker-overview.md) is not considered a new Device Guard feature, it complements Device Guard functionality when enforced code integrity cannot be fully implemented or its functionality does not cover every desired scenario. There are many scenarios in which code integrity policies would be used alongside AppLocker rules. As a best practice, you should enforce code integrity policies at the most restrictive level possible for your organization, and then you can use AppLocker to fine-tune the restrictions to an even lower level.
+Although [AppLocker](/windows/device-security/applocker/applocker-overview) is not considered a new Device Guard feature, it complements Device Guard functionality when enforced code integrity cannot be fully implemented or its functionality does not cover every desired scenario. There are many scenarios in which code integrity policies would be used alongside AppLocker rules. As a best practice, you should enforce code integrity policies at the most restrictive level possible for your organization, and then you can use AppLocker to fine-tune the restrictions to an even lower level.
> **Note** One example of how Device Guard functionality can be enhanced by AppLocker is when you want to limit universal applications. Universal applications have already been validated by Microsoft to be trustworthy to run, but an organization may not want to allow specific universal applications to run in their environment. You can accomplish this enforcement by using an AppLocker rule.
@@ -75,7 +75,7 @@ AppLocker and Device Guard should run side-by-side in your organization, which o
### Device Guard with Credential Guard
-Another Windows 10 feature that employs VBS is [Credential Guard](credential-guard.md). Credential Guard provides additional protection to Active Directory domain users by storing domain credentials within the same type of VBS virtualization container that hosts code integrity. By isolating these domain credentials from the active user mode and kernel mode, they have a much lower risk of being stolen. For more information about Credential Guard (which is not a feature within Device Guard), see [Protect derived domain credentials with Credential Guard](credential-guard.md).
+Another Windows 10 feature that employs VBS is [Credential Guard](/windows/access-protection/credential-guard/credential-guard). Credential Guard provides additional protection to Active Directory domain users by storing domain credentials within the same type of VBS virtualization container that hosts code integrity. By isolating these domain credentials from the active user mode and kernel mode, they have a much lower risk of being stolen. For more information about Credential Guard (which is not a feature within Device Guard), see [Protect derived domain credentials with Credential Guard](/windows/access-protection/credential-guard/credential-guard).
Credential Guard is targeted at resisting pass-the-hash and pass-the-ticket techniques. By employing multifactor authentication with Credential Guard, organizations can gain additional protection against such threats.
diff --git a/windows/keep-secure/optional-create-a-code-signing-certificate-for-code-integrity-policies.md b/windows/device-security/device-guard/optional-create-a-code-signing-certificate-for-code-integrity-policies.md
similarity index 100%
rename from windows/keep-secure/optional-create-a-code-signing-certificate-for-code-integrity-policies.md
rename to windows/device-security/device-guard/optional-create-a-code-signing-certificate-for-code-integrity-policies.md
diff --git a/windows/keep-secure/planning-and-getting-started-on-the-device-guard-deployment-process.md b/windows/device-security/device-guard/planning-and-getting-started-on-the-device-guard-deployment-process.md
similarity index 100%
rename from windows/keep-secure/planning-and-getting-started-on-the-device-guard-deployment-process.md
rename to windows/device-security/device-guard/planning-and-getting-started-on-the-device-guard-deployment-process.md
diff --git a/windows/keep-secure/requirements-and-deployment-planning-guidelines-for-device-guard.md b/windows/device-security/device-guard/requirements-and-deployment-planning-guidelines-for-device-guard.md
similarity index 100%
rename from windows/keep-secure/requirements-and-deployment-planning-guidelines-for-device-guard.md
rename to windows/device-security/device-guard/requirements-and-deployment-planning-guidelines-for-device-guard.md
diff --git a/windows/keep-secure/encrypted-hard-drive.md b/windows/device-security/encrypted-hard-drive.md
similarity index 100%
rename from windows/keep-secure/encrypted-hard-drive.md
rename to windows/device-security/encrypted-hard-drive.md
diff --git a/windows/keep-secure/images/hva-fig1-endtoend1.png b/windows/device-security/images/hva-fig1-endtoend1.png
similarity index 100%
rename from windows/keep-secure/images/hva-fig1-endtoend1.png
rename to windows/device-security/images/hva-fig1-endtoend1.png
diff --git a/windows/keep-secure/images/hva-fig10-conditionalaccesscontrol.png b/windows/device-security/images/hva-fig10-conditionalaccesscontrol.png
similarity index 100%
rename from windows/keep-secure/images/hva-fig10-conditionalaccesscontrol.png
rename to windows/device-security/images/hva-fig10-conditionalaccesscontrol.png
diff --git a/windows/keep-secure/images/hva-fig11-office365.png b/windows/device-security/images/hva-fig11-office365.png
similarity index 100%
rename from windows/keep-secure/images/hva-fig11-office365.png
rename to windows/device-security/images/hva-fig11-office365.png
diff --git a/windows/keep-secure/images/hva-fig12-conditionalaccess12.png b/windows/device-security/images/hva-fig12-conditionalaccess12.png
similarity index 100%
rename from windows/keep-secure/images/hva-fig12-conditionalaccess12.png
rename to windows/device-security/images/hva-fig12-conditionalaccess12.png
diff --git a/windows/keep-secure/images/hva-fig2-assessfromcloud2.png b/windows/device-security/images/hva-fig2-assessfromcloud2.png
similarity index 100%
rename from windows/keep-secure/images/hva-fig2-assessfromcloud2.png
rename to windows/device-security/images/hva-fig2-assessfromcloud2.png
diff --git a/windows/keep-secure/images/hva-fig3-endtoendoverview3.png b/windows/device-security/images/hva-fig3-endtoendoverview3.png
similarity index 100%
rename from windows/keep-secure/images/hva-fig3-endtoendoverview3.png
rename to windows/device-security/images/hva-fig3-endtoendoverview3.png
diff --git a/windows/keep-secure/images/hva-fig4-hardware.png b/windows/device-security/images/hva-fig4-hardware.png
similarity index 100%
rename from windows/keep-secure/images/hva-fig4-hardware.png
rename to windows/device-security/images/hva-fig4-hardware.png
diff --git a/windows/keep-secure/images/hva-fig5-virtualbasedsecurity.png b/windows/device-security/images/hva-fig5-virtualbasedsecurity.png
similarity index 100%
rename from windows/keep-secure/images/hva-fig5-virtualbasedsecurity.png
rename to windows/device-security/images/hva-fig5-virtualbasedsecurity.png
diff --git a/windows/keep-secure/images/hva-fig6-logs.png b/windows/device-security/images/hva-fig6-logs.png
similarity index 100%
rename from windows/keep-secure/images/hva-fig6-logs.png
rename to windows/device-security/images/hva-fig6-logs.png
diff --git a/windows/keep-secure/images/hva-fig7-measurement.png b/windows/device-security/images/hva-fig7-measurement.png
similarity index 100%
rename from windows/keep-secure/images/hva-fig7-measurement.png
rename to windows/device-security/images/hva-fig7-measurement.png
diff --git a/windows/keep-secure/images/hva-fig8-evaldevicehealth8.png b/windows/device-security/images/hva-fig8-evaldevicehealth8.png
similarity index 100%
rename from windows/keep-secure/images/hva-fig8-evaldevicehealth8.png
rename to windows/device-security/images/hva-fig8-evaldevicehealth8.png
diff --git a/windows/keep-secure/images/hva-fig8a-healthattest8a.png b/windows/device-security/images/hva-fig8a-healthattest8a.png
similarity index 100%
rename from windows/keep-secure/images/hva-fig8a-healthattest8a.png
rename to windows/device-security/images/hva-fig8a-healthattest8a.png
diff --git a/windows/keep-secure/images/hva-fig9-intune.png b/windows/device-security/images/hva-fig9-intune.png
similarity index 100%
rename from windows/keep-secure/images/hva-fig9-intune.png
rename to windows/device-security/images/hva-fig9-intune.png
diff --git a/windows/keep-secure/images/mobile-security-guide-fig1.png b/windows/device-security/images/mobile-security-guide-fig1.png
similarity index 100%
rename from windows/keep-secure/images/mobile-security-guide-fig1.png
rename to windows/device-security/images/mobile-security-guide-fig1.png
diff --git a/windows/keep-secure/images/mobile-security-guide-fig2.png b/windows/device-security/images/mobile-security-guide-fig2.png
similarity index 100%
rename from windows/keep-secure/images/mobile-security-guide-fig2.png
rename to windows/device-security/images/mobile-security-guide-fig2.png
diff --git a/windows/keep-secure/images/mobile-security-guide-figure3.png b/windows/device-security/images/mobile-security-guide-figure3.png
similarity index 100%
rename from windows/keep-secure/images/mobile-security-guide-figure3.png
rename to windows/device-security/images/mobile-security-guide-figure3.png
diff --git a/windows/keep-secure/images/mobile-security-guide-figure4.png b/windows/device-security/images/mobile-security-guide-figure4.png
similarity index 100%
rename from windows/keep-secure/images/mobile-security-guide-figure4.png
rename to windows/device-security/images/mobile-security-guide-figure4.png
diff --git a/windows/device-security/index.md b/windows/device-security/index.md
new file mode 100644
index 0000000000..9a34a8d74f
--- /dev/null
+++ b/windows/device-security/index.md
@@ -0,0 +1,28 @@
+---
+title: Device Security (Windows 10)
+description: Learn more about how to help secure your Windows 10 and Windows 10 Mobile devices.
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: security
+author: brianlic-msft
+---
+
+# Device Security
+
+Learn more about how to help secure your Windows 10 and Windows 10 Mobile devices.
+
+| Section | Description |
+|-|-|
+| [AppLocker](applocker/applocker-overview.md)| Describes AppLocker, and can help you decide if your organization can benefit from deploying AppLocker application control policies. AppLocker helps you control which apps and files users can run. These include executable files, scripts, Windows Installer files, dynamic-link libraries (DLLs), packaged apps, and packaged app installers.|
+| [BitLocker](bitlocker/bitlocker-overview.md)| Provides information about BitLocker, which is a data protection feature that integrates with the operating system and addresses the threats of data theft or exposure from lost, stolen, or inappropriately decommissioned computers. |
+| [Control the health of Windows 10-based devices](protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md) | Learn more about protecting high-value assets. |
+| [Device Guard deployment guide](device-guard/device-guard-deployment-guide.md) | Device Guard is a combination of hardware and software security features that, when configured together, will lock a device down so that it can only run trusted applications. If the app isn’t trusted it can’t run, period. It also means that even if an attacker manages to get control of the Windows kernel, he or she will be much less likely to be able to run malicious executable code after the computer restarts because of how decisions are made about what can run and when. |
+| [Encrypted Hard Drive](encrypted-hard-drive.md) | Provides information about Encrypted Hard Drive, which uses the rapid encryption that is provided by BitLocker Drive Encryption to enhance data security and management.|
+| [Security auditing](auditing/security-auditing-overview.md)| Describes how the IT professional can use the security auditing features in Windows, and how organizations can benefit from using these technologies, to enhance the security and manageability of networks.|
+| [Security policy settings](security-policy-settings/security-policy-settings.md)| Provides a collection of reference topics that describe the common scenarios, architecture, and processes for security settings.|
+| [Trusted Platform Module](tpm/trusted-platform-module-top-node.md)| Provides links to information about the Trusted Platform Module (TPM), which is a secure crypto-processor that helps you with actions such as generating, storing, and limiting the use of cryptographic keys. |
+| [Windows 10 Mobile security guide](windows-10-mobile-security-guide.md) | Learn more about securing your Windows 10 Mobile devices. |
+| [Windows security baselines](windows-security-baselines.md) | Learn why you should use security baselines in your organization. |
+
+
diff --git a/windows/keep-secure/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md b/windows/device-security/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md
similarity index 99%
rename from windows/keep-secure/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md
rename to windows/device-security/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md
index 9791688940..337320eccf 100644
--- a/windows/keep-secure/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md
+++ b/windows/device-security/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md
@@ -262,7 +262,7 @@ There are three different parts that make up the Device Guard solution in Window
- After the hardware security feature, there is the code integrity engine. In Windows 10, **Code Integrity is now fully configurable** and now resides in Isolated user mode, a part of the memory that is protected by virtualization-based security.
- The last part of Device Guard is **manageability**. Code Integrity configuration is exposed through specific Group Policy Objects, PowerShell cmdlets, and MDM configuration service providers (CSPs).
-For more information on how to deploy Device Guard in an enterprise, see the [Device Guard deployment guide](device-guard-deployment-guide.md).
+For more information on how to deploy Device Guard in an enterprise, see the [Device Guard deployment guide](/windows/device-security/device-guard/device-guard-deployment-guide).
### Device Guard scenarios
@@ -818,6 +818,6 @@ Health attestation is a key feature of Windows 10 that includes client and clou
## Related topics
-- [Protect derived domain credentials with Credential Guard](credential-guard.md)
-- [Device Guard deployment guide](device-guard-deployment-guide.md)
+- [Protect derived domain credentials with Credential Guard](/windows/access-protection/credential-guard/credential-guard)
+- [Device Guard deployment guide](/windows/device-security/device-guard/device-guard-deployment-guide)
- [Trusted Platform Module technology overview](https://go.microsoft.com/fwlink/p/?LinkId=733957)
diff --git a/windows/keep-secure/access-credential-manager-as-a-trusted-caller.md b/windows/device-security/security-policy-settings/access-credential-manager-as-a-trusted-caller.md
similarity index 100%
rename from windows/keep-secure/access-credential-manager-as-a-trusted-caller.md
rename to windows/device-security/security-policy-settings/access-credential-manager-as-a-trusted-caller.md
diff --git a/windows/keep-secure/access-this-computer-from-the-network.md b/windows/device-security/security-policy-settings/access-this-computer-from-the-network.md
similarity index 100%
rename from windows/keep-secure/access-this-computer-from-the-network.md
rename to windows/device-security/security-policy-settings/access-this-computer-from-the-network.md
diff --git a/windows/keep-secure/account-lockout-duration.md b/windows/device-security/security-policy-settings/account-lockout-duration.md
similarity index 100%
rename from windows/keep-secure/account-lockout-duration.md
rename to windows/device-security/security-policy-settings/account-lockout-duration.md
diff --git a/windows/keep-secure/account-lockout-policy.md b/windows/device-security/security-policy-settings/account-lockout-policy.md
similarity index 100%
rename from windows/keep-secure/account-lockout-policy.md
rename to windows/device-security/security-policy-settings/account-lockout-policy.md
diff --git a/windows/keep-secure/account-lockout-threshold.md b/windows/device-security/security-policy-settings/account-lockout-threshold.md
similarity index 100%
rename from windows/keep-secure/account-lockout-threshold.md
rename to windows/device-security/security-policy-settings/account-lockout-threshold.md
diff --git a/windows/keep-secure/account-policies.md b/windows/device-security/security-policy-settings/account-policies.md
similarity index 100%
rename from windows/keep-secure/account-policies.md
rename to windows/device-security/security-policy-settings/account-policies.md
diff --git a/windows/keep-secure/accounts-administrator-account-status.md b/windows/device-security/security-policy-settings/accounts-administrator-account-status.md
similarity index 100%
rename from windows/keep-secure/accounts-administrator-account-status.md
rename to windows/device-security/security-policy-settings/accounts-administrator-account-status.md
diff --git a/windows/keep-secure/accounts-block-microsoft-accounts.md b/windows/device-security/security-policy-settings/accounts-block-microsoft-accounts.md
similarity index 100%
rename from windows/keep-secure/accounts-block-microsoft-accounts.md
rename to windows/device-security/security-policy-settings/accounts-block-microsoft-accounts.md
diff --git a/windows/keep-secure/accounts-guest-account-status.md b/windows/device-security/security-policy-settings/accounts-guest-account-status.md
similarity index 100%
rename from windows/keep-secure/accounts-guest-account-status.md
rename to windows/device-security/security-policy-settings/accounts-guest-account-status.md
diff --git a/windows/keep-secure/accounts-limit-local-account-use-of-blank-passwords-to-console-logon-only.md b/windows/device-security/security-policy-settings/accounts-limit-local-account-use-of-blank-passwords-to-console-logon-only.md
similarity index 100%
rename from windows/keep-secure/accounts-limit-local-account-use-of-blank-passwords-to-console-logon-only.md
rename to windows/device-security/security-policy-settings/accounts-limit-local-account-use-of-blank-passwords-to-console-logon-only.md
diff --git a/windows/keep-secure/accounts-rename-administrator-account.md b/windows/device-security/security-policy-settings/accounts-rename-administrator-account.md
similarity index 100%
rename from windows/keep-secure/accounts-rename-administrator-account.md
rename to windows/device-security/security-policy-settings/accounts-rename-administrator-account.md
diff --git a/windows/keep-secure/accounts-rename-guest-account.md b/windows/device-security/security-policy-settings/accounts-rename-guest-account.md
similarity index 100%
rename from windows/keep-secure/accounts-rename-guest-account.md
rename to windows/device-security/security-policy-settings/accounts-rename-guest-account.md
diff --git a/windows/keep-secure/act-as-part-of-the-operating-system.md b/windows/device-security/security-policy-settings/act-as-part-of-the-operating-system.md
similarity index 100%
rename from windows/keep-secure/act-as-part-of-the-operating-system.md
rename to windows/device-security/security-policy-settings/act-as-part-of-the-operating-system.md
diff --git a/windows/keep-secure/add-workstations-to-domain.md b/windows/device-security/security-policy-settings/add-workstations-to-domain.md
similarity index 100%
rename from windows/keep-secure/add-workstations-to-domain.md
rename to windows/device-security/security-policy-settings/add-workstations-to-domain.md
diff --git a/windows/keep-secure/adjust-memory-quotas-for-a-process.md b/windows/device-security/security-policy-settings/adjust-memory-quotas-for-a-process.md
similarity index 100%
rename from windows/keep-secure/adjust-memory-quotas-for-a-process.md
rename to windows/device-security/security-policy-settings/adjust-memory-quotas-for-a-process.md
diff --git a/windows/keep-secure/administer-security-policy-settings.md b/windows/device-security/security-policy-settings/administer-security-policy-settings.md
similarity index 99%
rename from windows/keep-secure/administer-security-policy-settings.md
rename to windows/device-security/security-policy-settings/administer-security-policy-settings.md
index de0baa4b22..17efc2a182 100644
--- a/windows/keep-secure/administer-security-policy-settings.md
+++ b/windows/device-security/security-policy-settings/administer-security-policy-settings.md
@@ -85,7 +85,7 @@ Over time, new ways to manage security policy settings have been introduced, whi
AppLocker
-
See [Administer AppLocker](administer-applocker.md).
+
See [Administer AppLocker](/windows/device-security/applocker/administer-applocker).
Gpedit.msc
Prevents malicious software (malware) and unsupported applications from affecting computers in your environment, and it prevents users in your organization from installing and using unauthorized applications.
diff --git a/windows/keep-secure/allow-log-on-locally.md b/windows/device-security/security-policy-settings/allow-log-on-locally.md
similarity index 100%
rename from windows/keep-secure/allow-log-on-locally.md
rename to windows/device-security/security-policy-settings/allow-log-on-locally.md
diff --git a/windows/keep-secure/allow-log-on-through-remote-desktop-services.md b/windows/device-security/security-policy-settings/allow-log-on-through-remote-desktop-services.md
similarity index 100%
rename from windows/keep-secure/allow-log-on-through-remote-desktop-services.md
rename to windows/device-security/security-policy-settings/allow-log-on-through-remote-desktop-services.md
diff --git a/windows/keep-secure/audit-audit-the-access-of-global-system-objects.md b/windows/device-security/security-policy-settings/audit-audit-the-access-of-global-system-objects.md
similarity index 89%
rename from windows/keep-secure/audit-audit-the-access-of-global-system-objects.md
rename to windows/device-security/security-policy-settings/audit-audit-the-access-of-global-system-objects.md
index 9fcecc87b1..afb13502d6 100644
--- a/windows/keep-secure/audit-audit-the-access-of-global-system-objects.md
+++ b/windows/device-security/security-policy-settings/audit-audit-the-access-of-global-system-objects.md
@@ -18,7 +18,7 @@ Describes the best practices, location, values, and security considerations for
## Reference
-If you enable this policy setting, a default system access control list (SACL) is applied when the device creates system objects such as mutexes, events, semaphores, and MS-DOS® devices. If you also enable the [Audit object access](basic-audit-object-access.md) audit setting, access to these system objects is audited.
+If you enable this policy setting, a default system access control list (SACL) is applied when the device creates system objects such as mutexes, events, semaphores, and MS-DOS® devices. If you also enable the [Audit object access](../auditing/basic-audit-object-access.md) audit setting, access to these system objects is audited.
Global system objects, also known as "base system objects" or "base named objects," are temporary kernel objects that have had names assigned to them by the application or system component that created them. These objects are most commonly used to synchronize multiple applications or multiple parts of a complex application. Because they have names, these objects are global in scope and, therefore, visible to all processes on the device. These objects all have a security descriptor; but typically, they do not have a NULL SACL. If you enable this policy setting and it takes effect at startup time, the kernel assigns a SACL to these objects when they are created.
@@ -34,7 +34,7 @@ Enabling this policy setting can generate a large number of security events, esp
### Best practices
-- Use the advanced security audit policy option, [Audit Kernel Object](audit-kernel-object.md) in Advanced Security Audit Policy Settings\\Object Access, to reduce the number of unrelated audit events that you generate.
+- Use the advanced security audit policy option, [Audit Kernel Object](../auditing/audit-kernel-object.md) in Advanced Security Audit Policy Settings\\Object Access, to reduce the number of unrelated audit events that you generate.
### Location
@@ -69,12 +69,12 @@ All auditing capabilities are integrated in Group Policy. You can configure, dep
To audit attempts to access global system objects, you can use one of two security audit policy settings:
-- [Audit Kernel Object](audit-kernel-object.md) in Advanced Security Audit Policy Settings\\Object Access
-- [Audit object access](basic-audit-object-access.md) under Security Settings\\Local Policies\\Audit Policy
+- [Audit Kernel Object](../auditing/audit-kernel-object.md) in Advanced Security Audit Policy Settings\\Object Access
+- [Audit object access](../auditing/basic-audit-object-access.md) under Security Settings\\Local Policies\\Audit Policy
If possible, use the Advanced Security Audit Policy option to reduce the number of unrelated audit events that you generate.
-If the [Audit Kernel Object](audit-kernel-object.md) setting is configured, the following events are generated:
+If the [Audit Kernel Object](../auditing/audit-kernel-object.md) setting is configured, the following events are generated:
| Event ID | Event message |
| - | - |
@@ -83,7 +83,7 @@ If the [Audit Kernel Object](audit-kernel-object.md) setting is configured, the
| 4661 | A handle to an object was requested. |
| 4663 | An attempt was made to access an object. |
-If the [Audit Kernel Object](audit-kernel-object.md) setting is configured, the following events are generated:
+If the [Audit Kernel Object](../auditing/audit-kernel-object.md) setting is configured, the following events are generated:
| Event ID | Event message |
| - | - |
diff --git a/windows/keep-secure/audit-audit-the-use-of-backup-and-restore-privilege.md b/windows/device-security/security-policy-settings/audit-audit-the-use-of-backup-and-restore-privilege.md
similarity index 90%
rename from windows/keep-secure/audit-audit-the-use-of-backup-and-restore-privilege.md
rename to windows/device-security/security-policy-settings/audit-audit-the-use-of-backup-and-restore-privilege.md
index d66a9e0a4e..1abeb256d4 100644
--- a/windows/keep-secure/audit-audit-the-use-of-backup-and-restore-privilege.md
+++ b/windows/device-security/security-policy-settings/audit-audit-the-use-of-backup-and-restore-privilege.md
@@ -61,7 +61,7 @@ Enabling this policy setting in conjunction with the **Audit privilege use** pol
Enabling this policy setting when the **Audit privilege use** policy setting is also enabled generates an audit event for every file that is backed up or restored. This can help you to track down an administrator who is accidentally or maliciously restoring data in an unauthorized manner.
-Alternately, you can use the advanced audit policy, [Audit Sensitive Privilege Use](audit-sensitive-privilege-use.md), which can help you manage the number of events generated.
+Alternately, you can use the advanced audit policy, [Audit Sensitive Privilege Use](../auditing/audit-sensitive-privilege-use.md), which can help you manage the number of events generated.
## Security considerations
@@ -73,7 +73,7 @@ When the backup and restore function is used, it creates a copy of the file syst
### Countermeasure
-Enable the **Audit: Audit the use of Backup and Restore privilege** setting. Alternatively, implement automatic log backup by configuring the **AutoBackupLogFiles** registry key. If you enable this option when the [Audit privilege use](basic-audit-privilege-use.md) setting is also enabled, an audit event is generated for every file that is backed up or restored. This information could help you to identify an account that was used to accidentally or maliciously restore data in an unauthorized manner.
+Enable the **Audit: Audit the use of Backup and Restore privilege** setting. Alternatively, implement automatic log backup by configuring the **AutoBackupLogFiles** registry key. If you enable this option when the [Audit privilege use](../auditing/basic-audit-privilege-use.md) setting is also enabled, an audit event is generated for every file that is backed up or restored. This information could help you to identify an account that was used to accidentally or maliciously restore data in an unauthorized manner.
For more information about configuring this key, see Microsoft Knowledge Base article [100879](https://go.microsoft.com/fwlink/p/?LinkId=100879).
### Potential impact
diff --git a/windows/keep-secure/audit-force-audit-policy-subcategory-settings-to-override.md b/windows/device-security/security-policy-settings/audit-force-audit-policy-subcategory-settings-to-override.md
similarity index 97%
rename from windows/keep-secure/audit-force-audit-policy-subcategory-settings-to-override.md
rename to windows/device-security/security-policy-settings/audit-force-audit-policy-subcategory-settings-to-override.md
index 50880766f6..2cd37d2f17 100644
--- a/windows/keep-secure/audit-force-audit-policy-subcategory-settings-to-override.md
+++ b/windows/device-security/security-policy-settings/audit-force-audit-policy-subcategory-settings-to-override.md
@@ -20,7 +20,7 @@ Describes the best practices, location, values, and security considerations for
You can manage your audit policy in a more precise way by using audit policy subcategories.
-There are over 40 auditing subcategories that provide precise details about activities on a device. For info about these subcategories, see the [Advanced security audit policy settings](advanced-security-audit-policy-settings.md).
+There are over 40 auditing subcategories that provide precise details about activities on a device. For info about these subcategories, see the [Advanced security audit policy settings](../auditing/advanced-security-audit-policy-settings.md).
### Possible values
diff --git a/windows/keep-secure/audit-policy.md b/windows/device-security/security-policy-settings/audit-policy.md
similarity index 56%
rename from windows/keep-secure/audit-policy.md
rename to windows/device-security/security-policy-settings/audit-policy.md
index 2cd2c8cd95..793d65adee 100644
--- a/windows/keep-secure/audit-policy.md
+++ b/windows/device-security/security-policy-settings/audit-policy.md
@@ -19,19 +19,19 @@ Provides information about basic audit policies that are available in Windows an
The security audit policy settings under **Security Settings\\Local Policies\\Audit Policy** provide broad security audit capabilities for client devices and servers that cannot use advanced security audit policy settings.
The basic audit policy settings under **Security Settings\\Local Policies\\Audit Policy** are:
-- [Audit account logon events](basic-audit-account-logon-events.md)
-- [Audit account management](basic-audit-account-management.md)
-- [Audit directory service access](basic-audit-directory-service-access.md)
-- [Audit logon events](basic-audit-logon-events.md)
-- [Audit object access](basic-audit-object-access.md)
-- [Audit policy change](basic-audit-policy-change.md)
-- [Audit privilege use](basic-audit-privilege-use.md)
-- [Audit process tracking](basic-audit-process-tracking.md)
-- [Audit system events](basic-audit-system-events.md)
+- [Audit account logon events](../auditing/basic-audit-account-logon-events.md)
+- [Audit account management](../auditing/basic-audit-account-management.md)
+- [Audit directory service access](../auditing/basic-audit-directory-service-access.md)
+- [Audit logon events](../auditing/basic-audit-logon-events.md)
+- [Audit object access](../auditing/basic-audit-object-access.md)
+- [Audit policy change](../auditing/basic-audit-policy-change.md)
+- [Audit privilege use](../auditing/basic-audit-privilege-use.md)
+- [Audit process tracking](../auditing/basic-audit-process-tracking.md)
+- [Audit system events](../auditing/basic-audit-system-events.md)
## Related topics
- [Configure security policy settings](how-to-configure-security-policy-settings.md)
-- [Security auditing](security-auditing-overview.md)
+- [Security auditing](../auditing/security-auditing-overview.md)
diff --git a/windows/keep-secure/audit-shut-down-system-immediately-if-unable-to-log-security-audits.md b/windows/device-security/security-policy-settings/audit-shut-down-system-immediately-if-unable-to-log-security-audits.md
similarity index 100%
rename from windows/keep-secure/audit-shut-down-system-immediately-if-unable-to-log-security-audits.md
rename to windows/device-security/security-policy-settings/audit-shut-down-system-immediately-if-unable-to-log-security-audits.md
diff --git a/windows/keep-secure/back-up-files-and-directories.md b/windows/device-security/security-policy-settings/back-up-files-and-directories.md
similarity index 100%
rename from windows/keep-secure/back-up-files-and-directories.md
rename to windows/device-security/security-policy-settings/back-up-files-and-directories.md
diff --git a/windows/keep-secure/bypass-traverse-checking.md b/windows/device-security/security-policy-settings/bypass-traverse-checking.md
similarity index 100%
rename from windows/keep-secure/bypass-traverse-checking.md
rename to windows/device-security/security-policy-settings/bypass-traverse-checking.md
diff --git a/windows/keep-secure/change-the-system-time.md b/windows/device-security/security-policy-settings/change-the-system-time.md
similarity index 100%
rename from windows/keep-secure/change-the-system-time.md
rename to windows/device-security/security-policy-settings/change-the-system-time.md
diff --git a/windows/keep-secure/change-the-time-zone.md b/windows/device-security/security-policy-settings/change-the-time-zone.md
similarity index 100%
rename from windows/keep-secure/change-the-time-zone.md
rename to windows/device-security/security-policy-settings/change-the-time-zone.md
diff --git a/windows/keep-secure/create-a-pagefile.md b/windows/device-security/security-policy-settings/create-a-pagefile.md
similarity index 100%
rename from windows/keep-secure/create-a-pagefile.md
rename to windows/device-security/security-policy-settings/create-a-pagefile.md
diff --git a/windows/keep-secure/create-a-token-object.md b/windows/device-security/security-policy-settings/create-a-token-object.md
similarity index 100%
rename from windows/keep-secure/create-a-token-object.md
rename to windows/device-security/security-policy-settings/create-a-token-object.md
diff --git a/windows/keep-secure/create-global-objects.md b/windows/device-security/security-policy-settings/create-global-objects.md
similarity index 100%
rename from windows/keep-secure/create-global-objects.md
rename to windows/device-security/security-policy-settings/create-global-objects.md
diff --git a/windows/keep-secure/create-permanent-shared-objects.md b/windows/device-security/security-policy-settings/create-permanent-shared-objects.md
similarity index 100%
rename from windows/keep-secure/create-permanent-shared-objects.md
rename to windows/device-security/security-policy-settings/create-permanent-shared-objects.md
diff --git a/windows/keep-secure/create-symbolic-links.md b/windows/device-security/security-policy-settings/create-symbolic-links.md
similarity index 100%
rename from windows/keep-secure/create-symbolic-links.md
rename to windows/device-security/security-policy-settings/create-symbolic-links.md
diff --git a/windows/keep-secure/dcom-machine-access-restrictions-in-security-descriptor-definition-language-sddl-syntax.md b/windows/device-security/security-policy-settings/dcom-machine-access-restrictions-in-security-descriptor-definition-language-sddl-syntax.md
similarity index 100%
rename from windows/keep-secure/dcom-machine-access-restrictions-in-security-descriptor-definition-language-sddl-syntax.md
rename to windows/device-security/security-policy-settings/dcom-machine-access-restrictions-in-security-descriptor-definition-language-sddl-syntax.md
diff --git a/windows/keep-secure/dcom-machine-launch-restrictions-in-security-descriptor-definition-language-sddl-syntax.md b/windows/device-security/security-policy-settings/dcom-machine-launch-restrictions-in-security-descriptor-definition-language-sddl-syntax.md
similarity index 100%
rename from windows/keep-secure/dcom-machine-launch-restrictions-in-security-descriptor-definition-language-sddl-syntax.md
rename to windows/device-security/security-policy-settings/dcom-machine-launch-restrictions-in-security-descriptor-definition-language-sddl-syntax.md
diff --git a/windows/keep-secure/debug-programs.md b/windows/device-security/security-policy-settings/debug-programs.md
similarity index 100%
rename from windows/keep-secure/debug-programs.md
rename to windows/device-security/security-policy-settings/debug-programs.md
diff --git a/windows/keep-secure/deny-access-to-this-computer-from-the-network.md b/windows/device-security/security-policy-settings/deny-access-to-this-computer-from-the-network.md
similarity index 100%
rename from windows/keep-secure/deny-access-to-this-computer-from-the-network.md
rename to windows/device-security/security-policy-settings/deny-access-to-this-computer-from-the-network.md
diff --git a/windows/keep-secure/deny-log-on-as-a-batch-job.md b/windows/device-security/security-policy-settings/deny-log-on-as-a-batch-job.md
similarity index 100%
rename from windows/keep-secure/deny-log-on-as-a-batch-job.md
rename to windows/device-security/security-policy-settings/deny-log-on-as-a-batch-job.md
diff --git a/windows/keep-secure/deny-log-on-as-a-service.md b/windows/device-security/security-policy-settings/deny-log-on-as-a-service.md
similarity index 100%
rename from windows/keep-secure/deny-log-on-as-a-service.md
rename to windows/device-security/security-policy-settings/deny-log-on-as-a-service.md
diff --git a/windows/keep-secure/deny-log-on-locally.md b/windows/device-security/security-policy-settings/deny-log-on-locally.md
similarity index 100%
rename from windows/keep-secure/deny-log-on-locally.md
rename to windows/device-security/security-policy-settings/deny-log-on-locally.md
diff --git a/windows/keep-secure/deny-log-on-through-remote-desktop-services.md b/windows/device-security/security-policy-settings/deny-log-on-through-remote-desktop-services.md
similarity index 100%
rename from windows/keep-secure/deny-log-on-through-remote-desktop-services.md
rename to windows/device-security/security-policy-settings/deny-log-on-through-remote-desktop-services.md
diff --git a/windows/keep-secure/devices-allow-undock-without-having-to-log-on.md b/windows/device-security/security-policy-settings/devices-allow-undock-without-having-to-log-on.md
similarity index 100%
rename from windows/keep-secure/devices-allow-undock-without-having-to-log-on.md
rename to windows/device-security/security-policy-settings/devices-allow-undock-without-having-to-log-on.md
diff --git a/windows/keep-secure/devices-allowed-to-format-and-eject-removable-media.md b/windows/device-security/security-policy-settings/devices-allowed-to-format-and-eject-removable-media.md
similarity index 100%
rename from windows/keep-secure/devices-allowed-to-format-and-eject-removable-media.md
rename to windows/device-security/security-policy-settings/devices-allowed-to-format-and-eject-removable-media.md
diff --git a/windows/keep-secure/devices-prevent-users-from-installing-printer-drivers.md b/windows/device-security/security-policy-settings/devices-prevent-users-from-installing-printer-drivers.md
similarity index 100%
rename from windows/keep-secure/devices-prevent-users-from-installing-printer-drivers.md
rename to windows/device-security/security-policy-settings/devices-prevent-users-from-installing-printer-drivers.md
diff --git a/windows/keep-secure/devices-restrict-cd-rom-access-to-locally-logged-on-user-only.md b/windows/device-security/security-policy-settings/devices-restrict-cd-rom-access-to-locally-logged-on-user-only.md
similarity index 100%
rename from windows/keep-secure/devices-restrict-cd-rom-access-to-locally-logged-on-user-only.md
rename to windows/device-security/security-policy-settings/devices-restrict-cd-rom-access-to-locally-logged-on-user-only.md
diff --git a/windows/keep-secure/devices-restrict-floppy-access-to-locally-logged-on-user-only.md b/windows/device-security/security-policy-settings/devices-restrict-floppy-access-to-locally-logged-on-user-only.md
similarity index 100%
rename from windows/keep-secure/devices-restrict-floppy-access-to-locally-logged-on-user-only.md
rename to windows/device-security/security-policy-settings/devices-restrict-floppy-access-to-locally-logged-on-user-only.md
diff --git a/windows/keep-secure/domain-controller-allow-server-operators-to-schedule-tasks.md b/windows/device-security/security-policy-settings/domain-controller-allow-server-operators-to-schedule-tasks.md
similarity index 100%
rename from windows/keep-secure/domain-controller-allow-server-operators-to-schedule-tasks.md
rename to windows/device-security/security-policy-settings/domain-controller-allow-server-operators-to-schedule-tasks.md
diff --git a/windows/keep-secure/domain-controller-ldap-server-signing-requirements.md b/windows/device-security/security-policy-settings/domain-controller-ldap-server-signing-requirements.md
similarity index 100%
rename from windows/keep-secure/domain-controller-ldap-server-signing-requirements.md
rename to windows/device-security/security-policy-settings/domain-controller-ldap-server-signing-requirements.md
diff --git a/windows/keep-secure/domain-controller-refuse-machine-account-password-changes.md b/windows/device-security/security-policy-settings/domain-controller-refuse-machine-account-password-changes.md
similarity index 100%
rename from windows/keep-secure/domain-controller-refuse-machine-account-password-changes.md
rename to windows/device-security/security-policy-settings/domain-controller-refuse-machine-account-password-changes.md
diff --git a/windows/keep-secure/domain-member-digitally-encrypt-or-sign-secure-channel-data-always.md b/windows/device-security/security-policy-settings/domain-member-digitally-encrypt-or-sign-secure-channel-data-always.md
similarity index 100%
rename from windows/keep-secure/domain-member-digitally-encrypt-or-sign-secure-channel-data-always.md
rename to windows/device-security/security-policy-settings/domain-member-digitally-encrypt-or-sign-secure-channel-data-always.md
diff --git a/windows/keep-secure/domain-member-digitally-encrypt-secure-channel-data-when-possible.md b/windows/device-security/security-policy-settings/domain-member-digitally-encrypt-secure-channel-data-when-possible.md
similarity index 100%
rename from windows/keep-secure/domain-member-digitally-encrypt-secure-channel-data-when-possible.md
rename to windows/device-security/security-policy-settings/domain-member-digitally-encrypt-secure-channel-data-when-possible.md
diff --git a/windows/keep-secure/domain-member-digitally-sign-secure-channel-data-when-possible.md b/windows/device-security/security-policy-settings/domain-member-digitally-sign-secure-channel-data-when-possible.md
similarity index 100%
rename from windows/keep-secure/domain-member-digitally-sign-secure-channel-data-when-possible.md
rename to windows/device-security/security-policy-settings/domain-member-digitally-sign-secure-channel-data-when-possible.md
diff --git a/windows/keep-secure/domain-member-disable-machine-account-password-changes.md b/windows/device-security/security-policy-settings/domain-member-disable-machine-account-password-changes.md
similarity index 100%
rename from windows/keep-secure/domain-member-disable-machine-account-password-changes.md
rename to windows/device-security/security-policy-settings/domain-member-disable-machine-account-password-changes.md
diff --git a/windows/keep-secure/domain-member-maximum-machine-account-password-age.md b/windows/device-security/security-policy-settings/domain-member-maximum-machine-account-password-age.md
similarity index 100%
rename from windows/keep-secure/domain-member-maximum-machine-account-password-age.md
rename to windows/device-security/security-policy-settings/domain-member-maximum-machine-account-password-age.md
diff --git a/windows/keep-secure/domain-member-require-strong-windows-2000-or-later-session-key.md b/windows/device-security/security-policy-settings/domain-member-require-strong-windows-2000-or-later-session-key.md
similarity index 100%
rename from windows/keep-secure/domain-member-require-strong-windows-2000-or-later-session-key.md
rename to windows/device-security/security-policy-settings/domain-member-require-strong-windows-2000-or-later-session-key.md
diff --git a/windows/keep-secure/enable-computer-and-user-accounts-to-be-trusted-for-delegation.md b/windows/device-security/security-policy-settings/enable-computer-and-user-accounts-to-be-trusted-for-delegation.md
similarity index 100%
rename from windows/keep-secure/enable-computer-and-user-accounts-to-be-trusted-for-delegation.md
rename to windows/device-security/security-policy-settings/enable-computer-and-user-accounts-to-be-trusted-for-delegation.md
diff --git a/windows/keep-secure/enforce-password-history.md b/windows/device-security/security-policy-settings/enforce-password-history.md
similarity index 100%
rename from windows/keep-secure/enforce-password-history.md
rename to windows/device-security/security-policy-settings/enforce-password-history.md
diff --git a/windows/keep-secure/enforce-user-logon-restrictions.md b/windows/device-security/security-policy-settings/enforce-user-logon-restrictions.md
similarity index 100%
rename from windows/keep-secure/enforce-user-logon-restrictions.md
rename to windows/device-security/security-policy-settings/enforce-user-logon-restrictions.md
diff --git a/windows/keep-secure/force-shutdown-from-a-remote-system.md b/windows/device-security/security-policy-settings/force-shutdown-from-a-remote-system.md
similarity index 100%
rename from windows/keep-secure/force-shutdown-from-a-remote-system.md
rename to windows/device-security/security-policy-settings/force-shutdown-from-a-remote-system.md
diff --git a/windows/keep-secure/generate-security-audits.md b/windows/device-security/security-policy-settings/generate-security-audits.md
similarity index 100%
rename from windows/keep-secure/generate-security-audits.md
rename to windows/device-security/security-policy-settings/generate-security-audits.md
diff --git a/windows/keep-secure/how-to-configure-security-policy-settings.md b/windows/device-security/security-policy-settings/how-to-configure-security-policy-settings.md
similarity index 100%
rename from windows/keep-secure/how-to-configure-security-policy-settings.md
rename to windows/device-security/security-policy-settings/how-to-configure-security-policy-settings.md
diff --git a/windows/keep-secure/images/privacy-setting-in-sign-in-options.png b/windows/device-security/security-policy-settings/images/privacy-setting-in-sign-in-options.png
similarity index 100%
rename from windows/keep-secure/images/privacy-setting-in-sign-in-options.png
rename to windows/device-security/security-policy-settings/images/privacy-setting-in-sign-in-options.png
diff --git a/windows/keep-secure/images/secpol-architecture.gif b/windows/device-security/security-policy-settings/images/secpol-architecture.gif
similarity index 100%
rename from windows/keep-secure/images/secpol-architecture.gif
rename to windows/device-security/security-policy-settings/images/secpol-architecture.gif
diff --git a/windows/keep-secure/images/secpol-components.gif b/windows/device-security/security-policy-settings/images/secpol-components.gif
similarity index 100%
rename from windows/keep-secure/images/secpol-components.gif
rename to windows/device-security/security-policy-settings/images/secpol-components.gif
diff --git a/windows/keep-secure/images/secpol-multigpomerge.gif b/windows/device-security/security-policy-settings/images/secpol-multigpomerge.gif
similarity index 100%
rename from windows/keep-secure/images/secpol-multigpomerge.gif
rename to windows/device-security/security-policy-settings/images/secpol-multigpomerge.gif
diff --git a/windows/keep-secure/images/secpol-processes.gif b/windows/device-security/security-policy-settings/images/secpol-processes.gif
similarity index 100%
rename from windows/keep-secure/images/secpol-processes.gif
rename to windows/device-security/security-policy-settings/images/secpol-processes.gif
diff --git a/windows/keep-secure/impersonate-a-client-after-authentication.md b/windows/device-security/security-policy-settings/impersonate-a-client-after-authentication.md
similarity index 100%
rename from windows/keep-secure/impersonate-a-client-after-authentication.md
rename to windows/device-security/security-policy-settings/impersonate-a-client-after-authentication.md
diff --git a/windows/keep-secure/increase-a-process-working-set.md b/windows/device-security/security-policy-settings/increase-a-process-working-set.md
similarity index 100%
rename from windows/keep-secure/increase-a-process-working-set.md
rename to windows/device-security/security-policy-settings/increase-a-process-working-set.md
diff --git a/windows/keep-secure/increase-scheduling-priority.md b/windows/device-security/security-policy-settings/increase-scheduling-priority.md
similarity index 100%
rename from windows/keep-secure/increase-scheduling-priority.md
rename to windows/device-security/security-policy-settings/increase-scheduling-priority.md
diff --git a/windows/keep-secure/interactive-logon-display-user-information-when-the-session-is-locked.md b/windows/device-security/security-policy-settings/interactive-logon-display-user-information-when-the-session-is-locked.md
similarity index 100%
rename from windows/keep-secure/interactive-logon-display-user-information-when-the-session-is-locked.md
rename to windows/device-security/security-policy-settings/interactive-logon-display-user-information-when-the-session-is-locked.md
diff --git a/windows/keep-secure/interactive-logon-do-not-display-last-user-name.md b/windows/device-security/security-policy-settings/interactive-logon-do-not-display-last-user-name.md
similarity index 100%
rename from windows/keep-secure/interactive-logon-do-not-display-last-user-name.md
rename to windows/device-security/security-policy-settings/interactive-logon-do-not-display-last-user-name.md
diff --git a/windows/keep-secure/interactive-logon-do-not-require-ctrl-alt-del.md b/windows/device-security/security-policy-settings/interactive-logon-do-not-require-ctrl-alt-del.md
similarity index 100%
rename from windows/keep-secure/interactive-logon-do-not-require-ctrl-alt-del.md
rename to windows/device-security/security-policy-settings/interactive-logon-do-not-require-ctrl-alt-del.md
diff --git a/windows/keep-secure/interactive-logon-dont-display-username-at-sign-in.md b/windows/device-security/security-policy-settings/interactive-logon-dont-display-username-at-sign-in.md
similarity index 100%
rename from windows/keep-secure/interactive-logon-dont-display-username-at-sign-in.md
rename to windows/device-security/security-policy-settings/interactive-logon-dont-display-username-at-sign-in.md
diff --git a/windows/keep-secure/interactive-logon-machine-account-lockout-threshold.md b/windows/device-security/security-policy-settings/interactive-logon-machine-account-lockout-threshold.md
similarity index 100%
rename from windows/keep-secure/interactive-logon-machine-account-lockout-threshold.md
rename to windows/device-security/security-policy-settings/interactive-logon-machine-account-lockout-threshold.md
diff --git a/windows/keep-secure/interactive-logon-machine-inactivity-limit.md b/windows/device-security/security-policy-settings/interactive-logon-machine-inactivity-limit.md
similarity index 100%
rename from windows/keep-secure/interactive-logon-machine-inactivity-limit.md
rename to windows/device-security/security-policy-settings/interactive-logon-machine-inactivity-limit.md
diff --git a/windows/keep-secure/interactive-logon-message-text-for-users-attempting-to-log-on.md b/windows/device-security/security-policy-settings/interactive-logon-message-text-for-users-attempting-to-log-on.md
similarity index 100%
rename from windows/keep-secure/interactive-logon-message-text-for-users-attempting-to-log-on.md
rename to windows/device-security/security-policy-settings/interactive-logon-message-text-for-users-attempting-to-log-on.md
diff --git a/windows/keep-secure/interactive-logon-message-title-for-users-attempting-to-log-on.md b/windows/device-security/security-policy-settings/interactive-logon-message-title-for-users-attempting-to-log-on.md
similarity index 100%
rename from windows/keep-secure/interactive-logon-message-title-for-users-attempting-to-log-on.md
rename to windows/device-security/security-policy-settings/interactive-logon-message-title-for-users-attempting-to-log-on.md
diff --git a/windows/keep-secure/interactive-logon-number-of-previous-logons-to-cache-in-case-domain-controller-is-not-available.md b/windows/device-security/security-policy-settings/interactive-logon-number-of-previous-logons-to-cache-in-case-domain-controller-is-not-available.md
similarity index 100%
rename from windows/keep-secure/interactive-logon-number-of-previous-logons-to-cache-in-case-domain-controller-is-not-available.md
rename to windows/device-security/security-policy-settings/interactive-logon-number-of-previous-logons-to-cache-in-case-domain-controller-is-not-available.md
diff --git a/windows/keep-secure/interactive-logon-prompt-user-to-change-password-before-expiration.md b/windows/device-security/security-policy-settings/interactive-logon-prompt-user-to-change-password-before-expiration.md
similarity index 100%
rename from windows/keep-secure/interactive-logon-prompt-user-to-change-password-before-expiration.md
rename to windows/device-security/security-policy-settings/interactive-logon-prompt-user-to-change-password-before-expiration.md
diff --git a/windows/keep-secure/interactive-logon-require-domain-controller-authentication-to-unlock-workstation.md b/windows/device-security/security-policy-settings/interactive-logon-require-domain-controller-authentication-to-unlock-workstation.md
similarity index 100%
rename from windows/keep-secure/interactive-logon-require-domain-controller-authentication-to-unlock-workstation.md
rename to windows/device-security/security-policy-settings/interactive-logon-require-domain-controller-authentication-to-unlock-workstation.md
diff --git a/windows/keep-secure/interactive-logon-require-smart-card.md b/windows/device-security/security-policy-settings/interactive-logon-require-smart-card.md
similarity index 100%
rename from windows/keep-secure/interactive-logon-require-smart-card.md
rename to windows/device-security/security-policy-settings/interactive-logon-require-smart-card.md
diff --git a/windows/keep-secure/interactive-logon-smart-card-removal-behavior.md b/windows/device-security/security-policy-settings/interactive-logon-smart-card-removal-behavior.md
similarity index 100%
rename from windows/keep-secure/interactive-logon-smart-card-removal-behavior.md
rename to windows/device-security/security-policy-settings/interactive-logon-smart-card-removal-behavior.md
diff --git a/windows/keep-secure/kerberos-policy.md b/windows/device-security/security-policy-settings/kerberos-policy.md
similarity index 100%
rename from windows/keep-secure/kerberos-policy.md
rename to windows/device-security/security-policy-settings/kerberos-policy.md
diff --git a/windows/keep-secure/load-and-unload-device-drivers.md b/windows/device-security/security-policy-settings/load-and-unload-device-drivers.md
similarity index 100%
rename from windows/keep-secure/load-and-unload-device-drivers.md
rename to windows/device-security/security-policy-settings/load-and-unload-device-drivers.md
diff --git a/windows/keep-secure/lock-pages-in-memory.md b/windows/device-security/security-policy-settings/lock-pages-in-memory.md
similarity index 100%
rename from windows/keep-secure/lock-pages-in-memory.md
rename to windows/device-security/security-policy-settings/lock-pages-in-memory.md
diff --git a/windows/keep-secure/log-on-as-a-batch-job.md b/windows/device-security/security-policy-settings/log-on-as-a-batch-job.md
similarity index 100%
rename from windows/keep-secure/log-on-as-a-batch-job.md
rename to windows/device-security/security-policy-settings/log-on-as-a-batch-job.md
diff --git a/windows/keep-secure/log-on-as-a-service.md b/windows/device-security/security-policy-settings/log-on-as-a-service.md
similarity index 100%
rename from windows/keep-secure/log-on-as-a-service.md
rename to windows/device-security/security-policy-settings/log-on-as-a-service.md
diff --git a/windows/keep-secure/manage-auditing-and-security-log.md b/windows/device-security/security-policy-settings/manage-auditing-and-security-log.md
similarity index 96%
rename from windows/keep-secure/manage-auditing-and-security-log.md
rename to windows/device-security/security-policy-settings/manage-auditing-and-security-log.md
index 7a6cfdc0ea..282e775032 100644
--- a/windows/keep-secure/manage-auditing-and-security-log.md
+++ b/windows/device-security/security-policy-settings/manage-auditing-and-security-log.md
@@ -19,7 +19,7 @@ Describes the best practices, location, values, policy management, and security
## Reference
This policy setting determines which users can specify object access audit options for individual resources such as files, Active Directory objects, and registry keys. These objects specify their system access control lists (SACL). A user who is assigned this user right can also view and clear the
-Security log in Event Viewer. For more info about the Object Access audit policy, see [Audit object access](basic-audit-object-access.md).
+Security log in Event Viewer. For more info about the Object Access audit policy, see [Audit object access](../auditing/basic-audit-object-access.md).
Constant: SeSecurityPrivilege
@@ -62,7 +62,7 @@ Any change to the user rights assignment for an account becomes effective the ne
Audits for object access are not performed unless you enable them by using the Local Group Policy Editor, the Group Policy Management Console (GPMC), or the Auditpol command-line tool.
-For more information about the Object Access audit policy, see [Audit object access](basic-audit-object-access.md).
+For more information about the Object Access audit policy, see [Audit object access](../auditing/basic-audit-object-access.md).
### Group Policy
diff --git a/windows/keep-secure/maximum-lifetime-for-service-ticket.md b/windows/device-security/security-policy-settings/maximum-lifetime-for-service-ticket.md
similarity index 100%
rename from windows/keep-secure/maximum-lifetime-for-service-ticket.md
rename to windows/device-security/security-policy-settings/maximum-lifetime-for-service-ticket.md
diff --git a/windows/keep-secure/maximum-lifetime-for-user-ticket-renewal.md b/windows/device-security/security-policy-settings/maximum-lifetime-for-user-ticket-renewal.md
similarity index 100%
rename from windows/keep-secure/maximum-lifetime-for-user-ticket-renewal.md
rename to windows/device-security/security-policy-settings/maximum-lifetime-for-user-ticket-renewal.md
diff --git a/windows/keep-secure/maximum-lifetime-for-user-ticket.md b/windows/device-security/security-policy-settings/maximum-lifetime-for-user-ticket.md
similarity index 100%
rename from windows/keep-secure/maximum-lifetime-for-user-ticket.md
rename to windows/device-security/security-policy-settings/maximum-lifetime-for-user-ticket.md
diff --git a/windows/keep-secure/maximum-password-age.md b/windows/device-security/security-policy-settings/maximum-password-age.md
similarity index 100%
rename from windows/keep-secure/maximum-password-age.md
rename to windows/device-security/security-policy-settings/maximum-password-age.md
diff --git a/windows/keep-secure/maximum-tolerance-for-computer-clock-synchronization.md b/windows/device-security/security-policy-settings/maximum-tolerance-for-computer-clock-synchronization.md
similarity index 100%
rename from windows/keep-secure/maximum-tolerance-for-computer-clock-synchronization.md
rename to windows/device-security/security-policy-settings/maximum-tolerance-for-computer-clock-synchronization.md
diff --git a/windows/keep-secure/microsoft-network-client-digitally-sign-communications-always.md b/windows/device-security/security-policy-settings/microsoft-network-client-digitally-sign-communications-always.md
similarity index 100%
rename from windows/keep-secure/microsoft-network-client-digitally-sign-communications-always.md
rename to windows/device-security/security-policy-settings/microsoft-network-client-digitally-sign-communications-always.md
diff --git a/windows/keep-secure/microsoft-network-client-digitally-sign-communications-if-server-agrees.md b/windows/device-security/security-policy-settings/microsoft-network-client-digitally-sign-communications-if-server-agrees.md
similarity index 100%
rename from windows/keep-secure/microsoft-network-client-digitally-sign-communications-if-server-agrees.md
rename to windows/device-security/security-policy-settings/microsoft-network-client-digitally-sign-communications-if-server-agrees.md
diff --git a/windows/keep-secure/microsoft-network-client-send-unencrypted-password-to-third-party-smb-servers.md b/windows/device-security/security-policy-settings/microsoft-network-client-send-unencrypted-password-to-third-party-smb-servers.md
similarity index 100%
rename from windows/keep-secure/microsoft-network-client-send-unencrypted-password-to-third-party-smb-servers.md
rename to windows/device-security/security-policy-settings/microsoft-network-client-send-unencrypted-password-to-third-party-smb-servers.md
diff --git a/windows/keep-secure/microsoft-network-server-amount-of-idle-time-required-before-suspending-session.md b/windows/device-security/security-policy-settings/microsoft-network-server-amount-of-idle-time-required-before-suspending-session.md
similarity index 100%
rename from windows/keep-secure/microsoft-network-server-amount-of-idle-time-required-before-suspending-session.md
rename to windows/device-security/security-policy-settings/microsoft-network-server-amount-of-idle-time-required-before-suspending-session.md
diff --git a/windows/keep-secure/microsoft-network-server-attempt-s4u2self-to-obtain-claim-information.md b/windows/device-security/security-policy-settings/microsoft-network-server-attempt-s4u2self-to-obtain-claim-information.md
similarity index 100%
rename from windows/keep-secure/microsoft-network-server-attempt-s4u2self-to-obtain-claim-information.md
rename to windows/device-security/security-policy-settings/microsoft-network-server-attempt-s4u2self-to-obtain-claim-information.md
diff --git a/windows/keep-secure/microsoft-network-server-digitally-sign-communications-always.md b/windows/device-security/security-policy-settings/microsoft-network-server-digitally-sign-communications-always.md
similarity index 100%
rename from windows/keep-secure/microsoft-network-server-digitally-sign-communications-always.md
rename to windows/device-security/security-policy-settings/microsoft-network-server-digitally-sign-communications-always.md
diff --git a/windows/keep-secure/microsoft-network-server-digitally-sign-communications-if-client-agrees.md b/windows/device-security/security-policy-settings/microsoft-network-server-digitally-sign-communications-if-client-agrees.md
similarity index 100%
rename from windows/keep-secure/microsoft-network-server-digitally-sign-communications-if-client-agrees.md
rename to windows/device-security/security-policy-settings/microsoft-network-server-digitally-sign-communications-if-client-agrees.md
diff --git a/windows/keep-secure/microsoft-network-server-disconnect-clients-when-logon-hours-expire.md b/windows/device-security/security-policy-settings/microsoft-network-server-disconnect-clients-when-logon-hours-expire.md
similarity index 100%
rename from windows/keep-secure/microsoft-network-server-disconnect-clients-when-logon-hours-expire.md
rename to windows/device-security/security-policy-settings/microsoft-network-server-disconnect-clients-when-logon-hours-expire.md
diff --git a/windows/keep-secure/microsoft-network-server-server-spn-target-name-validation-level.md b/windows/device-security/security-policy-settings/microsoft-network-server-server-spn-target-name-validation-level.md
similarity index 100%
rename from windows/keep-secure/microsoft-network-server-server-spn-target-name-validation-level.md
rename to windows/device-security/security-policy-settings/microsoft-network-server-server-spn-target-name-validation-level.md
diff --git a/windows/keep-secure/minimum-password-age.md b/windows/device-security/security-policy-settings/minimum-password-age.md
similarity index 100%
rename from windows/keep-secure/minimum-password-age.md
rename to windows/device-security/security-policy-settings/minimum-password-age.md
diff --git a/windows/keep-secure/minimum-password-length.md b/windows/device-security/security-policy-settings/minimum-password-length.md
similarity index 100%
rename from windows/keep-secure/minimum-password-length.md
rename to windows/device-security/security-policy-settings/minimum-password-length.md
diff --git a/windows/keep-secure/modify-an-object-label.md b/windows/device-security/security-policy-settings/modify-an-object-label.md
similarity index 100%
rename from windows/keep-secure/modify-an-object-label.md
rename to windows/device-security/security-policy-settings/modify-an-object-label.md
diff --git a/windows/keep-secure/modify-firmware-environment-values.md b/windows/device-security/security-policy-settings/modify-firmware-environment-values.md
similarity index 100%
rename from windows/keep-secure/modify-firmware-environment-values.md
rename to windows/device-security/security-policy-settings/modify-firmware-environment-values.md
diff --git a/windows/keep-secure/network-access-allow-anonymous-sidname-translation.md b/windows/device-security/security-policy-settings/network-access-allow-anonymous-sidname-translation.md
similarity index 100%
rename from windows/keep-secure/network-access-allow-anonymous-sidname-translation.md
rename to windows/device-security/security-policy-settings/network-access-allow-anonymous-sidname-translation.md
diff --git a/windows/keep-secure/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts-and-shares.md b/windows/device-security/security-policy-settings/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts-and-shares.md
similarity index 100%
rename from windows/keep-secure/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts-and-shares.md
rename to windows/device-security/security-policy-settings/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts-and-shares.md
diff --git a/windows/keep-secure/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts.md b/windows/device-security/security-policy-settings/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts.md
similarity index 100%
rename from windows/keep-secure/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts.md
rename to windows/device-security/security-policy-settings/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts.md
diff --git a/windows/keep-secure/network-access-do-not-allow-storage-of-passwords-and-credentials-for-network-authentication.md b/windows/device-security/security-policy-settings/network-access-do-not-allow-storage-of-passwords-and-credentials-for-network-authentication.md
similarity index 100%
rename from windows/keep-secure/network-access-do-not-allow-storage-of-passwords-and-credentials-for-network-authentication.md
rename to windows/device-security/security-policy-settings/network-access-do-not-allow-storage-of-passwords-and-credentials-for-network-authentication.md
diff --git a/windows/keep-secure/network-access-let-everyone-permissions-apply-to-anonymous-users.md b/windows/device-security/security-policy-settings/network-access-let-everyone-permissions-apply-to-anonymous-users.md
similarity index 100%
rename from windows/keep-secure/network-access-let-everyone-permissions-apply-to-anonymous-users.md
rename to windows/device-security/security-policy-settings/network-access-let-everyone-permissions-apply-to-anonymous-users.md
diff --git a/windows/keep-secure/network-access-named-pipes-that-can-be-accessed-anonymously.md b/windows/device-security/security-policy-settings/network-access-named-pipes-that-can-be-accessed-anonymously.md
similarity index 100%
rename from windows/keep-secure/network-access-named-pipes-that-can-be-accessed-anonymously.md
rename to windows/device-security/security-policy-settings/network-access-named-pipes-that-can-be-accessed-anonymously.md
diff --git a/windows/keep-secure/network-access-remotely-accessible-registry-paths-and-subpaths.md b/windows/device-security/security-policy-settings/network-access-remotely-accessible-registry-paths-and-subpaths.md
similarity index 100%
rename from windows/keep-secure/network-access-remotely-accessible-registry-paths-and-subpaths.md
rename to windows/device-security/security-policy-settings/network-access-remotely-accessible-registry-paths-and-subpaths.md
diff --git a/windows/keep-secure/network-access-remotely-accessible-registry-paths.md b/windows/device-security/security-policy-settings/network-access-remotely-accessible-registry-paths.md
similarity index 100%
rename from windows/keep-secure/network-access-remotely-accessible-registry-paths.md
rename to windows/device-security/security-policy-settings/network-access-remotely-accessible-registry-paths.md
diff --git a/windows/keep-secure/network-access-restrict-anonymous-access-to-named-pipes-and-shares.md b/windows/device-security/security-policy-settings/network-access-restrict-anonymous-access-to-named-pipes-and-shares.md
similarity index 100%
rename from windows/keep-secure/network-access-restrict-anonymous-access-to-named-pipes-and-shares.md
rename to windows/device-security/security-policy-settings/network-access-restrict-anonymous-access-to-named-pipes-and-shares.md
diff --git a/windows/keep-secure/network-access-shares-that-can-be-accessed-anonymously.md b/windows/device-security/security-policy-settings/network-access-shares-that-can-be-accessed-anonymously.md
similarity index 100%
rename from windows/keep-secure/network-access-shares-that-can-be-accessed-anonymously.md
rename to windows/device-security/security-policy-settings/network-access-shares-that-can-be-accessed-anonymously.md
diff --git a/windows/keep-secure/network-access-sharing-and-security-model-for-local-accounts.md b/windows/device-security/security-policy-settings/network-access-sharing-and-security-model-for-local-accounts.md
similarity index 100%
rename from windows/keep-secure/network-access-sharing-and-security-model-for-local-accounts.md
rename to windows/device-security/security-policy-settings/network-access-sharing-and-security-model-for-local-accounts.md
diff --git a/windows/keep-secure/network-list-manager-policies.md b/windows/device-security/security-policy-settings/network-list-manager-policies.md
similarity index 100%
rename from windows/keep-secure/network-list-manager-policies.md
rename to windows/device-security/security-policy-settings/network-list-manager-policies.md
diff --git a/windows/keep-secure/network-security-allow-local-system-to-use-computer-identity-for-ntlm.md b/windows/device-security/security-policy-settings/network-security-allow-local-system-to-use-computer-identity-for-ntlm.md
similarity index 100%
rename from windows/keep-secure/network-security-allow-local-system-to-use-computer-identity-for-ntlm.md
rename to windows/device-security/security-policy-settings/network-security-allow-local-system-to-use-computer-identity-for-ntlm.md
diff --git a/windows/keep-secure/network-security-allow-localsystem-null-session-fallback.md b/windows/device-security/security-policy-settings/network-security-allow-localsystem-null-session-fallback.md
similarity index 100%
rename from windows/keep-secure/network-security-allow-localsystem-null-session-fallback.md
rename to windows/device-security/security-policy-settings/network-security-allow-localsystem-null-session-fallback.md
diff --git a/windows/keep-secure/network-security-allow-pku2u-authentication-requests-to-this-computer-to-use-online-identities.md b/windows/device-security/security-policy-settings/network-security-allow-pku2u-authentication-requests-to-this-computer-to-use-online-identities.md
similarity index 100%
rename from windows/keep-secure/network-security-allow-pku2u-authentication-requests-to-this-computer-to-use-online-identities.md
rename to windows/device-security/security-policy-settings/network-security-allow-pku2u-authentication-requests-to-this-computer-to-use-online-identities.md
diff --git a/windows/keep-secure/network-security-configure-encryption-types-allowed-for-kerberos.md b/windows/device-security/security-policy-settings/network-security-configure-encryption-types-allowed-for-kerberos.md
similarity index 100%
rename from windows/keep-secure/network-security-configure-encryption-types-allowed-for-kerberos.md
rename to windows/device-security/security-policy-settings/network-security-configure-encryption-types-allowed-for-kerberos.md
diff --git a/windows/keep-secure/network-security-do-not-store-lan-manager-hash-value-on-next-password-change.md b/windows/device-security/security-policy-settings/network-security-do-not-store-lan-manager-hash-value-on-next-password-change.md
similarity index 100%
rename from windows/keep-secure/network-security-do-not-store-lan-manager-hash-value-on-next-password-change.md
rename to windows/device-security/security-policy-settings/network-security-do-not-store-lan-manager-hash-value-on-next-password-change.md
diff --git a/windows/keep-secure/network-security-force-logoff-when-logon-hours-expire.md b/windows/device-security/security-policy-settings/network-security-force-logoff-when-logon-hours-expire.md
similarity index 100%
rename from windows/keep-secure/network-security-force-logoff-when-logon-hours-expire.md
rename to windows/device-security/security-policy-settings/network-security-force-logoff-when-logon-hours-expire.md
diff --git a/windows/keep-secure/network-security-lan-manager-authentication-level.md b/windows/device-security/security-policy-settings/network-security-lan-manager-authentication-level.md
similarity index 100%
rename from windows/keep-secure/network-security-lan-manager-authentication-level.md
rename to windows/device-security/security-policy-settings/network-security-lan-manager-authentication-level.md
diff --git a/windows/keep-secure/network-security-ldap-client-signing-requirements.md b/windows/device-security/security-policy-settings/network-security-ldap-client-signing-requirements.md
similarity index 100%
rename from windows/keep-secure/network-security-ldap-client-signing-requirements.md
rename to windows/device-security/security-policy-settings/network-security-ldap-client-signing-requirements.md
diff --git a/windows/keep-secure/network-security-minimum-session-security-for-ntlm-ssp-based-including-secure-rpc-clients.md b/windows/device-security/security-policy-settings/network-security-minimum-session-security-for-ntlm-ssp-based-including-secure-rpc-clients.md
similarity index 100%
rename from windows/keep-secure/network-security-minimum-session-security-for-ntlm-ssp-based-including-secure-rpc-clients.md
rename to windows/device-security/security-policy-settings/network-security-minimum-session-security-for-ntlm-ssp-based-including-secure-rpc-clients.md
diff --git a/windows/keep-secure/network-security-minimum-session-security-for-ntlm-ssp-based-including-secure-rpc-servers.md b/windows/device-security/security-policy-settings/network-security-minimum-session-security-for-ntlm-ssp-based-including-secure-rpc-servers.md
similarity index 100%
rename from windows/keep-secure/network-security-minimum-session-security-for-ntlm-ssp-based-including-secure-rpc-servers.md
rename to windows/device-security/security-policy-settings/network-security-minimum-session-security-for-ntlm-ssp-based-including-secure-rpc-servers.md
diff --git a/windows/keep-secure/network-security-restrict-ntlm-add-remote-server-exceptions-for-ntlm-authentication.md b/windows/device-security/security-policy-settings/network-security-restrict-ntlm-add-remote-server-exceptions-for-ntlm-authentication.md
similarity index 100%
rename from windows/keep-secure/network-security-restrict-ntlm-add-remote-server-exceptions-for-ntlm-authentication.md
rename to windows/device-security/security-policy-settings/network-security-restrict-ntlm-add-remote-server-exceptions-for-ntlm-authentication.md
diff --git a/windows/keep-secure/network-security-restrict-ntlm-add-server-exceptions-in-this-domain.md b/windows/device-security/security-policy-settings/network-security-restrict-ntlm-add-server-exceptions-in-this-domain.md
similarity index 100%
rename from windows/keep-secure/network-security-restrict-ntlm-add-server-exceptions-in-this-domain.md
rename to windows/device-security/security-policy-settings/network-security-restrict-ntlm-add-server-exceptions-in-this-domain.md
diff --git a/windows/keep-secure/network-security-restrict-ntlm-audit-incoming-ntlm-traffic.md b/windows/device-security/security-policy-settings/network-security-restrict-ntlm-audit-incoming-ntlm-traffic.md
similarity index 100%
rename from windows/keep-secure/network-security-restrict-ntlm-audit-incoming-ntlm-traffic.md
rename to windows/device-security/security-policy-settings/network-security-restrict-ntlm-audit-incoming-ntlm-traffic.md
diff --git a/windows/keep-secure/network-security-restrict-ntlm-audit-ntlm-authentication-in-this-domain.md b/windows/device-security/security-policy-settings/network-security-restrict-ntlm-audit-ntlm-authentication-in-this-domain.md
similarity index 100%
rename from windows/keep-secure/network-security-restrict-ntlm-audit-ntlm-authentication-in-this-domain.md
rename to windows/device-security/security-policy-settings/network-security-restrict-ntlm-audit-ntlm-authentication-in-this-domain.md
diff --git a/windows/keep-secure/network-security-restrict-ntlm-incoming-ntlm-traffic.md b/windows/device-security/security-policy-settings/network-security-restrict-ntlm-incoming-ntlm-traffic.md
similarity index 100%
rename from windows/keep-secure/network-security-restrict-ntlm-incoming-ntlm-traffic.md
rename to windows/device-security/security-policy-settings/network-security-restrict-ntlm-incoming-ntlm-traffic.md
diff --git a/windows/keep-secure/network-security-restrict-ntlm-ntlm-authentication-in-this-domain.md b/windows/device-security/security-policy-settings/network-security-restrict-ntlm-ntlm-authentication-in-this-domain.md
similarity index 100%
rename from windows/keep-secure/network-security-restrict-ntlm-ntlm-authentication-in-this-domain.md
rename to windows/device-security/security-policy-settings/network-security-restrict-ntlm-ntlm-authentication-in-this-domain.md
diff --git a/windows/keep-secure/network-security-restrict-ntlm-outgoing-ntlm-traffic-to-remote-servers.md b/windows/device-security/security-policy-settings/network-security-restrict-ntlm-outgoing-ntlm-traffic-to-remote-servers.md
similarity index 100%
rename from windows/keep-secure/network-security-restrict-ntlm-outgoing-ntlm-traffic-to-remote-servers.md
rename to windows/device-security/security-policy-settings/network-security-restrict-ntlm-outgoing-ntlm-traffic-to-remote-servers.md
diff --git a/windows/keep-secure/password-must-meet-complexity-requirements.md b/windows/device-security/security-policy-settings/password-must-meet-complexity-requirements.md
similarity index 100%
rename from windows/keep-secure/password-must-meet-complexity-requirements.md
rename to windows/device-security/security-policy-settings/password-must-meet-complexity-requirements.md
diff --git a/windows/keep-secure/password-policy.md b/windows/device-security/security-policy-settings/password-policy.md
similarity index 100%
rename from windows/keep-secure/password-policy.md
rename to windows/device-security/security-policy-settings/password-policy.md
diff --git a/windows/keep-secure/perform-volume-maintenance-tasks.md b/windows/device-security/security-policy-settings/perform-volume-maintenance-tasks.md
similarity index 100%
rename from windows/keep-secure/perform-volume-maintenance-tasks.md
rename to windows/device-security/security-policy-settings/perform-volume-maintenance-tasks.md
diff --git a/windows/keep-secure/profile-single-process.md b/windows/device-security/security-policy-settings/profile-single-process.md
similarity index 100%
rename from windows/keep-secure/profile-single-process.md
rename to windows/device-security/security-policy-settings/profile-single-process.md
diff --git a/windows/keep-secure/profile-system-performance.md b/windows/device-security/security-policy-settings/profile-system-performance.md
similarity index 100%
rename from windows/keep-secure/profile-system-performance.md
rename to windows/device-security/security-policy-settings/profile-system-performance.md
diff --git a/windows/keep-secure/recovery-console-allow-automatic-administrative-logon.md b/windows/device-security/security-policy-settings/recovery-console-allow-automatic-administrative-logon.md
similarity index 100%
rename from windows/keep-secure/recovery-console-allow-automatic-administrative-logon.md
rename to windows/device-security/security-policy-settings/recovery-console-allow-automatic-administrative-logon.md
diff --git a/windows/keep-secure/recovery-console-allow-floppy-copy-and-access-to-all-drives-and-folders.md b/windows/device-security/security-policy-settings/recovery-console-allow-floppy-copy-and-access-to-all-drives-and-folders.md
similarity index 100%
rename from windows/keep-secure/recovery-console-allow-floppy-copy-and-access-to-all-drives-and-folders.md
rename to windows/device-security/security-policy-settings/recovery-console-allow-floppy-copy-and-access-to-all-drives-and-folders.md
diff --git a/windows/keep-secure/remove-computer-from-docking-station.md b/windows/device-security/security-policy-settings/remove-computer-from-docking-station.md
similarity index 100%
rename from windows/keep-secure/remove-computer-from-docking-station.md
rename to windows/device-security/security-policy-settings/remove-computer-from-docking-station.md
diff --git a/windows/keep-secure/replace-a-process-level-token.md b/windows/device-security/security-policy-settings/replace-a-process-level-token.md
similarity index 100%
rename from windows/keep-secure/replace-a-process-level-token.md
rename to windows/device-security/security-policy-settings/replace-a-process-level-token.md
diff --git a/windows/keep-secure/reset-account-lockout-counter-after.md b/windows/device-security/security-policy-settings/reset-account-lockout-counter-after.md
similarity index 100%
rename from windows/keep-secure/reset-account-lockout-counter-after.md
rename to windows/device-security/security-policy-settings/reset-account-lockout-counter-after.md
diff --git a/windows/keep-secure/restore-files-and-directories.md b/windows/device-security/security-policy-settings/restore-files-and-directories.md
similarity index 100%
rename from windows/keep-secure/restore-files-and-directories.md
rename to windows/device-security/security-policy-settings/restore-files-and-directories.md
diff --git a/windows/keep-secure/secpol-advanced-security-audit-policy-settings.md b/windows/device-security/security-policy-settings/secpol-advanced-security-audit-policy-settings.md
similarity index 94%
rename from windows/keep-secure/secpol-advanced-security-audit-policy-settings.md
rename to windows/device-security/security-policy-settings/secpol-advanced-security-audit-policy-settings.md
index e3f6f2ce53..dca87d3e20 100644
--- a/windows/keep-secure/secpol-advanced-security-audit-policy-settings.md
+++ b/windows/device-security/security-policy-settings/secpol-advanced-security-audit-policy-settings.md
@@ -26,4 +26,4 @@ You can access these audit policy settings through the Local Security Policy sna
These Advanced Audit policy settings allow you to select only the behaviors that you want to monitor. You can exclude audit results for behaviors that are of little or no concern to you, or behaviors that create an excessive number of log entries. In addition, because security audit policies can be applied by using domain Group Policy Objects, audit policy settings can be modified, tested, and deployed to selected users and groups with relative simplicity.
-For more info, see [Advanced security audit policies](advanced-security-auditing.md).
+For more info, see [Advanced security audit policies](../auditing/advanced-security-auditing.md).
diff --git a/windows/keep-secure/security-options.md b/windows/device-security/security-policy-settings/security-options.md
similarity index 100%
rename from windows/keep-secure/security-options.md
rename to windows/device-security/security-policy-settings/security-options.md
diff --git a/windows/keep-secure/security-policy-settings-reference.md b/windows/device-security/security-policy-settings/security-policy-settings-reference.md
similarity index 100%
rename from windows/keep-secure/security-policy-settings-reference.md
rename to windows/device-security/security-policy-settings/security-policy-settings-reference.md
diff --git a/windows/keep-secure/security-policy-settings.md b/windows/device-security/security-policy-settings/security-policy-settings.md
similarity index 100%
rename from windows/keep-secure/security-policy-settings.md
rename to windows/device-security/security-policy-settings/security-policy-settings.md
diff --git a/windows/keep-secure/shut-down-the-system.md b/windows/device-security/security-policy-settings/shut-down-the-system.md
similarity index 100%
rename from windows/keep-secure/shut-down-the-system.md
rename to windows/device-security/security-policy-settings/shut-down-the-system.md
diff --git a/windows/keep-secure/shutdown-allow-system-to-be-shut-down-without-having-to-log-on.md b/windows/device-security/security-policy-settings/shutdown-allow-system-to-be-shut-down-without-having-to-log-on.md
similarity index 100%
rename from windows/keep-secure/shutdown-allow-system-to-be-shut-down-without-having-to-log-on.md
rename to windows/device-security/security-policy-settings/shutdown-allow-system-to-be-shut-down-without-having-to-log-on.md
diff --git a/windows/keep-secure/shutdown-clear-virtual-memory-pagefile.md b/windows/device-security/security-policy-settings/shutdown-clear-virtual-memory-pagefile.md
similarity index 100%
rename from windows/keep-secure/shutdown-clear-virtual-memory-pagefile.md
rename to windows/device-security/security-policy-settings/shutdown-clear-virtual-memory-pagefile.md
diff --git a/windows/keep-secure/store-passwords-using-reversible-encryption.md b/windows/device-security/security-policy-settings/store-passwords-using-reversible-encryption.md
similarity index 100%
rename from windows/keep-secure/store-passwords-using-reversible-encryption.md
rename to windows/device-security/security-policy-settings/store-passwords-using-reversible-encryption.md
diff --git a/windows/keep-secure/synchronize-directory-service-data.md b/windows/device-security/security-policy-settings/synchronize-directory-service-data.md
similarity index 100%
rename from windows/keep-secure/synchronize-directory-service-data.md
rename to windows/device-security/security-policy-settings/synchronize-directory-service-data.md
diff --git a/windows/keep-secure/system-cryptography-force-strong-key-protection-for-user-keys-stored-on-the-computer.md b/windows/device-security/security-policy-settings/system-cryptography-force-strong-key-protection-for-user-keys-stored-on-the-computer.md
similarity index 100%
rename from windows/keep-secure/system-cryptography-force-strong-key-protection-for-user-keys-stored-on-the-computer.md
rename to windows/device-security/security-policy-settings/system-cryptography-force-strong-key-protection-for-user-keys-stored-on-the-computer.md
diff --git a/windows/keep-secure/system-cryptography-use-fips-compliant-algorithms-for-encryption-hashing-and-signing.md b/windows/device-security/security-policy-settings/system-cryptography-use-fips-compliant-algorithms-for-encryption-hashing-and-signing.md
similarity index 100%
rename from windows/keep-secure/system-cryptography-use-fips-compliant-algorithms-for-encryption-hashing-and-signing.md
rename to windows/device-security/security-policy-settings/system-cryptography-use-fips-compliant-algorithms-for-encryption-hashing-and-signing.md
diff --git a/windows/keep-secure/system-objects-require-case-insensitivity-for-non-windows-subsystems.md b/windows/device-security/security-policy-settings/system-objects-require-case-insensitivity-for-non-windows-subsystems.md
similarity index 100%
rename from windows/keep-secure/system-objects-require-case-insensitivity-for-non-windows-subsystems.md
rename to windows/device-security/security-policy-settings/system-objects-require-case-insensitivity-for-non-windows-subsystems.md
diff --git a/windows/keep-secure/system-objects-strengthen-default-permissions-of-internal-system-objects.md b/windows/device-security/security-policy-settings/system-objects-strengthen-default-permissions-of-internal-system-objects.md
similarity index 100%
rename from windows/keep-secure/system-objects-strengthen-default-permissions-of-internal-system-objects.md
rename to windows/device-security/security-policy-settings/system-objects-strengthen-default-permissions-of-internal-system-objects.md
diff --git a/windows/keep-secure/system-settings-optional-subsystems.md b/windows/device-security/security-policy-settings/system-settings-optional-subsystems.md
similarity index 100%
rename from windows/keep-secure/system-settings-optional-subsystems.md
rename to windows/device-security/security-policy-settings/system-settings-optional-subsystems.md
diff --git a/windows/keep-secure/system-settings-use-certificate-rules-on-windows-executables-for-software-restriction-policies.md b/windows/device-security/security-policy-settings/system-settings-use-certificate-rules-on-windows-executables-for-software-restriction-policies.md
similarity index 100%
rename from windows/keep-secure/system-settings-use-certificate-rules-on-windows-executables-for-software-restriction-policies.md
rename to windows/device-security/security-policy-settings/system-settings-use-certificate-rules-on-windows-executables-for-software-restriction-policies.md
diff --git a/windows/keep-secure/take-ownership-of-files-or-other-objects.md b/windows/device-security/security-policy-settings/take-ownership-of-files-or-other-objects.md
similarity index 100%
rename from windows/keep-secure/take-ownership-of-files-or-other-objects.md
rename to windows/device-security/security-policy-settings/take-ownership-of-files-or-other-objects.md
diff --git a/windows/keep-secure/user-account-control-admin-approval-mode-for-the-built-in-administrator-account.md b/windows/device-security/security-policy-settings/user-account-control-admin-approval-mode-for-the-built-in-administrator-account.md
similarity index 98%
rename from windows/keep-secure/user-account-control-admin-approval-mode-for-the-built-in-administrator-account.md
rename to windows/device-security/security-policy-settings/user-account-control-admin-approval-mode-for-the-built-in-administrator-account.md
index 7b203c0bcd..e0e41611ad 100644
--- a/windows/keep-secure/user-account-control-admin-approval-mode-for-the-built-in-administrator-account.md
+++ b/windows/device-security/security-policy-settings/user-account-control-admin-approval-mode-for-the-built-in-administrator-account.md
@@ -81,4 +81,4 @@ Enable the **User Account Control: Admin Approval Mode for the Built-in Administ
Users who log on by using the local administrator account are prompted for consent whenever a program requests an elevation in privilege.
## Related topics
-- [Security Options](security-options.md)
+- [Security Options](/windows/device-security/security-policy-settings/security-options)
diff --git a/windows/keep-secure/user-account-control-allow-uiaccess-applications-to-prompt-for-elevation-without-using-the-secure-desktop.md b/windows/device-security/security-policy-settings/user-account-control-allow-uiaccess-applications-to-prompt-for-elevation-without-using-the-secure-desktop.md
similarity index 99%
rename from windows/keep-secure/user-account-control-allow-uiaccess-applications-to-prompt-for-elevation-without-using-the-secure-desktop.md
rename to windows/device-security/security-policy-settings/user-account-control-allow-uiaccess-applications-to-prompt-for-elevation-without-using-the-secure-desktop.md
index e80369cae9..ec501f6f2d 100644
--- a/windows/keep-secure/user-account-control-allow-uiaccess-applications-to-prompt-for-elevation-without-using-the-secure-desktop.md
+++ b/windows/device-security/security-policy-settings/user-account-control-allow-uiaccess-applications-to-prompt-for-elevation-without-using-the-secure-desktop.md
@@ -116,4 +116,4 @@ If a user requests remote assistance from an administrator and the remote assist
## Related topics
-- [Security Options](security-options.md)
+- [Security Options](/windows/device-security/security-policy-settings/security-options)
diff --git a/windows/keep-secure/user-account-control-behavior-of-the-elevation-prompt-for-administrators-in-admin-approval-mode.md b/windows/device-security/security-policy-settings/user-account-control-behavior-of-the-elevation-prompt-for-administrators-in-admin-approval-mode.md
similarity index 98%
rename from windows/keep-secure/user-account-control-behavior-of-the-elevation-prompt-for-administrators-in-admin-approval-mode.md
rename to windows/device-security/security-policy-settings/user-account-control-behavior-of-the-elevation-prompt-for-administrators-in-admin-approval-mode.md
index 97af8126a3..cbc598ba9f 100644
--- a/windows/keep-secure/user-account-control-behavior-of-the-elevation-prompt-for-administrators-in-admin-approval-mode.md
+++ b/windows/device-security/security-policy-settings/user-account-control-behavior-of-the-elevation-prompt-for-administrators-in-admin-approval-mode.md
@@ -97,4 +97,4 @@ Administrators should be made aware that they will be prompted for consent when
## Related topics
-- [Security Options](security-options.md)
+- [Security Options](/windows/device-security/security-policy-settings/security-options)
diff --git a/windows/keep-secure/user-account-control-behavior-of-the-elevation-prompt-for-standard-users.md b/windows/device-security/security-policy-settings/user-account-control-behavior-of-the-elevation-prompt-for-standard-users.md
similarity index 98%
rename from windows/keep-secure/user-account-control-behavior-of-the-elevation-prompt-for-standard-users.md
rename to windows/device-security/security-policy-settings/user-account-control-behavior-of-the-elevation-prompt-for-standard-users.md
index 7ca4ce4329..e2d5edf535 100644
--- a/windows/keep-secure/user-account-control-behavior-of-the-elevation-prompt-for-standard-users.md
+++ b/windows/device-security/security-policy-settings/user-account-control-behavior-of-the-elevation-prompt-for-standard-users.md
@@ -86,4 +86,4 @@ Users must provide administrative passwords to run programs with elevated privil
## Related topics
-- [Security Options](security-options.md)
+- [Security Options](/windows/device-security/security-policy-settings/security-options)
diff --git a/windows/keep-secure/user-account-control-detect-application-installations-and-prompt-for-elevation.md b/windows/device-security/security-policy-settings/user-account-control-detect-application-installations-and-prompt-for-elevation.md
similarity index 97%
rename from windows/keep-secure/user-account-control-detect-application-installations-and-prompt-for-elevation.md
rename to windows/device-security/security-policy-settings/user-account-control-detect-application-installations-and-prompt-for-elevation.md
index 0c372cd6ee..32708030df 100644
--- a/windows/keep-secure/user-account-control-detect-application-installations-and-prompt-for-elevation.md
+++ b/windows/device-security/security-policy-settings/user-account-control-detect-application-installations-and-prompt-for-elevation.md
@@ -79,4 +79,4 @@ Users must provide administrative passwords to install programs.
## Related topics
-- [Security Options](security-options.md)
+- [Security Options](/windows/device-security/security-policy-settings/security-options)
diff --git a/windows/keep-secure/user-account-control-only-elevate-executables-that-are-signed-and-validated.md b/windows/device-security/security-policy-settings/user-account-control-only-elevate-executables-that-are-signed-and-validated.md
similarity index 98%
rename from windows/keep-secure/user-account-control-only-elevate-executables-that-are-signed-and-validated.md
rename to windows/device-security/security-policy-settings/user-account-control-only-elevate-executables-that-are-signed-and-validated.md
index 76edee3e01..a40147e7fc 100644
--- a/windows/keep-secure/user-account-control-only-elevate-executables-that-are-signed-and-validated.md
+++ b/windows/device-security/security-policy-settings/user-account-control-only-elevate-executables-that-are-signed-and-validated.md
@@ -87,4 +87,4 @@ Control over the applications that are installed on the desktops and the hardwar
## Related topics
-- [Security Options](security-options.md)
+- [Security Options](/windows/device-security/security-policy-settings/security-options)
diff --git a/windows/keep-secure/user-account-control-only-elevate-uiaccess-applications-that-are-installed-in-secure-locations.md b/windows/device-security/security-policy-settings/user-account-control-only-elevate-uiaccess-applications-that-are-installed-in-secure-locations.md
similarity index 98%
rename from windows/keep-secure/user-account-control-only-elevate-uiaccess-applications-that-are-installed-in-secure-locations.md
rename to windows/device-security/security-policy-settings/user-account-control-only-elevate-uiaccess-applications-that-are-installed-in-secure-locations.md
index be21f041f5..bfa1ed931c 100644
--- a/windows/keep-secure/user-account-control-only-elevate-uiaccess-applications-that-are-installed-in-secure-locations.md
+++ b/windows/device-security/security-policy-settings/user-account-control-only-elevate-uiaccess-applications-that-are-installed-in-secure-locations.md
@@ -109,4 +109,4 @@ If the application that requests UIAccess meets the UIAccess setting requirement
## Related topics
-- [Security Options](security-options.md)
+- [Security Options](/windows/device-security/security-policy-settings/security-options)
diff --git a/windows/keep-secure/user-account-control-run-all-administrators-in-admin-approval-mode.md b/windows/device-security/security-policy-settings/user-account-control-run-all-administrators-in-admin-approval-mode.md
similarity index 97%
rename from windows/keep-secure/user-account-control-run-all-administrators-in-admin-approval-mode.md
rename to windows/device-security/security-policy-settings/user-account-control-run-all-administrators-in-admin-approval-mode.md
index 61664f5a6e..566bd4d85a 100644
--- a/windows/keep-secure/user-account-control-run-all-administrators-in-admin-approval-mode.md
+++ b/windows/device-security/security-policy-settings/user-account-control-run-all-administrators-in-admin-approval-mode.md
@@ -83,4 +83,4 @@ Users and administrators must learn to work with UAC prompts and adjust their wo
## Related topics
-- [Security Options](security-options.md)
+- [Security Options](/windows/device-security/security-policy-settings/security-options)
diff --git a/windows/keep-secure/user-account-control-switch-to-the-secure-desktop-when-prompting-for-elevation.md b/windows/device-security/security-policy-settings/user-account-control-switch-to-the-secure-desktop-when-prompting-for-elevation.md
similarity index 97%
rename from windows/keep-secure/user-account-control-switch-to-the-secure-desktop-when-prompting-for-elevation.md
rename to windows/device-security/security-policy-settings/user-account-control-switch-to-the-secure-desktop-when-prompting-for-elevation.md
index 85c36101a5..4946bf5cee 100644
--- a/windows/keep-secure/user-account-control-switch-to-the-secure-desktop-when-prompting-for-elevation.md
+++ b/windows/device-security/security-policy-settings/user-account-control-switch-to-the-secure-desktop-when-prompting-for-elevation.md
@@ -86,4 +86,4 @@ None. This is the default configuration.
## Related topics
-- [Security Options](security-options.md)
+- [Security Options](/windows/device-security/security-policy-settings/security-options)
diff --git a/windows/keep-secure/user-account-control-virtualize-file-and-registry-write-failures-to-per-user-locations.md b/windows/device-security/security-policy-settings/user-account-control-virtualize-file-and-registry-write-failures-to-per-user-locations.md
similarity index 97%
rename from windows/keep-secure/user-account-control-virtualize-file-and-registry-write-failures-to-per-user-locations.md
rename to windows/device-security/security-policy-settings/user-account-control-virtualize-file-and-registry-write-failures-to-per-user-locations.md
index 8501495c6b..8308a25a5d 100644
--- a/windows/keep-secure/user-account-control-virtualize-file-and-registry-write-failures-to-per-user-locations.md
+++ b/windows/device-security/security-policy-settings/user-account-control-virtualize-file-and-registry-write-failures-to-per-user-locations.md
@@ -84,4 +84,4 @@ None. This is the default configuration.
## Related topics
-- [Security Options](security-options.md)
+- [Security Options](/windows/device-security/security-policy-settings/security-options)
diff --git a/windows/keep-secure/user-rights-assignment.md b/windows/device-security/security-policy-settings/user-rights-assignment.md
similarity index 100%
rename from windows/keep-secure/user-rights-assignment.md
rename to windows/device-security/security-policy-settings/user-rights-assignment.md
diff --git a/windows/keep-secure/backup-tpm-recovery-information-to-ad-ds.md b/windows/device-security/tpm/backup-tpm-recovery-information-to-ad-ds.md
similarity index 100%
rename from windows/keep-secure/backup-tpm-recovery-information-to-ad-ds.md
rename to windows/device-security/tpm/backup-tpm-recovery-information-to-ad-ds.md
diff --git a/windows/keep-secure/change-the-tpm-owner-password.md b/windows/device-security/tpm/change-the-tpm-owner-password.md
similarity index 100%
rename from windows/keep-secure/change-the-tpm-owner-password.md
rename to windows/device-security/tpm/change-the-tpm-owner-password.md
diff --git a/windows/keep-secure/initialize-and-configure-ownership-of-the-tpm.md b/windows/device-security/tpm/initialize-and-configure-ownership-of-the-tpm.md
similarity index 100%
rename from windows/keep-secure/initialize-and-configure-ownership-of-the-tpm.md
rename to windows/device-security/tpm/initialize-and-configure-ownership-of-the-tpm.md
diff --git a/windows/keep-secure/manage-tpm-commands.md b/windows/device-security/tpm/manage-tpm-commands.md
similarity index 100%
rename from windows/keep-secure/manage-tpm-commands.md
rename to windows/device-security/tpm/manage-tpm-commands.md
diff --git a/windows/keep-secure/manage-tpm-lockout.md b/windows/device-security/tpm/manage-tpm-lockout.md
similarity index 100%
rename from windows/keep-secure/manage-tpm-lockout.md
rename to windows/device-security/tpm/manage-tpm-lockout.md
diff --git a/windows/keep-secure/switch-pcr-banks-on-tpm-2-0-devices.md b/windows/device-security/tpm/switch-pcr-banks-on-tpm-2-0-devices.md
similarity index 100%
rename from windows/keep-secure/switch-pcr-banks-on-tpm-2-0-devices.md
rename to windows/device-security/tpm/switch-pcr-banks-on-tpm-2-0-devices.md
diff --git a/windows/keep-secure/tpm-fundamentals.md b/windows/device-security/tpm/tpm-fundamentals.md
similarity index 100%
rename from windows/keep-secure/tpm-fundamentals.md
rename to windows/device-security/tpm/tpm-fundamentals.md
diff --git a/windows/keep-secure/tpm-recommendations.md b/windows/device-security/tpm/tpm-recommendations.md
similarity index 100%
rename from windows/keep-secure/tpm-recommendations.md
rename to windows/device-security/tpm/tpm-recommendations.md
diff --git a/windows/keep-secure/trusted-platform-module-overview.md b/windows/device-security/tpm/trusted-platform-module-overview.md
similarity index 100%
rename from windows/keep-secure/trusted-platform-module-overview.md
rename to windows/device-security/tpm/trusted-platform-module-overview.md
diff --git a/windows/keep-secure/trusted-platform-module-services-group-policy-settings.md b/windows/device-security/tpm/trusted-platform-module-services-group-policy-settings.md
similarity index 100%
rename from windows/keep-secure/trusted-platform-module-services-group-policy-settings.md
rename to windows/device-security/tpm/trusted-platform-module-services-group-policy-settings.md
diff --git a/windows/keep-secure/trusted-platform-module-top-node.md b/windows/device-security/tpm/trusted-platform-module-top-node.md
similarity index 100%
rename from windows/keep-secure/trusted-platform-module-top-node.md
rename to windows/device-security/tpm/trusted-platform-module-top-node.md
diff --git a/windows/keep-secure/windows-10-mobile-security-guide.md b/windows/device-security/windows-10-mobile-security-guide.md
similarity index 100%
rename from windows/keep-secure/windows-10-mobile-security-guide.md
rename to windows/device-security/windows-10-mobile-security-guide.md
diff --git a/windows/keep-secure/windows-security-baselines.md b/windows/device-security/windows-security-baselines.md
similarity index 100%
rename from windows/keep-secure/windows-security-baselines.md
rename to windows/device-security/windows-security-baselines.md
diff --git a/windows/hub/TOC.md b/windows/hub/TOC.md
new file mode 100644
index 0000000000..8ed1a52f71
--- /dev/null
+++ b/windows/hub/TOC.md
@@ -0,0 +1,9 @@
+# [Windows 10 and Windows 10 Mobile](index.md)
+## [What's new](/windows/whats-new)
+## [Deployment](/windows/deployment)
+## [Configuration](/windows/configuration)
+## [Client management](/windows/client-management)
+## [Application management](/windows/application-management)
+## [Access protection](/windows/access-protection)
+## [Device security](/windows/device-security)
+## [Threat protection](/windows/threat-protection)
\ No newline at end of file
diff --git a/windows/images/W10-WaaS-poster.PNG b/windows/hub/images/W10-WaaS-poster.PNG
similarity index 100%
rename from windows/images/W10-WaaS-poster.PNG
rename to windows/hub/images/W10-WaaS-poster.PNG
diff --git a/windows/hub/images/access-protection.png b/windows/hub/images/access-protection.png
new file mode 100644
index 0000000000..0da647699b
Binary files /dev/null and b/windows/hub/images/access-protection.png differ
diff --git a/windows/hub/images/application-management.png b/windows/hub/images/application-management.png
new file mode 100644
index 0000000000..078094818e
Binary files /dev/null and b/windows/hub/images/application-management.png differ
diff --git a/windows/hub/images/client-management.png b/windows/hub/images/client-management.png
new file mode 100644
index 0000000000..3b6e6f95e5
Binary files /dev/null and b/windows/hub/images/client-management.png differ
diff --git a/windows/hub/images/configuration.png b/windows/hub/images/configuration.png
new file mode 100644
index 0000000000..de9f183599
Binary files /dev/null and b/windows/hub/images/configuration.png differ
diff --git a/windows/hub/images/deployment.png b/windows/hub/images/deployment.png
new file mode 100644
index 0000000000..b87cebc6fc
Binary files /dev/null and b/windows/hub/images/deployment.png differ
diff --git a/windows/hub/images/device-security.png b/windows/hub/images/device-security.png
new file mode 100644
index 0000000000..348d0e1719
Binary files /dev/null and b/windows/hub/images/device-security.png differ
diff --git a/windows/images/front-page-video.PNG b/windows/hub/images/front-page-video.PNG
similarity index 100%
rename from windows/images/front-page-video.PNG
rename to windows/hub/images/front-page-video.PNG
diff --git a/windows/hub/images/remote.png b/windows/hub/images/remote.png
new file mode 100644
index 0000000000..3be3f8e27e
Binary files /dev/null and b/windows/hub/images/remote.png differ
diff --git a/windows/hub/images/threat-protection.png b/windows/hub/images/threat-protection.png
new file mode 100644
index 0000000000..a9d411cfa3
Binary files /dev/null and b/windows/hub/images/threat-protection.png differ
diff --git a/windows/hub/images/virtualization.png b/windows/hub/images/virtualization.png
new file mode 100644
index 0000000000..7e65511dfe
Binary files /dev/null and b/windows/hub/images/virtualization.png differ
diff --git a/windows/hub/images/whats-new-highlight.png b/windows/hub/images/whats-new-highlight.png
new file mode 100644
index 0000000000..679573dd94
Binary files /dev/null and b/windows/hub/images/whats-new-highlight.png differ
diff --git a/windows/hub/images/whats-new.png b/windows/hub/images/whats-new.png
new file mode 100644
index 0000000000..de0c3fa545
Binary files /dev/null and b/windows/hub/images/whats-new.png differ
diff --git a/windows/hub/index.md b/windows/hub/index.md
new file mode 100644
index 0000000000..5b45764b91
--- /dev/null
+++ b/windows/hub/index.md
@@ -0,0 +1,95 @@
+---
+title: Windows 10 and Windows 10 Mobile (Windows 10)
+description: Find the latest how to and support content that IT pros need to evaluate, plan, deploy, secure and manage devices running Windows 10 or Windows 10 Mobile.
+ms.assetid: 345A4B4E-BC1B-4F5C-9E90-58E647D11C60
+ms.prod: w10
+localizationpriority: high
+author: brianlic-msft
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: security
+---
+
+# Windows 10 and Windows 10 Mobile
+
+Find the latest how to and support content that IT pros need to evaluate, plan, deploy, secure and manage devices running Windows 10 or Windows 10 Mobile.
+
+
The Windows 10 operating system introduces a new way to build, deploy, and service Windows: Windows as a service. Microsoft has reimagined each part of the process, to simplify the lives of IT pros and maintain a consistent Windows 10 experience for its customers.
+
+ These improvements focus on maximizing customer involvement in Windows development, simplifying the deployment and servicing of Windows client computers, and leveling out the resources needed to deploy and maintain Windows over time.
+
+ - Read more about Windows as a Service
+
+
+
+
+
+## Related topics
+[Windows 10 TechCenter](https://go.microsoft.com/fwlink/?LinkId=620009)
+
+
+
+
+
diff --git a/windows/images/w10-configure.png b/windows/images/w10-configure.png
deleted file mode 100644
index ebfef8d97b..0000000000
Binary files a/windows/images/w10-configure.png and /dev/null differ
diff --git a/windows/images/w10-deploy.png b/windows/images/w10-deploy.png
deleted file mode 100644
index d567f44f1d..0000000000
Binary files a/windows/images/w10-deploy.png and /dev/null differ
diff --git a/windows/images/w10-evaluation.png b/windows/images/w10-evaluation.png
deleted file mode 100644
index 19d690b694..0000000000
Binary files a/windows/images/w10-evaluation.png and /dev/null differ
diff --git a/windows/images/w10-manage.png b/windows/images/w10-manage.png
deleted file mode 100644
index 9ace55b79b..0000000000
Binary files a/windows/images/w10-manage.png and /dev/null differ
diff --git a/windows/images/w10-plan.png b/windows/images/w10-plan.png
deleted file mode 100644
index 045f85e914..0000000000
Binary files a/windows/images/w10-plan.png and /dev/null differ
diff --git a/windows/images/w10-secure.png b/windows/images/w10-secure.png
deleted file mode 100644
index 7799e94849..0000000000
Binary files a/windows/images/w10-secure.png and /dev/null differ
diff --git a/windows/images/w10-update.png b/windows/images/w10-update.png
deleted file mode 100644
index 876374904b..0000000000
Binary files a/windows/images/w10-update.png and /dev/null differ
diff --git a/windows/images/w10-whatsnew-highlight.png b/windows/images/w10-whatsnew-highlight.png
deleted file mode 100644
index b8534ef41d..0000000000
Binary files a/windows/images/w10-whatsnew-highlight.png and /dev/null differ
diff --git a/windows/images/w10-whatsnew.png b/windows/images/w10-whatsnew.png
deleted file mode 100644
index cc040c45aa..0000000000
Binary files a/windows/images/w10-whatsnew.png and /dev/null differ
diff --git a/windows/index.md b/windows/index.md
deleted file mode 100644
index 5935b2a3a7..0000000000
--- a/windows/index.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-title: Windows 10 and Windows 10 Mobile (Windows 10)
-description: This library provides the core content that IT pros need to evaluate, plan, deploy, and manage devices running Windows 10 or Windows 10 Mobile.
-ms.assetid: 345A4B4E-BC1B-4F5C-9E90-58E647D11C60
-ms.prod: w10
-localizationpriority: high
-author: brianlic-msft
----
-
-# Windows 10 and Windows 10 Mobile
-
-This library provides the core content that IT pros need to evaluate, plan, deploy, secure and manage devices running Windows 10 or Windows 10 Mobile.
-
-
The Windows 10 operating system introduces a new way to build, deploy, and service Windows: Windows as a service. Microsoft has reimagined each part of the process, to simplify the lives of IT pros and maintain a consistent Windows 10 experience for its customers.
-
- These improvements focus on maximizing customer involvement in Windows development, simplifying the deployment and servicing of Windows client computers, and leveling out the resources needed to deploy and maintain Windows over time.
-
- - Read more about Windows as a Service
-
-
-
-
-
-## Related topics
-[Windows 10 TechCenter](https://go.microsoft.com/fwlink/?LinkId=620009)
-
-
-
-
-
diff --git a/windows/keep-secure/.vscode/settings.json b/windows/keep-secure/.vscode/settings.json
deleted file mode 100644
index 96b19b0418..0000000000
--- a/windows/keep-secure/.vscode/settings.json
+++ /dev/null
@@ -1,4 +0,0 @@
-// Place your settings in this file to overwrite default and user settings.
-{
- "update.channel": "none",
-}
\ No newline at end of file
diff --git a/windows/keep-secure/TOC.md b/windows/keep-secure/TOC.md
deleted file mode 100644
index 38d5a79370..0000000000
--- a/windows/keep-secure/TOC.md
+++ /dev/null
@@ -1,975 +0,0 @@
-# [Keep Windows 10 secure](index.md)
-## [Block untrusted fonts in an enterprise](block-untrusted-fonts-in-enterprise.md)
-## [Windows Hello for Business](hello-identity-verification.md)
-### [How Windows Hello for Business works](hello-how-it-works.md)
-### [Manage Windows Hello for Business in your organization](hello-manage-in-organization.md)
-### [Why a PIN is better than a password](hello-why-pin-is-better-than-password.md)
-### [Prepare people to use Windows Hello](hello-prepare-people-to-use.md)
-### [Windows Hello and password changes](hello-and-password-changes.md)
-### [Windows Hello errors during PIN creation](hello-errors-during-pin-creation.md)
-### [Event ID 300 - Windows Hello successfully created](hello-event-300.md)
-### [Windows Hello biometrics in the enterprise](hello-biometrics-in-enterprise.md)
-## [Configure S/MIME for Windows 10 and Windows 10 Mobile](configure-s-mime.md)
-## [Install digital certificates on Windows 10 Mobile](installing-digital-certificates-on-windows-10-mobile.md)
-## [Device Guard deployment guide](device-guard-deployment-guide.md)
-### [Introduction to Device Guard: virtualization-based security and code integrity policies](introduction-to-device-guard-virtualization-based-security-and-code-integrity-policies.md)
-### [Requirements and deployment planning guidelines for Device Guard](requirements-and-deployment-planning-guidelines-for-device-guard.md)
-### [Planning and getting started on the Device Guard deployment process](planning-and-getting-started-on-the-device-guard-deployment-process.md)
-### [Deploy Device Guard: deploy code integrity policies](deploy-device-guard-deploy-code-integrity-policies.md)
-#### [Optional: Create a code signing certificate for code integrity policies](optional-create-a-code-signing-certificate-for-code-integrity-policies.md)
-#### [Deploy code integrity policies: policy rules and file rules](deploy-code-integrity-policies-policy-rules-and-file-rules.md)
-#### [Deploy code integrity policies: steps](deploy-code-integrity-policies-steps.md)
-#### [Deploy catalog files to support code integrity policies](deploy-catalog-files-to-support-code-integrity-policies.md)
-### [Deploy Device Guard: enable virtualization-based security](deploy-device-guard-enable-virtualization-based-security.md)
-## [Mitigate threats by using Windows 10 security features](overview-of-threat-mitigations-in-windows-10.md)
-## [Protect derived domain credentials with Credential Guard](credential-guard.md)
-### [How Credential Guard works](credential-guard-how-it-works.md)
-### [Credential Guard Requirements](credential-guard-requirements.md)
-### [Manage Credential Guard](credential-guard-manage.md)
-### [Credential Guard protection limits](credential-guard-protection-limits.md)
-### [Considerations when using Credential Guard](credential-guard-considerations.md)
-### [Credential Guard: Additional mitigations](additional-mitigations.md)
-## [Protect Remote Desktop credentials with Remote Credential Guard](remote-credential-guard.md)
-## [Protect your enterprise data using Windows Information Protection (WIP)](protect-enterprise-data-using-wip.md)
-### [Create a Windows Information Protection (WIP) policy](overview-create-wip-policy.md)
-#### [Create a Windows Information Protection (WIP) policy using Microsoft Intune](create-wip-policy-using-intune.md)
-##### [Add apps to your Windows Information Protection (WIP) policy by using the Microsoft Intune custom URI functionality](add-apps-to-protected-list-using-custom-uri.md)
-##### [Deploy your Windows Information Protection (WIP) policy](deploy-wip-policy-using-intune.md)
-##### [Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Intune](create-vpn-and-wip-policy-using-intune.md)
-#### [Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager](create-wip-policy-using-sccm.md)
-#### [Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate](create-and-verify-an-efs-dra-certificate.md)
-#### [Determine the Enterprise Context of an app running in Windows Information Protection (WIP)](wip-app-enterprise-context.md)
-### [Mandatory tasks and settings required to turn on Windows Information Protection (WIP)](mandatory-settings-for-wip.md)
-### [Testing scenarios for Windows Information Protection (WIP)](testing-scenarios-for-wip.md)
-### [Limitations while using Windows Information Protection (WIP)](limitations-with-wip.md)
-### [General guidance and best practices for Windows Information Protection (WIP)](guidance-and-best-practices-wip.md)
-#### [Enlightened apps for use with Windows Information Protection (WIP)](enlightened-microsoft-apps-and-wip.md)
-#### [Unenlightened and enlightened app behavior while using Windows Information Protection (WIP)](app-behavior-with-wip.md)
-#### [Recommended Enterprise Cloud Resources and Neutral Resources network settings with Windows Information Protection (WIP)](recommended-network-definitions-for-wip.md)
-#### [Using Outlook on the web with Windows Information Protection (WIP)](using-owa-with-wip.md)
-## [Windows Defender SmartScreen](windows-defender-smartscreen-overview.md)
-### [Available Windows Defender SmartScreen Group Policy and mobile device management (MDM) settings](windows-defender-smartscreen-available-settings.md)
-### [Set up and use Windows Defender SmartScreen on individual devices](windows-defender-smartscreen-set-individual-device.md)
-## [Use Windows Event Forwarding to help with intrusion detection](use-windows-event-forwarding-to-assist-in-instrusion-detection.md)
-## [Override Process Mitigation Options to help enforce app-related security policies](override-mitigation-options-for-app-related-security-policies.md)
-## [VPN technical guide](vpn-guide.md)
-### [VPN connection types](vpn-connection-type.md)
-### [VPN routing decisions](vpn-routing.md)
-### [VPN authentication options](vpn-authentication.md)
-### [VPN and conditional access](vpn-conditional-access.md)
-### [VPN name resolution](vpn-name-resolution.md)
-### [VPN auto-triggered profile options](vpn-auto-trigger-profile.md)
-### [VPN security features](vpn-security-features.md)
-### [VPN profile options](vpn-profile-options.md)
-## [Windows security baselines](windows-security-baselines.md)
-## [Security technologies](security-technologies.md)
-### [Access Control Overview](access-control.md)
-#### [Dynamic Access Control Overview](dynamic-access-control.md)
-#### [Security identifiers](security-identifiers.md)
-#### [Security Principals](security-principals.md)
-#### [Local Accounts](local-accounts.md)
-#### [Active Directory Accounts](active-directory-accounts.md)
-#### [Microsoft Accounts](microsoft-accounts.md)
-#### [Service Accounts](service-accounts.md)
-#### [Active Directory Security Groups](active-directory-security-groups.md)
-#### [Special Identities](special-identities.md)
-### [AppLocker](applocker-overview.md)
-#### [Administer AppLocker](administer-applocker.md)
-##### [Maintain AppLocker policies](maintain-applocker-policies.md)
-##### [Edit an AppLocker policy](edit-an-applocker-policy.md)
-##### [Test and update an AppLocker policy](test-and-update-an-applocker-policy.md)
-##### [Deploy AppLocker policies by using the enforce rules setting](deploy-applocker-policies-by-using-the-enforce-rules-setting.md)
-##### [Use the AppLocker Windows PowerShell cmdlets](use-the-applocker-windows-powershell-cmdlets.md)
-##### [Use AppLocker and Software Restriction Policies in the same domain](use-applocker-and-software-restriction-policies-in-the-same-domain.md)
-##### [Optimize AppLocker performance](optimize-applocker-performance.md)
-##### [Monitor app usage with AppLocker](monitor-application-usage-with-applocker.md)
-##### [Manage packaged apps with AppLocker](manage-packaged-apps-with-applocker.md)
-##### [Working with AppLocker rules](working-with-applocker-rules.md)
-###### [Create a rule that uses a file hash condition](create-a-rule-that-uses-a-file-hash-condition.md)
-###### [Create a rule that uses a path condition](create-a-rule-that-uses-a-path-condition.md)
-###### [Create a rule that uses a publisher condition](create-a-rule-that-uses-a-publisher-condition.md)
-###### [Create AppLocker default rules](create-applocker-default-rules.md)
-###### [Add exceptions for an AppLocker rule](configure-exceptions-for-an-applocker-rule.md)
-###### [Create a rule for packaged apps](create-a-rule-for-packaged-apps.md)
-###### [Delete an AppLocker rule](delete-an-applocker-rule.md)
-###### [Edit AppLocker rules](edit-applocker-rules.md)
-###### [Enable the DLL rule collection](enable-the-dll-rule-collection.md)
-###### [Enforce AppLocker rules](enforce-applocker-rules.md)
-###### [Run the Automatically Generate Rules wizard](run-the-automatically-generate-rules-wizard.md)
-##### [Working with AppLocker policies](working-with-applocker-policies.md)
-###### [Configure the Application Identity service](configure-the-application-identity-service.md)
-###### [Configure an AppLocker policy for audit only](configure-an-applocker-policy-for-audit-only.md)
-###### [Configure an AppLocker policy for enforce rules](configure-an-applocker-policy-for-enforce-rules.md)
-###### [Display a custom URL message when users try to run a blocked app](display-a-custom-url-message-when-users-try-to-run-a-blocked-application.md)
-###### [Export an AppLocker policy from a GPO](export-an-applocker-policy-from-a-gpo.md)
-###### [Export an AppLocker policy to an XML file](export-an-applocker-policy-to-an-xml-file.md)
-###### [Import an AppLocker policy from another computer](import-an-applocker-policy-from-another-computer.md)
-###### [Import an AppLocker policy into a GPO](import-an-applocker-policy-into-a-gpo.md)
-###### [Add rules for packaged apps to existing AppLocker rule-set](add-rules-for-packaged-apps-to-existing-applocker-rule-set.md)
-###### [Merge AppLocker policies by using Set-ApplockerPolicy](merge-applocker-policies-by-using-set-applockerpolicy.md)
-###### [Merge AppLocker policies manually](merge-applocker-policies-manually.md)
-###### [Refresh an AppLocker policy](refresh-an-applocker-policy.md)
-###### [Test an AppLocker policy by using Test-AppLockerPolicy](test-an-applocker-policy-by-using-test-applockerpolicy.md)
-#### [AppLocker design guide](applocker-policies-design-guide.md)
-##### [Understand AppLocker policy design decisions](understand-applocker-policy-design-decisions.md)
-##### [Determine your application control objectives](determine-your-application-control-objectives.md)
-##### [Create a list of apps deployed to each business group](create-list-of-applications-deployed-to-each-business-group.md)
-###### [Document your app list](document-your-application-list.md)
-##### [Select the types of rules to create](select-types-of-rules-to-create.md)
-###### [Document your AppLocker rules](document-your-applocker-rules.md)
-##### [Determine the Group Policy structure and rule enforcement](determine-group-policy-structure-and-rule-enforcement.md)
-###### [Understand AppLocker enforcement settings](understand-applocker-enforcement-settings.md)
-###### [Understand AppLocker rules and enforcement setting inheritance in Group Policy](understand-applocker-rules-and-enforcement-setting-inheritance-in-group-policy.md)
-###### [Document the Group Policy structure and AppLocker rule enforcement](document-group-policy-structure-and-applocker-rule-enforcement.md)
-##### [Plan for AppLocker policy management](plan-for-applocker-policy-management.md)
-###### [Document your application control management processes](document-your-application-control-management-processes.md)
-##### [Create your AppLocker planning document](create-your-applocker-planning-document.md)
-#### [AppLocker deployment guide](applocker-policies-deployment-guide.md)
-##### [Understand the AppLocker policy deployment process](understand-the-applocker-policy-deployment-process.md)
-##### [Requirements for Deploying AppLocker Policies](requirements-for-deploying-applocker-policies.md)
-##### [Use Software Restriction Policies and AppLocker policies](using-software-restriction-policies-and-applocker-policies.md)
-##### [Create Your AppLocker policies](create-your-applocker-policies.md)
-###### [Create Your AppLocker rules](create-your-applocker-rules.md)
-##### [Deploy the AppLocker policy into production](deploy-the-applocker-policy-into-production.md)
-###### [Use a reference device to create and maintain AppLocker policies](use-a-reference-computer-to-create-and-maintain-applocker-policies.md)
-####### [Determine which apps are digitally signed on a reference device](determine-which-applications-are-digitally-signed-on-a-reference-computer.md)
-####### [Configure the AppLocker reference device](configure-the-appLocker-reference-device.md)
-#### [AppLocker technical reference](applocker-technical-reference.md)
-##### [What Is AppLocker?](what-is-applocker.md)
-##### [Requirements to use AppLocker](requirements-to-use-applocker.md)
-##### [AppLocker policy use scenarios](applocker-policy-use-scenarios.md)
-##### [How AppLocker works](how-applocker-works-techref.md)
-###### [Understanding AppLocker rule behavior](understanding-applocker-rule-behavior.md)
-###### [Understanding AppLocker rule exceptions](understanding-applocker-rule-exceptions.md)
-###### [Understanding AppLocker rule collections](understanding-applocker-rule-collections.md)
-###### [Understanding AppLocker allow and deny actions on rules](understanding-applocker-allow-and-deny-actions-on-rules.md)
-###### [Understanding AppLocker rule condition types](understanding-applocker-rule-condition-types.md)
-####### [Understanding the publisher rule condition in AppLocker](understanding-the-publisher-rule-condition-in-applocker.md)
-####### [Understanding the path rule condition in AppLocker](understanding-the-path-rule-condition-in-applocker.md)
-####### [Understanding the file hash rule condition in AppLocker](understanding-the-file-hash-rule-condition-in-applocker.md)
-###### [Understanding AppLocker default rules](understanding-applocker-default-rules.md)
-####### [Executable rules in AppLocker](executable-rules-in-applocker.md)
-####### [Windows Installer rules in AppLocker](windows-installer-rules-in-applocker.md)
-####### [Script rules in AppLocker](script-rules-in-applocker.md)
-####### [DLL rules in AppLocker](dll-rules-in-applocker.md)
-####### [Packaged apps and packaged app installer rules in AppLocker](packaged-apps-and-packaged-app-installer-rules-in-applocker.md)
-##### [AppLocker architecture and components](applocker-architecture-and-components.md)
-##### [AppLocker processes and interactions](applocker-processes-and-interactions.md)
-##### [AppLocker functions](applocker-functions.md)
-##### [Security considerations for AppLocker](security-considerations-for-applocker.md)
-##### [Tools to Use with AppLocker](tools-to-use-with-applocker.md)
-###### [Using Event Viewer with AppLocker](using-event-viewer-with-applocker.md)
-##### [AppLocker Settings](applocker-settings.md)
-### [BitLocker](bitlocker-overview.md)
-#### [Overview of BitLocker and device encryption in Windows 10](bitlocker-device-encryption-overview-windows-10.md)
-#### [BitLocker frequently asked questions (FAQ)](bitlocker-frequently-asked-questions.md)
-#### [Prepare your organization for BitLocker: Planning and policies](prepare-your-organization-for-bitlocker-planning-and-policies.md)
-#### [BitLocker basic deployment](bitlocker-basic-deployment.md)
-#### [BitLocker: How to deploy on Windows Server 2012 and later](bitlocker-how-to-deploy-on-windows-server.md)
-#### [BitLocker: How to enable Network Unlock](bitlocker-how-to-enable-network-unlock.md)
-#### [BitLocker: Use BitLocker Drive Encryption Tools to manage BitLocker](bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md)
-#### [BitLocker: Use BitLocker Recovery Password Viewer](bitlocker-use-bitlocker-recovery-password-viewer.md)
-#### [BitLocker Group Policy settings](bitlocker-group-policy-settings.md)
-#### [BCD settings and BitLocker](bcd-settings-and-bitlocker.md)
-#### [BitLocker Recovery Guide](bitlocker-recovery-guide-plan.md)
-#### [Protect BitLocker from pre-boot attacks](protect-bitlocker-from-pre-boot-attacks.md)
-##### [Types of attacks for volume encryption keys](types-of-attacks-for-volume-encryption-keys.md)
-##### [BitLocker Countermeasures](bitlocker-countermeasures.md)
-##### [Choose the Right BitLocker Countermeasure](choose-the-right-bitlocker-countermeasure.md)
-#### [Protecting cluster shared volumes and storage area networks with BitLocker](protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md)
-### [Encrypted Hard Drive](encrypted-hard-drive.md)
-### [Enterprise Certificate Pinning](enterprise-certificate-pinning.md)
-### [Security auditing](security-auditing-overview.md)
-#### [Basic security audit policies](basic-security-audit-policies.md)
-##### [Create a basic audit policy for an event category](create-a-basic-audit-policy-settings-for-an-event-category.md)
-##### [Apply a basic audit policy on a file or folder](apply-a-basic-audit-policy-on-a-file-or-folder.md)
-##### [View the security event log](view-the-security-event-log.md)
-##### [Basic security audit policy settings](basic-security-audit-policy-settings.md)
-###### [Audit account logon events](basic-audit-account-logon-events.md)
-###### [Audit account management](basic-audit-account-management.md)
-###### [Audit directory service access](basic-audit-directory-service-access.md)
-###### [Audit logon events](basic-audit-logon-events.md)
-###### [Audit object access](basic-audit-object-access.md)
-###### [Audit policy change](basic-audit-policy-change.md)
-###### [Audit privilege use](basic-audit-privilege-use.md)
-###### [Audit process tracking](basic-audit-process-tracking.md)
-###### [Audit system events](basic-audit-system-events.md)
-#### [Advanced security audit policies](advanced-security-auditing.md)
-##### [Planning and deploying advanced security audit policies](planning-and-deploying-advanced-security-audit-policies.md)
-##### [Advanced security auditing FAQ](advanced-security-auditing-faq.md)
-###### [Which editions of Windows support advanced audit policy configuration](which-editions-of-windows-support-advanced-audit-policy-configuration.md)
-##### [Using advanced security auditing options to monitor dynamic access control objects](using-advanced-security-auditing-options-to-monitor-dynamic-access-control-objects.md)
-###### [Monitor the central access policies that apply on a file server](monitor-the-central-access-policies-that-apply-on-a-file-server.md)
-###### [Monitor the use of removable storage devices](monitor-the-use-of-removable-storage-devices.md)
-###### [Monitor resource attribute definitions](monitor-resource-attribute-definitions.md)
-###### [Monitor central access policy and rule definitions](monitor-central-access-policy-and-rule-definitions.md)
-###### [Monitor user and device claims during sign-in](monitor-user-and-device-claims-during-sign-in.md)
-###### [Monitor the resource attributes on files and folders](monitor-the-resource-attributes-on-files-and-folders.md)
-###### [Monitor the central access policies associated with files and folders](monitor-the-central-access-policies-associated-with-files-and-folders.md)
-###### [Monitor claim types](monitor-claim-types.md)
-##### [Advanced security audit policy settings](advanced-security-audit-policy-settings.md)
-###### [Audit Credential Validation](audit-credential-validation.md)
-####### [Event 4774 S, F: An account was mapped for logon.](event-4774.md)
-####### [Event 4775 F: An account could not be mapped for logon.](event-4775.md)
-####### [Event 4776 S, F: The computer attempted to validate the credentials for an account.](event-4776.md)
-####### [Event 4777 F: The domain controller failed to validate the credentials for an account.](event-4777.md)
-###### [Audit Kerberos Authentication Service](audit-kerberos-authentication-service.md)
-####### [Event 4768 S, F: A Kerberos authentication ticket, TGT, was requested.](event-4768.md)
-####### [Event 4771 F: Kerberos pre-authentication failed.](event-4771.md)
-####### [Event 4772 F: A Kerberos authentication ticket request failed.](event-4772.md)
-###### [Audit Kerberos Service Ticket Operations](audit-kerberos-service-ticket-operations.md)
-####### [Event 4769 S, F: A Kerberos service ticket was requested.](event-4769.md)
-####### [Event 4770 S: A Kerberos service ticket was renewed.](event-4770.md)
-####### [Event 4773 F: A Kerberos service ticket request failed.](event-4773.md)
-###### [Audit Other Account Logon Events](audit-other-account-logon-events.md)
-###### [Audit Application Group Management](audit-application-group-management.md)
-###### [Audit Computer Account Management](audit-computer-account-management.md)
-####### [Event 4741 S: A computer account was created.](event-4741.md)
-####### [Event 4742 S: A computer account was changed.](event-4742.md)
-####### [Event 4743 S: A computer account was deleted.](event-4743.md)
-###### [Audit Distribution Group Management](audit-distribution-group-management.md)
-####### [Event 4749 S: A security-disabled global group was created.](event-4749.md)
-####### [Event 4750 S: A security-disabled global group was changed.](event-4750.md)
-####### [Event 4751 S: A member was added to a security-disabled global group.](event-4751.md)
-####### [Event 4752 S: A member was removed from a security-disabled global group.](event-4752.md)
-####### [Event 4753 S: A security-disabled global group was deleted.](event-4753.md)
-###### [Audit Other Account Management Events](audit-other-account-management-events.md)
-####### [Event 4782 S: The password hash an account was accessed.](event-4782.md)
-####### [Event 4793 S: The Password Policy Checking API was called.](event-4793.md)
-###### [Audit Security Group Management](audit-security-group-management.md)
-####### [Event 4731 S: A security-enabled local group was created.](event-4731.md)
-####### [Event 4732 S: A member was added to a security-enabled local group.](event-4732.md)
-####### [Event 4733 S: A member was removed from a security-enabled local group.](event-4733.md)
-####### [Event 4734 S: A security-enabled local group was deleted.](event-4734.md)
-####### [Event 4735 S: A security-enabled local group was changed.](event-4735.md)
-####### [Event 4764 S: A group’s type was changed.](event-4764.md)
-####### [Event 4799 S: A security-enabled local group membership was enumerated.](event-4799.md)
-###### [Audit User Account Management](audit-user-account-management.md)
-####### [Event 4720 S: A user account was created.](event-4720.md)
-####### [Event 4722 S: A user account was enabled.](event-4722.md)
-####### [Event 4723 S, F: An attempt was made to change an account's password.](event-4723.md)
-####### [Event 4724 S, F: An attempt was made to reset an account's password.](event-4724.md)
-####### [Event 4725 S: A user account was disabled.](event-4725.md)
-####### [Event 4726 S: A user account was deleted.](event-4726.md)
-####### [Event 4738 S: A user account was changed.](event-4738.md)
-####### [Event 4740 S: A user account was locked out.](event-4740.md)
-####### [Event 4765 S: SID History was added to an account.](event-4765.md)
-####### [Event 4766 F: An attempt to add SID History to an account failed.](event-4766.md)
-####### [Event 4767 S: A user account was unlocked.](event-4767.md)
-####### [Event 4780 S: The ACL was set on accounts which are members of administrators groups.](event-4780.md)
-####### [Event 4781 S: The name of an account was changed.](event-4781.md)
-####### [Event 4794 S, F: An attempt was made to set the Directory Services Restore Mode administrator password.](event-4794.md)
-####### [Event 4798 S: A user's local group membership was enumerated.](event-4798.md)
-####### [Event 5376 S: Credential Manager credentials were backed up.](event-5376.md)
-####### [Event 5377 S: Credential Manager credentials were restored from a backup.](event-5377.md)
-###### [Audit DPAPI Activity](audit-dpapi-activity.md)
-####### [Event 4692 S, F: Backup of data protection master key was attempted.](event-4692.md)
-####### [Event 4693 S, F: Recovery of data protection master key was attempted.](event-4693.md)
-####### [Event 4694 S, F: Protection of auditable protected data was attempted.](event-4694.md)
-####### [Event 4695 S, F: Unprotection of auditable protected data was attempted.](event-4695.md)
-###### [Audit PNP Activity](audit-pnp-activity.md)
-####### [Event 6416 S: A new external device was recognized by the System.](event-6416.md)
-####### [Event 6419 S: A request was made to disable a device.](event-6419.md)
-####### [Event 6420 S: A device was disabled.](event-6420.md)
-####### [Event 6421 S: A request was made to enable a device.](event-6421.md)
-####### [Event 6422 S: A device was enabled.](event-6422.md)
-####### [Event 6423 S: The installation of this device is forbidden by system policy.](event-6423.md)
-####### [Event 6424 S: The installation of this device was allowed, after having previously been forbidden by policy.](event-6424.md)
-###### [Audit Process Creation](audit-process-creation.md)
-####### [Event 4688 S: A new process has been created.](event-4688.md)
-####### [Event 4696 S: A primary token was assigned to process.](event-4696.md)
-###### [Audit Process Termination](audit-process-termination.md)
-####### [Event 4689 S: A process has exited.](event-4689.md)
-###### [Audit RPC Events](audit-rpc-events.md)
-####### [Event 5712 S: A Remote Procedure Call, RPC, was attempted.](event-5712.md)
-###### [Audit Detailed Directory Service Replication](audit-detailed-directory-service-replication.md)
-####### [Event 4928 S, F: An Active Directory replica source naming context was established.](event-4928.md)
-####### [Event 4929 S, F: An Active Directory replica source naming context was removed.](event-4929.md)
-####### [Event 4930 S, F: An Active Directory replica source naming context was modified.](event-4930.md)
-####### [Event 4931 S, F: An Active Directory replica destination naming context was modified.](event-4931.md)
-####### [Event 4934 S: Attributes of an Active Directory object were replicated.](event-4934.md)
-####### [Event 4935 F: Replication failure begins.](event-4935.md)
-####### [Event 4936 S: Replication failure ends.](event-4936.md)
-####### [Event 4937 S: A lingering object was removed from a replica.](event-4937.md)
-###### [Audit Directory Service Access](audit-directory-service-access.md)
-####### [Event 4662 S, F: An operation was performed on an object.](event-4662.md)
-####### [Event 4661 S, F: A handle to an object was requested.](event-4661.md)
-###### [Audit Directory Service Changes](audit-directory-service-changes.md)
-####### [Event 5136 S: A directory service object was modified.](event-5136.md)
-####### [Event 5137 S: A directory service object was created.](event-5137.md)
-####### [Event 5138 S: A directory service object was undeleted.](event-5138.md)
-####### [Event 5139 S: A directory service object was moved.](event-5139.md)
-####### [Event 5141 S: A directory service object was deleted.](event-5141.md)
-###### [Audit Directory Service Replication](audit-directory-service-replication.md)
-####### [Event 4932 S: Synchronization of a replica of an Active Directory naming context has begun.](event-4932.md)
-####### [Event 4933 S, F: Synchronization of a replica of an Active Directory naming context has ended.](event-4933.md)
-###### [Audit Account Lockout](audit-account-lockout.md)
-####### [Event 4625 F: An account failed to log on.](event-4625.md)
-###### [Audit User/Device Claims](audit-user-device-claims.md)
-####### [Event 4626 S: User/Device claims information.](event-4626.md)
-###### [Audit Group Membership](audit-group-membership.md)
-####### [Event 4627 S: Group membership information.](event-4627.md)
-###### [Audit IPsec Extended Mode](audit-ipsec-extended-mode.md)
-###### [Audit IPsec Main Mode](audit-ipsec-main-mode.md)
-###### [Audit IPsec Quick Mode](audit-ipsec-quick-mode.md)
-###### [Audit Logoff](audit-logoff.md)
-####### [Event 4634 S: An account was logged off.](event-4634.md)
-####### [Event 4647 S: User initiated logoff.](event-4647.md)
-###### [Audit Logon](audit-logon.md)
-####### [Event 4624 S: An account was successfully logged on.](event-4624.md)
-####### [Event 4625 F: An account failed to log on.](event-4625.md)
-####### [Event 4648 S: A logon was attempted using explicit credentials.](event-4648.md)
-####### [Event 4675 S: SIDs were filtered.](event-4675.md)
-###### [Audit Network Policy Server](audit-network-policy-server.md)
-###### [Audit Other Logon/Logoff Events](audit-other-logonlogoff-events.md)
-####### [Event 4649 S: A replay attack was detected.](event-4649.md)
-####### [Event 4778 S: A session was reconnected to a Window Station.](event-4778.md)
-####### [Event 4779 S: A session was disconnected from a Window Station.](event-4779.md)
-####### [Event 4800 S: The workstation was locked.](event-4800.md)
-####### [Event 4801 S: The workstation was unlocked.](event-4801.md)
-####### [Event 4802 S: The screen saver was invoked.](event-4802.md)
-####### [Event 4803 S: The screen saver was dismissed.](event-4803.md)
-####### [Event 5378 F: The requested credentials delegation was disallowed by policy.](event-5378.md)
-####### [Event 5632 S, F: A request was made to authenticate to a wireless network.](event-5632.md)
-####### [Event 5633 S, F: A request was made to authenticate to a wired network.](event-5633.md)
-###### [Audit Special Logon](audit-special-logon.md)
-####### [Event 4964 S: Special groups have been assigned to a new logon.](event-4964.md)
-####### [Event 4672 S: Special privileges assigned to new logon.](event-4672.md)
-###### [Audit Application Generated](audit-application-generated.md)
-###### [Audit Certification Services](audit-certification-services.md)
-###### [Audit Detailed File Share](audit-detailed-file-share.md)
-####### [Event 5145 S, F: A network share object was checked to see whether client can be granted desired access.](event-5145.md)
-###### [Audit File Share](audit-file-share.md)
-####### [Event 5140 S, F: A network share object was accessed.](event-5140.md)
-####### [Event 5142 S: A network share object was added.](event-5142.md)
-####### [Event 5143 S: A network share object was modified.](event-5143.md)
-####### [Event 5144 S: A network share object was deleted.](event-5144.md)
-####### [Event 5168 F: SPN check for SMB/SMB2 failed.](event-5168.md)
-###### [Audit File System](audit-file-system.md)
-####### [Event 4656 S, F: A handle to an object was requested.](event-4656.md)
-####### [Event 4658 S: The handle to an object was closed.](event-4658.md)
-####### [Event 4660 S: An object was deleted.](event-4660.md)
-####### [Event 4663 S: An attempt was made to access an object.](event-4663.md)
-####### [Event 4664 S: An attempt was made to create a hard link.](event-4664.md)
-####### [Event 4985 S: The state of a transaction has changed.](event-4985.md)
-####### [Event 5051: A file was virtualized.](event-5051.md)
-####### [Event 4670 S: Permissions on an object were changed.](event-4670.md)
-###### [Audit Filtering Platform Connection](audit-filtering-platform-connection.md)
-####### [Event 5031 F: The Windows Firewall Service blocked an application from accepting incoming connections on the network.](event-5031.md)
-####### [Event 5150: The Windows Filtering Platform blocked a packet.](event-5150.md)
-####### [Event 5151: A more restrictive Windows Filtering Platform filter has blocked a packet.](event-5151.md)
-####### [Event 5154 S: The Windows Filtering Platform has permitted an application or service to listen on a port for incoming connections.](event-5154.md)
-####### [Event 5155 F: The Windows Filtering Platform has blocked an application or service from listening on a port for incoming connections.](event-5155.md)
-####### [Event 5156 S: The Windows Filtering Platform has permitted a connection.](event-5156.md)
-####### [Event 5157 F: The Windows Filtering Platform has blocked a connection.](event-5157.md)
-####### [Event 5158 S: The Windows Filtering Platform has permitted a bind to a local port.](event-5158.md)
-####### [Event 5159 F: The Windows Filtering Platform has blocked a bind to a local port.](event-5159.md)
-###### [Audit Filtering Platform Packet Drop](audit-filtering-platform-packet-drop.md)
-####### [Event 5152 F: The Windows Filtering Platform blocked a packet.](event-5152.md)
-####### [Event 5153 S: A more restrictive Windows Filtering Platform filter has blocked a packet.](event-5153.md)
-###### [Audit Handle Manipulation](audit-handle-manipulation.md)
-####### [Event 4690 S: An attempt was made to duplicate a handle to an object.](event-4690.md)
-###### [Audit Kernel Object](audit-kernel-object.md)
-####### [Event 4656 S, F: A handle to an object was requested.](event-4656.md)
-####### [Event 4658 S: The handle to an object was closed.](event-4658.md)
-####### [Event 4660 S: An object was deleted.](event-4660.md)
-####### [Event 4663 S: An attempt was made to access an object.](event-4663.md)
-###### [Audit Other Object Access Events](audit-other-object-access-events.md)
-####### [Event 4671: An application attempted to access a blocked ordinal through the TBS.](event-4671.md)
-####### [Event 4691 S: Indirect access to an object was requested.](event-4691.md)
-####### [Event 5148 F: The Windows Filtering Platform has detected a DoS attack and entered a defensive mode; packets associated with this attack will be discarded.](event-5148.md)
-####### [Event 5149 F: The DoS attack has subsided and normal processing is being resumed.](event-5149.md)
-####### [Event 4698 S: A scheduled task was created.](event-4698.md)
-####### [Event 4699 S: A scheduled task was deleted.](event-4699.md)
-####### [Event 4700 S: A scheduled task was enabled.](event-4700.md)
-####### [Event 4701 S: A scheduled task was disabled.](event-4701.md)
-####### [Event 4702 S: A scheduled task was updated.](event-4702.md)
-####### [Event 5888 S: An object in the COM+ Catalog was modified.](event-5888.md)
-####### [Event 5889 S: An object was deleted from the COM+ Catalog.](event-5889.md)
-####### [Event 5890 S: An object was added to the COM+ Catalog.](event-5890.md)
-###### [Audit Registry](audit-registry.md)
-####### [Event 4663 S: An attempt was made to access an object.](event-4663.md)
-####### [Event 4656 S, F: A handle to an object was requested.](event-4656.md)
-####### [Event 4658 S: The handle to an object was closed.](event-4658.md)
-####### [Event 4660 S: An object was deleted.](event-4660.md)
-####### [Event 4657 S: A registry value was modified.](event-4657.md)
-####### [Event 5039: A registry key was virtualized.](event-5039.md)
-####### [Event 4670 S: Permissions on an object were changed.](event-4670.md)
-###### [Audit Removable Storage](audit-removable-storage.md)
-###### [Audit SAM](audit-sam.md)
-####### [Event 4661 S, F: A handle to an object was requested.](event-4661.md)
-###### [Audit Central Access Policy Staging](audit-central-access-policy-staging.md)
-####### [Event 4818 S: Proposed Central Access Policy does not grant the same access permissions as the current Central Access Policy.](event-4818.md)
-###### [Audit Audit Policy Change](audit-audit-policy-change.md)
-####### [Event 4670 S: Permissions on an object were changed.](event-4670.md)
-####### [Event 4715 S: The audit policy, SACL, on an object was changed.](event-4715.md)
-####### [Event 4719 S: System audit policy was changed.](event-4719.md)
-####### [Event 4817 S: Auditing settings on object were changed.](event-4817.md)
-####### [Event 4902 S: The Per-user audit policy table was created.](event-4902.md)
-####### [Event 4906 S: The CrashOnAuditFail value has changed.](event-4906.md)
-####### [Event 4907 S: Auditing settings on object were changed.](event-4907.md)
-####### [Event 4908 S: Special Groups Logon table modified.](event-4908.md)
-####### [Event 4912 S: Per User Audit Policy was changed.](event-4912.md)
-####### [Event 4904 S: An attempt was made to register a security event source.](event-4904.md)
-####### [Event 4905 S: An attempt was made to unregister a security event source.](event-4905.md)
-###### [Audit Authentication Policy Change](audit-authentication-policy-change.md)
-####### [Event 4706 S: A new trust was created to a domain.](event-4706.md)
-####### [Event 4707 S: A trust to a domain was removed.](event-4707.md)
-####### [Event 4716 S: Trusted domain information was modified.](event-4716.md)
-####### [Event 4713 S: Kerberos policy was changed.](event-4713.md)
-####### [Event 4717 S: System security access was granted to an account.](event-4717.md)
-####### [Event 4718 S: System security access was removed from an account.](event-4718.md)
-####### [Event 4739 S: Domain Policy was changed.](event-4739.md)
-####### [Event 4864 S: A namespace collision was detected.](event-4864.md)
-####### [Event 4865 S: A trusted forest information entry was added.](event-4865.md)
-####### [Event 4866 S: A trusted forest information entry was removed.](event-4866.md)
-####### [Event 4867 S: A trusted forest information entry was modified.](event-4867.md)
-###### [Audit Authorization Policy Change](audit-authorization-policy-change.md)
-####### [Event 4703 S: A user right was adjusted.](event-4703.md)
-####### [Event 4704 S: A user right was assigned.](event-4704.md)
-####### [Event 4705 S: A user right was removed.](event-4705.md)
-####### [Event 4670 S: Permissions on an object were changed.](event-4670.md)
-####### [Event 4911 S: Resource attributes of the object were changed.](event-4911.md)
-####### [Event 4913 S: Central Access Policy on the object was changed.](event-4913.md)
-###### [Audit Filtering Platform Policy Change](audit-filtering-platform-policy-change.md)
-###### [Audit MPSSVC Rule-Level Policy Change](audit-mpssvc-rule-level-policy-change.md)
-####### [Event 4944 S: The following policy was active when the Windows Firewall started.](event-4944.md)
-####### [Event 4945 S: A rule was listed when the Windows Firewall started.](event-4945.md)
-####### [Event 4946 S: A change has been made to Windows Firewall exception list. A rule was added.](event-4946.md)
-####### [Event 4947 S: A change has been made to Windows Firewall exception list. A rule was modified.](event-4947.md)
-####### [Event 4948 S: A change has been made to Windows Firewall exception list. A rule was deleted.](event-4948.md)
-####### [Event 4949 S: Windows Firewall settings were restored to the default values.](event-4949.md)
-####### [Event 4950 S: A Windows Firewall setting has changed.](event-4950.md)
-####### [Event 4951 F: A rule has been ignored because its major version number was not recognized by Windows Firewall.](event-4951.md)
-####### [Event 4952 F: Parts of a rule have been ignored because its minor version number was not recognized by Windows Firewall. The other parts of the rule will be enforced.](event-4952.md)
-####### [Event 4953 F: Windows Firewall ignored a rule because it could not be parsed.](event-4953.md)
-####### [Event 4954 S: Windows Firewall Group Policy settings have changed. The new settings have been applied.](event-4954.md)
-####### [Event 4956 S: Windows Firewall has changed the active profile.](event-4956.md)
-####### [Event 4957 F: Windows Firewall did not apply the following rule.](event-4957.md)
-####### [Event 4958 F: Windows Firewall did not apply the following rule because the rule referred to items not configured on this computer.](event-4958.md)
-###### [Audit Other Policy Change Events](audit-other-policy-change-events.md)
-####### [Event 4714 S: Encrypted data recovery policy was changed.](event-4714.md)
-####### [Event 4819 S: Central Access Policies on the machine have been changed.](event-4819.md)
-####### [Event 4826 S: Boot Configuration Data loaded.](event-4826.md)
-####### [Event 4909: The local policy settings for the TBS were changed.](event-4909.md)
-####### [Event 4910: The group policy settings for the TBS were changed.](event-4910.md)
-####### [Event 5063 S, F: A cryptographic provider operation was attempted.](event-5063.md)
-####### [Event 5064 S, F: A cryptographic context operation was attempted.](event-5064.md)
-####### [Event 5065 S, F: A cryptographic context modification was attempted.](event-5065.md)
-####### [Event 5066 S, F: A cryptographic function operation was attempted.](event-5066.md)
-####### [Event 5067 S, F: A cryptographic function modification was attempted.](event-5067.md)
-####### [Event 5068 S, F: A cryptographic function provider operation was attempted.](event-5068.md)
-####### [Event 5069 S, F: A cryptographic function property operation was attempted.](event-5069.md)
-####### [Event 5070 S, F: A cryptographic function property modification was attempted.](event-5070.md)
-####### [Event 5447 S: A Windows Filtering Platform filter has been changed.](event-5447.md)
-####### [Event 6144 S: Security policy in the group policy objects has been applied successfully.](event-6144.md)
-####### [Event 6145 F: One or more errors occurred while processing security policy in the group policy objects.](event-6145.md)
-###### [Audit Sensitive Privilege Use](audit-sensitive-privilege-use.md)
-####### [Event 4673 S, F: A privileged service was called.](event-4673.md)
-####### [Event 4674 S, F: An operation was attempted on a privileged object.](event-4674.md)
-####### [Event 4985 S: The state of a transaction has changed.](event-4985.md)
-###### [Audit Non Sensitive Privilege Use](audit-non-sensitive-privilege-use.md)
-####### [Event 4673 S, F: A privileged service was called.](event-4673.md)
-####### [Event 4674 S, F: An operation was attempted on a privileged object.](event-4674.md)
-####### [Event 4985 S: The state of a transaction has changed.](event-4985.md)
-###### [Audit Other Privilege Use Events](audit-other-privilege-use-events.md)
-####### [Event 4985 S: The state of a transaction has changed.](event-4985.md)
-###### [Audit IPsec Driver](audit-ipsec-driver.md)
-###### [Audit Other System Events](audit-other-system-events.md)
-####### [Event 5024 S: The Windows Firewall Service has started successfully.](event-5024.md)
-####### [Event 5025 S: The Windows Firewall Service has been stopped.](event-5025.md)
-####### [Event 5027 F: The Windows Firewall Service was unable to retrieve the security policy from the local storage. The service will continue enforcing the current policy.](event-5027.md)
-####### [Event 5028 F: The Windows Firewall Service was unable to parse the new security policy. The service will continue with currently enforced policy.](event-5028.md)
-####### [Event 5029 F: The Windows Firewall Service failed to initialize the driver. The service will continue to enforce the current policy.](event-5029.md)
-####### [Event 5030 F: The Windows Firewall Service failed to start.](event-5030.md)
-####### [Event 5032 F: Windows Firewall was unable to notify the user that it blocked an application from accepting incoming connections on the network.](event-5032.md)
-####### [Event 5033 S: The Windows Firewall Driver has started successfully.](event-5033.md)
-####### [Event 5034 S: The Windows Firewall Driver was stopped.](event-5034.md)
-####### [Event 5035 F: The Windows Firewall Driver failed to start.](event-5035.md)
-####### [Event 5037 F: The Windows Firewall Driver detected critical runtime error. Terminating.](event-5037.md)
-####### [Event 5058 S, F: Key file operation.](event-5058.md)
-####### [Event 5059 S, F: Key migration operation.](event-5059.md)
-####### [Event 6400: BranchCache: Received an incorrectly formatted response while discovering availability of content.](event-6400.md)
-####### [Event 6401: BranchCache: Received invalid data from a peer. Data discarded.](event-6401.md)
-####### [Event 6402: BranchCache: The message to the hosted cache offering it data is incorrectly formatted.](event-6402.md)
-####### [Event 6403: BranchCache: The hosted cache sent an incorrectly formatted response to the client.](event-6403.md)
-####### [Event 6404: BranchCache: Hosted cache could not be authenticated using the provisioned SSL certificate.](event-6404.md)
-####### [Event 6405: BranchCache: %2 instances of event id %1 occurred.](event-6405.md)
-####### [Event 6406: %1 registered to Windows Firewall to control filtering for the following: %2.](event-6406.md)
-####### [Event 6407: 1%.](event-6407.md)
-####### [Event 6408: Registered product %1 failed and Windows Firewall is now controlling the filtering for %2.](event-6408.md)
-####### [Event 6409: BranchCache: A service connection point object could not be parsed.](event-6409.md)
-###### [Audit Security State Change](audit-security-state-change.md)
-####### [Event 4608 S: Windows is starting up.](event-4608.md)
-####### [Event 4616 S: The system time was changed.](event-4616.md)
-####### [Event 4621 S: Administrator recovered system from CrashOnAuditFail.](event-4621.md)
-###### [Audit Security System Extension](audit-security-system-extension.md)
-####### [Event 4610 S: An authentication package has been loaded by the Local Security Authority.](event-4610.md)
-####### [Event 4611 S: A trusted logon process has been registered with the Local Security Authority.](event-4611.md)
-####### [Event 4614 S: A notification package has been loaded by the Security Account Manager.](event-4614.md)
-####### [Event 4622 S: A security package has been loaded by the Local Security Authority.](event-4622.md)
-####### [Event 4697 S: A service was installed in the system.](event-4697.md)
-###### [Audit System Integrity](audit-system-integrity.md)
-####### [Event 4612 S: Internal resources allocated for the queuing of audit messages have been exhausted, leading to the loss of some audits.](event-4612.md)
-####### [Event 4615 S: Invalid use of LPC port.](event-4615.md)
-####### [Event 4618 S: A monitored security event pattern has occurred.](event-4618.md)
-####### [Event 4816 S: RPC detected an integrity violation while decrypting an incoming message.](event-4816.md)
-####### [Event 5038 F: Code integrity determined that the image hash of a file is not valid.](event-5038.md)
-####### [Event 5056 S: A cryptographic self-test was performed.](event-5056.md)
-####### [Event 5062 S: A kernel-mode cryptographic self-test was performed.](event-5062.md)
-####### [Event 5057 F: A cryptographic primitive operation failed.](event-5057.md)
-####### [Event 5060 F: Verification operation failed.](event-5060.md)
-####### [Event 5061 S, F: Cryptographic operation.](event-5061.md)
-####### [Event 6281 F: Code Integrity determined that the page hashes of an image file are not valid.](event-6281.md)
-####### [Event 6410 F: Code integrity determined that a file does not meet the security requirements to load into a process.](event-6410.md)
-###### [Other Events](other-events.md)
-####### [Event 1100 S: The event logging service has shut down.](event-1100.md)
-####### [Event 1102 S: The audit log was cleared.](event-1102.md)
-####### [Event 1104 S: The security log is now full.](event-1104.md)
-####### [Event 1105 S: Event log automatic backup.](event-1105.md)
-####### [Event 1108 S: The event logging service encountered an error while processing an incoming event published from %1.](event-1108.md)
-###### [Appendix A: Security monitoring recommendations for many audit events](appendix-a-security-monitoring-recommendations-for-many-audit-events.md)
-###### [Registry (Global Object Access Auditing) ](registry-global-object-access-auditing.md)
-###### [File System (Global Object Access Auditing) ](file-system-global-object-access-auditing.md)
-### [Security policy settings](security-policy-settings.md)
-#### [Administer security policy settings](administer-security-policy-settings.md)
-##### [Network List Manager policies](network-list-manager-policies.md)
-#### [Configure security policy settings](how-to-configure-security-policy-settings.md)
-#### [Security policy settings reference](security-policy-settings-reference.md)
-##### [Account Policies](account-policies.md)
-###### [Password Policy](password-policy.md)
-####### [Enforce password history](enforce-password-history.md)
-####### [Maximum password age](maximum-password-age.md)
-####### [Minimum password age](minimum-password-age.md)
-####### [Minimum password length](minimum-password-length.md)
-####### [Password must meet complexity requirements](password-must-meet-complexity-requirements.md)
-####### [Store passwords using reversible encryption](store-passwords-using-reversible-encryption.md)
-###### [Account Lockout Policy](account-lockout-policy.md)
-####### [Account lockout duration](account-lockout-duration.md)
-####### [Account lockout threshold](account-lockout-threshold.md)
-####### [Reset account lockout counter after](reset-account-lockout-counter-after.md)
-###### [Kerberos Policy](kerberos-policy.md)
-####### [Enforce user logon restrictions](enforce-user-logon-restrictions.md)
-####### [Maximum lifetime for service ticket](maximum-lifetime-for-service-ticket.md)
-####### [Maximum lifetime for user ticket](maximum-lifetime-for-user-ticket.md)
-####### [Maximum lifetime for user ticket renewal](maximum-lifetime-for-user-ticket-renewal.md)
-####### [Maximum tolerance for computer clock synchronization](maximum-tolerance-for-computer-clock-synchronization.md)
-##### [Audit Policy](audit-policy.md)
-##### [Security Options](security-options.md)
-###### [Accounts: Administrator account status](accounts-administrator-account-status.md)
-###### [Accounts: Block Microsoft accounts](accounts-block-microsoft-accounts.md)
-###### [Accounts: Guest account status](accounts-guest-account-status.md)
-###### [Accounts: Limit local account use of blank passwords to console logon only](accounts-limit-local-account-use-of-blank-passwords-to-console-logon-only.md)
-###### [Accounts: Rename administrator account](accounts-rename-administrator-account.md)
-###### [Accounts: Rename guest account](accounts-rename-guest-account.md)
-###### [Audit: Audit the access of global system objects](audit-audit-the-access-of-global-system-objects.md)
-###### [Audit: Audit the use of Backup and Restore privilege](audit-audit-the-use-of-backup-and-restore-privilege.md)
-###### [Audit: Force audit policy subcategory settings (Windows Vista or later) to override audit policy category settings](audit-force-audit-policy-subcategory-settings-to-override.md)
-###### [Audit: Shut down system immediately if unable to log security audits](audit-shut-down-system-immediately-if-unable-to-log-security-audits.md)
-###### [DCOM: Machine Access Restrictions in Security Descriptor Definition Language (SDDL) syntax](dcom-machine-access-restrictions-in-security-descriptor-definition-language-sddl-syntax.md)
-###### [DCOM: Machine Launch Restrictions in Security Descriptor Definition Language (SDDL) syntax](dcom-machine-launch-restrictions-in-security-descriptor-definition-language-sddl-syntax.md)
-###### [Devices: Allow undock without having to log on](devices-allow-undock-without-having-to-log-on.md)
-###### [Devices: Allowed to format and eject removable media](devices-allowed-to-format-and-eject-removable-media.md)
-###### [Devices: Prevent users from installing printer drivers](devices-prevent-users-from-installing-printer-drivers.md)
-###### [Devices: Restrict CD-ROM access to locally logged-on user only](devices-restrict-cd-rom-access-to-locally-logged-on-user-only.md)
-###### [Devices: Restrict floppy access to locally logged-on user only](devices-restrict-floppy-access-to-locally-logged-on-user-only.md)
-###### [Domain controller: Allow server operators to schedule tasks](domain-controller-allow-server-operators-to-schedule-tasks.md)
-###### [Domain controller: LDAP server signing requirements](domain-controller-ldap-server-signing-requirements.md)
-###### [Domain controller: Refuse machine account password changes](domain-controller-refuse-machine-account-password-changes.md)
-###### [Domain member: Digitally encrypt or sign secure channel data (always)](domain-member-digitally-encrypt-or-sign-secure-channel-data-always.md)
-###### [Domain member: Digitally encrypt secure channel data (when possible)](domain-member-digitally-encrypt-secure-channel-data-when-possible.md)
-###### [Domain member: Digitally sign secure channel data (when possible)](domain-member-digitally-sign-secure-channel-data-when-possible.md)
-###### [Domain member: Disable machine account password changes](domain-member-disable-machine-account-password-changes.md)
-###### [Domain member: Maximum machine account password age](domain-member-maximum-machine-account-password-age.md)
-###### [Domain member: Require strong (Windows 2000 or later) session key](domain-member-require-strong-windows-2000-or-later-session-key.md)
-###### [Interactive logon: Display user information when the session is locked](interactive-logon-display-user-information-when-the-session-is-locked.md)
-###### [Interactive logon: Don't display last signed-in](interactive-logon-do-not-display-last-user-name.md)
-###### [Interactive logon: Don't display username at sign-in](interactive-logon-dont-display-username-at-sign-in.md)
-###### [Interactive logon: Do not require CTRL+ALT+DEL](interactive-logon-do-not-require-ctrl-alt-del.md)
-###### [Interactive logon: Machine account lockout threshold](interactive-logon-machine-account-lockout-threshold.md)
-###### [Interactive logon: Machine inactivity limit](interactive-logon-machine-inactivity-limit.md)
-###### [Interactive logon: Message text for users attempting to log on](interactive-logon-message-text-for-users-attempting-to-log-on.md)
-###### [Interactive logon: Message title for users attempting to log on](interactive-logon-message-title-for-users-attempting-to-log-on.md)
-###### [Interactive logon: Number of previous logons to cache (in case domain controller is not available)](interactive-logon-number-of-previous-logons-to-cache-in-case-domain-controller-is-not-available.md)
-###### [Interactive logon: Prompt user to change password before expiration](interactive-logon-prompt-user-to-change-password-before-expiration.md)
-###### [Interactive logon: Require Domain Controller authentication to unlock workstation](interactive-logon-require-domain-controller-authentication-to-unlock-workstation.md)
-###### [Interactive logon: Require smart card](interactive-logon-require-smart-card.md)
-###### [Interactive logon: Smart card removal behavior](interactive-logon-smart-card-removal-behavior.md)
-###### [Microsoft network client: Digitally sign communications (always)](microsoft-network-client-digitally-sign-communications-always.md)
-###### [Microsoft network client: Digitally sign communications (if server agrees)](microsoft-network-client-digitally-sign-communications-if-server-agrees.md)
-###### [Microsoft network client: Send unencrypted password to third-party SMB servers](microsoft-network-client-send-unencrypted-password-to-third-party-smb-servers.md)
-###### [Microsoft network server: Amount of idle time required before suspending session](microsoft-network-server-amount-of-idle-time-required-before-suspending-session.md)
-###### [Microsoft network server: Attempt S4U2Self to obtain claim information](microsoft-network-server-attempt-s4u2self-to-obtain-claim-information.md)
-###### [Microsoft network server: Digitally sign communications (always)](microsoft-network-server-digitally-sign-communications-always.md)
-###### [Microsoft network server: Digitally sign communications (if client agrees)](microsoft-network-server-digitally-sign-communications-if-client-agrees.md)
-###### [Microsoft network server: Disconnect clients when logon hours expire](microsoft-network-server-disconnect-clients-when-logon-hours-expire.md)
-###### [Microsoft network server: Server SPN target name validation level](microsoft-network-server-server-spn-target-name-validation-level.md)
-###### [Network access: Allow anonymous SID/Name translation](network-access-allow-anonymous-sidname-translation.md)
-###### [Network access: Do not allow anonymous enumeration of SAM accounts](network-access-do-not-allow-anonymous-enumeration-of-sam-accounts.md)
-###### [Network access: Do not allow anonymous enumeration of SAM accounts and shares](network-access-do-not-allow-anonymous-enumeration-of-sam-accounts-and-shares.md)
-###### [Network access: Do not allow storage of passwords and credentials for network authentication](network-access-do-not-allow-storage-of-passwords-and-credentials-for-network-authentication.md)
-###### [Network access: Let Everyone permissions apply to anonymous users](network-access-let-everyone-permissions-apply-to-anonymous-users.md)
-###### [Network access: Named Pipes that can be accessed anonymously](network-access-named-pipes-that-can-be-accessed-anonymously.md)
-###### [Network access: Remotely accessible registry paths](network-access-remotely-accessible-registry-paths.md)
-###### [Network access: Remotely accessible registry paths and subpaths](network-access-remotely-accessible-registry-paths-and-subpaths.md)
-###### [Network access: Restrict anonymous access to Named Pipes and Shares](network-access-restrict-anonymous-access-to-named-pipes-and-shares.md)
-###### [Network access: Shares that can be accessed anonymously](network-access-shares-that-can-be-accessed-anonymously.md)
-###### [Network access: Sharing and security model for local accounts](network-access-sharing-and-security-model-for-local-accounts.md)
-###### [Network security: Allow Local System to use computer identity for NTLM](network-security-allow-local-system-to-use-computer-identity-for-ntlm.md)
-###### [Network security: Allow LocalSystem NULL session fallback](network-security-allow-localsystem-null-session-fallback.md)
-###### [Network security: Allow PKU2U authentication requests to this computer to use online identities](network-security-allow-pku2u-authentication-requests-to-this-computer-to-use-online-identities.md)
-###### [Network security: Configure encryption types allowed for Kerberos Win7 only](network-security-configure-encryption-types-allowed-for-kerberos.md)
-###### [Network security: Do not store LAN Manager hash value on next password change](network-security-do-not-store-lan-manager-hash-value-on-next-password-change.md)
-###### [Network security: Force logoff when logon hours expire](network-security-force-logoff-when-logon-hours-expire.md)
-###### [Network security: LAN Manager authentication level](network-security-lan-manager-authentication-level.md)
-###### [Network security: LDAP client signing requirements](network-security-ldap-client-signing-requirements.md)
-###### [Network security: Minimum session security for NTLM SSP based (including secure RPC) clients](network-security-minimum-session-security-for-ntlm-ssp-based-including-secure-rpc-clients.md)
-###### [Network security: Minimum session security for NTLM SSP based (including secure RPC) servers](network-security-minimum-session-security-for-ntlm-ssp-based-including-secure-rpc-servers.md)
-###### [Network security: Restrict NTLM: Add remote server exceptions for NTLM authentication](network-security-restrict-ntlm-add-remote-server-exceptions-for-ntlm-authentication.md)
-###### [Network security: Restrict NTLM: Add server exceptions in this domain](network-security-restrict-ntlm-add-server-exceptions-in-this-domain.md)
-###### [Network security: Restrict NTLM: Audit incoming NTLM traffic](network-security-restrict-ntlm-audit-incoming-ntlm-traffic.md)
-###### [Network security: Restrict NTLM: Audit NTLM authentication in this domain](network-security-restrict-ntlm-audit-ntlm-authentication-in-this-domain.md)
-###### [Network security: Restrict NTLM: Incoming NTLM traffic](network-security-restrict-ntlm-incoming-ntlm-traffic.md)
-###### [Network security: Restrict NTLM: NTLM authentication in this domain](network-security-restrict-ntlm-ntlm-authentication-in-this-domain.md)
-###### [Network security: Restrict NTLM: Outgoing NTLM traffic to remote servers](network-security-restrict-ntlm-outgoing-ntlm-traffic-to-remote-servers.md)
-###### [Recovery console: Allow automatic administrative logon](recovery-console-allow-automatic-administrative-logon.md)
-###### [Recovery console: Allow floppy copy and access to all drives and folders](recovery-console-allow-floppy-copy-and-access-to-all-drives-and-folders.md)
-###### [Shutdown: Allow system to be shut down without having to log on](shutdown-allow-system-to-be-shut-down-without-having-to-log-on.md)
-###### [Shutdown: Clear virtual memory pagefile](shutdown-clear-virtual-memory-pagefile.md)
-###### [System cryptography: Force strong key protection for user keys stored on the computer](system-cryptography-force-strong-key-protection-for-user-keys-stored-on-the-computer.md)
-###### [System cryptography: Use FIPS compliant algorithms for encryption, hashing, and signing](system-cryptography-use-fips-compliant-algorithms-for-encryption-hashing-and-signing.md)
-###### [System objects: Require case insensitivity for non-Windows subsystems](system-objects-require-case-insensitivity-for-non-windows-subsystems.md)
-###### [System objects: Strengthen default permissions of internal system objects (e.g. Symbolic Links)](system-objects-strengthen-default-permissions-of-internal-system-objects.md)
-###### [System settings: Optional subsystems](system-settings-optional-subsystems.md)
-###### [System settings: Use certificate rules on Windows executables for Software Restriction Policies](system-settings-use-certificate-rules-on-windows-executables-for-software-restriction-policies.md)
-###### [User Account Control: Admin Approval Mode for the Built-in Administrator account](user-account-control-admin-approval-mode-for-the-built-in-administrator-account.md)
-###### [User Account Control: Allow UIAccess applications to prompt for elevation without using the secure desktop](user-account-control-allow-uiaccess-applications-to-prompt-for-elevation-without-using-the-secure-desktop.md)
-###### [User Account Control: Behavior of the elevation prompt for administrators in Admin Approval Mode](user-account-control-behavior-of-the-elevation-prompt-for-administrators-in-admin-approval-mode.md)
-###### [User Account Control: Behavior of the elevation prompt for standard users](user-account-control-behavior-of-the-elevation-prompt-for-standard-users.md)
-###### [User Account Control: Detect application installations and prompt for elevation](user-account-control-detect-application-installations-and-prompt-for-elevation.md)
-###### [User Account Control: Only elevate executables that are signed and validated](user-account-control-only-elevate-executables-that-are-signed-and-validated.md)
-###### [User Account Control: Only elevate UIAccess applications that are installed in secure locations](user-account-control-only-elevate-uiaccess-applications-that-are-installed-in-secure-locations.md)
-###### [User Account Control: Run all administrators in Admin Approval Mode](user-account-control-run-all-administrators-in-admin-approval-mode.md)
-###### [User Account Control: Switch to the secure desktop when prompting for elevation](user-account-control-switch-to-the-secure-desktop-when-prompting-for-elevation.md)
-###### [User Account Control: Virtualize file and registry write failures to per-user locations](user-account-control-virtualize-file-and-registry-write-failures-to-per-user-locations.md)
-##### [Advanced security audit policy settings](secpol-advanced-security-audit-policy-settings.md)
-##### [User Rights Assignment](user-rights-assignment.md)
-###### [Access Credential Manager as a trusted caller](access-credential-manager-as-a-trusted-caller.md)
-###### [Access this computer from the network](access-this-computer-from-the-network.md)
-###### [Act as part of the operating system](act-as-part-of-the-operating-system.md)
-###### [Add workstations to domain](add-workstations-to-domain.md)
-###### [Adjust memory quotas for a process](adjust-memory-quotas-for-a-process.md)
-###### [Allow log on locally](allow-log-on-locally.md)
-###### [Allow log on through Remote Desktop Services](allow-log-on-through-remote-desktop-services.md)
-###### [Back up files and directories](back-up-files-and-directories.md)
-###### [Bypass traverse checking](bypass-traverse-checking.md)
-###### [Change the system time](change-the-system-time.md)
-###### [Change the time zone](change-the-time-zone.md)
-###### [Create a pagefile](create-a-pagefile.md)
-###### [Create a token object](create-a-token-object.md)
-###### [Create global objects](create-global-objects.md)
-###### [Create permanent shared objects](create-permanent-shared-objects.md)
-###### [Create symbolic links](create-symbolic-links.md)
-###### [Debug programs](debug-programs.md)
-###### [Deny access to this computer from the network](deny-access-to-this-computer-from-the-network.md)
-###### [Deny log on as a batch job](deny-log-on-as-a-batch-job.md)
-###### [Deny log on as a service](deny-log-on-as-a-service.md)
-###### [Deny log on locally](deny-log-on-locally.md)
-###### [Deny log on through Remote Desktop Services](deny-log-on-through-remote-desktop-services.md)
-###### [Enable computer and user accounts to be trusted for delegation](enable-computer-and-user-accounts-to-be-trusted-for-delegation.md)
-###### [Force shutdown from a remote system](force-shutdown-from-a-remote-system.md)
-###### [Generate security audits](generate-security-audits.md)
-###### [Impersonate a client after authentication](impersonate-a-client-after-authentication.md)
-###### [Increase a process working set](increase-a-process-working-set.md)
-###### [Increase scheduling priority](increase-scheduling-priority.md)
-###### [Load and unload device drivers](load-and-unload-device-drivers.md)
-###### [Lock pages in memory](lock-pages-in-memory.md)
-###### [Log on as a batch job](log-on-as-a-batch-job.md)
-###### [Log on as a service](log-on-as-a-service.md)
-###### [Manage auditing and security log](manage-auditing-and-security-log.md)
-###### [Modify an object label](modify-an-object-label.md)
-###### [Modify firmware environment values](modify-firmware-environment-values.md)
-###### [Perform volume maintenance tasks](perform-volume-maintenance-tasks.md)
-###### [Profile single process](profile-single-process.md)
-###### [Profile system performance](profile-system-performance.md)
-###### [Remove computer from docking station](remove-computer-from-docking-station.md)
-###### [Replace a process level token](replace-a-process-level-token.md)
-###### [Restore files and directories](restore-files-and-directories.md)
-###### [Shut down the system](shut-down-the-system.md)
-###### [Synchronize directory service data](synchronize-directory-service-data.md)
-###### [Take ownership of files or other objects](take-ownership-of-files-or-other-objects.md)
-### [Smart Cards](smart-card-windows-smart-card-technical-reference.md)
-#### [How Smart Card Sign-in Works in Windows](smart-card-how-smart-card-sign-in-works-in-windows.md)
-##### [Smart Card Architecture](smart-card-architecture.md)
-##### [Certificate Requirements and Enumeration](smart-card-certificate-requirements-and-enumeration.md)
-##### [Smart Card and Remote Desktop Services](smart-card-and-remote-desktop-services.md)
-##### [Smart Cards for Windows Service](smart-card-smart-cards-for-windows-service.md)
-##### [Certificate Propagation Service](smart-card-certificate-propagation-service.md)
-##### [Smart Card Removal Policy Service](smart-card-removal-policy-service.md)
-#### [Smart Card Tools and Settings](smart-card-tools-and-settings.md)
-##### [Smart Cards Debugging Information](smart-card-debugging-information.md)
-##### [Smart Card Group Policy and Registry Settings](smart-card-group-policy-and-registry-settings.md)
-##### [Smart Card Events](smart-card-events.md)
-### [Trusted Platform Module](trusted-platform-module-top-node.md)
-#### [Trusted Platform Module Overview](trusted-platform-module-overview.md)
-#### [TPM fundamentals](tpm-fundamentals.md)
-#### [TPM Group Policy settings](trusted-platform-module-services-group-policy-settings.md)
-#### [Back up the TPM recovery information to AD DS](backup-tpm-recovery-information-to-ad-ds.md)
-#### [Manage TPM commands](manage-tpm-commands.md)
-#### [Manage TPM lockout](manage-tpm-lockout.md)
-#### [Change the TPM owner password](change-the-tpm-owner-password.md)
-#### [View status, clear, or troubleshoot the TPM](initialize-and-configure-ownership-of-the-tpm.md)
-#### [Understanding PCR banks on TPM 2.0 devices](switch-pcr-banks-on-tpm-2-0-devices.md)
-#### [TPM recommendations](tpm-recommendations.md)
-### [User Account Control](user-account-control-overview.md)
-#### [How User Account Control works](how-user-account-control-works.md)
-#### [User Account Control security policy settings](user-account-control-security-policy-settings.md)
-#### [User Account Control Group Policy and registry key settings](user-account-control-group-policy-and-registry-key-settings.md)
-### [Virtual Smart Cards](virtual-smart-card-overview.md)
-#### [Understanding and Evaluating Virtual Smart Cards](virtual-smart-card-understanding-and-evaluating.md)
-##### [Get Started with Virtual Smart Cards: Walkthrough Guide](virtual-smart-card-get-started.md)
-##### [Use Virtual Smart Cards](virtual-smart-card-use-virtual-smart-cards.md)
-##### [Deploy Virtual Smart Cards](virtual-smart-card-deploy-virtual-smart-cards.md)
-##### [Evaluate Virtual Smart Card Security](virtual-smart-card-evaluate-security.md)
-#### [Tpmvscmgr](virtual-smart-card-tpmvscmgr.md)
-### [Windows Defender Advanced Threat Protection](windows-defender-advanced-threat-protection.md)
-#### [Minimum requirements](minimum-requirements-windows-defender-advanced-threat-protection.md)
-#### [Preview features](preview-windows-defender-advanced-threat-protection.md)
-#### [Data storage and privacy](data-storage-privacy-windows-defender-advanced-threat-protection.md)
-#### [Assign user access to the portal](assign-portal-access-windows-defender-advanced-threat-protection.md)
-#### [Onboard endpoints and set up access](onboard-configure-windows-defender-advanced-threat-protection.md)
-##### [Configure endpoints](configure-endpoints-windows-defender-advanced-threat-protection.md)
-###### [Configure endpoints using Group Policy](configure-endpoints-gp-windows-defender-advanced-threat-protection.md)
-###### [Configure endpoints using System Security Configuration Manager](configure-endpoints-sccm-windows-defender-advanced-threat-protection.md)
-###### [Configure endpoints using Mobile Device Management tools](configure-endpoints-mdm-windows-defender-advanced-threat-protection.md)
-####### [Configure endpoints using Microsoft Intune](configure-endpoints-mdm-windows-defender-advanced-threat-protection.md#configure-endpoints-using-microsoft-intune)
-###### [Configure endpoints using a local script](configure-endpoints-script-windows-defender-advanced-threat-protection.md)
-##### [Configure proxy and Internet settings](configure-proxy-internet-windows-defender-advanced-threat-protection.md)
-##### [Troubleshoot onboarding issues](troubleshoot-onboarding-windows-defender-advanced-threat-protection.md)
-#### [Portal overview](portal-overview-windows-defender-advanced-threat-protection.md)
-#### [Use the Windows Defender ATP portal](use-windows-defender-advanced-threat-protection.md)
-##### [View the Dashboard](dashboard-windows-defender-advanced-threat-protection.md)
-##### [View and organize the Alerts queue](alerts-queue-windows-defender-advanced-threat-protection.md)
-##### [Investigate alerts](investigate-alerts-windows-defender-advanced-threat-protection.md)
-###### [Alert process tree](investigate-alerts-windows-defender-advanced-threat-protection.md#alert-process-tree)
-###### [Incident graph](investigate-alerts-windows-defender-advanced-threat-protection.md#incident-graph)
-###### [Alert timeline](investigate-alerts-windows-defender-advanced-threat-protection.md#alert-timeline)
-##### [Investigate files](investigate-files-windows-defender-advanced-threat-protection.md)
-##### [Investigate an IP address](investigate-ip-windows-defender-advanced-threat-protection.md)
-##### [Investigate a domain](investigate-domain-windows-defender-advanced-threat-protection.md)
-##### [View and organize the Machines view](machines-view-overview-windows-defender-advanced-threat-protection.md)
-##### [Investigate machines](investigate-machines-windows-defender-advanced-threat-protection.md)
-###### [Search for specific alerts](investigate-machines-windows-defender-advanced-threat-protection.md#search-for-specific-alerts)
-###### [Filter events from a specific date](investigate-machines-windows-defender-advanced-threat-protection.md#filter-events-from-a-specific-date)
-###### [Export machine timeline events](investigate-machines-windows-defender-advanced-threat-protection.md#export-machine-timeline-events)
-###### [Navigate between pages](investigate-machines-windows-defender-advanced-threat-protection.md#navigate-between-pages)
-##### [Investigate a user account](investigate-user-windows-defender-advanced-threat-protection.md)
-##### [Manage alerts](manage-alerts-windows-defender-advanced-threat-protection.md)
-##### [Take response actions](response-actions-windows-defender-advanced-threat-protection.md)
-###### [Take response actions on a machine](respond-machine-alerts-windows-defender-advanced-threat-protection.md)
-####### [Isolate machines from the network](respond-machine-alerts-windows-defender-advanced-threat-protection.md#isolate-machines-from-the-network)
-####### [Undo machine isolation](respond-machine-alerts-windows-defender-advanced-threat-protection.md#undo-machine-isolation)
-####### [Collect investigation package](respond-machine-alerts-windows-defender-advanced-threat-protection.md#collect-investigation-package)
-####### [Check activity details in Action center](respond-machine-alerts-windows-defender-advanced-threat-protection.md#check-activity-details-in-action-center)
-###### [Take response actions on a file](respond-file-alerts-windows-defender-advanced-threat-protection.md)
-####### [Stop and quarantine files in your network](respond-file-alerts-windows-defender-advanced-threat-protection.md#stop-and-quarantine-files-in-your-network)
-####### [Remove file from quarantine](respond-file-alerts-windows-defender-advanced-threat-protection.md#remove-file-from-quarantine)
-####### [Block files in your network](respond-file-alerts-windows-defender-advanced-threat-protection.md#block-files-in-your-network)
-####### [Check activity details in Action center](respond-file-alerts-windows-defender-advanced-threat-protection.md#check-activity-details-in-action-center)
-####### [Deep analysis](respond-file-alerts-windows-defender-advanced-threat-protection.md#deep-analysis)
-######## [Submit files for analysis](respond-file-alerts-windows-defender-advanced-threat-protection.md#submit-files-for-analysis)
-######## [View deep analysis reports](respond-file-alerts-windows-defender-advanced-threat-protection.md#view-deep-analysis-reports)
-######## [Troubleshoot deep analysis](respond-file-alerts-windows-defender-advanced-threat-protection.md#troubleshoot-deep-analysis)
-#### [Pull alerts to your SIEM tools](configure-siem-windows-defender-advanced-threat-protection.md)
-##### [Enable SIEM integration](enable-siem-integration-windows-defender-advanced-threat-protection.md)
-##### [Configure Splunk to pull alerts](configure-splunk-windows-defender-advanced-threat-protection.md)
-##### [Configure HP ArcSight to pull alerts](configure-arcsight-windows-defender-advanced-threat-protection.md)
-##### [Windows Defender ATP alert API fields](api-portal-mapping-windows-defender-advanced-threat-protection.md)
-##### [Pull alerts using REST API](pull-alerts-using-rest-api-windows-defender-advanced-threat-protection.md)
-##### [Troubleshoot SIEM tool integration issues](troubleshoot-siem-windows-defender-advanced-threat-protection.md)
-#### [Use the threat intelligence API to create custom alerts](use-custom-ti-windows-defender-advanced-threat-protection.md)
-##### [Understand threat intelligence concepts](threat-indicator-concepts-windows-defender-advanced-threat-protection.md)
-##### [Enable the custom threat intelligence application](enable-custom-ti-windows-defender-advanced-threat-protection.md)
-##### [Create custom threat intelligence alerts](custom-ti-api-windows-defender-advanced-threat-protection.md)
-##### [PowerShell code examples](powershell-example-code-windows-defender-advanced-threat-protection.md)
-##### [Python code examples](python-example-code-windows-defender-advanced-threat-protection.md)
-##### [Experiment with custom threat intelligence alerts](experiment-custom-ti-windows-defender-advanced-threat-protection.md)
-##### [Troubleshoot custom threat intelligence issues](troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md)
-#### [Check sensor state](check-sensor-status-windows-defender-advanced-threat-protection.md)
-##### [Fix unhealthy sensors](fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md)
-###### [Inactive machines](fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md#inactive-machines)
-###### [Misconfigured machines](fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md#misconfigured-machines)
-#### [Configure Windows Defender ATP preferences settings](preferences-setup-windows-defender-advanced-threat-protection.md)
-##### [Update general settings](general-settings-windows-defender-advanced-threat-protection.md)
-##### [Turn on advanced features](advanced-features-windows-defender-advanced-threat-protection.md)
-##### [Turn on preview experience](preview-settings-windows-defender-advanced-threat-protection.md)
-##### [Configure email notifications](configure-email-notifications-windows-defender-advanced-threat-protection.md)
-#### [Windows Defender ATP settings](settings-windows-defender-advanced-threat-protection.md)
-#### [Windows Defender ATP service status](service-status-windows-defender-advanced-threat-protection.md)
-#### [Troubleshoot Windows Defender ATP](troubleshoot-windows-defender-advanced-threat-protection.md)
-#### [Review events and errors on endpoints with Event Viewer](event-error-codes-windows-defender-advanced-threat-protection.md)
-#### [Windows Defender Antivirus compatibility](defender-compatibility-windows-defender-advanced-threat-protection.md)
-
-
-### [Windows Defender Antivirus in Windows 10](windows-defender-antivirus-in-windows-10.md)
-#### [Windows Defender AV in the Windows Defender Security Center app](windows-defender-security-center-antivirus.md)
-#### [Windows Defender Antivirus on Windows Server](windows-defender-antivirus-on-windows-server-2016.md)
-#### [Windows Defender Antivirus and Advanced Threat Protection: Better together](windows-defender-antivirus-compatibility.md)
-#### [Evaluate Windows Defender Antivirus protection](evaluate-windows-defender-antivirus.md)
-#### [Deploy, manage updates, and report on Windows Defender Antivirus](deploy-manage-report-windows-defender-antivirus.md)
-##### [Deploy and enable Windows Defender Antivirus](deploy-windows-defender-antivirus.md)
-###### [Deployment guide for VDI environments](deployment-vdi-windows-defender-antivirus.md)
-##### [Report on Windows Defender Antivirus protection](report-monitor-windows-defender-antivirus.md)
-##### [Manage updates and apply baselines](manage-updates-baselines-windows-defender-antivirus.md)
-###### [Manage protection and definition updates](manage-protection-updates-windows-defender-antivirus.md)
-###### [Manage when protection updates should be downloaded and applied](manage-protection-update-schedule-windows-defender-antivirus.md)
-###### [Manage updates for endpoints that are out of date](manage-outdated-endpoints-windows-defender-antivirus.md)
-###### [Manage event-based forced updates](manage-event-based-updates-windows-defender-antivirus.md)
-###### [Manage updates for mobile devices and VMs](manage-updates-mobile-devices-vms-windows-defender-antivirus.md)
-#### [Configure Windows Defender Antivirus features](configure-windows-defender-antivirus-features.md)
-##### [Utilize Microsoft cloud-provided protection](utilize-microsoft-cloud-protection-windows-defender-antivirus.md)
-###### [Enable cloud-delivered protection](enable-cloud-protection-windows-defender-antivirus.md)
-###### [Specify the cloud-delivered protection level](specify-cloud-protection-level-windows-defender-antivirus.md)
-###### [Configure and validate network connections](configure-network-connections-windows-defender-antivirus.md)
-###### [Enable the Block at First Sight feature](configure-block-at-first-sight-windows-defender-antivirus.md)
-###### [Configure the cloud block timeout period](configure-cloud-block-timeout-period-windows-defender-antivirus.md)
-##### [Configure behavioral, heuristic, and real-time protection](configure-protection-features-windows-defender-antivirus.md)
-###### [Detect and block Potentially Unwanted Applications](detect-block-potentially-unwanted-apps-windows-defender-antivirus.md)
-###### [Enable and configure always-on protection and monitoring](configure-real-time-protection-windows-defender-antivirus.md)
-##### [Configure end-user interaction with Windows Defender AV](configure-end-user-interaction-windows-defender-antivirus.md)
-###### [Configure the notifications that appear on endpoints](configure-notifications-windows-defender-antivirus.md)
-###### [Prevent users from seeing or interacting with the user interface](prevent-end-user-interaction-windows-defender-antivirus.md)
-###### [Prevent or allow users to locally modify policy settings](configure-local-policy-overrides-windows-defender-antivirus.md)
-#### [Customize, initiate, and review the results of scans and remediation](customize-run-review-remediate-scans-windows-defender-antivirus.md)
-##### [Configure and validate exclusions in Windows Defender AV scans](configure-exclusions-windows-defender-antivirus.md)
-###### [Configure and validate exclusions based on file name, extension, and folder location](configure-extension-file-exclusions-windows-defender-antivirus.md)
-###### [Configure and validate exclusions for files opened by processes](configure-process-opened-file-exclusions-windows-defender-antivirus.md)
-###### [Configure exclusions in Windows Defender AV on Windows Server 2016](configure-server-exclusions-windows-defender-antivirus.md)
-##### [Configure scanning options in Windows Defender AV](configure-advanced-scan-types-windows-defender-antivirus.md)
-##### [Configure remediation for scans](configure-remediation-windows-defender-antivirus.md)
-##### [Configure scheduled scans](scheduled-catch-up-scans-windows-defender-antivirus.md)
-##### [Configure and run scans](run-scan-windows-defender-antivirus.md)
-##### [Review scan results](review-scan-results-windows-defender-antivirus.md)
-##### [Run and review the results of a Windows Defender Offline scan](windows-defender-offline.md)
-#### [Review event logs and error codes to troubleshoot issues](troubleshoot-windows-defender-antivirus.md)
-#### [Reference topics for management and configuration tools](configuration-management-reference-windows-defender-antivirus.md)
-##### [Use Group Policy settings to configure and manage Windows Defender AV](use-group-policy-windows-defender-antivirus.md)
-##### [Use System Center Configuration Manager and Microsoft Intune to configure and manage Windows Defender AV](use-intune-config-manager-windows-defender-antivirus.md)
-##### [Use PowerShell cmdlets to configure and manage Windows Defender AV](use-powershell-cmdlets-windows-defender-antivirus.md)
-##### [Use Windows Management Instrumentation (WMI) to configure and manage Windows Defender AV](use-wmi-windows-defender-antivirus.md)
-##### [Use the mpcmdrun.exe commandline tool to configure and manage Windows Defender AV](command-line-arguments-windows-defender-antivirus.md)
-### [Windows Firewall with Advanced Security](windows-firewall-with-advanced-security.md)
-#### [Isolating Windows Store Apps on Your Network](isolating-apps-on-your-network.md)
-#### [Securing End-to-End IPsec Connections by Using IKEv2 in Windows Server 2012](securing-end-to-end-ipsec-connections-by-using-ikev2.md)
-#### [Windows Firewall with Advanced Security Administration with Windows PowerShell](windows-firewall-with-advanced-security-administration-with-windows-powershell.md)
-#### [Windows Firewall with Advanced Security Design Guide](windows-firewall-with-advanced-security-design-guide.md)
-##### [Understanding the Windows Firewall with Advanced Security Design Process](understanding-the-windows-firewall-with-advanced-security-design-process.md)
-##### [Identifying Your Windows Firewall with Advanced Security Deployment Goals](identifying-your-windows-firewall-with-advanced-security-deployment-goals.md)
-###### [Protect Devices from Unwanted Network Traffic](protect-devices-from-unwanted-network-traffic.md)
-###### [Restrict Access to Only Trusted Devices](restrict-access-to-only-trusted-devices.md)
-###### [Require Encryption When Accessing Sensitive Network Resources](require-encryption-when-accessing-sensitive-network-resources.md)
-###### [Restrict Access to Only Specified Users or Computers](restrict-access-to-only-specified-users-or-devices.md)
-##### [Mapping Your Deployment Goals to a Windows Firewall with Advanced Security Design](mapping-your-deployment-goals-to-a-windows-firewall-with-advanced-security-design.md)
-###### [Basic Firewall Policy Design](basic-firewall-policy-design.md)
-###### [Domain Isolation Policy Design](domain-isolation-policy-design.md)
-###### [Server Isolation Policy Design](server-isolation-policy-design.md)
-###### [Certificate-based Isolation Policy Design](certificate-based-isolation-policy-design.md)
-##### [Evaluating Windows Firewall with Advanced Security Design Examples](evaluating-windows-firewall-with-advanced-security-design-examples.md)
-###### [Firewall Policy Design Example](firewall-policy-design-example.md)
-###### [Domain Isolation Policy Design Example](domain-isolation-policy-design-example.md)
-###### [Server Isolation Policy Design Example](server-isolation-policy-design-example.md)
-###### [Certificate-based Isolation Policy Design Example](certificate-based-isolation-policy-design-example.md)
-##### [Designing a Windows Firewall with Advanced Security Strategy](designing-a-windows-firewall-with-advanced-security-strategy.md)
-###### [Gathering the Information You Need](gathering-the-information-you-need.md)
-####### [Gathering Information about Your Current Network Infrastructure](gathering-information-about-your-current-network-infrastructure.md)
-####### [Gathering Information about Your Active Directory Deployment](gathering-information-about-your-active-directory-deployment.md)
-####### [Gathering Information about Your Computers](gathering-information-about-your-devices.md)
-####### [Gathering Other Relevant Information](gathering-other-relevant-information.md)
-###### [Determining the Trusted State of Your Computers](determining-the-trusted-state-of-your-devices.md)
-##### [Planning Your Windows Firewall with Advanced Security Design](planning-your-windows-firewall-with-advanced-security-design.md)
-###### [Planning Settings for a Basic Firewall Policy](planning-settings-for-a-basic-firewall-policy.md)
-###### [Planning Domain Isolation Zones](planning-domain-isolation-zones.md)
-####### [Exemption List](exemption-list.md)
-####### [Isolated Domain](isolated-domain.md)
-####### [Boundary Zone](boundary-zone.md)
-####### [Encryption Zone](encryption-zone.md)
-###### [Planning Server Isolation Zones](planning-server-isolation-zones.md)
-###### [Planning Certificate-based Authentication](planning-certificate-based-authentication.md)
-###### [Documenting the Zones](documenting-the-zones.md)
-###### [Planning Group Policy Deployment for Your Isolation Zones](planning-group-policy-deployment-for-your-isolation-zones.md)
-####### [Planning Isolation Groups for the Zones](planning-isolation-groups-for-the-zones.md)
-####### [Planning Network Access Groups](planning-network-access-groups.md)
-####### [Planning the GPOs](planning-the-gpos.md)
-######## [Firewall GPOs](firewall-gpos.md)
-######### [GPO_DOMISO_Firewall](gpo-domiso-firewall.md)
-######## [Isolated Domain GPOs](isolated-domain-gpos.md)
-######### [GPO_DOMISO_IsolatedDomain_Clients](gpo-domiso-isolateddomain-clients.md)
-######### [GPO_DOMISO_IsolatedDomain_Servers](gpo-domiso-isolateddomain-servers.md)
-######## [Boundary Zone GPOs](boundary-zone-gpos.md)
-######### [GPO_DOMISO_Boundary](gpo-domiso-boundary.md)
-######## [Encryption Zone GPOs](encryption-zone-gpos.md)
-######### [GPO_DOMISO_Encryption](gpo-domiso-encryption.md)
-######## [Server Isolation GPOs](server-isolation-gpos.md)
-####### [Planning GPO Deployment](planning-gpo-deployment.md)
-##### [Appendix A: Sample GPO Template Files for Settings Used in this Guide](appendix-a-sample-gpo-template-files-for-settings-used-in-this-guide.md)
-#### [Windows Firewall with Advanced Security Deployment Guide](windows-firewall-with-advanced-security-deployment-guide.md)
-##### [Planning to Deploy Windows Firewall with Advanced Security](planning-to-deploy-windows-firewall-with-advanced-security.md)
-##### [Implementing Your Windows Firewall with Advanced Security Design Plan](implementing-your-windows-firewall-with-advanced-security-design-plan.md)
-##### [Checklist: Creating Group Policy Objects](checklist-creating-group-policy-objects.md)
-##### [Checklist: Implementing a Basic Firewall Policy Design](checklist-implementing-a-basic-firewall-policy-design.md)
-###### [Checklist: Configuring Basic Firewall Settings](checklist-configuring-basic-firewall-settings.md)
-###### [Checklist: Creating Inbound Firewall Rules](checklist-creating-inbound-firewall-rules.md)
-###### [Checklist: Creating Outbound Firewall Rules](checklist-creating-outbound-firewall-rules.md)
-##### [Checklist: Implementing a Domain Isolation Policy Design](checklist-implementing-a-domain-isolation-policy-design.md)
-###### [Checklist: Configuring Rules for the Isolated Domain](checklist-configuring-rules-for-the-isolated-domain.md)
-###### [Checklist: Configuring Rules for the Boundary Zone](checklist-configuring-rules-for-the-boundary-zone.md)
-###### [Checklist: Configuring Rules for the Encryption Zone](checklist-configuring-rules-for-the-encryption-zone.md)
-###### [Checklist: Configuring Rules for an Isolated Server Zone](checklist-configuring-rules-for-an-isolated-server-zone.md)
-##### [Checklist: Implementing a Standalone Server Isolation Policy Design](checklist-implementing-a-standalone-server-isolation-policy-design.md)
-###### [Checklist: Configuring Rules for Servers in a Standalone Isolated Server Zone](checklist-configuring-rules-for-servers-in-a-standalone-isolated-server-zone.md)
-###### [Checklist: Creating Rules for Clients of a Standalone Isolated Server Zone](checklist-creating-rules-for-clients-of-a-standalone-isolated-server-zone.md)
-##### [Checklist: Implementing a Certificate-based Isolation Policy Design](checklist-implementing-a-certificate-based-isolation-policy-design.md)
-##### [Procedures Used in This Guide](procedures-used-in-this-guide.md)
-###### [Add Production Devices to the Membership Group for a Zone](add-production-devices-to-the-membership-group-for-a-zone.md)
-###### [Add Test Devices to the Membership Group for a Zone](add-test-devices-to-the-membership-group-for-a-zone.md)
-###### [Assign Security Group Filters to the GPO](assign-security-group-filters-to-the-gpo.md)
-###### [Change Rules from Request to Require Mode](change-rules-from-request-to-require-mode.md)
-###### [Configure Authentication Methods](configure-authentication-methods.md)
-###### [Configure Data Protection (Quick Mode) Settings](configure-data-protection-quick-mode-settings.md)
-###### [Configure Group Policy to Autoenroll and Deploy Certificates](configure-group-policy-to-autoenroll-and-deploy-certificates.md)
-###### [Configure Key Exchange (Main Mode) Settings](configure-key-exchange-main-mode-settings.md)
-###### [Configure the Rules to Require Encryption](configure-the-rules-to-require-encryption.md)
-###### [Configure the Windows Firewall Log](configure-the-windows-firewall-log.md)
-###### [Configure the Workstation Authentication Certificate Template](configure-the-workstation-authentication-certificate-template.md)
-###### [Configure Windows Firewall to Suppress Notifications When a Program Is Blocked](configure-windows-firewall-to-suppress-notifications-when-a-program-is-blocked.md)
-###### [Confirm That Certificates Are Deployed Correctly](confirm-that-certificates-are-deployed-correctly.md)
-###### [Copy a GPO to Create a New GPO](copy-a-gpo-to-create-a-new-gpo.md)
-###### [Create a Group Account in Active Directory](create-a-group-account-in-active-directory.md)
-###### [Create a Group Policy Object](create-a-group-policy-object.md)
-###### [Create an Authentication Exemption List Rule](create-an-authentication-exemption-list-rule.md)
-###### [Create an Authentication Request Rule](create-an-authentication-request-rule.md)
-###### [Create an Inbound ICMP Rule](create-an-inbound-icmp-rule.md)
-###### [Create an Inbound Port Rule](create-an-inbound-port-rule.md)
-###### [Create an Inbound Program or Service Rule](create-an-inbound-program-or-service-rule.md)
-###### [Create an Outbound Port Rule](create-an-outbound-port-rule.md)
-###### [Create an Outbound Program or Service Rule](create-an-outbound-program-or-service-rule.md)
-###### [Create Inbound Rules to Support RPC](create-inbound-rules-to-support-rpc.md)
-###### [Create WMI Filters for the GPO](create-wmi-filters-for-the-gpo.md)
-###### [Enable Predefined Inbound Rules](enable-predefined-inbound-rules.md)
-###### [Enable Predefined Outbound Rules](enable-predefined-outbound-rules.md)
-###### [Exempt ICMP from Authentication](exempt-icmp-from-authentication.md)
-###### [Link the GPO to the Domain](link-the-gpo-to-the-domain.md)
-###### [Modify GPO Filters to Apply to a Different Zone or Version of Windows](modify-gpo-filters-to-apply-to-a-different-zone-or-version-of-windows.md)
-###### [Open the Group Policy Management Console to IP Security Policies](open-the-group-policy-management-console-to-ip-security-policies.md)
-###### [Open the Group Policy Management Console to Windows Firewall](open-the-group-policy-management-console-to-windows-firewall.md)
-###### [Open the Group Policy Management Console to Windows Firewall with Advanced Security](open-the-group-policy-management-console-to-windows-firewall-with-advanced-security.md)
-###### [Open Windows Firewall with Advanced Security](open-windows-firewall-with-advanced-security.md)
-###### [Restrict Server Access to Members of a Group Only](restrict-server-access-to-members-of-a-group-only.md)
-###### [Turn on Windows Firewall and Configure Default Behavior](turn-on-windows-firewall-and-configure-default-behavior.md)
-###### [Verify That Network Traffic Is Authenticated](verify-that-network-traffic-is-authenticated.md)
-## [Enterprise security guides](windows-10-enterprise-security-guides.md)
-### [Control the health of Windows 10-based devices](protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md)
-### [Windows 10 Mobile security guide](windows-10-mobile-security-guide.md)
-### [Windows 10 credential theft mitigation guide abstract](windows-credential-theft-mitigation-guide-abstract.md)
-### [How to use single sign-on (SSO) over VPN and Wi-Fi connections](how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md)
-## [Change history for Keep Windows 10 secure](change-history-for-keep-windows-10-secure.md)
diff --git a/windows/keep-secure/add-apps-to-protected-list-using-custom-uri.md b/windows/keep-secure/add-apps-to-protected-list-using-custom-uri.md
deleted file mode 100644
index fa9e88df53..0000000000
--- a/windows/keep-secure/add-apps-to-protected-list-using-custom-uri.md
+++ /dev/null
@@ -1,134 +0,0 @@
----
-title: Add apps to your Windows Information Protection (WIP) policy by using Microsoft Intune custom URI functionality (Windows 10)
-description: Add apps to your Windows Information Protection (WIP) allowed app list, by using the Microsoft Intune custom URI functionality and AppLocker.
-ms.assetid: b50db35d-a2a9-4b78-a95d-a1b066e66880
-keywords: WIP, Enterprise Data Protection, protected apps, protected app list
-ms.prod: w10
-ms.mktglfcycl: explore
-ms.pagetype: security
-ms.sitesec: library
-author: eross-msft
-localizationpriority: high
----
-
-# Add apps to your Windows Information Protection (WIP) policy by using the Microsoft Intune custom URI functionality
-**Applies to:**
-
-- Windows 10, version 1607 and later
-- Windows 10 Mobile
-
-You can add apps to your Windows Information Protection (WIP) protected app list using the Microsoft Intune custom URI functionality and AppLocker. For more info about how to create a custom URI using Intune, [Windows 10 custom policy settings in Microsoft Intune](https://go.microsoft.com/fwlink/p/?LinkID=691330).
-
->[!IMPORTANT]
->Results can be unpredictable if you configure your policy using both the UI and the Custom URI method together. We recommend using a single method for each policy.
-
-## Add Store apps
-1. Go to the AppLocker UI by opening a command line window and running secpol.msc. The local security policy MMC snap-in opens showing the **Security Settings**.
-
-2. In the left pane, expand **Application Control Policies**, expand **AppLocker**, right-click **Packaged app Rules**, and then click **Automatically Generate Rules**.
-
- The **Automatically Generate Packaged app Rules** wizard opens, letting you create WIP-protected app polices for all of the installed apps on the device or for packaged apps within a specific folder.
-
-3. In the **Folder and Permissions** screen, keep the default value of **Everyone** in the **User or security group that the rules will apply to** box.
-
- You want to keep this value because your WIP policy needs to apply to the device being managed, not a single user or group of users.
-
-4. Type the name you’ll use to tag the rules into the **Name to identify this set of rules** box, and then click **Next**.
-
- This name should be easily recognizable, such as *WIP_StoreApps_Rules*.
-
-5. In the **Rules Preferences** screen, keep the default settings, and then click **Next** to start generating the rules.
-
- >[!Note]
- >We recommend that you use **Publisher** rules because they only work with apps you've specifically defined and they can be configured to not require updating simply because a new version came out.
If you can't use **Publisher** rules, we then recommend that you use **File hash** rules. **File hash** rules are a secure alternative that can be used on unsigned code. The primary disadvantage to **File hash** is that every time a binary changes (such as, through servicing updates or upgrades), you'll need to create a new rule.
-
-6. In the **Review Rules** screen, look over your rules to make sure they’re right, and then click **Create** to add them to your collection of rules.
-
-7. In the left pane, right-click **AppLocker**, click **Export Policies**, go to where you want to save the XML file and type a file name, click **Save**, and then clear your AppLocker rules.
-
- >[!Important]
- >Be aware that what you're saving are the actual AppLocker rules using your local policy. You don't want to apply these rules to your employee devices, you just want to use them to create and export the XML content. You must delete the AppLocker rules before you apply your policy.
-
-8. Open the Intune administration console, and go to the **Policy** node, click **Add Policy** from the **Tasks** area, go to **Windows**, click the **Custom Configuration (Windows 10 Desktop and Mobile and later)** policy, click **Create and Deploy a Custom Policy**, and then click **Create Policy**.
-
-9. Type a name (required) and an optional description for your policy into the **Name** and **Description** boxes.
-
-10. In the **Add one or more OMA-URI settings that control functionality on Windows devices** box, click **Add**.
-
-11. Type your new **Setting Name** and **Description** into the associated boxes, keeping the default **Data Type** of **String**.
-
-12. In the **OMA-URI** box, type `./Vendor/MSFT/AppLocker/EnterpriseDataProtection//StoreApp EXE`
-
-13. Open File Explorer, go to the location where you saved your new XML file, and open it using an XML editor, such as Notepad.
-
-14. Copy the text that has a **Type** of `Appx`, within the **RuleCollection** tags, and then go back to Intune and paste the text into the **Value** box of the **Add or edit OMA-URI Setting** box. For example:
-
- ```
-
- ```
-
-15. Click **OK** to close the **Add or edit OMA-URI Setting** box, and then click **Save Policy**.
-
- After saving the policy, you’ll need to deploy it to your employee’s devices. For more info, see the [Deploy your Windows Information Protection (WIP) policy](deploy-wip-policy-using-intune.md) topic.
-
-## Add Desktop apps
-1. Open the Local Security Policy snap-in (SecPol.msc).
-
-2. In the left pane, expand **Application Control Policies**, expand **AppLocker**, right-click **Executable Rules**, and then click **Automatically Generate Rules**.
-
- The **Automatically Generate Executable Rules** wizard opens, letting you create WIP-protected app polices by analyzing the files within a specific folder.
-
-3. In the **Folder and Permissions** screen, keep the default value of **Everyone** in the **User or security group that the rules will apply to** box.
-
- You want to keep this value because your WIP policy needs to apply to the device being managed, not a single user or group of users.
-
-4. Type the name you’ll use to tag the rules into the **Name to identify this set of rules** box, and then click **Next**.
-
- This name should be easily recognizable, such as *WIP_DesktopApps_Rules*.
-
-5. In the **Rules Preferences** screen, keep the default settings, and then click **Next** to start generating the rules.
-
- >[!Important]
- >You can also use **Path** rules instead of the **File hash** if you have concerns about unsigned files potentially changing the hash value if they're updated in the future.
-
- >[!Note]
- >We recommend that you use **Publisher** rules because they only work with apps you've specifically defined and they can be configured to not require updating simply because a new version came out.
If you can't use **Publisher** rules, we then recommend that you use **File hash** rules. **File hash** rules are a secure alternative that can be used on unsigned code. The primary disadvantage to **File hash** is that every time a binary changes (such as, through servicing updates or upgrades), you'll need to create a new rule.
Finally, there's **Path** rules. **Path** rules are easier to set up and maintain, but can let apps bypass Windows Information Protection (WIP) by simply renaming and moving an unallowed file to match one of the apps on the **Protected App** list. For example, if your **Path** rule says to allow `%PROGRAMFILES%/NOTEPAD.EXE`, it becomes possible to rename DisallowedApp.exe to Notepad.exe, move it into the specified path above, and have it suddenly be allowed.
-
-6. In the **Review Rules** screen, look over your rules to make sure they’re right, and then click **Create** to add them to your collection of rules.
-
-7. In the left pane, right-click **AppLocker**, click **Export Policies**, go to where you want to save the XML file and type a file name, click **Save**, and then clear your AppLocker rules.
-
- >[!Important]
- >Be aware that what you're saving are the actual AppLocker rules using your local policy. You don't want to apply these rules to your employee devices, you just want to use them to create and export the XML content. You must delete the AppLocker rules before you apply your policy.
-
-8. Open the Intune administration console, and go to the **Policy** node, click **Add Policy** from the **Tasks** area, go to **Windows**, click the **Custom Configuration (Windows 10 Desktop and Mobile and later)** policy, click **Create and Deploy a Custom Policy**, and then click **Create Policy**.
-
-9. Type a name (required) and an optional description for your policy into the **Name** and **Description** boxes.
-
-10. In the **Add one or more OMA-URI settings that control functionality on Windows devices** box, click **Add**.
-
-11. Type your new **Setting Name** and **Description** into the associated boxes, keeping the default **Data Type** of **String**.
-
-12. In the **OMA-URI** box, type `./Vendor/MSFT/AppLocker/EnterpriseDataProtection//EXE`
-
-13. Open File Explorer, go to the location where you saved your new XML file, and open it using an XML editor, such as Notepad.
-
-14. Copy the text that has a **Type** of `EXE`, within in the **RuleCollection** tags, and then go back to Intune and paste the text into the **Value** box of the **Add or edit OMA-URI Setting** box. For example:
-
- ```
-
- ```
-
-15. Click **OK** to close the **Add or edit OMA-URI Setting** box, and then click **Save Policy**.
-
- After saving the policy, you’ll need to deploy it to your employee’s devices. For more info, see the [Deploy your Windows Information Protection (WIP) policy](deploy-wip-policy-using-intune.md) topic.
-
->[!NOTE]
->Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Contributing to TechNet content](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).
-
-## Related topics
-- [Create a Windows Information Protection (WIP) policy using Microsoft Intune](create-wip-policy-using-intune.md)
-
-- [Deploy your Windows Information Protection (WIP) policy](deploy-wip-policy-using-intune.md)
-
-- [Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Intune](create-vpn-and-wip-policy-using-intune.md)
diff --git a/windows/keep-secure/change-history-for-keep-windows-10-secure.md b/windows/keep-secure/change-history-for-keep-windows-10-secure.md
deleted file mode 100644
index ece3a3c127..0000000000
--- a/windows/keep-secure/change-history-for-keep-windows-10-secure.md
+++ /dev/null
@@ -1,192 +0,0 @@
----
-title: Change history for Keep Windows 10 secure (Windows 10)
-description: This topic lists new and updated topics in the Keep Windows 10 secure documentation for Windows 10 and Windows 10 Mobile.
-ms.assetid: E50EC5E6-71AA-4FF1-8356-574CFDB8079B
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: security
-author: brianlic-msft
----
-
-# Change history for Keep Windows 10 secure
-This topic lists new and updated topics in the [Keep Windows 10 secure](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md).
-
-
-## March 2017
-|New or changed topic |Description |
-|---------------------|------------|
-|[Mandatory tasks and settings required to turn on Windows Information Protection (WIP)](mandatory-settings-for-wip.md) |Updated based on Windows 10, version 1703. |
-|[Create a Windows Information Protection (WIP) policy using Microsoft Intune](create-wip-policy-using-intune.md) |Updated based on Windows 10, version 1703. |
-|[Deploy your Windows Information Protection (WIP) policy using Microsoft Intune](deploy-wip-policy-using-intune.md) |Updated based on Windows 10, version 1703.
-|[Limitations while using Windows Information Protection (WIP)](limitations-with-wip.md) |Added additional limitations for Windows 10, version 1703.|
-|[Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate](create-and-verify-an-efs-dra-certificate.md)|Added content about recovering data from a cloud environment.|
-|[Protect derived domain credentials with Credential Guard](credential-guard.md) |Updated to include additional security qualifications starting with Window 10, version 1703.|
-|[Requirements and deployment planning guidelines for Device Guard](requirements-and-deployment-planning-guidelines-for-device-guard.md) |Updated to include additional security qualifications starting with Window 10, version 1703.|
-|[Windows Defender SmartScreen overview](windows-defender-smartscreen-overview.md)|New |
-|[Available Windows Defender SmartScreen Group Policy and mobile device management (MDM) settings](windows-defender-smartscreen-available-settings.md)|New |
-|[Use Windows Defender Security Center to set Windows Defender SmartScreen for individual devices](windows-defender-smartscreen-set-individual-device.md)|New |
-|[Overview of threat mitigations in Windows 10](overview-of-threat-mitigations-in-windows-10.md) | Reorganized from existing content, to provide a better overview of threat mitigations. Explains how mitigations in the Enhanced Mitigation Experience Toolkit (EMET) relate to those in Windows 10. |
-
-## January 2017
-|New or changed topic |Description |
-|---------------------|------------|
-|[Determine the Enterprise Context of an app running in Windows Information Protection (WIP)](wip-app-enterprise-context.md) |New |
-|[Limitations while using Windows Information Protection (WIP)](limitations-with-wip.md) |Updated to include info about USB drives and Azure RMS (Windows Insider Program only) and to add more info about Work Folders and Offline files. |
-|[Recommended Enterprise Cloud Resources and Neutral Resources network settings with Windows Information Protection (WIP)](recommended-network-definitions-for-wip.md) |New |
-|[Using Outlook on the web with Windows Information Protection (WIP)](using-owa-with-wip.md) |New |
-| Microsoft Passport guide | Content merged into [Windows Hello for Business](hello-identity-verification.md) topics |
-
-## December 2016
-|New or changed topic |Description |
-|---------------------|------------|
-|[Create WMI Filters for the GPO](create-wmi-filters-for-the-gpo.md) |Added filter examples for Windows 10 and Windows Server 2016. |
-
-
-
-## November 2016
-| New or changed topic | Description |
-| --- | --- |
-|[Protect your enterprise data using Windows Information Protection (WIP)](protect-enterprise-data-using-wip.md), [Create a Windows Information Protection (WIP) policy using Microsoft Intune](create-wip-policy-using-intune.md), and [Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager](create-wip-policy-using-sccm.md) |Added additional details about what happens when you turn off WIP. |
-|[Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Intune](create-vpn-and-wip-policy-using-intune.md) |Changed WIPModeID to EDPModeID, to match the CSP. |
-
-
-
-## October 2016
-
-| New or changed topic | Description |
-| --- | --- |
-|[List of enlightened Microsoft apps for use with Windows Information Protection (WIP)](enlightened-microsoft-apps-and-wip.md) |Added Microsoft Remote Desktop information. |
-|[Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager](create-wip-policy-using-sccm.md) and [Create a Windows Information Protection (WIP) policy using Microsoft Intune](create-wip-policy-using-intune.md) |Updated the text about where the optioanl icon overlay appears.|
-|[Limitations while using Windows Information Protection (WIP)](limitations-with-wip.md) |Added content about using ActiveX controls.|
-|[Unenlightened and enlightened app behavior while using Windows Information Protection (WIP)](app-behavior-with-wip.md) |New |
-|[VPN technical guide](vpn-guide.md) | Multiple new topics, replacing previous **VPN profile options** topic |
-|[Windows security baselines](windows-security-baselines.md) | Added Windows 10, version 1607 and Windows Server 2016 baseline |
-
-
-## September 2016
-
-| New or changed topic | Description |
-| --- | --- |
-|[Limitations while using Windows Information Protection (WIP)](limitations-with-wip.md) | New |
-|[Create a Windows Information Protection (WIP) policy using Microsoft Intune](create-wip-policy-using-intune.md) |Updated the networking table to clarify details around Enterprise Cloud Resources and Enterprise Proxy Servers. |
-|[Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager](create-wip-policy-using-sccm.md) |Updated the networking table to clarify details around Enterprise Cloud Resources and Enterprise Proxy Servers. |
-| [Implement Windows Hello for Business in your organization](implement-microsoft-passport-in-your-organization.md) | Clarified how convenience PIN works in Windows 10, version 1607, on domain-joined PCs |
-| [BitLocker: How to enable Network Unlock](bitlocker-how-to-enable-network-unlock.md) | Corrected certreq example and added a new Windows PowerShell example for creating a self-signed certificate |
-
-## August 2016
-|New or changed topic | Description |
-|----------------------|-------------|
-|[Override Process Mitigation Options to help enforce app-related security policies](override-mitigation-options-for-app-related-security-policies.md) |New |
-|[Testing scenarios for Windows Information Protection (WIP)](testing-scenarios-for-wip.md) |Updated and added additional scenarios for testing |
-|[Protect your enterprise data using Windows Information Protection (WIP)](protect-enterprise-data-using-wip.md) |Updated to include info from the original What's New and Overview topics |
-
-## RELEASE: Windows 10, version 1607
-
-The topics in this library have been updated for Windows 10, version 1607 (also known as the Anniversary Update). The following new topics have been added:
-
-- [Enable phone sign-in to PC or VPN](enable-phone-signin-to-pc-and-vpn.md)
-- [Protect Remote Desktop credentials with Remote Credential Guard](remote-credential-guard.md)
-- [Windows Defender Offline in Windows 10](windows-defender-offline.md)
-- [Use PowerShell cmdlets to configure and run Windows Defender](use-powershell-cmdlets-windows-defender-for-windows-10.md)
-- [Enable the Block at First Sight feature in Windows 10](windows-defender-block-at-first-sight.md)
-- [Configure enhanced notifications for Windows Defender in Windows 10](windows-defender-enhanced-notifications.md)
-- [Run a Windows Defender scan from the command line](run-cmd-scan-windows-defender-for-windows-10.md)
-- [Detect and block Potentially Unwanted Applications with Windows Defender](enable-pua-windows-defender-for-windows-10.md)
-- [Assign user access to the Windows Defender ATP portal](assign-portal-access-windows-defender-advanced-threat-protection.md)
-- [Configure Windows Defender ATP endpoints](configure-endpoints-windows-defender-advanced-threat-protection.md)
-- [Troubleshoot Windows Defender Advanced Threat Protection onboarding issues](troubleshoot-onboarding-windows-defender-advanced-threat-protection.md)
-- [Configure security information and events management (SIEM) tools to consume alerts](configure-siem-windows-defender-advanced-threat-protection.md)
-- [Windows Defender compatibility](defender-compatibility-windows-defender-advanced-threat-protection.md)
-
-
-## July 2016
-
-|New or changed topic | Description |
-|----------------------|-------------|
-|[Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate](create-and-verify-an-efs-dra-certificate.md) |New |
-|[Mandatory settings for Windows Information Protection (WIP)](mandatory-settings-for-wip.md) |New |
-|[Create a Windows Information Protection (WIP) policy using Microsoft Intune](create-wip-policy-using-intune.md) |New |
-|[Create a Windows Information Protection (WIP) policy using System Center Configuration Manager](create-wip-policy-using-sccm.md) |New |
-|[Windows Defender Advanced Threat Protection](windows-defender-advanced-threat-protection.md) (multiple topics) | Updated |
-|[Device Guard deployment guide](device-guard-deployment-guide.md) (multiple topics) | Updated |
-
-
-## June 2016
-
-|New or changed topic | Description |
-|----------------------|-------------|
-|[Create a Windows Information Protection (WIP) policy using Microsoft Intune](create-wip-policy-using-intune.md) |Added an update about needing to reconfigure your enterprise data protection app rules after delivery of the June service update. |
-| [Windows Firewall with Advanced Security](windows-firewall-with-advanced-security.md) (multiple topics) | New |
-| [Advanced security audit policy settings](advanced-security-audit-policy-settings.md) (mutiple topics) | New security monitoring reference topics |
-| [Windows security baselines](windows-security-baselines.md) | New |
-
-## May 2016
-
-|New or changed topic | Description |
-|----------------------|-------------|
-| [Install digital certificates on Windows 10 Mobile](installing-digital-certificates-on-windows-10-mobile.md) | Changed Internet Explorer to Microsoft Edge |
-| [Microsoft Passport errors during PIN creation](microsoft-passport-errors-during-pin-creation.md) | Added errors 0x80090029 and 0x80070057, and merged entries for error 0x801c03ed. |
-| [Microsoft Passport guide](microsoft-passport-guide.md) | Updated Roadmap section content |
-|[Protect your enterprise data using Windows Information Protection (WIP)](protect-enterprise-data-using-wip.md) |Updated info based on changes to the features and functionality.|
-| [User Account Control Group Policy and registry key settings](user-account-control-group-policy-and-registry-key-settings.md) | Updated for Windows 10 and Windows Server 2016 |
-|[Windows Defender Advanced Threat Protection](windows-defender-advanced-threat-protection.md) (mutiple topics) | New |
-
-## April 2016
-
-|New or changed topic | Description |
-|----------------------|-------------|
-|[Protect derived domain credentials with Credential Guard](credential-guard.md) |Clarified Credential Guard protections |
-
-## March 2016
-
-|New or changed topic | Description |
-|----------------------|-------------|
-|[Requirements to use AppLocker](requirements-to-use-applocker.md) |Added that MDM can be used to manage any edition of Windows 10. Windows 10 Enterprise or Windows Server 2016 is required to manage AppLocker by using Group Policy.|
-|[Protect your enterprise data using Windows Information Protection (WIP)](protect-enterprise-data-using-wip.md) |Added pre-release content about how to set up and deploy Windows Information Protection (WIP) in an enterprise environment.|
-
-## February 2016
-
-| New or changed topic | Description |
-|----------------------|-------------|
-|[Configure S/MIME for Windows 10 and Windows 10 Mobile](configure-s-mime.md) |New |
-|[Install digital certificates on Windows 10 Mobile](installing-digital-certificates-on-windows-10-mobile.md) |New |
-|[Use Windows Event Forwarding to help with intrusion detection](use-windows-event-forwarding-to-assist-in-instrusion-detection.md) |New |
-|[Encrypted Hard Drive](encrypted-hard-drive.md) |New |
-
-## January 2016
-
-|New or changed topic |Description |
-|---------------------|------------|
-|[Device Guard deployment guide](device-guard-deployment-guide.md) |Updated recommendations in Bring Your Own Device section |
-|[Implement Microsoft Passport in your organization](implement-microsoft-passport-in-your-organization.md) |Updated the prerequisites for an Azure Active Directory/Active Directory hybrid environment |
-|[Microsoft Passport and password changes](microsoft-passport-and-password-changes.md) |Updated to clarify that this procedure is not needed for Passport for Work |
-|[Microsoft Passport guide](microsoft-passport-guide.md) |Updated the prerequisites for an Azure Active Directory/Active Directory hybrid environment |
-|[Windows 10 Mobile security guide](windows-10-mobile-security-guide.md) |New |
-
-## December 2015
-
-|New or changed topic |Description |
-|---------------------|------------|
-|[Device Guard certification and compliance](device-guard-certification-and-compliance.md) |Updated |
-|[Microsoft Passport errors during PIN creation](microsoft-passport-errors-during-pin-creation.md) |Updated |
-|[Protect derived domain credentials with Credential Guard](credential-guard.md) |Updated |
-|[Security policy settings](security-policy-settings.md) (multiple topics) |Updated |
-
-## November 2015
-
-|New or changed topic |Description |
-|---------------------|-------------|
-|[Windows Defender in Windows 10](windows-defender-in-windows-10.md) |New |
-|[Windows Hello biometrics in the enterprise](windows-hello-in-enterprise.md)|New |
-|[AppLocker](applocker-overview.md) (multiple topics) |Updated |
-|[Device Guard certification and compliance](device-guard-certification-and-compliance.md) |Updated |
-|[Device Guard deployment guide](device-guard-deployment-guide.md) |Updated |
-|[Security auditing](security-auditing-overview.md) (multiple topics) |Updated |
-|[Why a PIN is better than a password](why-a-pin-is-better-than-a-password.md) |Updated |
-
-## Related topics
-- [Change history for What's new in Windows 10](../whats-new/change-history-for-what-s-new-in-windows-10.md)
-- [Change history for Plan for Windows 10 deployment](../plan/change-history-for-plan-for-windows-10-deployment.md)
-- [Change history for Deploy Windows 10](../deploy/change-history-for-deploy-windows-10.md)
-- [Change history for Manage and update Windows 10](../manage/change-history-for-manage-and-update-windows-10.md)
diff --git a/windows/keep-secure/images/15dd35b6-6cc6-421f-93f8-7109920e7144.gif b/windows/keep-secure/images/15dd35b6-6cc6-421f-93f8-7109920e7144.gif
deleted file mode 100644
index 374b1fe60e..0000000000
Binary files a/windows/keep-secure/images/15dd35b6-6cc6-421f-93f8-7109920e7144.gif and /dev/null differ
diff --git a/windows/keep-secure/images/2b05dce3-938f-4168-9b8f-1f4398cbdb9b.gif b/windows/keep-secure/images/2b05dce3-938f-4168-9b8f-1f4398cbdb9b.gif
deleted file mode 100644
index 60246363c0..0000000000
Binary files a/windows/keep-secure/images/2b05dce3-938f-4168-9b8f-1f4398cbdb9b.gif and /dev/null differ
diff --git a/windows/keep-secure/images/add-user.png b/windows/keep-secure/images/add-user.png
deleted file mode 100644
index 45b52bbc4d..0000000000
Binary files a/windows/keep-secure/images/add-user.png and /dev/null differ
diff --git a/windows/keep-secure/images/adsi-edit.png b/windows/keep-secure/images/adsi-edit.png
deleted file mode 100644
index 2d0c4d0af7..0000000000
Binary files a/windows/keep-secure/images/adsi-edit.png and /dev/null differ
diff --git a/windows/keep-secure/images/alertsq.png b/windows/keep-secure/images/alertsq.png
deleted file mode 100644
index b89dab8196..0000000000
Binary files a/windows/keep-secure/images/alertsq.png and /dev/null differ
diff --git a/windows/keep-secure/images/alertsq2.png b/windows/keep-secure/images/alertsq2.png
deleted file mode 100644
index 8e823cd9c7..0000000000
Binary files a/windows/keep-secure/images/alertsq2.png and /dev/null differ
diff --git a/windows/keep-secure/images/assign-users.png b/windows/keep-secure/images/assign-users.png
deleted file mode 100644
index 87c529be50..0000000000
Binary files a/windows/keep-secure/images/assign-users.png and /dev/null differ
diff --git a/windows/keep-secure/images/auditpol-guid-list.png b/windows/keep-secure/images/auditpol-guid-list.png
deleted file mode 100644
index d69583ad89..0000000000
Binary files a/windows/keep-secure/images/auditpol-guid-list.png and /dev/null differ
diff --git a/windows/keep-secure/images/auditpol.png b/windows/keep-secure/images/auditpol.png
deleted file mode 100644
index cabf86563d..0000000000
Binary files a/windows/keep-secure/images/auditpol.png and /dev/null differ
diff --git a/windows/keep-secure/images/azure-active-directory-list.png b/windows/keep-secure/images/azure-active-directory-list.png
deleted file mode 100644
index 1a126b049d..0000000000
Binary files a/windows/keep-secure/images/azure-active-directory-list.png and /dev/null differ
diff --git a/windows/keep-secure/images/azure-active-directory.png b/windows/keep-secure/images/azure-active-directory.png
deleted file mode 100644
index b6e3efec10..0000000000
Binary files a/windows/keep-secure/images/azure-active-directory.png and /dev/null differ
diff --git a/windows/keep-secure/images/azure-browse.png b/windows/keep-secure/images/azure-browse.png
deleted file mode 100644
index 929c6050b4..0000000000
Binary files a/windows/keep-secure/images/azure-browse.png and /dev/null differ
diff --git a/windows/keep-secure/images/azure-org-directory.png b/windows/keep-secure/images/azure-org-directory.png
deleted file mode 100644
index dbb20d17eb..0000000000
Binary files a/windows/keep-secure/images/azure-org-directory.png and /dev/null differ
diff --git a/windows/keep-secure/images/azure-signout.png b/windows/keep-secure/images/azure-signout.png
deleted file mode 100644
index 29dd863029..0000000000
Binary files a/windows/keep-secure/images/azure-signout.png and /dev/null differ
diff --git a/windows/keep-secure/images/bc6cea1a-1c6c-4124-8c8f-1df5adfe8c88.gif b/windows/keep-secure/images/bc6cea1a-1c6c-4124-8c8f-1df5adfe8c88.gif
deleted file mode 100644
index 2d1bf229c3..0000000000
Binary files a/windows/keep-secure/images/bc6cea1a-1c6c-4124-8c8f-1df5adfe8c88.gif and /dev/null differ
diff --git a/windows/keep-secure/images/bt-passcode.png b/windows/keep-secure/images/bt-passcode.png
deleted file mode 100644
index 4941075883..0000000000
Binary files a/windows/keep-secure/images/bt-passcode.png and /dev/null differ
diff --git a/windows/keep-secure/images/btpair.png b/windows/keep-secure/images/btpair.png
deleted file mode 100644
index 16c087111d..0000000000
Binary files a/windows/keep-secure/images/btpair.png and /dev/null differ
diff --git a/windows/keep-secure/images/changes-icon.png b/windows/keep-secure/images/changes-icon.png
deleted file mode 100644
index 6cf9d4eb8c..0000000000
Binary files a/windows/keep-secure/images/changes-icon.png and /dev/null differ
diff --git a/windows/keep-secure/images/check-icon.png b/windows/keep-secure/images/check-icon.png
deleted file mode 100644
index 20d181d703..0000000000
Binary files a/windows/keep-secure/images/check-icon.png and /dev/null differ
diff --git a/windows/keep-secure/images/comments-icon.png b/windows/keep-secure/images/comments-icon.png
deleted file mode 100644
index bf54738910..0000000000
Binary files a/windows/keep-secure/images/comments-icon.png and /dev/null differ
diff --git a/windows/keep-secure/images/comments.png b/windows/keep-secure/images/comments.png
deleted file mode 100644
index 360aa79d2d..0000000000
Binary files a/windows/keep-secure/images/comments.png and /dev/null differ
diff --git a/windows/keep-secure/images/confirm-user-access.png b/windows/keep-secure/images/confirm-user-access.png
deleted file mode 100644
index 6199186405..0000000000
Binary files a/windows/keep-secure/images/confirm-user-access.png and /dev/null differ
diff --git a/windows/keep-secure/images/contoso-active-directory.png b/windows/keep-secure/images/contoso-active-directory.png
deleted file mode 100644
index 1a126b049d..0000000000
Binary files a/windows/keep-secure/images/contoso-active-directory.png and /dev/null differ
diff --git a/windows/keep-secure/images/contoso-application.png b/windows/keep-secure/images/contoso-application.png
deleted file mode 100644
index 66cd9ac852..0000000000
Binary files a/windows/keep-secure/images/contoso-application.png and /dev/null differ
diff --git a/windows/keep-secure/images/contoso-users.png b/windows/keep-secure/images/contoso-users.png
deleted file mode 100644
index 39a6d1a7eb..0000000000
Binary files a/windows/keep-secure/images/contoso-users.png and /dev/null differ
diff --git a/windows/keep-secure/images/contoso.png b/windows/keep-secure/images/contoso.png
deleted file mode 100644
index 8c72d9ac32..0000000000
Binary files a/windows/keep-secure/images/contoso.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender-gp-defsharesfield.png b/windows/keep-secure/images/defender-gp-defsharesfield.png
deleted file mode 100644
index bd40c53930..0000000000
Binary files a/windows/keep-secure/images/defender-gp-defsharesfield.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender-gp-defsourcefield.png b/windows/keep-secure/images/defender-gp-defsourcefield.png
deleted file mode 100644
index 9ce64c0b3c..0000000000
Binary files a/windows/keep-secure/images/defender-gp-defsourcefield.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender-scanarchivecpu.png b/windows/keep-secure/images/defender-scanarchivecpu.png
deleted file mode 100644
index 03f469da10..0000000000
Binary files a/windows/keep-secure/images/defender-scanarchivecpu.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender-scanarchivedepth.png b/windows/keep-secure/images/defender-scanarchivedepth.png
deleted file mode 100644
index 051b12d342..0000000000
Binary files a/windows/keep-secure/images/defender-scanarchivedepth.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender-scanarchivefiles.png b/windows/keep-secure/images/defender-scanarchivefiles.png
deleted file mode 100644
index 64b8a47f65..0000000000
Binary files a/windows/keep-secure/images/defender-scanarchivefiles.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender-scanarchivesize.png b/windows/keep-secure/images/defender-scanarchivesize.png
deleted file mode 100644
index 3c2d70974c..0000000000
Binary files a/windows/keep-secure/images/defender-scanarchivesize.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender-scanemailfiles.png b/windows/keep-secure/images/defender-scanemailfiles.png
deleted file mode 100644
index 8d03c9c1c2..0000000000
Binary files a/windows/keep-secure/images/defender-scanemailfiles.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender/detection-source.png b/windows/keep-secure/images/defender/detection-source.png
deleted file mode 100644
index 7d471dc22d..0000000000
Binary files a/windows/keep-secure/images/defender/detection-source.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender/download-wdo.png b/windows/keep-secure/images/defender/download-wdo.png
deleted file mode 100644
index 50d2fc3152..0000000000
Binary files a/windows/keep-secure/images/defender/download-wdo.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender/enhanced-notifications.png b/windows/keep-secure/images/defender/enhanced-notifications.png
deleted file mode 100644
index 8317458416..0000000000
Binary files a/windows/keep-secure/images/defender/enhanced-notifications.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender/gp.png b/windows/keep-secure/images/defender/gp.png
deleted file mode 100644
index 8b57c7b45c..0000000000
Binary files a/windows/keep-secure/images/defender/gp.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender/malware-detected.png b/windows/keep-secure/images/defender/malware-detected.png
deleted file mode 100644
index 91fce5a44b..0000000000
Binary files a/windows/keep-secure/images/defender/malware-detected.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender/order-update-sources-wdav.png b/windows/keep-secure/images/defender/order-update-sources-wdav.png
deleted file mode 100644
index 904f314699..0000000000
Binary files a/windows/keep-secure/images/defender/order-update-sources-wdav.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender/quarantine.png b/windows/keep-secure/images/defender/quarantine.png
deleted file mode 100644
index 6a908aedec..0000000000
Binary files a/windows/keep-secure/images/defender/quarantine.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender/settings-wdo.png b/windows/keep-secure/images/defender/settings-wdo.png
deleted file mode 100644
index 23412856b0..0000000000
Binary files a/windows/keep-secure/images/defender/settings-wdo.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender/ux-config-key.png b/windows/keep-secure/images/defender/ux-config-key.png
deleted file mode 100644
index 3e2d966342..0000000000
Binary files a/windows/keep-secure/images/defender/ux-config-key.png and /dev/null differ
diff --git a/windows/keep-secure/images/defender/ux-uilockdown-key.png b/windows/keep-secure/images/defender/ux-uilockdown-key.png
deleted file mode 100644
index 86d1b4b249..0000000000
Binary files a/windows/keep-secure/images/defender/ux-uilockdown-key.png and /dev/null differ
diff --git a/windows/keep-secure/images/detection-source.png b/windows/keep-secure/images/detection-source.png
deleted file mode 100644
index 7d471dc22d..0000000000
Binary files a/windows/keep-secure/images/detection-source.png and /dev/null differ
diff --git a/windows/keep-secure/images/expand.png b/windows/keep-secure/images/expand.png
deleted file mode 100644
index aba33dc51f..0000000000
Binary files a/windows/keep-secure/images/expand.png and /dev/null differ
diff --git a/windows/keep-secure/images/export-sccm.png b/windows/keep-secure/images/export-sccm.png
deleted file mode 100644
index 62ed43e9e7..0000000000
Binary files a/windows/keep-secure/images/export-sccm.png and /dev/null differ
diff --git a/windows/keep-secure/images/faa393df-4856-4431-9eda-4f4e5be72a90.gif b/windows/keep-secure/images/faa393df-4856-4431-9eda-4f4e5be72a90.gif
deleted file mode 100644
index d3c8021646..0000000000
Binary files a/windows/keep-secure/images/faa393df-4856-4431-9eda-4f4e5be72a90.gif and /dev/null differ
diff --git a/windows/keep-secure/images/machine-investigation.png b/windows/keep-secure/images/machine-investigation.png
deleted file mode 100644
index d9ef2ad4a2..0000000000
Binary files a/windows/keep-secure/images/machine-investigation.png and /dev/null differ
diff --git a/windows/keep-secure/images/machines-view.png b/windows/keep-secure/images/machines-view.png
deleted file mode 100644
index f1d00f4035..0000000000
Binary files a/windows/keep-secure/images/machines-view.png and /dev/null differ
diff --git a/windows/keep-secure/images/manage-alert-menu.png b/windows/keep-secure/images/manage-alert-menu.png
deleted file mode 100644
index 27f2129dbf..0000000000
Binary files a/windows/keep-secure/images/manage-alert-menu.png and /dev/null differ
diff --git a/windows/keep-secure/images/mva_videos.png b/windows/keep-secure/images/mva_videos.png
deleted file mode 100644
index 2a785874bd..0000000000
Binary files a/windows/keep-secure/images/mva_videos.png and /dev/null differ
diff --git a/windows/keep-secure/images/net-helpmsg-58.png b/windows/keep-secure/images/net-helpmsg-58.png
deleted file mode 100644
index 53f96107ea..0000000000
Binary files a/windows/keep-secure/images/net-helpmsg-58.png and /dev/null differ
diff --git a/windows/keep-secure/images/oma-uri.png b/windows/keep-secure/images/oma-uri.png
deleted file mode 100644
index 00cfe55d01..0000000000
Binary files a/windows/keep-secure/images/oma-uri.png and /dev/null differ
diff --git a/windows/keep-secure/images/onboardingstate.png b/windows/keep-secure/images/onboardingstate.png
deleted file mode 100644
index ab49c49e17..0000000000
Binary files a/windows/keep-secure/images/onboardingstate.png and /dev/null differ
diff --git a/windows/keep-secure/images/passport-fig1.png b/windows/keep-secure/images/passport-fig1.png
deleted file mode 100644
index 3144e48b59..0000000000
Binary files a/windows/keep-secure/images/passport-fig1.png and /dev/null differ
diff --git a/windows/keep-secure/images/passport-fig2-pinimmeduse.png b/windows/keep-secure/images/passport-fig2-pinimmeduse.png
deleted file mode 100644
index d52ab7168e..0000000000
Binary files a/windows/keep-secure/images/passport-fig2-pinimmeduse.png and /dev/null differ
diff --git a/windows/keep-secure/images/passport-fig4-join.png b/windows/keep-secure/images/passport-fig4-join.png
deleted file mode 100644
index 367d78a5aa..0000000000
Binary files a/windows/keep-secure/images/passport-fig4-join.png and /dev/null differ
diff --git a/windows/keep-secure/images/phone-signin-device-select.png b/windows/keep-secure/images/phone-signin-device-select.png
deleted file mode 100644
index a002efa427..0000000000
Binary files a/windows/keep-secure/images/phone-signin-device-select.png and /dev/null differ
diff --git a/windows/keep-secure/images/phone-signin-menu.png b/windows/keep-secure/images/phone-signin-menu.png
deleted file mode 100644
index 4672433344..0000000000
Binary files a/windows/keep-secure/images/phone-signin-menu.png and /dev/null differ
diff --git a/windows/keep-secure/images/phone-signin-settings.png b/windows/keep-secure/images/phone-signin-settings.png
deleted file mode 100644
index e0ae827426..0000000000
Binary files a/windows/keep-secure/images/phone-signin-settings.png and /dev/null differ
diff --git a/windows/keep-secure/images/portal-image.png b/windows/keep-secure/images/portal-image.png
deleted file mode 100644
index c038da30de..0000000000
Binary files a/windows/keep-secure/images/portal-image.png and /dev/null differ
diff --git a/windows/keep-secure/images/portal.png b/windows/keep-secure/images/portal.png
deleted file mode 100644
index 7bc1d56ed3..0000000000
Binary files a/windows/keep-secure/images/portal.png and /dev/null differ
diff --git a/windows/keep-secure/images/portqry.png b/windows/keep-secure/images/portqry.png
deleted file mode 100644
index e14de2dc2d..0000000000
Binary files a/windows/keep-secure/images/portqry.png and /dev/null differ
diff --git a/windows/keep-secure/images/proxy-settings.png b/windows/keep-secure/images/proxy-settings.png
deleted file mode 100644
index 717e483a89..0000000000
Binary files a/windows/keep-secure/images/proxy-settings.png and /dev/null differ
diff --git a/windows/keep-secure/images/psexec-cmd.png b/windows/keep-secure/images/psexec-cmd.png
deleted file mode 100644
index dd35045531..0000000000
Binary files a/windows/keep-secure/images/psexec-cmd.png and /dev/null differ
diff --git a/windows/keep-secure/images/pua1.png b/windows/keep-secure/images/pua1.png
deleted file mode 100644
index f3d96a245a..0000000000
Binary files a/windows/keep-secure/images/pua1.png and /dev/null differ
diff --git a/windows/keep-secure/images/pua2.png b/windows/keep-secure/images/pua2.png
deleted file mode 100644
index 72ffa10aa5..0000000000
Binary files a/windows/keep-secure/images/pua2.png and /dev/null differ
diff --git a/windows/keep-secure/images/registry-editor.png b/windows/keep-secure/images/registry-editor.png
deleted file mode 100644
index 5b3c291a9a..0000000000
Binary files a/windows/keep-secure/images/registry-editor.png and /dev/null differ
diff --git a/windows/keep-secure/images/remove-menu.png b/windows/keep-secure/images/remove-menu.png
deleted file mode 100644
index 04c622a051..0000000000
Binary files a/windows/keep-secure/images/remove-menu.png and /dev/null differ
diff --git a/windows/keep-secure/images/resolve-alert.png b/windows/keep-secure/images/resolve-alert.png
deleted file mode 100644
index ffd43633fd..0000000000
Binary files a/windows/keep-secure/images/resolve-alert.png and /dev/null differ
diff --git a/windows/keep-secure/images/sc-query-diagtrack.png b/windows/keep-secure/images/sc-query-diagtrack.png
deleted file mode 100644
index 1fd1031ae8..0000000000
Binary files a/windows/keep-secure/images/sc-query-diagtrack.png and /dev/null differ
diff --git a/windows/keep-secure/images/sc-query-sense-autostart.png b/windows/keep-secure/images/sc-query-sense-autostart.png
deleted file mode 100644
index 814513a98c..0000000000
Binary files a/windows/keep-secure/images/sc-query-sense-autostart.png and /dev/null differ
diff --git a/windows/keep-secure/images/sc-query-sense-running.png b/windows/keep-secure/images/sc-query-sense-running.png
deleted file mode 100644
index 0e537a3e96..0000000000
Binary files a/windows/keep-secure/images/sc-query-sense-running.png and /dev/null differ
diff --git a/windows/keep-secure/images/sc-query-sense.png b/windows/keep-secure/images/sc-query-sense.png
deleted file mode 100644
index 0e537a3e96..0000000000
Binary files a/windows/keep-secure/images/sc-query-sense.png and /dev/null differ
diff --git a/windows/keep-secure/images/sccm-primary-domain.png b/windows/keep-secure/images/sccm-primary-domain.png
deleted file mode 100644
index ca2c5a0b78..0000000000
Binary files a/windows/keep-secure/images/sccm-primary-domain.png and /dev/null differ
diff --git a/windows/keep-secure/images/security-fig1-invalidaccess.png b/windows/keep-secure/images/security-fig1-invalidaccess.png
deleted file mode 100644
index 8aa3535761..0000000000
Binary files a/windows/keep-secure/images/security-fig1-invalidaccess.png and /dev/null differ
diff --git a/windows/keep-secure/images/security-fig10-optinsettings.png b/windows/keep-secure/images/security-fig10-optinsettings.png
deleted file mode 100644
index 6754e27e0c..0000000000
Binary files a/windows/keep-secure/images/security-fig10-optinsettings.png and /dev/null differ
diff --git a/windows/keep-secure/images/security-fig11-defendersettings.png b/windows/keep-secure/images/security-fig11-defendersettings.png
deleted file mode 100644
index bba84ac28f..0000000000
Binary files a/windows/keep-secure/images/security-fig11-defendersettings.png and /dev/null differ
diff --git a/windows/keep-secure/images/security-fig2-vbsarchitecture-redo.png b/windows/keep-secure/images/security-fig2-vbsarchitecture-redo.png
deleted file mode 100644
index 6bcddd364a..0000000000
Binary files a/windows/keep-secure/images/security-fig2-vbsarchitecture-redo.png and /dev/null differ
diff --git a/windows/keep-secure/images/security-fig2-vbsarchitecture.png b/windows/keep-secure/images/security-fig2-vbsarchitecture.png
deleted file mode 100644
index 55301bf8c2..0000000000
Binary files a/windows/keep-secure/images/security-fig2-vbsarchitecture.png and /dev/null differ
diff --git a/windows/keep-secure/images/security-fig3-healthattestation.png b/windows/keep-secure/images/security-fig3-healthattestation.png
deleted file mode 100644
index 8cc8003555..0000000000
Binary files a/windows/keep-secure/images/security-fig3-healthattestation.png and /dev/null differ
diff --git a/windows/keep-secure/images/security-fig6-edge2.png b/windows/keep-secure/images/security-fig6-edge2.png
deleted file mode 100644
index d3d2d9c2e5..0000000000
Binary files a/windows/keep-secure/images/security-fig6-edge2.png and /dev/null differ
diff --git a/windows/keep-secure/images/security-fig7-smartscreenfilter.png b/windows/keep-secure/images/security-fig7-smartscreenfilter.png
deleted file mode 100644
index dba19d0f08..0000000000
Binary files a/windows/keep-secure/images/security-fig7-smartscreenfilter.png and /dev/null differ
diff --git a/windows/keep-secure/images/security-fig8-smartscreenconfig.png b/windows/keep-secure/images/security-fig8-smartscreenconfig.png
deleted file mode 100644
index 1377b79de8..0000000000
Binary files a/windows/keep-secure/images/security-fig8-smartscreenconfig.png and /dev/null differ
diff --git a/windows/keep-secure/images/security-fig9-windows7allow.png b/windows/keep-secure/images/security-fig9-windows7allow.png
deleted file mode 100644
index cc2bc0e16b..0000000000
Binary files a/windows/keep-secure/images/security-fig9-windows7allow.png and /dev/null differ
diff --git a/windows/keep-secure/images/service-components.png b/windows/keep-secure/images/service-components.png
deleted file mode 100644
index 1dd6cd48ba..0000000000
Binary files a/windows/keep-secure/images/service-components.png and /dev/null differ
diff --git a/windows/keep-secure/images/settings-icon.png b/windows/keep-secure/images/settings-icon.png
deleted file mode 100644
index 697ba3b0c3..0000000000
Binary files a/windows/keep-secure/images/settings-icon.png and /dev/null differ
diff --git a/windows/keep-secure/images/sort-order-icon.png b/windows/keep-secure/images/sort-order-icon.png
deleted file mode 100644
index c3cda66580..0000000000
Binary files a/windows/keep-secure/images/sort-order-icon.png and /dev/null differ
diff --git a/windows/keep-secure/images/suppression-rules.png b/windows/keep-secure/images/suppression-rules.png
deleted file mode 100644
index cd78d0a860..0000000000
Binary files a/windows/keep-secure/images/suppression-rules.png and /dev/null differ
diff --git a/windows/keep-secure/images/timeline.png b/windows/keep-secure/images/timeline.png
deleted file mode 100644
index ac657b2a12..0000000000
Binary files a/windows/keep-secure/images/timeline.png and /dev/null differ
diff --git a/windows/keep-secure/images/value-prop.png b/windows/keep-secure/images/value-prop.png
deleted file mode 100644
index 75291f8d96..0000000000
Binary files a/windows/keep-secure/images/value-prop.png and /dev/null differ
diff --git a/windows/keep-secure/images/windef-utc-console-start.png b/windows/keep-secure/images/windef-utc-console-start.png
deleted file mode 100644
index 57c2020b04..0000000000
Binary files a/windows/keep-secure/images/windef-utc-console-start.png and /dev/null differ
diff --git a/windows/keep-secure/images/windows-atp-service-users.png b/windows/keep-secure/images/windows-atp-service-users.png
deleted file mode 100644
index 87c529be50..0000000000
Binary files a/windows/keep-secure/images/windows-atp-service-users.png and /dev/null differ
diff --git a/windows/keep-secure/images/windows-atp-service.png b/windows/keep-secure/images/windows-atp-service.png
deleted file mode 100644
index e2175190f4..0000000000
Binary files a/windows/keep-secure/images/windows-atp-service.png and /dev/null differ
diff --git a/windows/keep-secure/index.md b/windows/keep-secure/index.md
deleted file mode 100644
index db8b674702..0000000000
--- a/windows/keep-secure/index.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-title: Keep Windows 10 secure (Windows 10)
-description: Learn about keeping Windows 10 and Windows 10 Mobile secure.
-ms.assetid: EA559BA8-734F-41DB-A74A-D8DBF36BE920
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: security
-localizationpriority: high
-author: brianlic-msft
----
-# Keep Windows 10 secure
-
-Learn about keeping Windows 10 and Windows 10 Mobile secure.
-
-## In this section
-
-| Topic | Description |
-| --- | --- |
-| [Block untrusted fonts in an enterprise](block-untrusted-fonts-in-enterprise.md) | To help protect your company from attacks which may originate from untrusted or attacker controlled font files, we’ve created the Blocking Untrusted Fonts feature. Using this feature, you can turn on a global setting that stops your employees from loading untrusted fonts processed using the Graphics Device Interface (GDI) onto your network. Untrusted fonts are any font installed outside of the %windir%/Fonts directory. Blocking untrusted fonts helps prevent both remote (web-based or email-based) and local EOP attacks that can happen during the font file-parsing process. |
-| [Windows Hello for Business](hello-identity-verification.md) | In Windows 10, Windows Hello replaces passwords with strong two-factor authentication on PCs and mobile devices. This authentication consists of a new type of user credential that is tied to a device and a biometric or PIN. |
-| [Configure S/MIME for Windows 10 and Windows 10 Mobile](configure-s-mime.md) | In Windows 10, S/MIME lets users encrypt outgoing messages and attachments so that only intended recipients who have a digital identification (ID), also known as a certificate, can read them. Users can digitally sign a message, which provides the recipients with a way to verify the identity of the sender and that the message hasn't been tampered with. |
-| [Install digital certificates on Windows 10 Mobile](installing-digital-certificates-on-windows-10-mobile.md) | Digital certificates bind the identity of a user or computer to a pair of keys that can be used to encrypt and sign digital information. Certificates are issued by a certification authority (CA) that vouches for the identity of the certificate holder, and they enable secure client communications with websites and services. |
-| [Device Guard deployment guide](device-guard-deployment-guide.md) | Device Guard is a combination of hardware and software security features that, when configured together, will lock a device down so that it can only run trusted applications. If the app isn’t trusted it can’t run, period. It also means that even if an attacker manages to get control of the Windows kernel, he or she will be much less likely to be able to run malicious executable code after the computer restarts because of how decisions are made about what can run and when. |
-| [Protect derived domain credentials with Credential Guard](credential-guard.md) | Introduced in Windows 10 Enterprise, Credential Guard uses virtualization-based security to isolate secrets so that only privileged system software can access them. Unauthorized access to these secrets can lead to credential theft attacks, such as Pass-the-Hash or Pass-The-Ticket. Credential Guard helps prevent these attacks by protecting NTLM password hashes and Kerberos Ticket Granting Tickets. |
-| [Protect Remote Desktop credentials with Remote Credential Guard](remote-credential-guard.md) | Remote Credential Guard helps you protect your credentials over a Remote Desktop connection by redirecting the Kerberos requests back to the device that's requesting the connection. |
-| [Protect your enterprise data using Windows Information Protection (WIP)](protect-enterprise-data-using-wip.md) | With the increase of employee-owned devices in the enterprise, there’s also an increasing risk of accidental data leak through apps and services, like email, social media, and the public cloud, which are outside of the enterprise’s control. Windows Information Protection (WIP), previously known as enterprise data protection (EDP), helps to protect against this potential data leakage without otherwise interfering with the employee experience. |
-| [Use Windows Event Forwarding to help with intrusion detection](use-windows-event-forwarding-to-assist-in-instrusion-detection.md) | Learn about an approach to collect events from devices in your organization. This article talks about events in both normal operations and when an intrusion is suspected. |
-|[Override Process Mitigation Options to help enforce app-related security policies](override-mitigation-options-for-app-related-security-policies.md) |Use Group Policy to override individual **Process Mitigation Options** settings and help to enforce specific app-related security policies. |
-| [VPN technical guide](vpn-guide.md) | Virtual private networks (VPN) let you give your users secure remote access to your company network. Windows 10 adds useful new VPN profile options to help you manage how users connect. |
-| [Windows security baselines](windows-security-baselines.md) | Learn why you should use security baselines in your organization. |
-| [Security technologies](security-technologies.md) | Learn more about the different security technologies that are available in Windows 10 and Windows 10 Mobile. For example, learn about AppLocker, BitLocker, and Security auditing. |
-| [Enterprise security guides](windows-10-enterprise-security-guides.md) | Review technology overviews that help you understand Windows 10 security technologies in the context of the enterprise. |
-| [Change history for Keep Windows 10 secure](change-history-for-keep-windows-10-secure.md) | This topic lists new and updated topics in the Keep Windows 10 secure documentation for [Windows 10 and Windows 10 Mobile](../index.md). |
-
-## Related topics
-
-[Windows 10 and Windows 10 Mobile](../index.md)
-
-
diff --git a/windows/keep-secure/security-technologies.md b/windows/keep-secure/security-technologies.md
deleted file mode 100644
index 6b82a956c7..0000000000
--- a/windows/keep-secure/security-technologies.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-title: Security technologies (Windows 10)
-description: Learn more about the different security technologies that are available in Windows 10 and Windows 10 Mobile.
-ms.assetid: BFE2DE22-B0CE-465B-8CF6-28F64464DF08
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: security
-author: brianlic-msft
----
-
-# Security technologies
-
-As an IT professional, you can use these topics to learn more about the different security technologies that are available in Windows 10 and Windows 10 Mobile.
-
-| Section | Description |
-|-|-|
-| [Access control](access-control.md) | Describes access control in Windows, which is the process of authorizing users, groups, and computers to access objects on the network or computer. Key concepts that make up access control are permissions, ownership of objects, inheritance of permissions, user rights, and object auditing. |
-| [AppLocker](applocker-overview.md)| Describes AppLocker, and can help you decide if your organization can benefit from deploying AppLocker application control policies. AppLocker helps you control which apps and files users can run. These include executable files, scripts, Windows Installer files, dynamic-link libraries (DLLs), packaged apps, and packaged app installers.|
-| [BitLocker](bitlocker-overview.md)| Provides information about BitLocker, which is a data protection feature that integrates with the operating system and addresses the threats of data theft or exposure from lost, stolen, or inappropriately decommissioned computers. |
-| [Encrypted Hard Drive](encrypted-hard-drive.md) | Provides information about Encrypted Hard Drive, which uses the rapid encryption that is provided by BitLocker Drive Encryption to enhance data security and management.|
-| [Security auditing](security-auditing-overview.md)| Describes how the IT professional can use the security auditing features in Windows, and how organizations can benefit from using these technologies, to enhance the security and manageability of networks.|
-| [Security policy settings](security-policy-settings.md)| Provides a collection of reference topics that describe the common scenarios, architecture, and processes for security settings.|
-| [Smart Cards](smart-card-windows-smart-card-technical-reference.md) | Provides a collection of references topics about smart cards, which are tamper-resistant portable storage devices that can enhance the security of tasks such as authenticating clients, signing code, securing e-mail, and signing in with a Windows domain account. |
-| [Trusted Platform Module](trusted-platform-module-top-node.md)| Provides links to information about the Trusted Platform Module (TPM), which is a secure crypto-processor that helps you with actions such as generating, storing, and limiting the use of cryptographic keys. |
-| [User Account Control](user-account-control-overview.md)| Provides information about User Account Control (UAC), which helps prevent malware from damaging a PC and helps organizations deploy a better-managed desktop. UAC can help block the automatic installation of unauthorized apps and prevent inadvertent changes to system settings.|
-| [Virtual Smart Cards](virtual-smart-card-overview.md) | Provides information about deploying and managing virtual smart cards, which are functionally similar to physical smart cards and appear in Windows as smart cards that are always-inserted. Virtual smart cards use the Trusted Platform Module (TPM) chip that is available on computers in many organizations, rather than requiring the use of a separate physical smart card and reader. |
-| [Windows Defender Advanced Threat Protection](windows-defender-advanced-threat-protection.md)| Provides information about Windows Defender Advanced Threat Protection (Windows Defender ATP), an out-of-the-box Windows enterprise security service that enables enterprise cybersecurity teams to detect and respond to advanced threats on their networks.|
-| [Windows Defender in Windows 10](windows-defender-in-windows-10.md)| Provides information about Windows Defender, a built-in antimalware solution that helps provide security and antimalware management for desktops, portable computers, and servers. Includes a list of system requirements and new features.|
-| [Windows Firewall with Advanced Security](windows-firewall-with-advanced-security.md) | Provides information about Windows Firewall with Advanced Security, which is an important part of a layered security model. By providing host-based, two-way network traffic filtering for a device, Windows Firewall with Advanced Security blocks unauthorized network traffic flowing into or out of the local device. |
-
-
-
diff --git a/windows/keep-secure/windows-10-enterprise-security-guides.md b/windows/keep-secure/windows-10-enterprise-security-guides.md
deleted file mode 100644
index 496bb6addb..0000000000
--- a/windows/keep-secure/windows-10-enterprise-security-guides.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: Enterprise security guides (Windows 10)
-description: Get proven guidance to help you better secure and protect your enterprise by using technologies such as Credential Guard, Microsoft Passport, and Windows Hello. This section offers technology overviews and step-by-step guides.
-ms.assetid: 57134f84-bd4b-4b1d-b663-4a2d36f5a7f8
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: security, devices
-author: challum
-
----
-
-# Enterprise security guides
-
-## Purpose
-
-This section offers overviews to help you understand selected enterprise-level security technologies, such as technologies to control the health of Windows 10-based devices.
-
-## In this section
-
-
-
-
-
-
-
-
-
Topic
-
Description
-
-
-
-
-
[Control the health of Windows 10-based devices](protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md)
-
This article details an end-to-end solution that helps you protect high-value assets by enforcing, controlling, and reporting the health of Windows 10-based devices.
-
-
-
[Windows 10 Mobile security guide](windows-10-mobile-security-guide.md)
-
This guide provides a detailed description of the most important security features in the Windows 10 Mobile operating system—identity access and control, data protection, malware resistance, and app platform security.
This topic provides a summary of the Windows 10 credential theft mitigation guide, which can be downloaded from the Microsoft Download Center.
-
-
-
[How to use single sign on (SSO) over VPN and Wi-Fi connections](how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md)
-
This topic explains requirements to enable Single Sign-On (SSO) to on-premises domain resources over WiFi or VPN connections.
-
-
-
-
-
-
diff --git a/windows/manage/.vscode/settings.json b/windows/manage/.vscode/settings.json
deleted file mode 100644
index 20af2f68a6..0000000000
--- a/windows/manage/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place your settings in this file to overwrite default and user settings.
-{
-}
\ No newline at end of file
diff --git a/windows/manage/TOC.md b/windows/manage/TOC.md
deleted file mode 100644
index a6009478c9..0000000000
--- a/windows/manage/TOC.md
+++ /dev/null
@@ -1,167 +0,0 @@
-# [Manage Windows 10](index.md)
-## [Manage Windows 10 in your organization - transitioning to modern management](manage-windows-10-in-your-organization-modern-management.md)
-## [Windows 10 Mobile and MDM](windows-10-mobile-and-mdm.md)
-## [Administrative Tools in Windows 10](administrative-tools-in-windows-10.md)
-## [Windows Store for Business](windows-store-for-business.md)
-### [Sign up and get started](sign-up-windows-store-for-business-overview.md)
-####[Windows Store for Business overview](windows-store-for-business-overview.md)
-#### [Prerequisites for Windows Store for Business](prerequisites-windows-store-for-business.md)
-#### [Sign up for Windows Store for Business](sign-up-windows-store-for-business.md)
-#### [Roles and permissions in the Windows Store for Business](roles-and-permissions-windows-store-for-business.md)
-#### [Settings reference: Windows Store for Business](settings-reference-windows-store-for-business.md)
-### [Find and acquire apps](find-and-acquire-apps-overview.md)
-#### [Apps in the Windows Store for Business](apps-in-windows-store-for-business.md)
-#### [Acquire apps in the Windows Store for Business](acquire-apps-windows-store-for-business.md)
-#### [Working with line-of-business apps](working-with-line-of-business-apps.md)
-### [Distribute apps to your employees from the Windows Store for Business](distribute-apps-to-your-employees-windows-store-for-business.md)
-#### [Distribute apps using your private store](distribute-apps-from-your-private-store.md)
-#### [Assign apps to employees](assign-apps-to-employees.md)
-#### [Distribute apps with a management tool](distribute-apps-with-management-tool.md)
-#### [Distribute offline apps](distribute-offline-apps.md)
-### [Manage apps](manage-apps-windows-store-for-business-overview.md)
-#### [App inventory managemement for Windows Store for Business](app-inventory-management-windows-store-for-business.md)
-#### [Manage app orders in Windows Store for Business](manage-orders-windows-store-for-business.md)
-#### [Manage access to private store](manage-access-to-private-store.md)
-#### [Manage private store settings](manage-private-store-settings.md)
-#### [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md)
-### [Device Guard signing portal](device-guard-signing-portal.md)
-#### [Add unsigned app to code integrity policy](add-unsigned-app-to-code-integrity-policy.md)
-#### [Sign code integrity policy with Device Guard signing](sign-code-integrity-policy-with-device-guard-signing.md)
-### [Manage settings in the Windows Store for Business](manage-settings-windows-store-for-business.md)
-#### [Update Windows Store for Business account settings](update-windows-store-for-business-account-settings.md)
-#### [Manage user accounts in Windows Store for Business](manage-users-and-groups-windows-store-for-business.md)
-### [Troubleshoot Windows Store for Business](troubleshoot-windows-store-for-business.md)
-## [Create mandatory user profiles](mandatory-user-profile.md)
-## [Connect to remote Azure Active Directory-joined PC](connect-to-remote-aadj-pc.md)
-## [Join Windows 10 Mobile to Azure Active Directory](join-windows-10-mobile-to-azure-active-directory.md)
-## [New policies for Windows 10](new-policies-for-windows-10.md)
-## [Group Policies that apply only to Windows 10 Enterprise and Windows 10 Education](group-policies-for-enterprise-and-education-editions.md)
-## [Manage the Settings app with Group Policy](manage-settings-app-with-group-policy.md)
-## [Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md)
-## [Application Virtualization (App-V) for Windows](appv-for-windows.md)
-### [Getting Started with App-V](appv-getting-started.md)
-#### [What's new in App-V for Windows 10, version 1703 and earlier](appv-about-appv.md)
-##### [Release Notes for App-V for Windows 10, version 1607](appv-release-notes-for-appv-for-windows.md)
-##### [Release Notes for App-V for Windows 10, version 1703](appv-release-notes-for-appv-for-windows-1703.md)
-#### [Evaluating App-V](appv-evaluating-appv.md)
-#### [High Level Architecture for App-V](appv-high-level-architecture.md)
-### [Planning for App-V](appv-planning-for-appv.md)
-#### [Preparing Your Environment for App-V](appv-preparing-your-environment.md)
-##### [App-V Prerequisites](appv-prerequisites.md)
-##### [App-V Security Considerations](appv-security-considerations.md)
-#### [Planning to Deploy App-V](appv-planning-to-deploy-appv.md)
-##### [App-V Supported Configurations](appv-supported-configurations.md)
-##### [App-V Capacity Planning](appv-capacity-planning.md)
-##### [Planning for High Availability with App-V](appv-planning-for-high-availability-with-appv.md)
-##### [Planning to Deploy App-V with an Electronic Software Distribution System](appv-planning-to-deploy-appv-with-electronic-software-distribution-solutions.md)
-##### [Planning for the App-V Server Deployment](appv-planning-for-appv-server-deployment.md)
-##### [Planning for the App-V Sequencer and Client Deployment](appv-planning-for-sequencer-and-client-deployment.md)
-##### [Planning for Using App-V with Office](appv-planning-for-using-appv-with-office.md)
-##### [Planning to Use Folder Redirection with App-V](appv-planning-folder-redirection-with-appv.md)
-#### [App-V Planning Checklist](appv-planning-checklist.md)
-### [Deploying App-V](appv-deploying-appv.md)
-#### [Deploying the App-V Sequencer and Configuring the Client](appv-deploying-the-appv-sequencer-and-client.md)
-##### [About Client Configuration Settings](appv-client-configuration-settings.md)
-##### [Enable the App-V desktop client](appv-enable-the-app-v-desktop-client.md)
-##### [How to Install the Sequencer](appv-install-the-sequencer.md)
-#### [Deploying the App-V Server](appv-deploying-the-appv-server.md)
-##### [How to Deploy the App-V Server](appv-deploy-the-appv-server.md)
-##### [How to Deploy the App-V Server Using a Script](appv-deploy-the-appv-server-with-a-script.md)
-##### [How to Deploy the App-V Databases by Using SQL Scripts](appv-deploy-appv-databases-with-sql-scripts.md)
-##### [How to Install the Publishing Server on a Remote Computer](appv-install-the-publishing-server-on-a-remote-computer.md)
-##### [How to Install the Management and Reporting Databases on Separate Computers from the Management and Reporting Services](appv-install-the-management-and-reporting-databases-on-separate-computers.md)
-##### [How to install the Management Server on a Standalone Computer and Connect it to the Database ](appv-install-the-management-server-on-a-standalone-computer.md)
-##### [About App-V Reporting](appv-reporting.md)
-##### [How to install the Reporting Server on a Standalone Computer and Connect it to the Database](appv-install-the-reporting-server-on-a-standalone-computer.md)
-#### [App-V Deployment Checklist](appv-deployment-checklist.md)
-#### [Deploying Microsoft Office 2016 by Using App-V](appv-deploying-microsoft-office-2016-with-appv.md)
-#### [Deploying Microsoft Office 2013 by Using App-V](appv-deploying-microsoft-office-2013-with-appv.md)
-#### [Deploying Microsoft Office 2010 by Using App-V](appv-deploying-microsoft-office-2010-wth-appv.md)
-### [Operations for App-V](appv-operations.md)
-#### [Creating and Managing App-V Virtualized Applications](appv-creating-and-managing-virtualized-applications.md)
-##### [Automatically provision your sequencing environment using Microsoft Application Virtualization Sequencer (App-V Sequencer)](appv-auto-provision-a-vm.md)
-##### [Automatically sequence multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)](appv-auto-batch-sequencing.md)
-##### [Automatically update multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)](appv-auto-batch-updating.md)
-##### [Manually sequence a new app using Microsoft Application Virtualization Sequencer (App-V Sequencer)](appv-sequence-a-new-application.md)
-##### [How to Modify an Existing Virtual Application Package](appv-modify-an-existing-virtual-application-package.md)
-##### [How to Create and Use a Project Template](appv-create-and-use-a-project-template.md)
-##### [How to Create a Package Accelerator](appv-create-a-package-accelerator.md)
-##### [How to Create a Virtual Application Package Using an App-V Package Accelerator](appv-create-a-virtual-application-package-package-accelerator.md)
-#### [Administering App-V Virtual Applications by Using the Management Console](appv-administering-virtual-applications-with-the-management-console.md)
-##### [About App-V Dynamic Configuration](appv-dynamic-configuration.md)
-##### [How to Connect to the Management Console ](appv-connect-to-the-management-console.md)
-##### [How to Add or Upgrade Packages by Using the Management Console](appv-add-or-upgrade-packages-with-the-management-console.md)
-##### [How to Configure Access to Packages by Using the Management Console ](appv-configure-access-to-packages-with-the-management-console.md)
-##### [How to Publish a Package by Using the Management Console ](appv-publish-a-packages-with-the-management-console.md)
-##### [How to Delete a Package in the Management Console ](appv-delete-a-package-with-the-management-console.md)
-##### [How to Add or Remove an Administrator by Using the Management Console](appv-add-or-remove-an-administrator-with-the-management-console.md)
-##### [How to Register and Unregister a Publishing Server by Using the Management Console](appv-register-and-unregister-a-publishing-server-with-the-management-console.md)
-##### [How to Create a Custom Configuration File by Using the App-V Management Console](appv-create-a-custom-configuration-file-with-the-management-console.md)
-##### [How to Transfer Access and Configurations to Another Version of a Package by Using the Management Console](appv-transfer-access-and-configurations-to-another-version-of-a-package-with-the-management-console.md)
-##### [How to Customize Virtual Applications Extensions for a Specific AD Group by Using the Management Console](appv-customize-virtual-application-extensions-with-the-management-console.md)
-##### [How to View and Configure Applications and Default Virtual Application Extensions by Using the Management Console ](appv-view-and-configure-applications-and-default-virtual-application-extensions-with-the-management-console.md)
-#### [Managing Connection Groups](appv-managing-connection-groups.md)
-##### [About the Connection Group Virtual Environment](appv-connection-group-virtual-environment.md)
-##### [About the Connection Group File](appv-connection-group-file.md)
-##### [How to Create a Connection Group](appv-create-a-connection-group.md)
-##### [How to Create a Connection Group with User-Published and Globally Published Packages](appv-create-a-connection-group-with-user-published-and-globally-published-packages.md)
-##### [How to Delete a Connection Group](appv-delete-a-connection-group.md)
-##### [How to Publish a Connection Group](appv-publish-a-connection-group.md)
-##### [How to Make a Connection Group Ignore the Package Version](appv-configure-connection-groups-to-ignore-the-package-version.md)
-##### [How to Allow Only Administrators to Enable Connection Groups](appv-allow-administrators-to-enable-connection-groups.md)
-#### [Deploying App-V Packages by Using Electronic Software Distribution (ESD)](appv-deploying-packages-with-electronic-software-distribution-solutions.md)
-##### [How to deploy App-V Packages Using Electronic Software Distribution](appv-deploy-appv-packages-with-electronic-software-distribution-solutions.md)
-##### [How to Enable Only Administrators to Publish Packages by Using an ESD](appv-enable-administrators-to-publish-packages-with-electronic-software-distribution-solutions.md)
-#### [Using the App-V Client Management Console](appv-using-the-client-management-console.md)
-##### [Automatically clean-up unpublished packages on the App-V client](appv-auto-clean-unpublished-packages.md)
-#### [Migrating to App-V from a Previous Version](appv-migrating-to-appv-from-a-previous-version.md)
-##### [How to Convert a Package Created in a Previous Version of App-V](appv-convert-a-package-created-in-a-previous-version-of-appv.md)
-#### [Maintaining App-V](appv-maintaining-appv.md)
-##### [How to Move the App-V Server to Another Computer](appv-move-the-appv-server-to-another-computer.md)
-#### [Administering App-V by Using Windows PowerShell](appv-administering-appv-with-powershell.md)
-##### [How to Load the Windows PowerShell Cmdlets for App-V and Get Cmdlet Help ](appv-load-the-powershell-cmdlets-and-get-cmdlet-help.md)
-##### [How to Manage App-V Packages Running on a Stand-Alone Computer by Using Windows PowerShell](appv-manage-appv-packages-running-on-a-stand-alone-computer-with-powershell.md)
-##### [How to Manage Connection Groups on a Stand-alone Computer by Using Windows PowerShell](appv-manage-connection-groups-on-a-stand-alone-computer-with-powershell.md)
-##### [How to Modify Client Configuration by Using Windows PowerShell](appv-modify-client-configuration-with-powershell.md)
-##### [How to Configure the Client to Receive Package and Connection Groups Updates From the Publishing Server](appv-configure-the-client-to-receive-updates-from-the-publishing-server.md)
-##### [How to Apply the User Configuration File by Using Windows PowerShell](appv-apply-the-user-configuration-file-with-powershell.md)
-##### [How to Apply the Deployment Configuration File by Using Windows PowerShell](appv-apply-the-deployment-configuration-file-with-powershell.md)
-##### [How to Sequence a Package by Using Windows PowerShell ](appv-sequence-a-package-with-powershell.md)
-##### [How to Create a Package Accelerator by Using Windows PowerShell](appv-create-a-package-accelerator-with-powershell.md)
-##### [How to Enable Reporting on the App-V Client by Using Windows PowerShell](appv-enable-reporting-on-the-appv-client-with-powershell.md)
-##### [How to Install the App-V Databases and Convert the Associated Security Identifiers by Using Windows PowerShell](appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md)
-### [Troubleshooting App-V](appv-troubleshooting.md)
-### [Technical Reference for App-V](appv-technical-reference.md)
-#### [Available Mobile Device Management (MDM) settings for App-V](appv-available-mdm-settings.md)
-#### [Performance Guidance for Application Virtualization](appv-performance-guidance.md)
-#### [Application Publishing and Client Interaction](appv-application-publishing-and-client-interaction.md)
-#### [Viewing App-V Server Publishing Metadata](appv-viewing-appv-server-publishing-metadata.md)
-#### [Running a Locally Installed Application Inside a Virtual Environment with Virtualized Applications](appv-running-locally-installed-applications-inside-a-virtual-environment.md)
-## [User Experience Virtualization (UE-V) for Windows](uev-for-windows.md)
-### [Get Started with UE-V](uev-getting-started.md)
-#### [What's New in UE-V for Windows 10, version 1607](uev-whats-new-in-uev-for-windows.md)
-#### [User Experience Virtualization Release Notes](uev-release-notes-1607.md)
-#### [Upgrade to UE-V for Windows 10](uev-upgrade-uev-from-previous-releases.md)
-### [Prepare a UE-V Deployment](uev-prepare-for-deployment.md)
-#### [Deploy Required UE-V Features](uev-deploy-required-features.md)
-#### [Deploy UE-V for use with Custom Applications](uev-deploy-uev-for-custom-applications.md)
-### [Administering UE-V](uev-administering-uev.md)
-#### [Manage Configurations for UE-V](uev-manage-configurations.md)
-##### [Configuring UE-V with Group Policy Objects](uev-configuring-uev-with-group-policy-objects.md)
-##### [Configuring UE-V with System Center Configuration Manager](uev-configuring-uev-with-system-center-configuration-manager.md)
-##### [Administering UE-V with Windows PowerShell and WMI](uev-administering-uev-with-windows-powershell-and-wmi.md)
-###### [Managing the UE-V Service and Packages with Windows PowerShell and WMI](uev-managing-uev-agent-and-packages-with-windows-powershell-and-wmi.md)
-###### [Managing UE-V Settings Location Templates Using Windows PowerShell and WMI](uev-managing-settings-location-templates-using-windows-powershell-and-wmi.md)
-#### [Working with Custom UE-V Templates and the UE-V Template Generator](uev-working-with-custom-templates-and-the-uev-generator.md)
-#### [Manage Administrative Backup and Restore in UE-V](uev-manage-administrative-backup-and-restore.md)
-#### [Changing the Frequency of UE-V Scheduled Tasks](uev-changing-the-frequency-of-scheduled-tasks.md)
-#### [Migrating UE-V Settings Packages](uev-migrating-settings-packages.md)
-#### [Using UE-V with Application Virtualization Applications](uev-using-uev-with-application-virtualization-applications.md)
-### [Troubleshooting UE-V](uev-troubleshooting.md)
-### [Technical Reference for UE-V](uev-technical-reference.md)
-#### [Sync Methods for UE-V](uev-sync-methods.md)
-#### [Sync Trigger Events for UE-V](uev-sync-trigger-events.md)
-#### [Synchronizing Microsoft Office with UE-V](uev-synchronizing-microsoft-office-with-uev.md)
-#### [Application Template Schema Reference for UE-V](uev-application-template-schema-reference.md)
-#### [Security Considerations for UE-V](uev-security-considerations.md)
-## [Change history for Manage Windows 10](change-history-for-manage-and-update-windows-10.md)
diff --git a/windows/manage/application-development-for-windows-as-a-service.zip b/windows/manage/application-development-for-windows-as-a-service.zip
deleted file mode 100644
index 7ae85a8f22..0000000000
Binary files a/windows/manage/application-development-for-windows-as-a-service.zip and /dev/null differ
diff --git a/windows/manage/change-history-for-manage-and-update-windows-10.md b/windows/manage/change-history-for-manage-and-update-windows-10.md
deleted file mode 100644
index 62a652728f..0000000000
--- a/windows/manage/change-history-for-manage-and-update-windows-10.md
+++ /dev/null
@@ -1,205 +0,0 @@
----
-title: Change history for Manage Windows 10 (Windows 10)
-description: This topic lists new and updated topics in the Manage Windows 10 documentation for Windows 10 and Windows 10 Mobile.
-ms.assetid: 29144AFA-1DA9-4532-B07D-1EBE34B7E1E0
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.sitesec: library
-author: jdeckerMS
----
-
-# Change history for Manage Windows 10
-
-This topic lists new and updated topics in the [Manage Windows 10](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md).
-
->If you're looking for **update history** for Windows 10, see [Windows 10 and Windows Server 2016 update history](https://support.microsoft.com/help/12387/windows-10-update-history).
-
-## RELEASE: Windows 10, version 1703
-
-The topics in this library have been updated for Windows 10, version 1703 (also known as the Creators Update). Some topics have been moved to [Update Windows 10](../update/index.md) or to [Configure Windows 10](../configure/index.md). The following new topics have been added:
-
-- [Release Notes for App-V for Windows 10, version 1703](appv-release-notes-for-appv-for-windows-1703.md)
-- [Automatically provision your sequencing environment using Microsoft Application Virtualization Sequencer (App-V Sequencer)](appv-auto-provision-a-vm.md)
-- [Automatically sequence multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)](appv-auto-batch-sequencing.md)
-- [Automatically update multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)](appv-auto-batch-updating.md)
-- [Automatically cleanup unpublished packages on the App-V client](appv-auto-clean-unpublished-packages.md)
-- [Available Mobile Device Management (MDM) settings for App-V](appv-available-mdm-settings.md)
-
-
-## March 2017
-| New or changed topic | Description |
-| --- | --- |
-|[Test scenario 6 - Review a reminder suggested by Cortana based on what you’ve promised in email](cortana-at-work-scenario-6.md) |New |
-
-
-## February 2017
-| New or changed topic | Description |
-| --- | --- |
-| [Windows Libraries](windows-libraries.md) | New |
-| [Monitor Windows Updates with Update Compliance](update-compliance-monitor.md) | New |
-| [Get started with Update Compliance](update-compliance-get-started.md) | New |
-| [Use Update Compliance to monitor Windows Updates](update-compliance-using.md) | New |
-|[Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) | Added Group Policy setting that blocks user access to Windows Update. |
-|[Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) |Added Express updates. |
-| [Distribute offline apps](distribute-offline-apps.md) | General updates to topic. Added links to supporting content for System Center Configuration Manager and Microsoft Intune. |
-
-
-## January 2017
-
-| New or changed topic | Description |
-| --- | --- |
-| [Cortana at work topics](../configure/cortana-at-work-overview.md)]|New |
-| [Start layout XML for desktop editions of Windows 10](start-layout-xml-desktop.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [Start layout XML for mobile editions of Windows 10](start-layout-xml-mobile.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [Quick guide to Windows as a service](waas-quick-start.md) | Added video that explains how Windows as a service works. |
-| [Manage device restarts after updates](waas-restart.md) | Added Registry keys for controlling restarts. |
-
-## December 2016
-
-| New or changed topic | Description |
-| --- | --- |
-| [Quick guide to Windows as a service](waas-quick-start.md) | New |
-| [Manage Windows 10 in your organization - transitioning to modern management](manage-windows-10-in-your-organization-modern-management.md) | Added video demonstration of the latest in modern management for Windows 10 |
-| [Windows Store for Business overview](windows-store-for-business-overview.md) | Updated list of supported markets. |
-
-## November 2016
-
-| New or changed topic | Description |
-| --- | --- |
-| [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) | Added guidance for switching devices between servicing branches |
-| [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md) | Added Windows 10 IoT Mobile |
-
-## October 2016
-
-| New or changed topic | Description |
-| --- | --- |
-| [Manage device restarts after updates](waas-restart.md) | New |
-| [Manage Windows 10 in your organization - transitioning to modern management](manage-windows-10-in-your-organization-modern-management.md) | New |
-| [Cortana integration in your business or enterprise](../configure/cortana-at-work-overview.md) |Added an important note about Cortana and Office 365 integration. |
-| [Customize Windows 10 Start and taskbar with Group Policy](customize-windows-10-start-screens-by-using-group-policy.md) | Fixed the explanation for Start behavior when the .xml file containing the layout is not available when the user signs in. |
-| [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md) | Added link to the Windows Restricted Traffic Limited Functionality Baseline. Added Teredo Group Policy. |
-| [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md) | Added Current Branch for Business (CBB) support for Windows 10 IoT Mobile. |
-
-
-## September 2016
-
-| New or changed topic | Description |
-| --- | --- |
-| [Update Windows 10 in the enterprise](waas-update-windows-10.md), replaces **Windows 10 servicing options** | New |
-| [Lockdown features from Windows Embedded 8.1 Industry](../configure/lockdown-features-windows-10.md) | Added Group Policy setting to replace Gesture Filter |
-| [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md) | Added content for Windows Server 2016 |
-| [Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md) | Updated the script for setting a custom shell using Shell Launcher. |
-
-## August 2016
-
-| New or changed topic | Description |
-| --- | --- |
-| [Create mandatory user profiles](mandatory-user-profile.md) | New |
-| [Update Windows 10 in the enterprise](waas-update-windows-10.md) | New section |
-| [Configure Windows 10 taskbar](configure-windows-10-taskbar.md) | Updated sample XML for combined Start and taskbar layout; added note to explain the difference between applying taskbar configuration by Group Policy and by provisioning package |
-| [Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md) | Updated instructions for exiting assigned access mode. |
-| Application development for Windows as a service | Topic moved to MSDN: [Application development for Windows as a service](https://msdn.microsoft.com/windows/uwp/get-started/application-development-for-windows-as-a-service)
-| Windows 10 servicing options | New content replaced this topic; see [Overview of Windows as a service](waas-overview.md) |
-
-## RELEASE: Windows 10, version 1607
-
-The topics in this library have been updated for Windows 10, version 1607 (also known as the Anniversary Update). The following new topics have been added:
-
-- [Connect to remote Azure Active Directory-joined PC](connect-to-remote-aadj-pc.md)
-- [Configure Windows 10 taskbar](configure-windows-10-taskbar.md)
-- [Set up a shared or guest PC with Windows 10](../configure/set-up-shared-or-guest-pc.md)
-- [Guidelines for choosing an app for assigned access (kiosk mode)](guidelines-for-assigned-access-app.md)
-- [Application Virtualization (App-V) for Windows 10](appv-for-windows.md)
-- [User Experience Virtualization (UE-V) for Windows 10](uev-for-windows.md)
-
-## July 2016
-
-| New or changed topic | Description |
-| ---|---|
-| [Manage Windows 10 and Windows Store tips, tricks, and suggestions](manage-tips-and-suggestions.md) | New |
-| [Windows 10 servicing options](introduction-to-windows-10-servicing.md) | Added detailed content on servicing branches, moved from [Windows 10 servicing overview](../plan/windows-10-servicing-options.md). |
-
-
-## June 2016
-
-| New or changed topic | Description |
-| ---|---|
-| [Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md) | Updated the sample script for Shell Launcher. |
-
-## May 2016
-
-| New or changed topic | Description |
-| ---|---|
-| [Group Policies that apply only to Windows 10 Enterprise and Education Editions](group-policies-for-enterprise-and-education-editions.md) | New |
-| [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md) | Added section on how to turn off Live Tiles |
-| [Configure Windows telemetry in your organization](configure-windows-telemetry-in-your-organization.md) | New telemetry content |
-| [Manage Wi-Fi Sense in your company](manage-wifi-sense-in-enterprise.md) |Removed info about sharing wi-fi network access with contacts, since it's been deprecated. |
-| [Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md) | Corrected script for setting a custom shell using Shell Launcher |
-| [Windows 10 servicing options for updates and upgrades](introduction-to-windows-10-servicing.md) | Removed Windows 10 Mobile from **Applies to** |
-
-
-
-## April 2016
-
-| New or changed topic | Description |
-| ---|---|
-| [Administrative tools in Windows 10](administrative-tools-in-windows-10.md) | Added screenshots of Control Panel and the administrative tools folder. |
-| [Configure telemetry and other settings in your organization](disconnect-your-organization-from-microsoft.md) | Added the font streaming section. |
-| [Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md) | Made corrections to script and instructions for Shell Launcher. |
-
-## March 2016
-
-| New or changed topic | Description |
-| ---|---|
-| [Application development for Windows as a service](application-development-for-windows-as-a-service.md) | New |
-| [Join Windows 10 Mobile to Azure Active Directory](join-windows-10-mobile-to-azure-active-directory.md) | New |
-| [Cortana integration in your business or enterprise](../configure/cortana-at-work-overview.md) | Updated to include the new Preview feature, Cortana and Microsoft Dynamics CRM integration. |
-
-## February 2016
-
-| New or changed topic | Description |
-| ---|---|
-| [Configure telemetry and other settings in your organization](disconnect-your-organization-from-microsoft.md) | Added call history and email to the Settings > Privacy section. Added the Turn off Windows Mail application Group Policy to the Mail synchronization section. |
-| [Customize and export Start layout](customize-and-export-start-layout.md) | Added a note to clarify that partial Start layout is only supported in Windows 10, version 1511 and later |
-| [Customize Windows 10 Start with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md) | Added instructions for replacing markup characters with escape characters in Start layout XML |
-| [Introduction to configuration service providers (CSPs) for IT pros](how-it-pros-can-use-configuration-service-providers.md) | New |
-| [Windows 10 Mobile and MDM](windows-10-mobile-and-mdm.md) | New |
-| [Windows 10 servicing options for updates and upgrades](introduction-to-windows-10-servicing.md) | Added information on servicing options for Windows 10 Mobile, Windows 10 Mobile Enterprise, and Windows 10 IoT Core (IoT Core). |
-
-
-## December 2015
-
-| New or changed topic | Description |
-| ---|---|
-| [Cortana integration in your business or enterprise](../configure/cortana-at-work-overview.md) | New |
-| [Manage Wi-Fi Sense in your company](manage-wifi-sense-in-enterprise.md) | New |
-| [Customize Windows 10 Start with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md) | New |
-
-## November 2015
-
-| New or changed topic | Description |
-|--------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
-| [Administrative Tools in Windows 10](administrative-tools-in-windows-10.md) | New |
-| [Configure Windows 10 Mobile using Lockdown XML](lockdown-xml.md) | New |
-| [Customize and export Start layout](customize-and-export-start-layout.md) | New |
-| [Customize Windows 10 Start with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md) | New |
-| [Lock down Windows 10 to specific apps](lock-down-windows-10-to-specific-apps.md) | New |
-| [Product IDs in Windows 10 Mobile](product-ids-in-windows-10-mobile.md) | New |
-| [Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md) | New |
-| [Settings and quick actions that can be locked down in Windows 10 Mobile](settings-that-can-be-locked-down.md) | New |
-| [Set up a kiosk on Windows 10 Mobile or Windows 10 Mobile Enterprise](set-up-a-kiosk-for-windows-10-for-mobile-edition.md) | New |
-| [Windows Hello biometrics in the enterprise](../keep-secure/windows-hello-in-enterprise.md) | New |
-| [Windows Store for Business](windows-store-for-business.md) (multiple topics) | New |
-| [Changes to Group Policy settings for Windows 10 Start](changes-to-start-policies-in-windows-10.md) | Updated |
-| [Configure telemetry and other settings in your organization](disconnect-your-organization-from-microsoft.md) | Updated |
-| [New policies for Windows 10](new-policies-for-windows-10.md) | Updated |
-
-## Related topics
-
-[Change history for What's new in Windows 10](../whats-new/change-history-for-what-s-new-in-windows-10.md)
-
-[Change history for Plan for Windows 10 deployment](../plan/change-history-for-plan-for-windows-10-deployment.md)
-
-[Change history for Deploy Windows 10](../deploy/change-history-for-deploy-windows-10.md)
-
-[Change history for Keep Windows 10 secure](../keep-secure/change-history-for-keep-windows-10-secure.md)
diff --git a/windows/manage/images/aadj1.jpg b/windows/manage/images/aadj1.jpg
deleted file mode 100644
index 2348fc4c84..0000000000
Binary files a/windows/manage/images/aadj1.jpg and /dev/null differ
diff --git a/windows/manage/images/aadj2.jpg b/windows/manage/images/aadj2.jpg
deleted file mode 100644
index 39486bfc66..0000000000
Binary files a/windows/manage/images/aadj2.jpg and /dev/null differ
diff --git a/windows/manage/images/aadj3.jpg b/windows/manage/images/aadj3.jpg
deleted file mode 100644
index 80e1f5762f..0000000000
Binary files a/windows/manage/images/aadj3.jpg and /dev/null differ
diff --git a/windows/manage/images/aadj4.jpg b/windows/manage/images/aadj4.jpg
deleted file mode 100644
index 0db2910012..0000000000
Binary files a/windows/manage/images/aadj4.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjbrowser.jpg b/windows/manage/images/aadjbrowser.jpg
deleted file mode 100644
index c8d909688e..0000000000
Binary files a/windows/manage/images/aadjbrowser.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjcal.jpg b/windows/manage/images/aadjcal.jpg
deleted file mode 100644
index 1858886f5f..0000000000
Binary files a/windows/manage/images/aadjcal.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjcalmail.jpg b/windows/manage/images/aadjcalmail.jpg
deleted file mode 100644
index 5a5661259a..0000000000
Binary files a/windows/manage/images/aadjcalmail.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjmail1.jpg b/windows/manage/images/aadjmail1.jpg
deleted file mode 100644
index 89b1fcc3b7..0000000000
Binary files a/windows/manage/images/aadjmail1.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjmail2.jpg b/windows/manage/images/aadjmail2.jpg
deleted file mode 100644
index 0608010c6a..0000000000
Binary files a/windows/manage/images/aadjmail2.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjmail3.jpg b/windows/manage/images/aadjmail3.jpg
deleted file mode 100644
index d7154a7e0e..0000000000
Binary files a/windows/manage/images/aadjmail3.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjonedrive.jpg b/windows/manage/images/aadjonedrive.jpg
deleted file mode 100644
index 6fb1196d5f..0000000000
Binary files a/windows/manage/images/aadjonedrive.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjonenote.jpg b/windows/manage/images/aadjonenote.jpg
deleted file mode 100644
index 4ccd207f9f..0000000000
Binary files a/windows/manage/images/aadjonenote.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjonenote2.jpg b/windows/manage/images/aadjonenote2.jpg
deleted file mode 100644
index 1b6941e638..0000000000
Binary files a/windows/manage/images/aadjonenote2.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjonenote3.jpg b/windows/manage/images/aadjonenote3.jpg
deleted file mode 100644
index 3ac6911046..0000000000
Binary files a/windows/manage/images/aadjonenote3.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjpin.jpg b/windows/manage/images/aadjpin.jpg
deleted file mode 100644
index dac6cfec30..0000000000
Binary files a/windows/manage/images/aadjpin.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjppt.jpg b/windows/manage/images/aadjppt.jpg
deleted file mode 100644
index 268d5fe662..0000000000
Binary files a/windows/manage/images/aadjppt.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjverify.jpg b/windows/manage/images/aadjverify.jpg
deleted file mode 100644
index 7b30210f39..0000000000
Binary files a/windows/manage/images/aadjverify.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjword.jpg b/windows/manage/images/aadjword.jpg
deleted file mode 100644
index db2a58406e..0000000000
Binary files a/windows/manage/images/aadjword.jpg and /dev/null differ
diff --git a/windows/manage/images/aadjwsfb.jpg b/windows/manage/images/aadjwsfb.jpg
deleted file mode 100644
index 428f1a26d4..0000000000
Binary files a/windows/manage/images/aadjwsfb.jpg and /dev/null differ
diff --git a/windows/manage/images/button.png b/windows/manage/images/button.png
deleted file mode 100644
index 1ba7590f76..0000000000
Binary files a/windows/manage/images/button.png and /dev/null differ
diff --git a/windows/manage/index.md b/windows/manage/index.md
deleted file mode 100644
index 3446fc1a1b..0000000000
--- a/windows/manage/index.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-title: Manage Windows 10 (Windows 10)
-description: Learn about managing and updating Windows 10.
-ms.assetid: E5716355-02AB-4B75-A962-14B1A7F7BDA0
-keywords: Windows 10, MDM, WSUS, Windows update
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.sitesec: library
-ms.pagetype: security
-localizationpriority: high
-author: jdeckerMS
----
-
-# Manage Windows 10
-
-Learn about managing Windows 10.
-
->[!NOTE]
->Information for Windows 10 Enterprise also applies to Windows 10 IoT Enterprise, and information for Windows 10 Mobile Enterprise also applies to Windows 10 IoT Mobile. For information about managing devices running Windows 10 IoT Core, see [Windows 10 IoT Core Commercialization](https://www.windowsforiotdevices.com/).
-
-## In this section
-
-
-
-| Topic | Description |
-| --- | --- |
-| [Manage Windows 10 in your organization - transitioning to modern management](manage-windows-10-in-your-organization-modern-management.md) | Strategies for deploying and managing Windows 10, including deploying Windows 10 in a mixed environment. |
-| [Windows 10 Mobile and MDM](windows-10-mobile-and-mdm.md) | How to plan for and deploy Windows 10 Mobile devices. |
-| [Administrative Tools in Windows 10](administrative-tools-in-windows-10.md) | Administrative Tools is a folder in Control Panel that contains tools for system administrators and advanced users. |
-| [Windows Store for Business](windows-store-for-business.md) | Welcome to the Windows Store for Business! You can use the Store for Business, to find, acquire, distribute, and manage apps for your organization. |
-| [Create mandatory user profiles](mandatory-user-profile.md) | Mandatory user profiles are useful when standardization is important, such as on a kiosk device or in educational settings. |
-| [Connect to remote Azure Active Directory-joined PC](connect-to-remote-aadj-pc.md) | How to use Remote Desktop Connection to connect to an Azure AD-joined PC. |
-| [Join Windows 10 Mobile to Azure Active Directory](join-windows-10-mobile-to-azure-active-directory.md) | Devices running Windows 10 Mobile can join Azure Active Directory (Azure AD) when the device is configured during the out-of-box experience (OOBE). |
-| [New policies for Windows 10](new-policies-for-windows-10.md) | New Group Policy settings added in Windows 10. |
-| [Group Policies that apply only to Windows 10 Enterprise and Windows 10 Education](group-policies-for-enterprise-and-education-editions.md) | Group Policy settings that apply only to Windows 10 Enterprise and Windows 10 Education. |
-| [Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md) | There are two methods for resetting a Windows 10 Mobile device: factory reset and "wipe and persist" reset. |
-| [Application Virtualization (App-V) for Windows](appv-for-windows.md) | When you deploy Application Virtualization (App-V) in your orgnazation, you can deliver Win32 applications to users as virtual applications. Virtual applications are installed on centrally managed servers and delivered to users as a service – in real time and on as as-needed basis. Users launch virtual applications from familiar access points, including the Windows Store, and interact with them as if they were installed locally. |
-| [User Experience Virtualization for Windows (UE-V)](uev-for-windows.md) | When you deploy User Experience Virtualization (UE-V) in your organization, you can synchronize users' personalized application and operating system settings across all the devices they work from. UE-V allows you to capture user-customized application and Windows settings and store them on a centrally managed network file share. When users log on, their personalized settings are applied to their work session, regardless of which device or virtual desktop infrastructure (VDI) sessions they log on to. |
-| [Change history for Manage Windows 10](change-history-for-manage-and-update-windows-10.md) | This topic lists new and updated topics in the Manage and update Windows 10 documentation for [Windows 10 and Windows 10 Mobile](../index.md). |
-
-
-
-
-
-
-## Related topics
-[Windows 10 and Windows 10 Mobile](../index.md)
-
-
-[Learn how Microsoft does IT at the IT Showcase](https://www.microsoft.com/itshowcase)
diff --git a/windows/threat-protection/TOC.md b/windows/threat-protection/TOC.md
new file mode 100644
index 0000000000..a166cca5f1
--- /dev/null
+++ b/windows/threat-protection/TOC.md
@@ -0,0 +1,159 @@
+# [Threat protection](index.md)
+
+## [Windows Defender Advanced Threat Protection](windows-defender-atp\windows-defender-advanced-threat-protection.md)
+### [Minimum requirements](windows-defender-atp\minimum-requirements-windows-defender-advanced-threat-protection.md)
+### [Preview features](windows-defender-atp\preview-windows-defender-advanced-threat-protection.md)
+### [Data storage and privacy](windows-defender-atp\data-storage-privacy-windows-defender-advanced-threat-protection.md)
+### [Assign user access to the portal](windows-defender-atp\assign-portal-access-windows-defender-advanced-threat-protection.md)
+### [Onboard endpoints and set up access](windows-defender-atp\onboard-configure-windows-defender-advanced-threat-protection.md)
+#### [Configure endpoints](windows-defender-atp\configure-endpoints-windows-defender-advanced-threat-protection.md)
+##### [Configure endpoints using Group Policy](windows-defender-atp\configure-endpoints-gp-windows-defender-advanced-threat-protection.md)
+##### [Configure endpoints using System Security Configuration Manager](windows-defender-atp\configure-endpoints-sccm-windows-defender-advanced-threat-protection.md)
+##### [Configure endpoints using Mobile Device Management tools](windows-defender-atp\configure-endpoints-mdm-windows-defender-advanced-threat-protection.md)
+###### [Configure endpoints using Microsoft Intune](windows-defender-atp\configure-endpoints-mdm-windows-defender-advanced-threat-protection.md#configure-endpoints-using-microsoft-intune)
+##### [Configure endpoints using a local script](windows-defender-atp\configure-endpoints-script-windows-defender-advanced-threat-protection.md)
+#### [Configure proxy and Internet settings](windows-defender-atp\configure-proxy-internet-windows-defender-advanced-threat-protection.md)
+#### [Troubleshoot onboarding issues](windows-defender-atp\troubleshoot-onboarding-windows-defender-advanced-threat-protection.md)
+### [Portal overview](windows-defender-atp\portal-overview-windows-defender-advanced-threat-protection.md)
+### [Use the Windows Defender ATP portal](windows-defender-atp\use-windows-defender-advanced-threat-protection.md)
+#### [View the Dashboard](windows-defender-atp\dashboard-windows-defender-advanced-threat-protection.md)
+#### [View and organize the Alerts queue](windows-defender-atp\alerts-queue-windows-defender-advanced-threat-protection.md)
+#### [Investigate alerts](windows-defender-atp\investigate-alerts-windows-defender-advanced-threat-protection.md)
+##### [Alert process tree](windows-defender-atp\investigate-alerts-windows-defender-advanced-threat-protection.md#alert-process-tree)
+##### [Incident graph](windows-defender-atp\investigate-alerts-windows-defender-advanced-threat-protection.md#incident-graph)
+##### [Alert timeline](windows-defender-atp\investigate-alerts-windows-defender-advanced-threat-protection.md#alert-timeline)
+#### [Investigate files](windows-defender-atp\investigate-files-windows-defender-advanced-threat-protection.md)
+#### [Investigate an IP address](windows-defender-atp\investigate-ip-windows-defender-advanced-threat-protection.md)
+#### [Investigate a domain](windows-defender-atp\investigate-domain-windows-defender-advanced-threat-protection.md)
+#### [View and organize the Machines view](windows-defender-atp\machines-view-overview-windows-defender-advanced-threat-protection.md)
+#### [Investigate machines](windows-defender-atp\investigate-machines-windows-defender-advanced-threat-protection.md)
+##### [Search for specific alerts](windows-defender-atp\investigate-machines-windows-defender-advanced-threat-protection.md#search-for-specific-alerts)
+##### [Filter events from a specific date](windows-defender-atp\investigate-machines-windows-defender-advanced-threat-protection.md#filter-events-from-a-specific-date)
+##### [Export machine timeline events](windows-defender-atp\investigate-machines-windows-defender-advanced-threat-protection.md#export-machine-timeline-events)
+##### [Navigate between pages](windows-defender-atp\investigate-machines-windows-defender-advanced-threat-protection.md#navigate-between-pages)
+#### [Investigate a user account](windows-defender-atp\investigate-user-windows-defender-advanced-threat-protection.md)
+#### [Manage alerts](windows-defender-atp\manage-alerts-windows-defender-advanced-threat-protection.md)
+#### [Take response actions](windows-defender-atp\response-actions-windows-defender-advanced-threat-protection.md)
+##### [Take response actions on a machine](windows-defender-atp\respond-machine-alerts-windows-defender-advanced-threat-protection.md)
+###### [Isolate machines from the network](windows-defender-atp\respond-machine-alerts-windows-defender-advanced-threat-protection.md#isolate-machines-from-the-network)
+###### [Undo machine isolation](windows-defender-atp\respond-machine-alerts-windows-defender-advanced-threat-protection.md#undo-machine-isolation)
+###### [Collect investigation package](windows-defender-atp\respond-machine-alerts-windows-defender-advanced-threat-protection.md#collect-investigation-package)
+###### [Check activity details in Action center](windows-defender-atp\respond-machine-alerts-windows-defender-advanced-threat-protection.md#check-activity-details-in-action-center)
+##### [Take response actions on a file](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md)
+###### [Stop and quarantine files in your network](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#stop-and-quarantine-files-in-your-network)
+###### [Remove file from quarantine](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#remove-file-from-quarantine)
+###### [Block files in your network](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#block-files-in-your-network)
+###### [Check activity details in Action center](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#check-activity-details-in-action-center)
+###### [Deep analysis](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#deep-analysis)
+####### [Submit files for analysis](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#submit-files-for-analysis)
+####### [View deep analysis reports](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#view-deep-analysis-reports)
+####### [Troubleshoot deep analysis](windows-defender-atp\respond-file-alerts-windows-defender-advanced-threat-protection.md#troubleshoot-deep-analysis)
+### [Pull alerts to your SIEM tools](windows-defender-atp\configure-siem-windows-defender-advanced-threat-protection.md)
+#### [Enable SIEM integration](windows-defender-atp\enable-siem-integration-windows-defender-advanced-threat-protection.md)
+#### [Configure Splunk to pull alerts](windows-defender-atp\configure-splunk-windows-defender-advanced-threat-protection.md)
+#### [Configure HP ArcSight to pull alerts](windows-defender-atp\configure-arcsight-windows-defender-advanced-threat-protection.md)
+#### [Windows Defender ATP alert API fields](windows-defender-atp\api-portal-mapping-windows-defender-advanced-threat-protection.md)
+#### [Pull alerts using REST API](windows-defender-atp\pull-alerts-using-rest-api-windows-defender-advanced-threat-protection.md)
+#### [Troubleshoot SIEM tool integration issues](windows-defender-atp\troubleshoot-siem-windows-defender-advanced-threat-protection.md)
+### [Use the threat intelligence API to create custom alerts](windows-defender-atp\use-custom-ti-windows-defender-advanced-threat-protection.md)
+#### [Understand threat intelligence concepts](windows-defender-atp\threat-indicator-concepts-windows-defender-advanced-threat-protection.md)
+#### [Enable the custom threat intelligence application](windows-defender-atp\enable-custom-ti-windows-defender-advanced-threat-protection.md)
+#### [Create custom threat intelligence alerts](windows-defender-atp\custom-ti-api-windows-defender-advanced-threat-protection.md)
+#### [PowerShell code examples](windows-defender-atp\powershell-example-code-windows-defender-advanced-threat-protection.md)
+#### [Python code examples](windows-defender-atp\python-example-code-windows-defender-advanced-threat-protection.md)
+#### [Experiment with custom threat intelligence alerts](windows-defender-atp\experiment-custom-ti-windows-defender-advanced-threat-protection.md)
+#### [Troubleshoot custom threat intelligence issues](windows-defender-atp\troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md)
+### [Check sensor state](windows-defender-atp\check-sensor-status-windows-defender-advanced-threat-protection.md)
+#### [Fix unhealthy sensors](windows-defender-atp\fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md)
+##### [Inactive machines](windows-defender-atp\fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md#inactive-machines)
+##### [Misconfigured machines](windows-defender-atp\fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md#misconfigured-machines)
+### [Configure Windows Defender ATP preferences settings](windows-defender-atp\preferences-setup-windows-defender-advanced-threat-protection.md)
+#### [Update general settings](windows-defender-atp\general-settings-windows-defender-advanced-threat-protection.md)
+#### [Turn on advanced features](windows-defender-atp\advanced-features-windows-defender-advanced-threat-protection.md)
+#### [Turn on preview experience](windows-defender-atp\preview-settings-windows-defender-advanced-threat-protection.md)
+#### [Configure email notifications](windows-defender-atp\configure-email-notifications-windows-defender-advanced-threat-protection.md)
+### [Windows Defender ATP settings](windows-defender-atp\settings-windows-defender-advanced-threat-protection.md)
+### [Windows Defender ATP service status](windows-defender-atp\service-status-windows-defender-advanced-threat-protection.md)
+### [Troubleshoot Windows Defender ATP](windows-defender-atp\troubleshoot-windows-defender-advanced-threat-protection.md)
+### [Review events and errors on endpoints with Event Viewer](windows-defender-atp\event-error-codes-windows-defender-advanced-threat-protection.md)
+### [Windows Defender Antivirus compatibility](windows-defender-atp\defender-compatibility-windows-defender-advanced-threat-protection.md)
+
+## [Windows Defender Antivirus in Windows 10](windows-defender-antivirus\windows-defender-antivirus-in-windows-10.md)
+### [Windows Defender AV in the Windows Defender Security Center app](windows-defender-antivirus\windows-defender-security-center-antivirus.md)
+### [Windows Defender Antivirus on Windows Server](windows-defender-antivirus\windows-defender-antivirus-on-windows-server-2016.md)
+### [Windows Defender Antivirus and Advanced Threat Protection: Better together](windows-defender-antivirus\windows-defender-antivirus-compatibility.md)
+### [Evaluate Windows Defender Antivirus protection](windows-defender-antivirus\evaluate-windows-defender-antivirus.md)
+### [Deploy, manage updates, and report on Windows Defender Antivirus](windows-defender-antivirus\deploy-manage-report-windows-defender-antivirus.md)
+#### [Deploy and enable Windows Defender Antivirus](windows-defender-antivirus\deploy-windows-defender-antivirus.md)
+##### [Deployment guide for VDI environments](windows-defender-antivirus\deployment-vdi-windows-defender-antivirus.md)
+#### [Report on Windows Defender Antivirus protection](windows-defender-antivirus\report-monitor-windows-defender-antivirus.md)
+#### [Manage updates and apply baselines](windows-defender-antivirus\manage-updates-baselines-windows-defender-antivirus.md)
+##### [Manage protection and definition updates](windows-defender-antivirus\manage-protection-updates-windows-defender-antivirus.md)
+##### [Manage when protection updates should be downloaded and applied](windows-defender-antivirus\manage-protection-update-schedule-windows-defender-antivirus.md)
+##### [Manage updates for endpoints that are out of date](windows-defender-antivirus\manage-outdated-endpoints-windows-defender-antivirus.md)
+##### [Manage event-based forced updates](windows-defender-antivirus\manage-event-based-updates-windows-defender-antivirus.md)
+##### [Manage updates for mobile devices and VMs](windows-defender-antivirus\manage-updates-mobile-devices-vms-windows-defender-antivirus.md)
+### [Configure Windows Defender Antivirus features](windows-defender-antivirus\configure-windows-defender-antivirus-features.md)
+#### [Utilize Microsoft cloud-provided protection](windows-defender-antivirus\utilize-microsoft-cloud-protection-windows-defender-antivirus.md)
+##### [Enable cloud-delivered protection](windows-defender-antivirus\enable-cloud-protection-windows-defender-antivirus.md)
+##### [Specify the cloud-delivered protection level](windows-defender-antivirus\specify-cloud-protection-level-windows-defender-antivirus.md)
+##### [Configure and validate network connections](windows-defender-antivirus\configure-network-connections-windows-defender-antivirus.md)
+##### [Enable the Block at First Sight feature](windows-defender-antivirus\configure-block-at-first-sight-windows-defender-antivirus.md)
+##### [Configure the cloud block timeout period](windows-defender-antivirus\configure-cloud-block-timeout-period-windows-defender-antivirus.md)
+#### [Configure behavioral, heuristic, and real-time protection](windows-defender-antivirus\configure-protection-features-windows-defender-antivirus.md)
+##### [Detect and block Potentially Unwanted Applications](windows-defender-antivirus\detect-block-potentially-unwanted-apps-windows-defender-antivirus.md)
+##### [Enable and configure always-on protection and monitoring](windows-defender-antivirus\configure-real-time-protection-windows-defender-antivirus.md)
+#### [Configure end-user interaction with Windows Defender AV](windows-defender-antivirus\configure-end-user-interaction-windows-defender-antivirus.md)
+##### [Configure the notifications that appear on endpoints](windows-defender-antivirus\configure-notifications-windows-defender-antivirus.md)
+##### [Prevent users from seeing or interacting with the user interface](windows-defender-antivirus\prevent-end-user-interaction-windows-defender-antivirus.md)
+##### [Prevent or allow users to locally modify policy settings](windows-defender-antivirus\configure-local-policy-overrides-windows-defender-antivirus.md)
+### [Customize, initiate, and review the results of scans and remediation](windows-defender-antivirus\customize-run-review-remediate-scans-windows-defender-antivirus.md)
+#### [Configure and validate exclusions in Windows Defender AV scans](windows-defender-antivirus\configure-exclusions-windows-defender-antivirus.md)
+##### [Configure and validate exclusions based on file name, extension, and folder location](windows-defender-antivirus\configure-extension-file-exclusions-windows-defender-antivirus.md)
+##### [Configure and validate exclusions for files opened by processes](windows-defender-antivirus\configure-process-opened-file-exclusions-windows-defender-antivirus.md)
+##### [Configure exclusions in Windows Defender AV on Windows Server 2016](windows-defender-antivirus\configure-server-exclusions-windows-defender-antivirus.md)
+#### [Configure scanning options in Windows Defender AV](windows-defender-antivirus\configure-advanced-scan-types-windows-defender-antivirus.md)
+#### [Configure remediation for scans](windows-defender-antivirus\configure-remediation-windows-defender-antivirus.md)
+#### [Configure scheduled scans](windows-defender-antivirus\scheduled-catch-up-scans-windows-defender-antivirus.md)
+#### [Configure and run scans](windows-defender-antivirus\run-scan-windows-defender-antivirus.md)
+#### [Review scan results](windows-defender-antivirus\review-scan-results-windows-defender-antivirus.md)
+#### [Run and review the results of a Windows Defender Offline scan](windows-defender-antivirus\windows-defender-offline.md)
+### [Review event logs and error codes to troubleshoot issues](windows-defender-antivirus\troubleshoot-windows-defender-antivirus.md)
+### [Reference topics for management and configuration tools](windows-defender-antivirus\configuration-management-reference-windows-defender-antivirus.md)
+#### [Use Group Policy settings to configure and manage Windows Defender AV](windows-defender-antivirus\use-group-policy-windows-defender-antivirus.md)
+#### [Use System Center Configuration Manager and Microsoft Intune to configure and manage Windows Defender AV](windows-defender-antivirus\use-intune-config-manager-windows-defender-antivirus.md)
+#### [Use PowerShell cmdlets to configure and manage Windows Defender AV](windows-defender-antivirus\use-powershell-cmdlets-windows-defender-antivirus.md)
+#### [Use Windows Management Instrumentation (WMI) to configure and manage Windows Defender AV](windows-defender-antivirus\use-wmi-windows-defender-antivirus.md)
+#### [Use the mpcmdrun.exe commandline tool to configure and manage Windows Defender AV](windows-defender-antivirus\command-line-arguments-windows-defender-antivirus.md)
+
+## [Windows Defender SmartScreen](windows-defender-smartscreen\windows-defender-smartscreen-overview.md)
+### [Available Windows Defender SmartScreen Group Policy and mobile device management (MDM) settings](windows-defender-smartscreen\windows-defender-smartscreen-available-settings.md)
+### [Set up and use Windows Defender SmartScreen on individual devices](windows-defender-smartscreen\windows-defender-smartscreen-set-individual-device.md)
+
+## [Protect your enterprise data using Windows Information Protection (WIP)](windows-information-protection\protect-enterprise-data-using-wip.md)
+### [Create a Windows Information Protection (WIP) policy](windows-information-protection\overview-create-wip-policy.md)
+#### [Create a Windows Information Protection (WIP) policy using Microsoft Intune](windows-information-protection\create-wip-policy-using-intune.md)
+##### [Deploy your Windows Information Protection (WIP) policy](windows-information-protection\deploy-wip-policy-using-intune.md)
+##### [Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Intune](windows-information-protection\create-vpn-and-wip-policy-using-intune.md)
+#### [Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager](windows-information-protection\create-wip-policy-using-sccm.md)
+#### [Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate](windows-information-protection\create-and-verify-an-efs-dra-certificate.md)
+#### [Determine the Enterprise Context of an app running in Windows Information Protection (WIP)](windows-information-protection\wip-app-enterprise-context.md)
+### [Mandatory tasks and settings required to turn on Windows Information Protection (WIP)](windows-information-protection\mandatory-settings-for-wip.md)
+### [Testing scenarios for Windows Information Protection (WIP)](windows-information-protection\testing-scenarios-for-wip.md)
+### [Limitations while using Windows Information Protection (WIP)](windows-information-protection\limitations-with-wip.md)
+### [How to collect Windows Information Protection (WIP) audit event logs](windows-information-protection\collect-wip-audit-event-logs.md)
+### [General guidance and best practices for Windows Information Protection (WIP)](windows-information-protection\guidance-and-best-practices-wip.md)
+#### [Enlightened apps for use with Windows Information Protection (WIP)](windows-information-protection\enlightened-microsoft-apps-and-wip.md)
+#### [Unenlightened and enlightened app behavior while using Windows Information Protection (WIP)](windows-information-protection\app-behavior-with-wip.md)
+#### [Recommended Enterprise Cloud Resources and Neutral Resources network settings with Windows Information Protection (WIP)](windows-information-protection\recommended-network-definitions-for-wip.md)
+#### [Using Outlook Web Access with Windows Information Protection (WIP)](windows-information-protection\using-owa-with-wip.md)
+
+## [Mitigate threats by using Windows 10 security features](overview-of-threat-mitigations-in-windows-10.md)
+
+## [Override Process Mitigation Options to help enforce app-related security policies](override-mitigation-options-for-app-related-security-policies.md)
+
+## [Use Windows Event Forwarding to help with intrusion detection](use-windows-event-forwarding-to-assist-in-instrusion-detection.md)
+
+## [Block untrusted fonts in an enterprise](block-untrusted-fonts-in-enterprise.md)
+
+## [Change history for Threat Protection](change-history-for-threat-protection.md)
\ No newline at end of file
diff --git a/windows/keep-secure/block-untrusted-fonts-in-enterprise.md b/windows/threat-protection/block-untrusted-fonts-in-enterprise.md
similarity index 100%
rename from windows/keep-secure/block-untrusted-fonts-in-enterprise.md
rename to windows/threat-protection/block-untrusted-fonts-in-enterprise.md
diff --git a/windows/threat-protection/change-history-for-threat-protection.md b/windows/threat-protection/change-history-for-threat-protection.md
new file mode 100644
index 0000000000..5ada088112
--- /dev/null
+++ b/windows/threat-protection/change-history-for-threat-protection.md
@@ -0,0 +1,25 @@
+---
+title: Change history for threat protection (Windows 10)
+description: This topic lists new and updated topics in the Windows 10 threat protection documentation for Windows 10 and Windows 10 Mobile.
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: security
+author: brianlic-msft
+---
+
+# Change history for threat protection
+This topic lists new and updated topics in the [Threat protection](index.md) documentation.
+
+## March 2017
+|New or changed topic |Description |
+|---------------------|------------|
+|[How to collect Windows Information Protection (WIP) audit event logs](windows-information-protection\collect-wip-audit-event-logs.md) |New |
+|[Mandatory tasks and settings required to turn on Windows Information Protection (WIP)](windows-information-protection\mandatory-settings-for-wip.md) |Updated based on Windows 10, version 1703. |
+|[Create a Windows Information Protection (WIP) policy using Microsoft Intune](windows-information-protection\create-wip-policy-using-intune.md) |Updated based on Windows 10, version 1703. |
+|[Deploy your Windows Information Protection (WIP) policy using Microsoft Intune](windows-information-protection\deploy-wip-policy-using-intune.md) |Updated based on Windows 10, version 1703.
+|[Limitations while using Windows Information Protection (WIP)](windows-information-protection\limitations-with-wip.md) |Added additional limitations for Windows 10, version 1703.|
+|[Windows Defender SmartScreen overview](windows-defender-smartscreen\windows-defender-smartscreen-overview.md)|New |
+|[Available Windows Defender SmartScreen Group Policy and mobile device management (MDM) settings](windows-defender-smartscreen\windows-defender-smartscreen-available-settings.md)|New |
+|[Use Windows Defender Security Center to set Windows Defender SmartScreen for individual devices](windows-defender-smartscreen\windows-defender-smartscreen-set-individual-device.md)|New |
+|[Overview of threat mitigations in Windows 10](overview-of-threat-mitigations-in-windows-10.md) | Reorganized from existing content, to provide a better overview of threat mitigations. Explains how mitigations in the Enhanced Mitigation Experience Toolkit (EMET) relate to those in Windows 10. |
diff --git a/windows/keep-secure/images/capi-gpo.png b/windows/threat-protection/images/capi-gpo.png
similarity index 100%
rename from windows/keep-secure/images/capi-gpo.png
rename to windows/threat-protection/images/capi-gpo.png
diff --git a/windows/keep-secure/images/gp-process-mitigation-options-bit-flag-image.png b/windows/threat-protection/images/gp-process-mitigation-options-bit-flag-image.png
similarity index 100%
rename from windows/keep-secure/images/gp-process-mitigation-options-bit-flag-image.png
rename to windows/threat-protection/images/gp-process-mitigation-options-bit-flag-image.png
diff --git a/windows/keep-secure/images/gp-process-mitigation-options-show.png b/windows/threat-protection/images/gp-process-mitigation-options-show.png
similarity index 100%
rename from windows/keep-secure/images/gp-process-mitigation-options-show.png
rename to windows/threat-protection/images/gp-process-mitigation-options-show.png
diff --git a/windows/keep-secure/images/gp-process-mitigation-options.png b/windows/threat-protection/images/gp-process-mitigation-options.png
similarity index 100%
rename from windows/keep-secure/images/gp-process-mitigation-options.png
rename to windows/threat-protection/images/gp-process-mitigation-options.png
diff --git a/windows/keep-secure/images/runkey.png b/windows/threat-protection/images/runkey.png
similarity index 100%
rename from windows/keep-secure/images/runkey.png
rename to windows/threat-protection/images/runkey.png
diff --git a/windows/keep-secure/images/runoncekey.png b/windows/threat-protection/images/runoncekey.png
similarity index 100%
rename from windows/keep-secure/images/runoncekey.png
rename to windows/threat-protection/images/runoncekey.png
diff --git a/windows/keep-secure/images/security-fig4-aslr.png b/windows/threat-protection/images/security-fig4-aslr.png
similarity index 100%
rename from windows/keep-secure/images/security-fig4-aslr.png
rename to windows/threat-protection/images/security-fig4-aslr.png
diff --git a/windows/keep-secure/images/security-fig5-dep.png b/windows/threat-protection/images/security-fig5-dep.png
similarity index 100%
rename from windows/keep-secure/images/security-fig5-dep.png
rename to windows/threat-protection/images/security-fig5-dep.png
diff --git a/windows/keep-secure/images/threat-mitigations-pre-breach-post-breach-conceptual.png b/windows/threat-protection/images/threat-mitigations-pre-breach-post-breach-conceptual.png
similarity index 100%
rename from windows/keep-secure/images/threat-mitigations-pre-breach-post-breach-conceptual.png
rename to windows/threat-protection/images/threat-mitigations-pre-breach-post-breach-conceptual.png
diff --git a/windows/keep-secure/images/wef-client-config.png b/windows/threat-protection/images/wef-client-config.png
similarity index 100%
rename from windows/keep-secure/images/wef-client-config.png
rename to windows/threat-protection/images/wef-client-config.png
diff --git a/windows/threat-protection/index.md b/windows/threat-protection/index.md
new file mode 100644
index 0000000000..e1b2bdd0e9
--- /dev/null
+++ b/windows/threat-protection/index.md
@@ -0,0 +1,25 @@
+---
+title: Threat Protection (Windows 10)
+description: Learn more about how to help protect against threats in Windows 10 and Windows 10 Mobile.
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: security
+author: brianlic-msft
+---
+
+# Threat Protection
+
+Learn more about how to help protect against threats in Windows 10 and Windows 10 Mobile.
+
+| Section | Description |
+|-|-|
+| [Mitigate threats by using Windows 10 security features](overview-of-threat-mitigations-in-windows-10.md) | Learn more about mitigating threats in Windows 10. |
+| [Override Process Mitigation Options to help enforce app-related security policies](override-mitigation-options-for-app-related-security-policies.md) |Use Group Policy to override individual **Process Mitigation Options** settings and help to enforce specific app-related security policies. |
+| [Windows Defender Advanced Threat Protection](windows-defender-atp/windows-defender-advanced-threat-protection.md)| Provides information about Windows Defender Advanced Threat Protection (Windows Defender ATP), an out-of-the-box Windows enterprise security service that enables enterprise cybersecurity teams to detect and respond to advanced threats on their networks.|
+| [Windows Defender Antivirus](windows-defender-antivirus/windows-defender-antivirus-in-windows-10.md)| Provides information about Windows Defender, a built-in antimalware solution that helps provide security and antimalware management for desktops, portable computers, and servers. Includes a list of system requirements and new features.|
+|[Protect your enterprise data using Windows Information Protection (WIP)](windows-information-protection/protect-enterprise-data-using-wip.md)|Learn more about how to help protect against potential corporate data leakage. |
+| [Windows Defender SmartScreen](windows-defender-smartscreen/windows-defender-smartscreen-overview.md) | Learn more about Windows Defender SmartScreen. |
+| [Use Windows Event Forwarding to help with intrusion detection](use-windows-event-forwarding-to-assist-in-instrusion-detection.md) | Learn about an approach to collect events from devices in your organization. This article talks about events in both normal operations and when an intrusion is suspected. |
+| [Block untrusted fonts in an enterprise](block-untrusted-fonts-in-enterprise.md) | To help protect your company from attacks which may originate from untrusted or attacker controlled font files, we’ve created the Blocking Untrusted Fonts feature. Using this feature, you can turn on a global setting that stops your employees from loading untrusted fonts processed using the Graphics Device Interface (GDI) onto your network. Untrusted fonts are any font installed outside of the %windir%/Fonts directory. Blocking untrusted fonts helps prevent both remote (web-based or email-based) and local EOP attacks that can happen during the font file-parsing process. |
+
diff --git a/windows/keep-secure/override-mitigation-options-for-app-related-security-policies.md b/windows/threat-protection/override-mitigation-options-for-app-related-security-policies.md
similarity index 100%
rename from windows/keep-secure/override-mitigation-options-for-app-related-security-policies.md
rename to windows/threat-protection/override-mitigation-options-for-app-related-security-policies.md
diff --git a/windows/keep-secure/overview-of-threat-mitigations-in-windows-10.md b/windows/threat-protection/overview-of-threat-mitigations-in-windows-10.md
similarity index 96%
rename from windows/keep-secure/overview-of-threat-mitigations-in-windows-10.md
rename to windows/threat-protection/overview-of-threat-mitigations-in-windows-10.md
index ff8d0da12b..0f50719dce 100644
--- a/windows/keep-secure/overview-of-threat-mitigations-in-windows-10.md
+++ b/windows/threat-protection/overview-of-threat-mitigations-in-windows-10.md
@@ -54,15 +54,15 @@ Windows 10 mitigations that you can configure are listed in the following two ta
| Mitigation and corresponding threat | Description and links |
|---|---|
| **Windows Defender SmartScreen** helps prevent malicious applications from being downloaded | Windows Defender SmartScreen can check the reputation of a downloaded application by using a service that Microsoft maintains. The first time a user runs an app that originates from the Internet (even if the user copied it from another PC), SmartScreen checks to see if the app lacks a reputation or is known to be malicious, and responds accordingly.
**More information**: [Windows Defender SmartScreen](#windows-defender-smartscreen), later in this topic |
-| **Credential Guard** helps keep attackers from gaining access through Pass-the-Hash or Pass-the-Ticket attacks | Credential Guard uses virtualization-based security to isolate secrets, such as NTLM password hashes and Kerberos Ticket Granting Tickets, so that only privileged system software can access them. Credential Guard is included in Windows 10 Enterprise and Windows Server 2016.
**More information**: [Protect derived domain credentials with Credential Guard](credential-guard.md) |
-| **Enterprise certificate pinning** helps prevent man-in-the-middle attacks that leverage PKI | Enterprise certificate pinning enables you to protect your internal domain names from chaining to unwanted certificates or to fraudulently issued certificates. With enterprise certificate pinning, you can “pin” (associate) an X.509 certificate and its public key to its Certification Authority, either root or leaf.
**More information**: [Enterprise Certificate Pinning](enterprise-certificate-pinning.md) |
-| **Device Guard** helps keep a device from running malware or other untrusted apps | Device Guard includes a Code Integrity policy that you create; a whitelist of trusted apps—the only apps allowed to run in your organization. Device Guard also includes a powerful system mitigation called hypervisor-protected code integrity (HVCI), which leverages virtualization-based security (VBS) to protect Windows’ kernel-mode code integrity validation process. HVCI has specific hardware requirements, and works with Code Integrity policies to help stop attacks even if they gain access to the kernel. Device Guard is included in Windows 10 Enterprise and Windows Server 2016.
**More information**: [Introduction to Device Guard](introduction-to-device-guard-virtualization-based-security-and-code-integrity-policies.md) |
+| **Credential Guard** helps keep attackers from gaining access through Pass-the-Hash or Pass-the-Ticket attacks | Credential Guard uses virtualization-based security to isolate secrets, such as NTLM password hashes and Kerberos Ticket Granting Tickets, so that only privileged system software can access them. Credential Guard is included in Windows 10 Enterprise and Windows Server 2016.
**More information**: [Protect derived domain credentials with Credential Guard](/windows/access-protection/credential-guard/credential-guard) |
+| **Enterprise certificate pinning** helps prevent man-in-the-middle attacks that leverage PKI | Enterprise certificate pinning enables you to protect your internal domain names from chaining to unwanted certificates or to fraudulently issued certificates. With enterprise certificate pinning, you can “pin” (associate) an X.509 certificate and its public key to its Certification Authority, either root or leaf.
**More information**: [Enterprise Certificate Pinning](/windows/access-protection/enterprise-certificate-pinning) |
+| **Device Guard** helps keep a device from running malware or other untrusted apps | Device Guard includes a Code Integrity policy that you create; a whitelist of trusted apps—the only apps allowed to run in your organization. Device Guard also includes a powerful system mitigation called hypervisor-protected code integrity (HVCI), which leverages virtualization-based security (VBS) to protect Windows’ kernel-mode code integrity validation process. HVCI has specific hardware requirements, and works with Code Integrity policies to help stop attacks even if they gain access to the kernel. Device Guard is included in Windows 10 Enterprise and Windows Server 2016.
**More information**: [Introduction to Device Guard](/windows/access-protection/device-guard/introduction-to-device-guard-virtualization-based-security-and-code-integrity-policies. |
| **Windows Defender Antivirus**, which helps keep devices free of viruses and other malware | Windows 10 includes Windows Defender Antivirus, a robust inbox antimalware solution. Windows Defender Antivirus has been significantly improved since it was introduced in Windows 8.
**More information**: [Windows Defender Antivirus](#windows-defender-antivirus), later in this topic |
-| **Blocking of untrusted fonts** helps prevent fonts from being used in elevation-of-privilege attacks | Block Untrusted Fonts is a setting that allows you to prevent users from loading fonts that are "untrusted" onto your network, which can mitigate elevation-of-privilege attacks associated with the parsing of font files. However, as of Windows 10, version 1703, this mitigation is less important, because font parsing is isolated in an [AppContainer sandbox](https://msdn.microsoft.com/library/windows/desktop/mt595898(v=vs.85).aspx) (for a list describing this and other kernel pool protections, see [Kernel pool protections](#kernel-pool-protections), later in this topic).
**More information**: [Block untrusted fonts in an enterprise](block-untrusted-fonts-in-enterprise.md) |
+| **Blocking of untrusted fonts** helps prevent fonts from being used in elevation-of-privilege attacks | Block Untrusted Fonts is a setting that allows you to prevent users from loading fonts that are "untrusted" onto your network, which can mitigate elevation-of-privilege attacks associated with the parsing of font files. However, as of Windows 10, version 1703, this mitigation is less important, because font parsing is isolated in an [AppContainer sandbox](https://msdn.microsoft.com/library/windows/desktop/mt595898(v=vs.85).aspx) (for a list describing this and other kernel pool protections, see [Kernel pool protections](#kernel-pool-protections), later in this topic).
**More information**: [Block untrusted fonts in an enterprise](/windows/threat-protection/block-untrusted-fonts-in-enterprise) |
| **Memory protections** help prevent malware from using memory manipulation techniques such as buffer overruns | These mitigations, listed in [Table 2](#table-2), help to protect against memory-based attacks, where malware or other code manipulates memory to gain control of a system (for example, malware that attempts to use buffer overruns to inject malicious executable code into memory. Note: A subset of apps will not be able to run if some of these mitigations are set to their most restrictive settings. Testing can help you maximize protection while still allowing these apps to run.
**More information**: [Table 2](#table-2), later in this topic |
-| **UEFI Secure Boot** helps protect the platform from bootkits and rootkits | Unified Extensible Firmware Interface (UEFI) Secure Boot is a security standard for firmware built in to PCs by manufacturers beginning with Windows 8. It helps to protect the boot process and firmware against tampering, such as from a physically present attacker or from forms of malware that run early in the boot process or in kernel after startup.
**More information**: [UEFI and Secure Boot](bitlocker-countermeasures.md#uefi-and-secure-boot) |
-| **Early Launch Antimalware (ELAM)** helps protect the platform from rootkits disguised as drivers | Early Launch Antimalware (ELAM) is designed to enable the antimalware solution to start before all non-Microsoft drivers and apps. If malware modifies a boot-related driver, ELAM will detect the change, and Windows will prevent the driver from starting, thus blocking driver-based rootkits.
**More information**: [Early Launch Antimalware](bitlocker-countermeasures.md#protection-during-startup) |
-| **Device Health Attestation** helps prevent compromised devices from accessing an organization’s assets | Device Health Attestation (DHA) provides a way to confirm that devices attempting to connect to an organization's network are in a healthy state, not compromised with malware. When DHA has been configured, a device’s actual boot data measurements can be checked against the expected "healthy" boot data. If the check indicates a device is unhealthy, the device can be prevented from accessing the network.
**More information**: [Control the health of Windows 10-based devices](protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md) and [Device Health Attestation](https://technet.microsoft.com/windows-server-docs/security/device-health-attestation) |
+| **UEFI Secure Boot** helps protect the platform from bootkits and rootkits | Unified Extensible Firmware Interface (UEFI) Secure Boot is a security standard for firmware built in to PCs by manufacturers beginning with Windows 8. It helps to protect the boot process and firmware against tampering, such as from a physically present attacker or from forms of malware that run early in the boot process or in kernel after startup.
**More information**: [UEFI and Secure Boot](/windows/device-security/bitlocker/bitlocker-countermeasures#uefi-and-secure-boot) |
+| **Early Launch Antimalware (ELAM)** helps protect the platform from rootkits disguised as drivers | Early Launch Antimalware (ELAM) is designed to enable the antimalware solution to start before all non-Microsoft drivers and apps. If malware modifies a boot-related driver, ELAM will detect the change, and Windows will prevent the driver from starting, thus blocking driver-based rootkits.
**More information**: [Early Launch Antimalware](/windows/device-security/bitlocker/bitlocker-countermeasures#protection-during-startup) |
+| **Device Health Attestation** helps prevent compromised devices from accessing an organization’s assets | Device Health Attestation (DHA) provides a way to confirm that devices attempting to connect to an organization's network are in a healthy state, not compromised with malware. When DHA has been configured, a device’s actual boot data measurements can be checked against the expected "healthy" boot data. If the check indicates a device is unhealthy, the device can be prevented from accessing the network.
**More information**: [Control the health of Windows 10-based devices](/windows/device-security/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices) and [Device Health Attestation](https://technet.microsoft.com/windows-server-docs/security/device-health-attestation) |
Configurable Windows 10 mitigations designed to help protect against memory manipulation require in-depth understanding of these threats and mitigations and knowledge about how the operating system and applications handle memory. The standard process for maximizing these types of mitigations is to work in a test lab to discover whether a given setting interferes with any applications that you use so that you can deploy settings that maximize protection while still allowing apps to run correctly.
@@ -82,7 +82,7 @@ Windows Defender SmartScreen notifies users if they click on reported phishing a
For Windows 10, Microsoft improved SmartScreen (now called Windows Defender SmartScreen) protection capability by integrating its app reputation abilities into the operating system itself, which allows SmartScreen to check the reputation of files downloaded from the Internet and warn users when they’re about to run a high-risk downloaded file. The first time a user runs an app that originates from the Internet, SmartScreen checks the reputation of the application by using digital signatures and other factors against a service that Microsoft maintains. If the app lacks a reputation or is known to be malicious, SmartScreen warns the user or blocks execution entirely, depending on how the administrator has configured Microsoft Intune or Group Policy settings.
-For more information, see [Windows Defender SmartScreen overview](windows-defender-smartscreen-overview.md).
+For more information, see [Windows Defender SmartScreen overview](windows-defender-smartscreen/windows-defender-smartscreen-overview.md).
### Windows Defender Antivirus
@@ -100,7 +100,7 @@ Windows Defender Antivirus in Windows 10 uses a multi-pronged approach to improv
-For more information, see [Windows Defender in Windows 10](windows-defender-in-windows-10.md) and [Windows Defender Overview for Windows Server](https://technet.microsoft.com/windows-server-docs/security/windows-defender/windows-defender-overview-windows-server).
+For more information, see [Windows Defender in Windows 10](windows-defender-antivirus/windows-defender-antivirus-in-windows-10.md) and [Windows Defender Overview for Windows Server](https://technet.microsoft.com/windows-server-docs/security/windows-defender/windows-defender-overview-windows-server).
For information about Windows Defender Advanced Threat Protection, a service that helps enterprises to detect, investigate, and respond to advanced and targeted attacks on their networks, see [Windows Defender Advanced Threat Protection (ATP)](https://www.microsoft.com/en-us/WindowsForBusiness/windows-atp) (resources) and [Windows Defender Advanced Threat Protection (ATP)](https://technet.microsoft.com/itpro/windows/keep-secure/windows-defender-advanced-threat-protection) (documentation).
@@ -431,9 +431,9 @@ Examples:
Set-ProcessMitigation -Name notepad.exe -Enable SEHOP -Disable MandatoryASLR,DEPATL
```
-- **Convert Attack Surface Reduction (ASR) settings to a Code Integrity policy file**: If the input file contains any settings for EMET’s Attack Surface Reduction (ASR) mitigation, the converter will also create a Code Integrity policy file. In this case, you can complete the merging, auditing, and deployment process for the Code Integrity policy, as described in [Deploy Device Guard: deploy code integrity policies](deploy-device-guard-deploy-code-integrity-policies.md). This will enable protections on Windows 10 equivalent to EMET’s ASR protections.
+- **Convert Attack Surface Reduction (ASR) settings to a Code Integrity policy file**: If the input file contains any settings for EMET’s Attack Surface Reduction (ASR) mitigation, the converter will also create a Code Integrity policy file. In this case, you can complete the merging, auditing, and deployment process for the Code Integrity policy, as described in [Deploy Device Guard: deploy code integrity policies](/windows/device-security/device-guard/deploy-device-guard-deploy-code-integrity-policies). This will enable protections on Windows 10 equivalent to EMET’s ASR protections.
-- **Convert Certificate Trust settings to enterprise certificate pinning rules**: If you have an EMET “Certificate Trust” XML file (pinning rules file), you can also use ConvertTo-ProcessMitigationPolicy to convert the pinning rules file into an enterprise certificate pinning rules file. Then you can finish enabling that file as described in [Enterprise Certificate Pinning](enterprise-certificate-pinning.md). For example:
+- **Convert Certificate Trust settings to enterprise certificate pinning rules**: If you have an EMET “Certificate Trust” XML file (pinning rules file), you can also use ConvertTo-ProcessMitigationPolicy to convert the pinning rules file into an enterprise certificate pinning rules file. Then you can finish enabling that file as described in [Enterprise Certificate Pinning](/windows/access-protection/enterprise-certificate-pinning). For example:
```powershell
ConvertTo-ProcessMitigationPolicy -EMETfilePath certtrustrules.xml -OutputFilePath enterprisecertpinningrules.xml
@@ -441,15 +441,13 @@ Examples:
#### EMET-related products
-Microsoft Consulting Services (MCS) and Microsoft Support/Premier Field Engineering (PFE) offer a range of options for EMET, support for EMET, and EMET-related reporting and auditing products such as the EMET Enterprise Reporting Service (ERS). For any enterprise customers who use such products today or who are interested in similar capabilities, we recommend evaluating [Windows Defender Advanced Threat Protection](windows-defender-advanced-threat-protection.md) (ATP).
+Microsoft Consulting Services (MCS) and Microsoft Support/Premier Field Engineering (PFE) offer a range of options for EMET, support for EMET, and EMET-related reporting and auditing products such as the EMET Enterprise Reporting Service (ERS). For any enterprise customers who use such products today or who are interested in similar capabilities, we recommend evaluating [Windows Defender Advanced Threat Protection](windows-defender-atp/windows-defender-advanced-threat-protection.md) (ATP).
## Related topics
-- [Keep Windows 10 secure](index.md)
-- [Security technologies in Windows 10](security-technologies.md)
- [Security and Assurance in Windows Server 2016](https://technet.microsoft.com/windows-server-docs/security/security-and-assurance)
- [Windows Defender Advanced Threat Protection (ATP) - resources](https://www.microsoft.com/en-us/WindowsForBusiness/windows-atp)
-- [Windows Defender Advanced Threat Protection (ATP) - documentation](windows-defender-advanced-threat-protection.md)
+- [Windows Defender Advanced Threat Protection (ATP) - documentation](windows-defender-atp/windows-defender-advanced-threat-protection.md)
- [Exchange Online Advanced Threat Protection Service Description](https://technet.microsoft.com/library/exchange-online-advanced-threat-protection-service-description.aspx)
- [Office 365 Advanced Threat Protection](https://products.office.com/en-us/exchange/online-email-threat-protection)
- [Microsoft Malware Protection Center](https://www.microsoft.com/en-us/security/portal/mmpc/default.aspx)
diff --git a/windows/keep-secure/use-windows-event-forwarding-to-assist-in-instrusion-detection.md b/windows/threat-protection/use-windows-event-forwarding-to-assist-in-instrusion-detection.md
similarity index 100%
rename from windows/keep-secure/use-windows-event-forwarding-to-assist-in-instrusion-detection.md
rename to windows/threat-protection/use-windows-event-forwarding-to-assist-in-instrusion-detection.md
diff --git a/windows/keep-secure/command-line-arguments-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/command-line-arguments-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/command-line-arguments-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/command-line-arguments-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configuration-management-reference-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configuration-management-reference-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configuration-management-reference-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configuration-management-reference-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-advanced-scan-types-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-advanced-scan-types-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configure-advanced-scan-types-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configure-advanced-scan-types-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-block-at-first-sight-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-block-at-first-sight-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configure-block-at-first-sight-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configure-block-at-first-sight-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-cloud-block-timeout-period-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-cloud-block-timeout-period-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configure-cloud-block-timeout-period-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configure-cloud-block-timeout-period-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-end-user-interaction-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-end-user-interaction-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configure-end-user-interaction-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configure-end-user-interaction-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-exclusions-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-exclusions-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configure-exclusions-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configure-exclusions-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-extension-file-exclusions-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-extension-file-exclusions-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configure-extension-file-exclusions-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configure-extension-file-exclusions-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-local-policy-overrides-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-local-policy-overrides-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configure-local-policy-overrides-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configure-local-policy-overrides-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-network-connections-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-network-connections-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configure-network-connections-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configure-network-connections-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-notifications-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-notifications-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configure-notifications-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configure-notifications-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-process-opened-file-exclusions-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-process-opened-file-exclusions-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configure-process-opened-file-exclusions-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configure-process-opened-file-exclusions-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-protection-features-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-protection-features-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configure-protection-features-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configure-protection-features-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-real-time-protection-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-real-time-protection-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configure-real-time-protection-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configure-real-time-protection-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-remediation-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-remediation-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configure-remediation-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configure-remediation-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-server-exclusions-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/configure-server-exclusions-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/configure-server-exclusions-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/configure-server-exclusions-windows-defender-antivirus.md
diff --git a/windows/keep-secure/configure-windows-defender-antivirus-features.md b/windows/threat-protection/windows-defender-antivirus/configure-windows-defender-antivirus-features.md
similarity index 100%
rename from windows/keep-secure/configure-windows-defender-antivirus-features.md
rename to windows/threat-protection/windows-defender-antivirus/configure-windows-defender-antivirus-features.md
diff --git a/windows/keep-secure/customize-run-review-remediate-scans-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/customize-run-review-remediate-scans-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/customize-run-review-remediate-scans-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/customize-run-review-remediate-scans-windows-defender-antivirus.md
diff --git a/windows/keep-secure/deploy-manage-report-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/deploy-manage-report-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/deploy-manage-report-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/deploy-manage-report-windows-defender-antivirus.md
diff --git a/windows/keep-secure/deploy-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/deploy-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/deploy-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/deploy-windows-defender-antivirus.md
diff --git a/windows/keep-secure/deployment-vdi-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/deployment-vdi-windows-defender-antivirus.md
similarity index 99%
rename from windows/keep-secure/deployment-vdi-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/deployment-vdi-windows-defender-antivirus.md
index edd4fc5d3e..29c80abf0c 100644
--- a/windows/keep-secure/deployment-vdi-windows-defender-antivirus.md
+++ b/windows/threat-protection/windows-defender-antivirus/deployment-vdi-windows-defender-antivirus.md
@@ -53,7 +53,7 @@ For Azure-based virtual machines, you can also review the [Install Endpoint Prot
There are three main steps in this guide to help roll out Windows Defender AV protection across your VDI:
1. [Create and deploy the base image (for example, as a virtual hard disk (VHD)) that your virtual machines (VMs) will use](#create-and-deploy-the-base-image)
-2. [Manage the base image and updates for your VMs](#manage-vms-and-base-image)
+2. [Manage the base image and updates for your VMs](#manage-your-vms-and-base-image)
3. [Configure the VMs for optimal protection and performance](#configure-endpoints-for-optimal-performance), including:
- [Randomize scheduled scans](#randomize-scheduled-scans)
- [Use quick scans](#use-quick-scans)
diff --git a/windows/keep-secure/detect-block-potentially-unwanted-apps-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/detect-block-potentially-unwanted-apps-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/detect-block-potentially-unwanted-apps-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/detect-block-potentially-unwanted-apps-windows-defender-antivirus.md
diff --git a/windows/keep-secure/enable-cloud-protection-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/enable-cloud-protection-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/enable-cloud-protection-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/enable-cloud-protection-windows-defender-antivirus.md
diff --git a/windows/keep-secure/evaluate-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/evaluate-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/evaluate-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/evaluate-windows-defender-antivirus.md
diff --git a/windows/keep-secure/images/defender-updatedefs2.png b/windows/threat-protection/windows-defender-antivirus/images/defender-updatedefs2.png
similarity index 100%
rename from windows/keep-secure/images/defender-updatedefs2.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender-updatedefs2.png
diff --git a/windows/keep-secure/images/defender/client.png b/windows/threat-protection/windows-defender-antivirus/images/defender/client.png
similarity index 100%
rename from windows/keep-secure/images/defender/client.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/client.png
diff --git a/windows/keep-secure/images/defender/notification.png b/windows/threat-protection/windows-defender-antivirus/images/defender/notification.png
similarity index 100%
rename from windows/keep-secure/images/defender/notification.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/notification.png
diff --git a/windows/keep-secure/images/defender/sccm-wdo.png b/windows/threat-protection/windows-defender-antivirus/images/defender/sccm-wdo.png
similarity index 100%
rename from windows/keep-secure/images/defender/sccm-wdo.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/sccm-wdo.png
diff --git a/windows/keep-secure/images/defender/wdav-bafs-edge.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-bafs-edge.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-bafs-edge.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-bafs-edge.png
diff --git a/windows/keep-secure/images/defender/wdav-bafs-ie.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-bafs-ie.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-bafs-ie.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-bafs-ie.png
diff --git a/windows/keep-secure/images/defender/wdav-extension-exclusions.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-extension-exclusions.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-extension-exclusions.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-extension-exclusions.png
diff --git a/windows/keep-secure/images/defender/wdav-get-mpthreat.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-get-mpthreat.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-get-mpthreat.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-get-mpthreat.png
diff --git a/windows/keep-secure/images/defender/wdav-get-mpthreatdetection.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-get-mpthreatdetection.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-get-mpthreatdetection.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-get-mpthreatdetection.png
diff --git a/windows/keep-secure/images/defender/wdav-headless-mode-1607.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-headless-mode-1607.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-headless-mode-1607.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-headless-mode-1607.png
diff --git a/windows/keep-secure/images/defender/wdav-headless-mode-1703.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-headless-mode-1703.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-headless-mode-1703.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-headless-mode-1703.png
diff --git a/windows/keep-secure/images/defender/wdav-headless-mode-off-1703.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-headless-mode-off-1703.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-headless-mode-off-1703.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-headless-mode-off-1703.png
diff --git a/windows/keep-secure/images/defender/wdav-history-wdsc.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-history-wdsc.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-history-wdsc.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-history-wdsc.png
diff --git a/windows/keep-secure/images/defender/wdav-malware-detected.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-malware-detected.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-malware-detected.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-malware-detected.png
diff --git a/windows/keep-secure/images/defender/wdav-order-update-sources.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-order-update-sources.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-order-update-sources.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-order-update-sources.png
diff --git a/windows/keep-secure/images/defender/wdav-path-exclusions.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-path-exclusions.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-path-exclusions.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-path-exclusions.png
diff --git a/windows/keep-secure/images/defender/wdav-powershell-get-exclusions-all.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-powershell-get-exclusions-all.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-powershell-get-exclusions-all.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-powershell-get-exclusions-all.png
diff --git a/windows/keep-secure/images/defender/wdav-powershell-get-exclusions-variable.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-powershell-get-exclusions-variable.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-powershell-get-exclusions-variable.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-powershell-get-exclusions-variable.png
diff --git a/windows/keep-secure/images/defender/wdav-process-exclusions.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-process-exclusions.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-process-exclusions.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-process-exclusions.png
diff --git a/windows/keep-secure/images/defender/wdav-protection-settings-wdsc.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-protection-settings-wdsc.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-protection-settings-wdsc.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-protection-settings-wdsc.png
diff --git a/windows/keep-secure/images/defender/wdav-quarantined-history-wdsc.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-quarantined-history-wdsc.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-quarantined-history-wdsc.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-quarantined-history-wdsc.png
diff --git a/windows/keep-secure/images/defender/wdav-settings-old.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-settings-old.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-settings-old.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-settings-old.png
diff --git a/windows/keep-secure/images/defender/wdav-wdsc.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-wdsc.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-wdsc.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-wdsc.png
diff --git a/windows/keep-secure/images/defender/wdav-windows-defender-app-old.png b/windows/threat-protection/windows-defender-antivirus/images/defender/wdav-windows-defender-app-old.png
similarity index 100%
rename from windows/keep-secure/images/defender/wdav-windows-defender-app-old.png
rename to windows/threat-protection/windows-defender-antivirus/images/defender/wdav-windows-defender-app-old.png
diff --git a/windows/keep-secure/manage-event-based-updates-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/manage-event-based-updates-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/manage-event-based-updates-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/manage-event-based-updates-windows-defender-antivirus.md
diff --git a/windows/keep-secure/manage-outdated-endpoints-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/manage-outdated-endpoints-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/manage-outdated-endpoints-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/manage-outdated-endpoints-windows-defender-antivirus.md
diff --git a/windows/keep-secure/manage-protection-update-schedule-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/manage-protection-update-schedule-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/manage-protection-update-schedule-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/manage-protection-update-schedule-windows-defender-antivirus.md
diff --git a/windows/keep-secure/manage-protection-updates-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/manage-protection-updates-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/manage-protection-updates-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/manage-protection-updates-windows-defender-antivirus.md
diff --git a/windows/keep-secure/manage-updates-baselines-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/manage-updates-baselines-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/manage-updates-baselines-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/manage-updates-baselines-windows-defender-antivirus.md
diff --git a/windows/keep-secure/manage-updates-mobile-devices-vms-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/manage-updates-mobile-devices-vms-windows-defender-antivirus.md
similarity index 97%
rename from windows/keep-secure/manage-updates-mobile-devices-vms-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/manage-updates-mobile-devices-vms-windows-defender-antivirus.md
index 6138bb8a05..b54cfd7521 100644
--- a/windows/keep-secure/manage-updates-mobile-devices-vms-windows-defender-antivirus.md
+++ b/windows/threat-protection/windows-defender-antivirus/manage-updates-mobile-devices-vms-windows-defender-antivirus.md
@@ -101,4 +101,4 @@ You can configure Windows Defender AV to only download protection updates when t
## Related topics
- [Manage Windows Defender Antivirus updates and apply baselines](manage-updates-baselines-windows-defender-antivirus.md)
-- [Update and manage Windows Defender in Windows 10](get-started-with-windows-defender-for-windows-10.md)
+- [Update and manage Windows Defender in Windows 10](deploy-manage-report-windows-defender-antivirus.md)
diff --git a/windows/keep-secure/prevent-end-user-interaction-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/prevent-end-user-interaction-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/prevent-end-user-interaction-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/prevent-end-user-interaction-windows-defender-antivirus.md
diff --git a/windows/keep-secure/report-monitor-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/report-monitor-windows-defender-antivirus.md
similarity index 93%
rename from windows/keep-secure/report-monitor-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/report-monitor-windows-defender-antivirus.md
index 1ada466447..2ace158d7c 100644
--- a/windows/keep-secure/report-monitor-windows-defender-antivirus.md
+++ b/windows/threat-protection/windows-defender-antivirus/report-monitor-windows-defender-antivirus.md
@@ -30,7 +30,7 @@ You can use System Center Configuration Manager to [monitor Windows Defender AV
If you have a third-party security information and event management (SIEM) tool, you can also consume [Windows Defender client events](https://msdn.microsoft.com/en-us/library/windows/desktop/aa964766(v=vs.85).aspx).
-Windows events comprise several security event sources, including Security Account Manager (SAM) events ([enhanced for Windows 10](https://technet.microsoft.com/library/mt431757.aspx), also see the [Security audting](security-auditing-overview.md) topic) and [Windows Defender events](troubleshoot-windows-defender-antivirus.md).
+Windows events comprise several security event sources, including Security Account Manager (SAM) events ([enhanced for Windows 10](https://technet.microsoft.com/library/mt431757.aspx), also see the [Security audting](/windows/device-security/auditing/security-auditing-overview) topic) and [Windows Defender events](troubleshoot-windows-defender-antivirus.md).
These events can be centrally aggregated using the [Windows event collector](https://msdn.microsoft.com/en-us/library/windows/desktop/bb427443(v=vs.85).aspx). It is common practice for SIEMs to have connectors for Windows events. This technique allows for correlation of all security events from the machine in the SIEM.
diff --git a/windows/keep-secure/review-scan-results-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/review-scan-results-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/review-scan-results-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/review-scan-results-windows-defender-antivirus.md
diff --git a/windows/keep-secure/run-scan-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/run-scan-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/run-scan-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/run-scan-windows-defender-antivirus.md
diff --git a/windows/keep-secure/scheduled-catch-up-scans-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/scheduled-catch-up-scans-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/scheduled-catch-up-scans-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/scheduled-catch-up-scans-windows-defender-antivirus.md
diff --git a/windows/keep-secure/specify-cloud-protection-level-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/specify-cloud-protection-level-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/specify-cloud-protection-level-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/specify-cloud-protection-level-windows-defender-antivirus.md
diff --git a/windows/keep-secure/troubleshoot-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/troubleshoot-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/troubleshoot-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/troubleshoot-windows-defender-antivirus.md
diff --git a/windows/keep-secure/use-group-policy-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/use-group-policy-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/use-group-policy-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/use-group-policy-windows-defender-antivirus.md
diff --git a/windows/keep-secure/use-intune-config-manager-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/use-intune-config-manager-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/use-intune-config-manager-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/use-intune-config-manager-windows-defender-antivirus.md
diff --git a/windows/keep-secure/use-powershell-cmdlets-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/use-powershell-cmdlets-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/use-powershell-cmdlets-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/use-powershell-cmdlets-windows-defender-antivirus.md
diff --git a/windows/keep-secure/use-wmi-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/use-wmi-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/use-wmi-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/use-wmi-windows-defender-antivirus.md
diff --git a/windows/keep-secure/utilize-microsoft-cloud-protection-windows-defender-antivirus.md b/windows/threat-protection/windows-defender-antivirus/utilize-microsoft-cloud-protection-windows-defender-antivirus.md
similarity index 100%
rename from windows/keep-secure/utilize-microsoft-cloud-protection-windows-defender-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/utilize-microsoft-cloud-protection-windows-defender-antivirus.md
diff --git a/windows/keep-secure/windows-defender-antivirus-compatibility.md b/windows/threat-protection/windows-defender-antivirus/windows-defender-antivirus-compatibility.md
similarity index 91%
rename from windows/keep-secure/windows-defender-antivirus-compatibility.md
rename to windows/threat-protection/windows-defender-antivirus/windows-defender-antivirus-compatibility.md
index 4945834e0f..7fa6451710 100644
--- a/windows/keep-secure/windows-defender-antivirus-compatibility.md
+++ b/windows/threat-protection/windows-defender-antivirus/windows-defender-antivirus-compatibility.md
@@ -27,7 +27,7 @@ author: iaanw
Windows Defender Advanced Threat Protection (ATP) is an additional service beyond Windows Defender Antivirus that helps enterprises detect, investigate, and respond to advanced persistent threats on their network.
-See the [Windows Defender Advanced Threat Protection](windows-defender-advanced-threat-protection.md) topics for more information about the service.
+See the [Windows Defender Advanced Threat Protection](../windows-defender-atp/windows-defender-advanced-threat-protection.md) topics for more information about the service.
If you are enrolled in Windows Defender ATP, and you are not using Windows Defender AV as your real-time protection service on your endpoints, Windows Defender will automatically enter into a passive mode. On Windows Server 2016 SKUs, Windows Defender AV will not enter into the passive mode and will run alongside your other antivirus product.
diff --git a/windows/keep-secure/windows-defender-antivirus-in-windows-10.md b/windows/threat-protection/windows-defender-antivirus/windows-defender-antivirus-in-windows-10.md
similarity index 100%
rename from windows/keep-secure/windows-defender-antivirus-in-windows-10.md
rename to windows/threat-protection/windows-defender-antivirus/windows-defender-antivirus-in-windows-10.md
diff --git a/windows/keep-secure/windows-defender-antivirus-on-windows-server-2016.md b/windows/threat-protection/windows-defender-antivirus/windows-defender-antivirus-on-windows-server-2016.md
similarity index 94%
rename from windows/keep-secure/windows-defender-antivirus-on-windows-server-2016.md
rename to windows/threat-protection/windows-defender-antivirus/windows-defender-antivirus-on-windows-server-2016.md
index 3510bcb390..b350ed550f 100644
--- a/windows/keep-secure/windows-defender-antivirus-on-windows-server-2016.md
+++ b/windows/threat-protection/windows-defender-antivirus/windows-defender-antivirus-on-windows-server-2016.md
@@ -41,7 +41,7 @@ See [Windows Defender Overview for Windows Server](https://technet.microsoft.com
While the functionality, configuration, and management is largely the same for Windows Defender AV either on Windows 10 or Windows Server 2016, there are a few key differences:
- In Windows Server 2016, [automatic exclusions](configure-server-exclusions-windows-defender-antivirus.md) are applied based on your defined Server Role.
-- In Windows Server 2016, [Windows Defender AV will not disable itself if you are running another antivirus product](windows-defender-antivirus-on-windows-server-2016.md#sysreq).
+- In Windows Server 2016, [Windows Defender AV will not disable itself if you are running another antivirus product](windows-defender-antivirus-on-windows-server-2016.md).
## Related topics
diff --git a/windows/keep-secure/windows-defender-offline.md b/windows/threat-protection/windows-defender-antivirus/windows-defender-offline.md
similarity index 100%
rename from windows/keep-secure/windows-defender-offline.md
rename to windows/threat-protection/windows-defender-antivirus/windows-defender-offline.md
diff --git a/windows/keep-secure/windows-defender-security-center-antivirus.md b/windows/threat-protection/windows-defender-antivirus/windows-defender-security-center-antivirus.md
similarity index 98%
rename from windows/keep-secure/windows-defender-security-center-antivirus.md
rename to windows/threat-protection/windows-defender-antivirus/windows-defender-security-center-antivirus.md
index dec5bc9ff3..1def305540 100644
--- a/windows/keep-secure/windows-defender-security-center-antivirus.md
+++ b/windows/threat-protection/windows-defender-antivirus/windows-defender-security-center-antivirus.md
@@ -43,7 +43,7 @@ The app also includes the settings and status of:
- Parental and Family Controls
>[!NOTE]
->The Windows Defender Security Center app is a client interface on Windows 10, version 1703. It is not the Windows Defender Advanced Security Center, which is the web portal used to review and manage [Windows Defender Advanced Threat Protection](windows-defender-advanced-threat-protection.md).
+>The Windows Defender Security Center app is a client interface on Windows 10, version 1703. It is not the Windows Defender Advanced Security Center, which is the web portal used to review and manage [Windows Defender Advanced Threat Protection](../windows-defender-atp/windows-defender-advanced-threat-protection.md).
**Review virus and threat protection settings in the Windows Defender Security Center app:**
diff --git a/windows/keep-secure/advanced-features-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/advanced-features-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/advanced-features-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/advanced-features-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/alerts-queue-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/alerts-queue-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/alerts-queue-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/alerts-queue-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/api-portal-mapping-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/api-portal-mapping-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/api-portal-mapping-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/api-portal-mapping-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/assign-portal-access-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/assign-portal-access-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/assign-portal-access-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/assign-portal-access-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/check-sensor-status-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/check-sensor-status-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/check-sensor-status-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/check-sensor-status-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/configure-arcsight-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/configure-arcsight-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/configure-arcsight-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/configure-arcsight-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/configure-email-notifications-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/configure-email-notifications-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/configure-email-notifications-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/configure-email-notifications-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/configure-endpoints-gp-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/configure-endpoints-gp-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/configure-endpoints-gp-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/configure-endpoints-gp-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/configure-endpoints-mdm-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/configure-endpoints-mdm-windows-defender-advanced-threat-protection.md
similarity index 98%
rename from windows/keep-secure/configure-endpoints-mdm-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/configure-endpoints-mdm-windows-defender-advanced-threat-protection.md
index 2c283921d7..d714ae09df 100644
--- a/windows/keep-secure/configure-endpoints-mdm-windows-defender-advanced-threat-protection.md
+++ b/windows/threat-protection/windows-defender-atp/configure-endpoints-mdm-windows-defender-advanced-threat-protection.md
@@ -46,13 +46,15 @@ For more information on using Windows Defender ATP CSP see, [WindowsAdvancedThre
a. Select **Policy** > **Configuration Policies** > **Add**.

- b. Under **Windows**, select **Custom Configuration (Windows 10 Desktop and Mobile and later)** > **Create and Deploy a Custom Policy** > **Create Policy**.
+ b. Under **Windows**, select **Custom Configuration (Windows 10 Desktop and Mobile and later)** > **Create and Deploy a Custom Policy** > **Create Policy**.

- c. Type a name and description for the policy.
+ c. Type a name and description for the policy.
+

- d. Under OMA-URI settings, select **Add...**.
+ d. Under OMA-URI settings, select **Add...**.
+

e. Type the following values then select **OK**:
diff --git a/windows/keep-secure/configure-endpoints-sccm-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/configure-endpoints-sccm-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/configure-endpoints-sccm-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/configure-endpoints-sccm-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/configure-endpoints-script-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/configure-endpoints-script-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/configure-endpoints-script-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/configure-endpoints-script-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/configure-endpoints-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/configure-endpoints-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/configure-endpoints-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/configure-endpoints-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/configure-proxy-internet-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/configure-proxy-internet-windows-defender-advanced-threat-protection.md
similarity index 99%
rename from windows/keep-secure/configure-proxy-internet-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/configure-proxy-internet-windows-defender-advanced-threat-protection.md
index 399486b886..2f6d228d47 100644
--- a/windows/keep-secure/configure-proxy-internet-windows-defender-advanced-threat-protection.md
+++ b/windows/threat-protection/windows-defender-atp/configure-proxy-internet-windows-defender-advanced-threat-protection.md
@@ -111,7 +111,7 @@ Verify the proxy configuration completed successfully, that WinHTTP can discover
HardDrivePath\WDATPConnectivityAnalyzer.cmd
```
Replace *HardDrivePath* with the path where the WDATPConnectivityAnalyzer tool was downloaded to, for example
- ```text
+ ```
C:\Work\tools\WDATPConnectivityAnalyzer\WDATPConnectivityAnalyzer.cmd
```
diff --git a/windows/keep-secure/configure-siem-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/configure-siem-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/configure-siem-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/configure-siem-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/configure-splunk-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/configure-splunk-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/configure-splunk-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/configure-splunk-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/custom-ti-api-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/custom-ti-api-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/custom-ti-api-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/custom-ti-api-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/dashboard-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/dashboard-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/dashboard-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/dashboard-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/data-storage-privacy-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/data-storage-privacy-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/data-storage-privacy-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/data-storage-privacy-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/defender-compatibility-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/defender-compatibility-windows-defender-advanced-threat-protection.md
similarity index 92%
rename from windows/keep-secure/defender-compatibility-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/defender-compatibility-windows-defender-advanced-threat-protection.md
index 314ccc9c79..a10edb15c5 100644
--- a/windows/keep-secure/defender-compatibility-windows-defender-advanced-threat-protection.md
+++ b/windows/threat-protection/windows-defender-atp/defender-compatibility-windows-defender-advanced-threat-protection.md
@@ -30,4 +30,4 @@ Windows Defender Antivirus will continue to receive updates, and the *mspeng.exe
The Windows Defender Antivirus interface will be disabled, and users on the endpoint will not be able to use Windows Defender Antivirus to perform on-demand scans or configure most options.
-For more information, see the [Windows Defender Antivirus and Windows Defender ATP compatibility topic](windows-defender-antivirus-compatibility.md).
+For more information, see the [Windows Defender Antivirus and Windows Defender ATP compatibility topic](../windows-defender-antivirus/windows-defender-antivirus-compatibility.md).
diff --git a/windows/keep-secure/enable-custom-ti-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/enable-custom-ti-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/enable-custom-ti-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/enable-custom-ti-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/enable-siem-integration-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/enable-siem-integration-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/enable-siem-integration-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/enable-siem-integration-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/event-error-codes-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/event-error-codes-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/event-error-codes-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/event-error-codes-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/experiment-custom-ti-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/experiment-custom-ti-windows-defender-advanced-threat-protection.md
similarity index 63%
rename from windows/keep-secure/experiment-custom-ti-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/experiment-custom-ti-windows-defender-advanced-threat-protection.md
index df1301d438..073acf1b34 100644
--- a/windows/keep-secure/experiment-custom-ti-windows-defender-advanced-threat-protection.md
+++ b/windows/threat-protection/windows-defender-atp/experiment-custom-ti-windows-defender-advanced-threat-protection.md
@@ -42,74 +42,72 @@ This step will guide you in creating an alert definition and an IOC for a malici
2. Copy and paste the following PowerShell script. This script will upload a sample alert definition and IOC to Windows Defender ATP which you can use to generate an alert.
- NOTE:
- Make sure you replace the `authUrl`, `clientId`, and `clientSecret` values with your details which you saved in when you enabled the threat intelligence application.
+ NOTE:
+ Make sure you replace the authUrl, clientId, and clientSecret values with your details which you saved in when you enabled the threat intelligence application.
- ```
- $authUrl = 'Your Authorization URL'
- $clientId = 'Your Client ID'
- $clientSecret = 'Your Client Secret'
+ ~~~~
+ $authUrl = 'Your Authorization URL'
+ $clientId = 'Your Client ID'
+ $clientSecret = 'Your Client Secret'
+ Try
+ {
+ $tokenPayload = @{
+ "resource" = 'https://graph.windows.net'
+ "client_id" = $clientId
+ "client_secret" = $clientSecret
+ "grant_type"='client_credentials'}
- Try
- {
- $tokenPayload = @{
- "resource" = 'https://graph.windows.net'
- "client_id" = $clientId
- "client_secret" = $clientSecret
- "grant_type"='client_credentials'}
+ "Fetching an access token"
+ $response = Invoke-RestMethod $authUrl -Method Post -Body $tokenPayload
+ $token = $response.access_token
+ "Token fetched successfully"
- "Fetching an access token"
- $response = Invoke-RestMethod $authUrl -Method Post -Body $tokenPayload
- $token = $response.access_token
- "Token fetched successfully"
+ $headers = @{
+ "Content-Type" = "application/json"
+ "Accept" = "application/json"
+ "Authorization" = "Bearer {0}" -f $token }
- $headers = @{
- "Content-Type" = "application/json"
- "Accept" = "application/json"
- "Authorization" = "Bearer {0}" -f $token }
+ $apiBaseUrl = "https://ti.securitycenter.windows.com/V1.0/"
- $apiBaseUrl = "https://ti.securitycenter.windows.com/V1.0/"
+ $alertDefinitionPayload = @{
+ "Name" = "Test Alert"
+ "Severity" = "Medium"
+ "InternalDescription" = "A test alert used to demonstrate the Windows Defender ATP TI API feature"
+ "Title" = "Test alert."
+ "UxDescription" = "This is a test alert based on a sample custom alert definition. This alert was triggered manually using a provided test command. It indicates that the Threat Intelligence API has been properly enabled."
+ "RecommendedAction" = "No recommended action for this test alert."
+ "Category" = "SuspiciousNetworkTraffic"
+ "Enabled" = "true"}
- $alertDefinitionPayload = @{
- "Name" = "Test Alert"
- "Severity" = "Medium"
- "InternalDescription" = "A test alert used to demonstrate the Windows Defender ATP TI API feature"
- "Title" = "Test alert."
- "UxDescription" = "This is a test alert based on a sample custom alert definition. This alert was triggered manually using a provided test command. It indicates that the Threat Intelligence API has been properly enabled."
- "RecommendedAction" = "No recommended action for this test alert."
- "Category" = "SuspiciousNetworkTraffic"
- "Enabled" = "true"}
+ "Creating an Alert Definition"
+ $alertDefinition =
+ Invoke-RestMethod ("{0}AlertDefinitions" -f $apiBaseUrl) `
+ -Method Post -Headers $headers -Body ($alertDefinitionPayload | ConvertTo-Json)
- "Creating an Alert Definition"
- $alertDefinition =
- Invoke-RestMethod ("{0}AlertDefinitions" -f $apiBaseUrl) `
- -Method Post -Headers $headers -Body ($alertDefinitionPayload | ConvertTo-Json)
+ "Alert Definition created successfully"
+ $alertDefinitionId = $alertDefinition.Id
- "Alert Definition created successfully"
- $alertDefinitionId = $alertDefinition.Id
+ $iocPayload = @{
+ "Type"="IpAddress"
+ "Value"="52.184.197.12"
+ "DetectionFunction"="Equals"
+ "Enabled"="true"
+ "AlertDefinition@odata.bind"="AlertDefinitions({0})" -f $alertDefinitionId }
- $iocPayload = @{
- "Type"="IpAddress"
- "Value"="52.184.197.12"
- "DetectionFunction"="Equals"
- "Enabled"="true"
- "AlertDefinition@odata.bind"="AlertDefinitions({0})" -f $alertDefinitionId }
+ "Creating an Indicator of Compromise"
+ $ioc =
+ Invoke-RestMethod ("{0}IndicatorsOfCompromise" -f $apiBaseUrl) `
+ -Method Post -Headers $headers -Body ($iocPayload | ConvertTo-Json)
+ "Indicator of Compromise created successfully"
- "Creating an Indicator of Compromise"
- $ioc =
- Invoke-RestMethod ("{0}IndicatorsOfCompromise" -f $apiBaseUrl) `
- -Method Post -Headers $headers -Body ($iocPayload | ConvertTo-Json)
- "Indicator of Compromise created successfully"
-
- "All done!"
- }
- Catch
- {
- 'Something went wrong! Got the following exception message: {0}' -f $_.Exception.Message
- }
-
- ```
+ "All done!"
+ }
+ Catch
+ {
+ "Something went wrong! Got the following exception message: {0}" -f $_.Exception.Message
+ }
+ ~~~~
3. Run the script and verify that the operation succeeded in the results the window. Wait up to 20 minutes until the new or updated alert definition propagates to the detection engines.
@@ -118,11 +116,11 @@ This step will guide you in creating an alert definition and an IOC for a malici
NOTE:
If you get the exception “The remote server returned an error: (407) Proxy Authentication Required", you need to add the proxy configuration by adding the following code to the PowerShell script:
- ```syntax
+ ~~~~
$webclient=New-Object System.Net.WebClient
$creds=Get-Credential
$webclient.Proxy.Credentials=$creds
- ```
+ ~~~~
## Step 3: Simulate a custom TI alert
This step will guide you in simulating an event in connection to a malicious IP that will trigger the Windows Defender ATP custom TI alert.
diff --git a/windows/keep-secure/fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/general-settings-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/general-settings-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/general-settings-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/general-settings-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/images/active-threat-icon.png b/windows/threat-protection/windows-defender-atp/images/active-threat-icon.png
similarity index 100%
rename from windows/keep-secure/images/active-threat-icon.png
rename to windows/threat-protection/windows-defender-atp/images/active-threat-icon.png
diff --git a/windows/keep-secure/images/alert-details.png b/windows/threat-protection/windows-defender-atp/images/alert-details.png
similarity index 100%
rename from windows/keep-secure/images/alert-details.png
rename to windows/threat-protection/windows-defender-atp/images/alert-details.png
diff --git a/windows/keep-secure/images/alert-icon.png b/windows/threat-protection/windows-defender-atp/images/alert-icon.png
similarity index 100%
rename from windows/keep-secure/images/alert-icon.png
rename to windows/threat-protection/windows-defender-atp/images/alert-icon.png
diff --git a/windows/keep-secure/images/alerts-q-bulk.png b/windows/threat-protection/windows-defender-atp/images/alerts-q-bulk.png
similarity index 100%
rename from windows/keep-secure/images/alerts-q-bulk.png
rename to windows/threat-protection/windows-defender-atp/images/alerts-q-bulk.png
diff --git a/windows/keep-secure/images/alerts-queue-numbered.png b/windows/threat-protection/windows-defender-atp/images/alerts-queue-numbered.png
similarity index 100%
rename from windows/keep-secure/images/alerts-queue-numbered.png
rename to windows/threat-protection/windows-defender-atp/images/alerts-queue-numbered.png
diff --git a/windows/keep-secure/images/analysis-results.png b/windows/threat-protection/windows-defender-atp/images/analysis-results.png
similarity index 100%
rename from windows/keep-secure/images/analysis-results.png
rename to windows/threat-protection/windows-defender-atp/images/analysis-results.png
diff --git a/windows/keep-secure/images/atp-action-center-with-info.png b/windows/threat-protection/windows-defender-atp/images/atp-action-center-with-info.png
similarity index 100%
rename from windows/keep-secure/images/atp-action-center-with-info.png
rename to windows/threat-protection/windows-defender-atp/images/atp-action-center-with-info.png
diff --git a/windows/keep-secure/images/atp-actor-report.png b/windows/threat-protection/windows-defender-atp/images/atp-actor-report.png
similarity index 100%
rename from windows/keep-secure/images/atp-actor-report.png
rename to windows/threat-protection/windows-defender-atp/images/atp-actor-report.png
diff --git a/windows/keep-secure/images/atp-actor.png b/windows/threat-protection/windows-defender-atp/images/atp-actor.png
similarity index 100%
rename from windows/keep-secure/images/atp-actor.png
rename to windows/threat-protection/windows-defender-atp/images/atp-actor.png
diff --git a/windows/keep-secure/images/atp-add-intune-policy.png b/windows/threat-protection/windows-defender-atp/images/atp-add-intune-policy.png
similarity index 100%
rename from windows/keep-secure/images/atp-add-intune-policy.png
rename to windows/threat-protection/windows-defender-atp/images/atp-add-intune-policy.png
diff --git a/windows/keep-secure/images/atp-alert-process-tree.png b/windows/threat-protection/windows-defender-atp/images/atp-alert-process-tree.png
similarity index 100%
rename from windows/keep-secure/images/atp-alert-process-tree.png
rename to windows/threat-protection/windows-defender-atp/images/atp-alert-process-tree.png
diff --git a/windows/keep-secure/images/atp-alert-source.png b/windows/threat-protection/windows-defender-atp/images/atp-alert-source.png
similarity index 100%
rename from windows/keep-secure/images/atp-alert-source.png
rename to windows/threat-protection/windows-defender-atp/images/atp-alert-source.png
diff --git a/windows/keep-secure/images/atp-alert-status.png b/windows/threat-protection/windows-defender-atp/images/atp-alert-status.png
similarity index 100%
rename from windows/keep-secure/images/atp-alert-status.png
rename to windows/threat-protection/windows-defender-atp/images/atp-alert-status.png
diff --git a/windows/keep-secure/images/atp-alert-timeline-numbered.png b/windows/threat-protection/windows-defender-atp/images/atp-alert-timeline-numbered.png
similarity index 100%
rename from windows/keep-secure/images/atp-alert-timeline-numbered.png
rename to windows/threat-protection/windows-defender-atp/images/atp-alert-timeline-numbered.png
diff --git a/windows/keep-secure/images/atp-alert-timeline.png b/windows/threat-protection/windows-defender-atp/images/atp-alert-timeline.png
similarity index 100%
rename from windows/keep-secure/images/atp-alert-timeline.png
rename to windows/threat-protection/windows-defender-atp/images/atp-alert-timeline.png
diff --git a/windows/keep-secure/images/atp-alerts-group.png b/windows/threat-protection/windows-defender-atp/images/atp-alerts-group.png
similarity index 100%
rename from windows/keep-secure/images/atp-alerts-group.png
rename to windows/threat-protection/windows-defender-atp/images/atp-alerts-group.png
diff --git a/windows/keep-secure/images/atp-alerts-q.png b/windows/threat-protection/windows-defender-atp/images/atp-alerts-q.png
similarity index 100%
rename from windows/keep-secure/images/atp-alerts-q.png
rename to windows/threat-protection/windows-defender-atp/images/atp-alerts-q.png
diff --git a/windows/keep-secure/images/atp-alerts-related-to-file.png b/windows/threat-protection/windows-defender-atp/images/atp-alerts-related-to-file.png
similarity index 100%
rename from windows/keep-secure/images/atp-alerts-related-to-file.png
rename to windows/threat-protection/windows-defender-atp/images/atp-alerts-related-to-file.png
diff --git a/windows/keep-secure/images/atp-azure-intune-category.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-intune-category.png
similarity index 100%
rename from windows/keep-secure/images/atp-azure-intune-category.png
rename to windows/threat-protection/windows-defender-atp/images/atp-azure-intune-category.png
diff --git a/windows/keep-secure/images/atp-azure-intune-configure.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-intune-configure.png
similarity index 100%
rename from windows/keep-secure/images/atp-azure-intune-configure.png
rename to windows/threat-protection/windows-defender-atp/images/atp-azure-intune-configure.png
diff --git a/windows/keep-secure/images/atp-azure-intune-create-policy-configure.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-intune-create-policy-configure.png
similarity index 100%
rename from windows/keep-secure/images/atp-azure-intune-create-policy-configure.png
rename to windows/threat-protection/windows-defender-atp/images/atp-azure-intune-create-policy-configure.png
diff --git a/windows/keep-secure/images/atp-azure-intune-create-policy-name.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-intune-create-policy-name.png
similarity index 100%
rename from windows/keep-secure/images/atp-azure-intune-create-policy-name.png
rename to windows/threat-protection/windows-defender-atp/images/atp-azure-intune-create-policy-name.png
diff --git a/windows/keep-secure/images/atp-azure-intune-create-policy.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-intune-create-policy.png
similarity index 100%
rename from windows/keep-secure/images/atp-azure-intune-create-policy.png
rename to windows/threat-protection/windows-defender-atp/images/atp-azure-intune-create-policy.png
diff --git a/windows/keep-secure/images/atp-azure-intune-create-profile.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-intune-create-profile.png
similarity index 100%
rename from windows/keep-secure/images/atp-azure-intune-create-profile.png
rename to windows/threat-protection/windows-defender-atp/images/atp-azure-intune-create-profile.png
diff --git a/windows/keep-secure/images/atp-azure-intune-create.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-intune-create.png
similarity index 100%
rename from windows/keep-secure/images/atp-azure-intune-create.png
rename to windows/threat-protection/windows-defender-atp/images/atp-azure-intune-create.png
diff --git a/windows/keep-secure/images/atp-azure-intune-device-config.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-intune-device-config.png
similarity index 100%
rename from windows/keep-secure/images/atp-azure-intune-device-config.png
rename to windows/threat-protection/windows-defender-atp/images/atp-azure-intune-device-config.png
diff --git a/windows/keep-secure/images/atp-azure-intune-save-policy.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-intune-save-policy.png
similarity index 100%
rename from windows/keep-secure/images/atp-azure-intune-save-policy.png
rename to windows/threat-protection/windows-defender-atp/images/atp-azure-intune-save-policy.png
diff --git a/windows/keep-secure/images/atp-azure-intune-save.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-intune-save.png
similarity index 100%
rename from windows/keep-secure/images/atp-azure-intune-save.png
rename to windows/threat-protection/windows-defender-atp/images/atp-azure-intune-save.png
diff --git a/windows/keep-secure/images/atp-azure-intune-select-group.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-intune-select-group.png
similarity index 100%
rename from windows/keep-secure/images/atp-azure-intune-select-group.png
rename to windows/threat-protection/windows-defender-atp/images/atp-azure-intune-select-group.png
diff --git a/windows/keep-secure/images/atp-azure-intune-settings-configure.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-intune-settings-configure.png
similarity index 100%
rename from windows/keep-secure/images/atp-azure-intune-settings-configure.png
rename to windows/threat-protection/windows-defender-atp/images/atp-azure-intune-settings-configure.png
diff --git a/windows/keep-secure/images/atp-azure-intune.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-intune.png
similarity index 100%
rename from windows/keep-secure/images/atp-azure-intune.png
rename to windows/threat-protection/windows-defender-atp/images/atp-azure-intune.png
diff --git a/windows/keep-secure/images/atp-azure-ui-user-access.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-ui-user-access.png
similarity index 100%
rename from windows/keep-secure/images/atp-azure-ui-user-access.png
rename to windows/threat-protection/windows-defender-atp/images/atp-azure-ui-user-access.png
diff --git a/windows/keep-secure/images/atp-blockfile.png b/windows/threat-protection/windows-defender-atp/images/atp-blockfile.png
similarity index 100%
rename from windows/keep-secure/images/atp-blockfile.png
rename to windows/threat-protection/windows-defender-atp/images/atp-blockfile.png
diff --git a/windows/keep-secure/images/atp-custom-ti-mapping.png b/windows/threat-protection/windows-defender-atp/images/atp-custom-ti-mapping.png
similarity index 100%
rename from windows/keep-secure/images/atp-custom-ti-mapping.png
rename to windows/threat-protection/windows-defender-atp/images/atp-custom-ti-mapping.png
diff --git a/windows/keep-secure/images/atp-disableantispyware-regkey.png b/windows/threat-protection/windows-defender-atp/images/atp-disableantispyware-regkey.png
similarity index 100%
rename from windows/keep-secure/images/atp-disableantispyware-regkey.png
rename to windows/threat-protection/windows-defender-atp/images/atp-disableantispyware-regkey.png
diff --git a/windows/keep-secure/images/atp-example-email-notification.png b/windows/threat-protection/windows-defender-atp/images/atp-example-email-notification.png
similarity index 100%
rename from windows/keep-secure/images/atp-example-email-notification.png
rename to windows/threat-protection/windows-defender-atp/images/atp-example-email-notification.png
diff --git a/windows/keep-secure/images/atp-export-machine-timeline-events.png b/windows/threat-protection/windows-defender-atp/images/atp-export-machine-timeline-events.png
similarity index 100%
rename from windows/keep-secure/images/atp-export-machine-timeline-events.png
rename to windows/threat-protection/windows-defender-atp/images/atp-export-machine-timeline-events.png
diff --git a/windows/keep-secure/images/atp-file-action.png b/windows/threat-protection/windows-defender-atp/images/atp-file-action.png
similarity index 100%
rename from windows/keep-secure/images/atp-file-action.png
rename to windows/threat-protection/windows-defender-atp/images/atp-file-action.png
diff --git a/windows/keep-secure/images/atp-file-details.png b/windows/threat-protection/windows-defender-atp/images/atp-file-details.png
similarity index 100%
rename from windows/keep-secure/images/atp-file-details.png
rename to windows/threat-protection/windows-defender-atp/images/atp-file-details.png
diff --git a/windows/keep-secure/images/atp-file-in-org.png b/windows/threat-protection/windows-defender-atp/images/atp-file-in-org.png
similarity index 100%
rename from windows/keep-secure/images/atp-file-in-org.png
rename to windows/threat-protection/windows-defender-atp/images/atp-file-in-org.png
diff --git a/windows/keep-secure/images/atp-file-information.png b/windows/threat-protection/windows-defender-atp/images/atp-file-information.png
similarity index 100%
rename from windows/keep-secure/images/atp-file-information.png
rename to windows/threat-protection/windows-defender-atp/images/atp-file-information.png
diff --git a/windows/keep-secure/images/atp-incident-graph.png b/windows/threat-protection/windows-defender-atp/images/atp-incident-graph.png
similarity index 100%
rename from windows/keep-secure/images/atp-incident-graph.png
rename to windows/threat-protection/windows-defender-atp/images/atp-incident-graph.png
diff --git a/windows/keep-secure/images/atp-intune-add-oma.png b/windows/threat-protection/windows-defender-atp/images/atp-intune-add-oma.png
similarity index 100%
rename from windows/keep-secure/images/atp-intune-add-oma.png
rename to windows/threat-protection/windows-defender-atp/images/atp-intune-add-oma.png
diff --git a/windows/keep-secure/images/atp-intune-add-policy.png b/windows/threat-protection/windows-defender-atp/images/atp-intune-add-policy.png
similarity index 100%
rename from windows/keep-secure/images/atp-intune-add-policy.png
rename to windows/threat-protection/windows-defender-atp/images/atp-intune-add-policy.png
diff --git a/windows/keep-secure/images/atp-intune-deploy-policy.png b/windows/threat-protection/windows-defender-atp/images/atp-intune-deploy-policy.png
similarity index 100%
rename from windows/keep-secure/images/atp-intune-deploy-policy.png
rename to windows/threat-protection/windows-defender-atp/images/atp-intune-deploy-policy.png
diff --git a/windows/keep-secure/images/atp-intune-manage-deployment.png b/windows/threat-protection/windows-defender-atp/images/atp-intune-manage-deployment.png
similarity index 100%
rename from windows/keep-secure/images/atp-intune-manage-deployment.png
rename to windows/threat-protection/windows-defender-atp/images/atp-intune-manage-deployment.png
diff --git a/windows/keep-secure/images/atp-intune-new-policy.png b/windows/threat-protection/windows-defender-atp/images/atp-intune-new-policy.png
similarity index 100%
rename from windows/keep-secure/images/atp-intune-new-policy.png
rename to windows/threat-protection/windows-defender-atp/images/atp-intune-new-policy.png
diff --git a/windows/keep-secure/images/atp-intune-oma-uri-setting.png b/windows/threat-protection/windows-defender-atp/images/atp-intune-oma-uri-setting.png
similarity index 100%
rename from windows/keep-secure/images/atp-intune-oma-uri-setting.png
rename to windows/threat-protection/windows-defender-atp/images/atp-intune-oma-uri-setting.png
diff --git a/windows/keep-secure/images/atp-intune-policy-name.png b/windows/threat-protection/windows-defender-atp/images/atp-intune-policy-name.png
similarity index 100%
rename from windows/keep-secure/images/atp-intune-policy-name.png
rename to windows/threat-protection/windows-defender-atp/images/atp-intune-policy-name.png
diff --git a/windows/keep-secure/images/atp-intune-save-policy.png b/windows/threat-protection/windows-defender-atp/images/atp-intune-save-policy.png
similarity index 100%
rename from windows/keep-secure/images/atp-intune-save-policy.png
rename to windows/threat-protection/windows-defender-atp/images/atp-intune-save-policy.png
diff --git a/windows/keep-secure/images/atp-investigation-package-action-center.png b/windows/threat-protection/windows-defender-atp/images/atp-investigation-package-action-center.png
similarity index 100%
rename from windows/keep-secure/images/atp-investigation-package-action-center.png
rename to windows/threat-protection/windows-defender-atp/images/atp-investigation-package-action-center.png
diff --git a/windows/keep-secure/images/atp-isolate-machine.png b/windows/threat-protection/windows-defender-atp/images/atp-isolate-machine.png
similarity index 100%
rename from windows/keep-secure/images/atp-isolate-machine.png
rename to windows/threat-protection/windows-defender-atp/images/atp-isolate-machine.png
diff --git a/windows/keep-secure/images/atp-machine-details-view.png b/windows/threat-protection/windows-defender-atp/images/atp-machine-details-view.png
similarity index 100%
rename from windows/keep-secure/images/atp-machine-details-view.png
rename to windows/threat-protection/windows-defender-atp/images/atp-machine-details-view.png
diff --git a/windows/keep-secure/images/atp-machine-health-details.png b/windows/threat-protection/windows-defender-atp/images/atp-machine-health-details.png
similarity index 100%
rename from windows/keep-secure/images/atp-machine-health-details.png
rename to windows/threat-protection/windows-defender-atp/images/atp-machine-health-details.png
diff --git a/windows/keep-secure/images/atp-machine-health.png b/windows/threat-protection/windows-defender-atp/images/atp-machine-health.png
similarity index 100%
rename from windows/keep-secure/images/atp-machine-health.png
rename to windows/threat-protection/windows-defender-atp/images/atp-machine-health.png
diff --git a/windows/keep-secure/images/atp-machine-investigation-package.png b/windows/threat-protection/windows-defender-atp/images/atp-machine-investigation-package.png
similarity index 100%
rename from windows/keep-secure/images/atp-machine-investigation-package.png
rename to windows/threat-protection/windows-defender-atp/images/atp-machine-investigation-package.png
diff --git a/windows/keep-secure/images/atp-machine-isolation.png b/windows/threat-protection/windows-defender-atp/images/atp-machine-isolation.png
similarity index 100%
rename from windows/keep-secure/images/atp-machine-isolation.png
rename to windows/threat-protection/windows-defender-atp/images/atp-machine-isolation.png
diff --git a/windows/keep-secure/images/atp-machine-timeline-details-panel.png b/windows/threat-protection/windows-defender-atp/images/atp-machine-timeline-details-panel.png
similarity index 100%
rename from windows/keep-secure/images/atp-machine-timeline-details-panel.png
rename to windows/threat-protection/windows-defender-atp/images/atp-machine-timeline-details-panel.png
diff --git a/windows/keep-secure/images/atp-machine-timeline.png b/windows/threat-protection/windows-defender-atp/images/atp-machine-timeline.png
similarity index 100%
rename from windows/keep-secure/images/atp-machine-timeline.png
rename to windows/threat-protection/windows-defender-atp/images/atp-machine-timeline.png
diff --git a/windows/keep-secure/images/atp-machines-at-risk.png b/windows/threat-protection/windows-defender-atp/images/atp-machines-at-risk.png
similarity index 100%
rename from windows/keep-secure/images/atp-machines-at-risk.png
rename to windows/threat-protection/windows-defender-atp/images/atp-machines-at-risk.png
diff --git a/windows/keep-secure/images/atp-machines-view-list.png b/windows/threat-protection/windows-defender-atp/images/atp-machines-view-list.png
similarity index 100%
rename from windows/keep-secure/images/atp-machines-view-list.png
rename to windows/threat-protection/windows-defender-atp/images/atp-machines-view-list.png
diff --git a/windows/keep-secure/images/atp-main-portal.png b/windows/threat-protection/windows-defender-atp/images/atp-main-portal.png
similarity index 100%
rename from windows/keep-secure/images/atp-main-portal.png
rename to windows/threat-protection/windows-defender-atp/images/atp-main-portal.png
diff --git a/windows/keep-secure/images/atp-mdm-onboarding-package.png b/windows/threat-protection/windows-defender-atp/images/atp-mdm-onboarding-package.png
similarity index 100%
rename from windows/keep-secure/images/atp-mdm-onboarding-package.png
rename to windows/threat-protection/windows-defender-atp/images/atp-mdm-onboarding-package.png
diff --git a/windows/keep-secure/images/atp-no-network-connection.png b/windows/threat-protection/windows-defender-atp/images/atp-no-network-connection.png
similarity index 100%
rename from windows/keep-secure/images/atp-no-network-connection.png
rename to windows/threat-protection/windows-defender-atp/images/atp-no-network-connection.png
diff --git a/windows/keep-secure/images/atp-notification-file.png b/windows/threat-protection/windows-defender-atp/images/atp-notification-file.png
similarity index 100%
rename from windows/keep-secure/images/atp-notification-file.png
rename to windows/threat-protection/windows-defender-atp/images/atp-notification-file.png
diff --git a/windows/keep-secure/images/atp-notification-isolate.png b/windows/threat-protection/windows-defender-atp/images/atp-notification-isolate.png
similarity index 100%
rename from windows/keep-secure/images/atp-notification-isolate.png
rename to windows/threat-protection/windows-defender-atp/images/atp-notification-isolate.png
diff --git a/windows/keep-secure/images/atp-observed-in-organization.png b/windows/threat-protection/windows-defender-atp/images/atp-observed-in-organization.png
similarity index 100%
rename from windows/keep-secure/images/atp-observed-in-organization.png
rename to windows/threat-protection/windows-defender-atp/images/atp-observed-in-organization.png
diff --git a/windows/keep-secure/images/atp-observed-machines.png b/windows/threat-protection/windows-defender-atp/images/atp-observed-machines.png
similarity index 100%
rename from windows/keep-secure/images/atp-observed-machines.png
rename to windows/threat-protection/windows-defender-atp/images/atp-observed-machines.png
diff --git a/windows/keep-secure/images/atp-onboard-mdm.png b/windows/threat-protection/windows-defender-atp/images/atp-onboard-mdm.png
similarity index 100%
rename from windows/keep-secure/images/atp-onboard-mdm.png
rename to windows/threat-protection/windows-defender-atp/images/atp-onboard-mdm.png
diff --git a/windows/keep-secure/images/atp-preferences-setup.png b/windows/threat-protection/windows-defender-atp/images/atp-preferences-setup.png
similarity index 100%
rename from windows/keep-secure/images/atp-preferences-setup.png
rename to windows/threat-protection/windows-defender-atp/images/atp-preferences-setup.png
diff --git a/windows/keep-secure/images/atp-refresh-token.png b/windows/threat-protection/windows-defender-atp/images/atp-refresh-token.png
similarity index 100%
rename from windows/keep-secure/images/atp-refresh-token.png
rename to windows/threat-protection/windows-defender-atp/images/atp-refresh-token.png
diff --git a/windows/keep-secure/images/atp-remediated-alert.png b/windows/threat-protection/windows-defender-atp/images/atp-remediated-alert.png
similarity index 100%
rename from windows/keep-secure/images/atp-remediated-alert.png
rename to windows/threat-protection/windows-defender-atp/images/atp-remediated-alert.png
diff --git a/windows/keep-secure/images/atp-remove-blocked-file.png b/windows/threat-protection/windows-defender-atp/images/atp-remove-blocked-file.png
similarity index 100%
rename from windows/keep-secure/images/atp-remove-blocked-file.png
rename to windows/threat-protection/windows-defender-atp/images/atp-remove-blocked-file.png
diff --git a/windows/keep-secure/images/atp-running-script.png b/windows/threat-protection/windows-defender-atp/images/atp-running-script.png
similarity index 100%
rename from windows/keep-secure/images/atp-running-script.png
rename to windows/threat-protection/windows-defender-atp/images/atp-running-script.png
diff --git a/windows/keep-secure/images/atp-sample-custom-ti-alert.png b/windows/threat-protection/windows-defender-atp/images/atp-sample-custom-ti-alert.png
similarity index 100%
rename from windows/keep-secure/images/atp-sample-custom-ti-alert.png
rename to windows/threat-protection/windows-defender-atp/images/atp-sample-custom-ti-alert.png
diff --git a/windows/keep-secure/images/atp-sensor-filter.png b/windows/threat-protection/windows-defender-atp/images/atp-sensor-filter.png
similarity index 100%
rename from windows/keep-secure/images/atp-sensor-filter.png
rename to windows/threat-protection/windows-defender-atp/images/atp-sensor-filter.png
diff --git a/windows/keep-secure/images/atp-sensor-health-filter-resized.png b/windows/threat-protection/windows-defender-atp/images/atp-sensor-health-filter-resized.png
similarity index 100%
rename from windows/keep-secure/images/atp-sensor-health-filter-resized.png
rename to windows/threat-protection/windows-defender-atp/images/atp-sensor-health-filter-resized.png
diff --git a/windows/keep-secure/images/atp-sensor-health-filter-tile.png b/windows/threat-protection/windows-defender-atp/images/atp-sensor-health-filter-tile.png
similarity index 100%
rename from windows/keep-secure/images/atp-sensor-health-filter-tile.png
rename to windows/threat-protection/windows-defender-atp/images/atp-sensor-health-filter-tile.png
diff --git a/windows/keep-secure/images/atp-sensor-health-filter.png b/windows/threat-protection/windows-defender-atp/images/atp-sensor-health-filter.png
similarity index 100%
rename from windows/keep-secure/images/atp-sensor-health-filter.png
rename to windows/threat-protection/windows-defender-atp/images/atp-sensor-health-filter.png
diff --git a/windows/keep-secure/images/atp-sensor-health-nonav.png b/windows/threat-protection/windows-defender-atp/images/atp-sensor-health-nonav.png
similarity index 100%
rename from windows/keep-secure/images/atp-sensor-health-nonav.png
rename to windows/threat-protection/windows-defender-atp/images/atp-sensor-health-nonav.png
diff --git a/windows/keep-secure/images/atp-sensor-health-tile.png b/windows/threat-protection/windows-defender-atp/images/atp-sensor-health-tile.png
similarity index 100%
rename from windows/keep-secure/images/atp-sensor-health-tile.png
rename to windows/threat-protection/windows-defender-atp/images/atp-sensor-health-tile.png
diff --git a/windows/keep-secure/images/atp-siem-integration.png b/windows/threat-protection/windows-defender-atp/images/atp-siem-integration.png
similarity index 100%
rename from windows/keep-secure/images/atp-siem-integration.png
rename to windows/threat-protection/windows-defender-atp/images/atp-siem-integration.png
diff --git a/windows/keep-secure/images/atp-simulate-custom-ti.png b/windows/threat-protection/windows-defender-atp/images/atp-simulate-custom-ti.png
similarity index 100%
rename from windows/keep-secure/images/atp-simulate-custom-ti.png
rename to windows/threat-protection/windows-defender-atp/images/atp-simulate-custom-ti.png
diff --git a/windows/keep-secure/images/atp-stop-quarantine-file.png b/windows/threat-protection/windows-defender-atp/images/atp-stop-quarantine-file.png
similarity index 100%
rename from windows/keep-secure/images/atp-stop-quarantine-file.png
rename to windows/threat-protection/windows-defender-atp/images/atp-stop-quarantine-file.png
diff --git a/windows/keep-secure/images/atp-stopnquarantine-file.png b/windows/threat-protection/windows-defender-atp/images/atp-stopnquarantine-file.png
similarity index 100%
rename from windows/keep-secure/images/atp-stopnquarantine-file.png
rename to windows/threat-protection/windows-defender-atp/images/atp-stopnquarantine-file.png
diff --git a/windows/keep-secure/images/atp-suppression-rules.png b/windows/threat-protection/windows-defender-atp/images/atp-suppression-rules.png
similarity index 100%
rename from windows/keep-secure/images/atp-suppression-rules.png
rename to windows/threat-protection/windows-defender-atp/images/atp-suppression-rules.png
diff --git a/windows/keep-secure/images/atp-threat-intel-api.png b/windows/threat-protection/windows-defender-atp/images/atp-threat-intel-api.png
similarity index 100%
rename from windows/keep-secure/images/atp-threat-intel-api.png
rename to windows/threat-protection/windows-defender-atp/images/atp-threat-intel-api.png
diff --git a/windows/keep-secure/images/atp-thunderbolt-icon.png b/windows/threat-protection/windows-defender-atp/images/atp-thunderbolt-icon.png
similarity index 100%
rename from windows/keep-secure/images/atp-thunderbolt-icon.png
rename to windows/threat-protection/windows-defender-atp/images/atp-thunderbolt-icon.png
diff --git a/windows/keep-secure/images/atp-tile-sensor-health.png b/windows/threat-protection/windows-defender-atp/images/atp-tile-sensor-health.png
similarity index 100%
rename from windows/keep-secure/images/atp-tile-sensor-health.png
rename to windows/threat-protection/windows-defender-atp/images/atp-tile-sensor-health.png
diff --git a/windows/keep-secure/images/atp-undo-isolation.png b/windows/threat-protection/windows-defender-atp/images/atp-undo-isolation.png
similarity index 100%
rename from windows/keep-secure/images/atp-undo-isolation.png
rename to windows/threat-protection/windows-defender-atp/images/atp-undo-isolation.png
diff --git a/windows/keep-secure/images/atp-user-details-pane.png b/windows/threat-protection/windows-defender-atp/images/atp-user-details-pane.png
similarity index 100%
rename from windows/keep-secure/images/atp-user-details-pane.png
rename to windows/threat-protection/windows-defender-atp/images/atp-user-details-pane.png
diff --git a/windows/keep-secure/images/atp-user-details-view.png b/windows/threat-protection/windows-defender-atp/images/atp-user-details-view.png
similarity index 100%
rename from windows/keep-secure/images/atp-user-details-view.png
rename to windows/threat-protection/windows-defender-atp/images/atp-user-details-view.png
diff --git a/windows/keep-secure/images/atp-users-at-risk.png b/windows/threat-protection/windows-defender-atp/images/atp-users-at-risk.png
similarity index 100%
rename from windows/keep-secure/images/atp-users-at-risk.png
rename to windows/threat-protection/windows-defender-atp/images/atp-users-at-risk.png
diff --git a/windows/keep-secure/images/atp.png b/windows/threat-protection/windows-defender-atp/images/atp.png
similarity index 100%
rename from windows/keep-secure/images/atp.png
rename to windows/threat-protection/windows-defender-atp/images/atp.png
diff --git a/windows/keep-secure/images/components.png b/windows/threat-protection/windows-defender-atp/images/components.png
similarity index 100%
rename from windows/keep-secure/images/components.png
rename to windows/threat-protection/windows-defender-atp/images/components.png
diff --git a/windows/keep-secure/images/detection-icon.png b/windows/threat-protection/windows-defender-atp/images/detection-icon.png
similarity index 100%
rename from windows/keep-secure/images/detection-icon.png
rename to windows/threat-protection/windows-defender-atp/images/detection-icon.png
diff --git a/windows/keep-secure/images/filter-log.png b/windows/threat-protection/windows-defender-atp/images/filter-log.png
similarity index 100%
rename from windows/keep-secure/images/filter-log.png
rename to windows/threat-protection/windows-defender-atp/images/filter-log.png
diff --git a/windows/keep-secure/images/machines-active-threats-tile.png b/windows/threat-protection/windows-defender-atp/images/machines-active-threats-tile.png
similarity index 100%
rename from windows/keep-secure/images/machines-active-threats-tile.png
rename to windows/threat-protection/windows-defender-atp/images/machines-active-threats-tile.png
diff --git a/windows/keep-secure/images/machines-at-risk.png b/windows/threat-protection/windows-defender-atp/images/machines-at-risk.png
similarity index 100%
rename from windows/keep-secure/images/machines-at-risk.png
rename to windows/threat-protection/windows-defender-atp/images/machines-at-risk.png
diff --git a/windows/keep-secure/images/machines-reporting-tile.png b/windows/threat-protection/windows-defender-atp/images/machines-reporting-tile.png
similarity index 100%
rename from windows/keep-secure/images/machines-reporting-tile.png
rename to windows/threat-protection/windows-defender-atp/images/machines-reporting-tile.png
diff --git a/windows/keep-secure/images/menu-icon.png b/windows/threat-protection/windows-defender-atp/images/menu-icon.png
similarity index 100%
rename from windows/keep-secure/images/menu-icon.png
rename to windows/threat-protection/windows-defender-atp/images/menu-icon.png
diff --git a/windows/keep-secure/images/not-remediated-icon.png b/windows/threat-protection/windows-defender-atp/images/not-remediated-icon.png
similarity index 100%
rename from windows/keep-secure/images/not-remediated-icon.png
rename to windows/threat-protection/windows-defender-atp/images/not-remediated-icon.png
diff --git a/windows/keep-secure/images/overview.png b/windows/threat-protection/windows-defender-atp/images/overview.png
similarity index 100%
rename from windows/keep-secure/images/overview.png
rename to windows/threat-protection/windows-defender-atp/images/overview.png
diff --git a/windows/keep-secure/images/remediated-icon.png b/windows/threat-protection/windows-defender-atp/images/remediated-icon.png
similarity index 100%
rename from windows/keep-secure/images/remediated-icon.png
rename to windows/threat-protection/windows-defender-atp/images/remediated-icon.png
diff --git a/windows/keep-secure/images/rules-legend.png b/windows/threat-protection/windows-defender-atp/images/rules-legend.png
similarity index 100%
rename from windows/keep-secure/images/rules-legend.png
rename to windows/threat-protection/windows-defender-atp/images/rules-legend.png
diff --git a/windows/keep-secure/images/run-as-admin.png b/windows/threat-protection/windows-defender-atp/images/run-as-admin.png
similarity index 100%
rename from windows/keep-secure/images/run-as-admin.png
rename to windows/threat-protection/windows-defender-atp/images/run-as-admin.png
diff --git a/windows/keep-secure/images/sccm-deployment.png b/windows/threat-protection/windows-defender-atp/images/sccm-deployment.png
similarity index 100%
rename from windows/keep-secure/images/sccm-deployment.png
rename to windows/threat-protection/windows-defender-atp/images/sccm-deployment.png
diff --git a/windows/keep-secure/images/settings.png b/windows/threat-protection/windows-defender-atp/images/settings.png
similarity index 100%
rename from windows/keep-secure/images/settings.png
rename to windows/threat-protection/windows-defender-atp/images/settings.png
diff --git a/windows/keep-secure/images/status-tile.png b/windows/threat-protection/windows-defender-atp/images/status-tile.png
similarity index 100%
rename from windows/keep-secure/images/status-tile.png
rename to windows/threat-protection/windows-defender-atp/images/status-tile.png
diff --git a/windows/keep-secure/images/submit-file.png b/windows/threat-protection/windows-defender-atp/images/submit-file.png
similarity index 100%
rename from windows/keep-secure/images/submit-file.png
rename to windows/threat-protection/windows-defender-atp/images/submit-file.png
diff --git a/windows/keep-secure/images/windefatp-sc-qc-diagtrack.png b/windows/threat-protection/windows-defender-atp/images/windefatp-sc-qc-diagtrack.png
similarity index 100%
rename from windows/keep-secure/images/windefatp-sc-qc-diagtrack.png
rename to windows/threat-protection/windows-defender-atp/images/windefatp-sc-qc-diagtrack.png
diff --git a/windows/keep-secure/images/windefatp-sc-query-diagtrack.png b/windows/threat-protection/windows-defender-atp/images/windefatp-sc-query-diagtrack.png
similarity index 100%
rename from windows/keep-secure/images/windefatp-sc-query-diagtrack.png
rename to windows/threat-protection/windows-defender-atp/images/windefatp-sc-query-diagtrack.png
diff --git a/windows/keep-secure/images/windefatp-sc-query.png b/windows/threat-protection/windows-defender-atp/images/windefatp-sc-query.png
similarity index 100%
rename from windows/keep-secure/images/windefatp-sc-query.png
rename to windows/threat-protection/windows-defender-atp/images/windefatp-sc-query.png
diff --git a/windows/keep-secure/images/windefatp-utc-console-autostart.png b/windows/threat-protection/windows-defender-atp/images/windefatp-utc-console-autostart.png
similarity index 100%
rename from windows/keep-secure/images/windefatp-utc-console-autostart.png
rename to windows/threat-protection/windows-defender-atp/images/windefatp-utc-console-autostart.png
diff --git a/windows/keep-secure/investigate-alerts-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/investigate-alerts-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/investigate-alerts-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/investigate-alerts-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/investigate-domain-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/investigate-domain-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/investigate-domain-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/investigate-domain-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/investigate-files-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/investigate-files-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/investigate-files-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/investigate-files-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/investigate-ip-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/investigate-ip-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/investigate-ip-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/investigate-ip-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/investigate-machines-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/investigate-machines-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/investigate-machines-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/investigate-machines-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/investigate-user-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/investigate-user-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/investigate-user-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/investigate-user-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/machines-view-overview-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/machines-view-overview-windows-defender-advanced-threat-protection.md
similarity index 97%
rename from windows/keep-secure/machines-view-overview-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/machines-view-overview-windows-defender-advanced-threat-protection.md
index 4537784b7b..44a32cf414 100644
--- a/windows/keep-secure/machines-view-overview-windows-defender-advanced-threat-protection.md
+++ b/windows/threat-protection/windows-defender-atp/machines-view-overview-windows-defender-advanced-threat-protection.md
@@ -81,7 +81,7 @@ You can sort the **Machines list** by the following columns:
- **Active malware detections** - Number of active malware detections reported by the machine
> [!NOTE]
-> The **Active malware detections** filter column will only appear if your endpoints are using [Windows Defender](windows-defender-in-windows-10.md) as the active real-time protection antimalware product.
+> The **Active malware detections** filter column will only appear if your endpoints are using [Windows Defender](../windows-defender-antivirus/windows-defender-antivirus-in-windows-10.md) as the active real-time protection antimalware product.
## Related topics
diff --git a/windows/keep-secure/manage-alerts-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/manage-alerts-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/manage-alerts-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/manage-alerts-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/minimum-requirements-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/minimum-requirements-windows-defender-advanced-threat-protection.md
similarity index 96%
rename from windows/keep-secure/minimum-requirements-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/minimum-requirements-windows-defender-advanced-threat-protection.md
index b632c08944..a0815dd8f5 100644
--- a/windows/keep-secure/minimum-requirements-windows-defender-advanced-threat-protection.md
+++ b/windows/threat-protection/windows-defender-atp/minimum-requirements-windows-defender-advanced-threat-protection.md
@@ -108,9 +108,9 @@ If the **START_TYPE** is not set to **AUTO_START**, then you'll need to set the
```
## Windows Defender signature updates are configured
-The Windows Defender ATP agent depends on Windows Defender’s ability to scan files and provide information about them. If Windows Defender is not the active antimalware in your organization, you may need to configure the signature updates. For more information see [Configure Windows Defender in Windows 10](windows-defender-in-windows-10.md).
+The Windows Defender ATP agent depends on Windows Defender’s ability to scan files and provide information about them. If Windows Defender is not the active antimalware in your organization, you may need to configure the signature updates. For more information see [Configure Windows Defender in Windows 10](../windows-defender-antivirus/windows-defender-antivirus-in-windows-10.md).
-When Windows Defender is not the active antimalware in your organization and you use the Windows Defender ATP service, Windows Defender goes on passive mode. For more information, see the **Compatibility** section in the [Windows Defender in Windows 10 topic](windows-defender-in-windows-10.md).
+When Windows Defender is not the active antimalware in your organization and you use the Windows Defender ATP service, Windows Defender goes on passive mode. For more information, see the **Compatibility** section in the [Windows Defender in Windows 10 topic](../windows-defender-antivirus/windows-defender-antivirus-in-windows-10.md).
## Windows Defender Early Launch Antimalware (ELAM) driver is enabled
If you're running Windows Defender as the primary antimalware product on your endpoints, the Windows Defender ATP agent will successfully onboard.
diff --git a/windows/keep-secure/onboard-configure-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/onboard-configure-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/onboard-configure-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/onboard-configure-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/portal-overview-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/portal-overview-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/portal-overview-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/portal-overview-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/powershell-example-code-windows-defender-advanced-threat-protection.md
similarity index 99%
rename from windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/powershell-example-code-windows-defender-advanced-threat-protection.md
index 9bf4342870..c34193f76e 100644
--- a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md
+++ b/windows/threat-protection/windows-defender-atp/powershell-example-code-windows-defender-advanced-threat-protection.md
@@ -52,7 +52,7 @@ $token = $response.access_token
```
-
+
## Step 2: Create headers used for the requests with the API
Use the following code to create the headers used for the requests with the API:
diff --git a/windows/keep-secure/preferences-setup-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/preferences-setup-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/preferences-setup-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/preferences-setup-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/preview-settings-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/preview-settings-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/preview-settings-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/preview-settings-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/preview-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/preview-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/preview-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/preview-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/pull-alerts-using-rest-api-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/pull-alerts-using-rest-api-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/pull-alerts-using-rest-api-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/pull-alerts-using-rest-api-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/python-example-code-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/python-example-code-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/respond-file-alerts-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md
similarity index 98%
rename from windows/keep-secure/respond-file-alerts-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md
index c768906d08..220ed86e05 100644
--- a/windows/keep-secure/respond-file-alerts-windows-defender-advanced-threat-protection.md
+++ b/windows/threat-protection/windows-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection.md
@@ -93,7 +93,7 @@ You can roll back and remove a file from quarantine if you’ve determined that
You can prevent further propagation of an attack in your organization by banning potentially malicious files or suspected malware. If you know a potentially malicious file, you can block it. This operation will prevent it from being read, written, or executed on machines in your organization.
>[!NOTE]
->This feature is only available if your organization uses Windows Defender Antivirus and Cloud–based protection is enabled. For more information, see [Manage cloud–based protection](configure-windows-defender-in-windows-10.md).
+>This feature is only available if your organization uses Windows Defender Antivirus and Cloud–based protection is enabled. For more information, see [Manage cloud–based protection](../windows-defender-antivirus/deploy-manage-report-windows-defender-antivirus.md).
This feature is designed to prevent suspected malware (or potentially malicious files) from being downloaded from the web. The coverage will be extended over time. The action takes effect on machines with the latest Windows 10 Insider Preview build.
### Enable the block file feature
diff --git a/windows/keep-secure/respond-machine-alerts-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/respond-machine-alerts-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/respond-machine-alerts-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/respond-machine-alerts-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/response-actions-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/response-actions-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/response-actions-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/response-actions-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/service-status-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/service-status-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/service-status-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/service-status-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/settings-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/settings-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/settings-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/settings-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/threat-indicator-concepts-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/threat-indicator-concepts-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/threat-indicator-concepts-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/threat-indicator-concepts-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/troubleshoot-onboarding-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/troubleshoot-onboarding-windows-defender-advanced-threat-protection.md
similarity index 94%
rename from windows/keep-secure/troubleshoot-onboarding-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/troubleshoot-onboarding-windows-defender-advanced-threat-protection.md
index a02feda9ea..6025221e43 100644
--- a/windows/keep-secure/troubleshoot-onboarding-windows-defender-advanced-threat-protection.md
+++ b/windows/threat-protection/windows-defender-atp/troubleshoot-onboarding-windows-defender-advanced-threat-protection.md
@@ -90,9 +90,9 @@ Error Code Hex | Error Code Dec | Error Description | OMA-URI | Possible cause a
:---|:---|:---|:---|:---
0x87D1FDE8 | -2016281112 | Remediation failed | Onboarding Offboarding | **Possible cause:** Onboarding or offboarding failed on a wrong blob: wrong signature or missing PreviousOrgIds fields.
**Troubleshooting steps:** Check the event IDs in the [View agent onboarding errors in the endpoint event log](#view-agent-onboarding-errors-in-the-endpoint-event-log) section.
Check the MDM event logs in the following table or follow the instructions in [Diagnose MDM failures in Windows 10](https://msdn.microsoft.com/library/windows/hardware/mt632120%28v=vs.85%29.aspx).
| | | Onboarding Offboarding SampleSharing | **Possible cause:** Windows Defender ATP Policy registry key does not exist or the OMA DM client doesn't have permissions to write to it.
**Troubleshooting steps:** Ensure that the following registry key exists: ```HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Advanced Threat Protection```.
If it doesn't exist, open an elevated command and add the key.
- | | | SenseIsRunning OnboardingState OrgId | **Possible cause:** An attempt to remediate by read-only property. Onboarding has failed.
**Troubleshooting steps:** Check the troubleshooting steps in [Troubleshoot Windows Defender Advanced Threat Protection onboarding issues](#troubleshoot-windows-defender-advanced-threat-protection-onboarding-issues).
Check the MDM event logs in the following table or follow the instructions in [Diagnose MDM failures in Windows 10](https://msdn.microsoft.com/library/windows/hardware/mt632120%28v=vs.85%29.aspx).
- | | | All | **Possible cause:** Attempt to deploy Windows Defender ATP on non-supported SKU/Platform, particularly Holographic SKU.
Currently is supported platforms: Enterprise, Education, and Professional. Server is not supported.
- 0x87D101A9 | -2016345687 |Syncml(425): The requested command failed because the sender does not have adequate access control permissions (ACL) on the recipient. | All | **Possible cause:** Attempt to deploy Windows Defender ATP on non-supported SKU/Platform, particularly Holographic SKU.
Currently is supported platforms: Enterprise, Education, and Professional.
+ | | | SenseIsRunning OnboardingState OrgId | **Possible cause:** An attempt to remediate by read-only property. Onboarding has failed.
**Troubleshooting steps:** Check the troubleshooting steps in [Troubleshoot Windows Defender Advanced Threat Protection onboarding issues](#troubleshoot-windows-defender-advanced-threat-protection-onboarding-issues).
Check the MDM event logs in the following table or follow the instructions in [Diagnose MDM failures in Windows 10](https://msdn.microsoft.com/library/windows/hardware/mt632120%28v=vs.85%29.aspx).
+ | | | All | **Possible cause:** Attempt to deploy Windows Defender ATP on non-supported SKU/Platform, particularly Holographic SKU.
Currently is supported platforms: Enterprise, Education, and Professional. Server is not supported.
+ 0x87D101A9 | -2016345687 |Syncml(425): The requested command failed because the sender does not have adequate access control permissions (ACL) on the recipient. | All | **Possible cause:** Attempt to deploy Windows Defender ATP on non-supported SKU/Platform, particularly Holographic SKU.
Currently is supported platforms: Enterprise, Education, and Professional.
**Known issues with non-compliance**
diff --git a/windows/keep-secure/troubleshoot-siem-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/troubleshoot-siem-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/troubleshoot-siem-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/troubleshoot-siem-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/troubleshoot-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/troubleshoot-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/troubleshoot-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/troubleshoot-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/use-custom-ti-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/use-custom-ti-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/use-custom-ti-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/use-custom-ti-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/use-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/use-windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/use-windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/use-windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/windows-defender-advanced-threat-protection.md
similarity index 100%
rename from windows/keep-secure/windows-defender-advanced-threat-protection.md
rename to windows/threat-protection/windows-defender-atp/windows-defender-advanced-threat-protection.md
diff --git a/windows/keep-secure/images/windows-defender-security-center.png b/windows/threat-protection/windows-defender-smartscreen/images/windows-defender-security-center.png
similarity index 100%
rename from windows/keep-secure/images/windows-defender-security-center.png
rename to windows/threat-protection/windows-defender-smartscreen/images/windows-defender-security-center.png
diff --git a/windows/keep-secure/images/windows-defender-smartscreen-control.png b/windows/threat-protection/windows-defender-smartscreen/images/windows-defender-smartscreen-control.png
similarity index 100%
rename from windows/keep-secure/images/windows-defender-smartscreen-control.png
rename to windows/threat-protection/windows-defender-smartscreen/images/windows-defender-smartscreen-control.png
diff --git a/windows/keep-secure/windows-defender-smartscreen-available-settings.md b/windows/threat-protection/windows-defender-smartscreen/windows-defender-smartscreen-available-settings.md
similarity index 97%
rename from windows/keep-secure/windows-defender-smartscreen-available-settings.md
rename to windows/threat-protection/windows-defender-smartscreen/windows-defender-smartscreen-available-settings.md
index fb399e44b3..506e512699 100644
--- a/windows/keep-secure/windows-defender-smartscreen-available-settings.md
+++ b/windows/threat-protection/windows-defender-smartscreen/windows-defender-smartscreen-available-settings.md
@@ -205,11 +205,11 @@ To better help you protect your organization, we recommend turning on and using
## Related topics
-- [Keep Windows 10 secure](https://technet.microsoft.com/itpro/windows/keep-secure/index)
+- [Threat protection](../index.md)
-- [Security technologies in Windows 10](https://technet.microsoft.com/itpro/windows/keep-secure/security-technologies)
+- [Windows Defender SmartScreen overview](windows-defender-smartscreen-overview.md)
-- [Available Group Policy and Mobile Device Management (MDM) settings for Microsoft Edge](https://technet.microsoft.com/itpro/microsoft-edge/available-policies)
+- [Available Group Policy and Mobile Device Management (MDM) settings for Microsoft Edge](/microsoft-edge/deploy/available-policies)
>[!NOTE]
>Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Contributing to TechNet content](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).
\ No newline at end of file
diff --git a/windows/keep-secure/windows-defender-smartscreen-overview.md b/windows/threat-protection/windows-defender-smartscreen/windows-defender-smartscreen-overview.md
similarity index 94%
rename from windows/keep-secure/windows-defender-smartscreen-overview.md
rename to windows/threat-protection/windows-defender-smartscreen/windows-defender-smartscreen-overview.md
index e48e138b84..9b1db90c72 100644
--- a/windows/keep-secure/windows-defender-smartscreen-overview.md
+++ b/windows/threat-protection/windows-defender-smartscreen/windows-defender-smartscreen-overview.md
@@ -54,10 +54,7 @@ When Windows Defender SmartScreen warns or blocks an employee from a website, it
- [How to recognize phishing email messages, links, or phone calls](https://www.microsoft.com/en-us/safety/online-privacy/phishing-symptoms.aspx)
-- [Keep Windows 10 secure](https://technet.microsoft.com/itpro/windows/keep-secure/index)
-
-- [Security technologies in Windows 10](https://technet.microsoft.com/itpro/windows/keep-secure/security-technologies)
-
+- [Threat protection](../index.md)
>[!NOTE]
>Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Contributing to TechNet content](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).
\ No newline at end of file
diff --git a/windows/keep-secure/windows-defender-smartscreen-set-individual-device.md b/windows/threat-protection/windows-defender-smartscreen/windows-defender-smartscreen-set-individual-device.md
similarity index 95%
rename from windows/keep-secure/windows-defender-smartscreen-set-individual-device.md
rename to windows/threat-protection/windows-defender-smartscreen/windows-defender-smartscreen-set-individual-device.md
index 482d88a367..e611009fcf 100644
--- a/windows/keep-secure/windows-defender-smartscreen-set-individual-device.md
+++ b/windows/threat-protection/windows-defender-smartscreen/windows-defender-smartscreen-set-individual-device.md
@@ -73,8 +73,9 @@ You can configure Windows Defender SmartScreen to warn employees from going to a
- If a site seems potentially dangerous, employees can report it to Microsoft by clicking on the **Tools** menu, clicking **Windows Defender SmartScreen**, and then clicking **Report unsafe website**.
## Related topics
-- [Keep Windows 10 secure](https://technet.microsoft.com/itpro/windows/keep-secure/index)
-- [Security technologies in Windows 10](https://technet.microsoft.com/itpro/windows/keep-secure/security-technologies)
+- [Threat protection](../index.md)
+
+- [Windows Defender SmartScreen overview](windows-defender-smartscreen-overview.md)
>[!NOTE]
>Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Contributing to TechNet content](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).
\ No newline at end of file
diff --git a/windows/keep-secure/app-behavior-with-wip.md b/windows/threat-protection/windows-information-protection/app-behavior-with-wip.md
similarity index 100%
rename from windows/keep-secure/app-behavior-with-wip.md
rename to windows/threat-protection/windows-information-protection/app-behavior-with-wip.md
diff --git a/windows/threat-protection/windows-information-protection/collect-wip-audit-event-logs.md b/windows/threat-protection/windows-information-protection/collect-wip-audit-event-logs.md
new file mode 100644
index 0000000000..fed5d91fb9
--- /dev/null
+++ b/windows/threat-protection/windows-information-protection/collect-wip-audit-event-logs.md
@@ -0,0 +1,172 @@
+---
+title: How to collect Windows Information Protection (WIP) audit event logs (Windows 10)
+description: How to collect and understand your Windows Information Protection audit event logs by using the Reporting configuration service provider (CSP) or the Windows Event Forwarding (for Windows desktop domain-joined devices only).
+ms.prod: w10
+ms.mktglfcycl: explore
+ms.sitesec: library
+ms.pagetype: security
+author: eross-msft
+localizationpriority: high
+---
+
+# How to collect Windows Information Protection (WIP) audit event logs
+
+**Applies to:**
+
+- Windows 10 and later
+- Windows 10 Mobile and later
+
+Windows Information Protection (WIP) creates audit events in the following situations:
+
+- If an employee changes the File ownership for a file from **Work** to **Personal**.
+
+- If data is marked as **Work**, but shared to a personal app or webpage. For example, through copying and pasting, dragging and dropping, sharing a contact, uploading to a personal webpage, or if the user grants a personal app provides temporary access to a work file.
+
+- If an app has custom audit events.
+
+## Collect WIP audit logs by using the Reporting configuration service provider (CSP)
+Collect the WIP audit logs from your employee’s devices by following the guidance provided by the [Reporting configuration service provider (CSP)](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/reporting-csp) documentation. This topic provides info about the actual audit events.
+
+>[!Note]
+>The **Data** element in the response includes the requested audit logs in an XML-encoded format.
+
+### User element and attributes
+This table includes all available attributes for the **User** element.
+
+|Attribute |Value type |Description |
+|----------|-----------|------------|
+|UserID |String |The security identifier (SID) of the user corresponding to this audit report. |
+|EnterpriseID |String |The enterprise ID corresponding to this audit report. |
+
+### Log element and attributes
+This table includes all available attributes/elements for the **Log** element. The response can contain zero (0) or more **Log** elements.
+
+|Attribute/Element |Value type |Description |
+|----------|-----------|------------|
+|ProviderType |String |This is always **EDPAudit**. |
+|LogType |String |Includes:
**DataCopied.** Work data is copied or shared to a personal location.
**ProtectionRemoved.** WIP protection is removed from a Work-defined file.
**ApplicationGenerated.** A custom audit log provided by an app.
|
+|TimeStamp |Int |Uses the [FILETIME structure](https://msdn.microsoft.com/library/windows/desktop/ms724284(v=vs.85).aspx) to represent the time that the event happened. |
+|Policy |String |How the work data was shared to the personal location:
**CopyPaste.** Work data was pasted into a personal location or app.
**ProtectionRemoved.** Work data was changed to be unprotected.
**DragDrop.** Work data was dropped into a personal location or app.
**Share.** Work data was shared with a personal location or app.
**NULL.** Any other way work data could be made personal beyond the options above. For example, when a work file is opened using a personal application (also known as, temporary access).
|
+|Justification |String |Not implemented. This will always be either blank or NULL.
**Note** Reserved for future use to collect the user justification for changing from **Work** to **Personal**. |
+|Object |String |A description of the shared work data. For example, if an employee opens a work file by using a personal app, this would be the file path. |
+|DataInfo |String |Any additional info about how the work file changed:
**A file path.** If an employee uploads a work file to a personal website by using Microsoft Edge or Internet Explorer, the file path is included here.
**Clipboard data types.** If an employee pastes work data into a personal app, the list of clipboard data types provided by the work app are included here. For more info, see the [Examples](#examples) section of this topic.
|
+|Action |Int |Provides info about what happened when the work data was shared to personal, including:
**1.** File decrypt.
**2.** Copy to location.
**3.** Send to recipient.
**4.** Other.
|
+|FilePath |String |The file path to the file specified in the audit event. For example, the location of a file that’s been decrypted by an employee or uploaded to a personal website. |
+|SourceApplicationName |String |The source app or website. For the source app, this is the AppLocker identity. For the source website, this is the hostname. |
+|SourceName |String |A string provided by the app that’s logging the event. It’s intended to describe the source of the work data. |
+|DestinationEnterpriseID |String |The enterprise ID value for the app or website where the employee is sharing the data.
**NULL**, **Personal**, or **blank** means there’s no enterprise ID because the work data was shared to a personal location. Because we don’t currently support multiple enrollments, you’ll always see one of these values. |
+|DestinationApplicationName |String |The destination app or website. For the destination app, this is the AppLocker identity. For the destination website, this is the hostname. |
+|DestinationName |String |A string provided by the app that’s logging the event. It’s intended to describe the destination of the work data. |
+|Application |String |The AppLocker identity for the app where the audit event happened. |
+
+### Examples
+Here are a few examples of responses from the Reporting CSP.
+
+#### File ownership on a file is changed from work to personal
+```
+110SyncHdr200212Replace200314Get200414./Vendor/MSFT/Reporting/EnterpriseDataProtection/RetrieveByTimeRange/Logsxml<?xml version="1.0" encoding="utf-8"?>
+<Reporting Version="com.contoso/2.0/MDM/Reporting">
+ <User UserID="S-1-12-1-1111111111-1111111111-1111111111-1111111111" EnterpriseID="corp.contoso.com">
+ <Log ProviderType="EDPAudit" LogType="ProtectionRemoved" TimeStamp="131357166318347527">
+ <Policy>Protection removed</Policy>
+ <Justification>NULL</Justification>
+ <FilePath>C:\Users\TestUser\Desktop\tmp\demo\Work document.docx</FilePath>
+ </Log>
+ </User>
+</Reporting>
+```
+
+#### A work file is uploaded to a personal webpage in Edge
+```
+110SyncHdr200212Replace200314Get200414./Vendor/MSFT/Reporting/EnterpriseDataProtection/RetrieveByTimeRange/Logsxml<?xml version="1.0" encoding="utf-8"?>
+<Reporting Version="com.contoso/2.0/MDM/Reporting">
+ <User UserID="S-1-12-1-1111111111-1111111111-1111111111-1111111111" EnterpriseID="corp.contoso.com">
+ <Log ProviderType="EDPAudit" LogType="DataCopied" TimeStamp="131357192409318534">
+ <Policy>CopyPaste</Policy>
+ <Justification>NULL</Justification>
+ <SourceApplicationName>NULL</SourceApplicationName>
+ <DestinationEnterpriseID>NULL</DestinationEnterpriseID>
+ <DestinationApplicationName>mail.contoso.com</DestinationApplicationName>
+ <DataInfo>C:\Users\TestUser\Desktop\tmp\demo\Work document.docx</DataInfo>
+ </Log>
+ </User>
+</Reporting>
+```
+
+#### Work data is pasted into a personal webpage
+```
+110SyncHdr200212Replace200314Get200414./Vendor/MSFT/Reporting/EnterpriseDataProtection/RetrieveByTimeRange/Logsxml<?xml version="1.0" encoding="utf-8"?>
+<Reporting Version="com.contoso/2.0/MDM/Reporting">
+ <User UserID="S-1-12-1-1111111111-1111111111-1111111111-1111111111" EnterpriseID="corp.contoso.com">
+ <Log ProviderType="EDPAudit" LogType="DataCopied" TimeStamp="131357193734179782">
+ <Policy>CopyPaste</Policy>
+ <Justification>NULL</Justification>
+ <SourceApplicationName>O=MICROSOFT CORPORATION, L=REDMOND, S=WASHINGTON, C=US\MICROSOFT OFFICE 2016\WINWORD.EXE\16.0.8027.1000</SourceApplicationName>
+ <DestinationEnterpriseID>NULL</DestinationEnterpriseID>
+ <DestinationApplicationName>mail.contoso.com</DestinationApplicationName>
+ <DataInfo>EnterpriseDataProtectionId|Object Descriptor|Rich Text Format|HTML Format|AnsiText|Text|EnhancedMetafile|Embed Source|Link Source|Link Source Descriptor|ObjectLink|Hyperlink</DataInfo>
+ </Log>
+ </User>
+</Reporting>
+```
+
+#### A work file is opened with a personal application
+```
+110SyncHdr200212Replace200314Get200414./Vendor/MSFT/Reporting/EnterpriseDataProtection/RetrieveByTimeRange/Logsxml<?xml version="1.0" encoding="utf-8"?>
+<Reporting Version="com.contoso/2.0/MDM/Reporting">
+ <User UserID="S-1-12-1-1111111111-1111111111-1111111111-1111111111" EnterpriseID="corp.contoso.com">
+ <Log ProviderType="EDPAudit" LogType="ApplicationGenerated" TimeStamp="131357194991209469">
+ <Policy>NULL</Policy>
+ <Justification></Justification>
+ <Object>C:\Users\TestUser\Desktop\tmp\demo\Work document.docx</Object>
+ <Action>1</Action>
+ <SourceName>O=MICROSOFT CORPORATION, L=REDMOND, S=WASHINGTON, C=US\MICROSOFT® WINDOWS® OPERATING SYSTEM\WORDPAD.EXE\10.0.15063.2</SourceName>
+ <DestinationEnterpriseID>Personal</DestinationEnterpriseID>
+ <DestinationName>O=MICROSOFT CORPORATION, L=REDMOND, S=WASHINGTON, C=US\MICROSOFT® WINDOWS® OPERATING SYSTEM\WORDPAD.EXE\10.0.15063.2</DestinationName>
+ <Application>O=MICROSOFT CORPORATION, L=REDMOND, S=WASHINGTON, C=US\MICROSOFT® WINDOWS® OPERATING SYSTEM\WORDPAD.EXE\10.0.15063.2</Application>
+ </Log>
+ </User>
+</Reporting>
+```
+
+#### Work data is pasted into a personal application
+```
+110SyncHdr200212Replace200314Get200414./Vendor/MSFT/Reporting/EnterpriseDataProtection/RetrieveByTimeRange/Logsxml<?xml version="1.0" encoding="utf-8"?>
+<Reporting Version="com.contoso/2.0/MDM/Reporting">
+ <User UserID="S-1-12-1-1111111111-1111111111-1111111111-1111111111" EnterpriseID="corp.contoso.com">
+ <Log ProviderType="EDPAudit" LogType="DataCopied" TimeStamp="131357196076537270">
+ <Policy>CopyPaste</Policy>
+ <Justification>NULL</Justification>
+ <SourceApplicationName>O=MICROSOFT CORPORATION, L=REDMOND, S=WASHINGTON, C=US\MICROSOFT OFFICE 2016\WINWORD.EXE\16.0.8027.1000</SourceApplicationName>
+ <DestinationEnterpriseID>NULL</DestinationEnterpriseID>
+ <DestinationApplicationName></DestinationApplicationName>
+ <DataInfo>EnterpriseDataProtectionId|Object Descriptor|Rich Text Format|HTML Format|AnsiText|Text|EnhancedMetafile|Embed Source|Link Source|Link Source Descriptor|ObjectLink|Hyperlink</DataInfo>
+ </Log>
+ </User>
+</Reporting>
+```
+
+## Collect WIP audit logs by using Windows Event Forwarding (for Windows desktop domain-joined devices only)
+Use Windows Event Forwarding to collect and aggregate your WIP audit events. You can view your audit events in the Event Viewer.
+
+>[!NOTE]
+>Windows 10 Mobile requires you to use the [Reporting CSP process](#collect-wip-audit-logs-by-using-the-reporting-configuration-service-provider-csp) instead.
+
+**To view the WIP events in the Event Viewer**
+1. Open Event Viewer.
+
+2. In the console tree under **Application and Services Logs\Microsoft\Windows**, click **EDP-Audit-Regular** and **EDP-Audit-TCB**.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/windows/keep-secure/create-and-verify-an-efs-dra-certificate.md b/windows/threat-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md
similarity index 100%
rename from windows/keep-secure/create-and-verify-an-efs-dra-certificate.md
rename to windows/threat-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md
diff --git a/windows/keep-secure/create-vpn-and-wip-policy-using-intune.md b/windows/threat-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune.md
similarity index 100%
rename from windows/keep-secure/create-vpn-and-wip-policy-using-intune.md
rename to windows/threat-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune.md
diff --git a/windows/keep-secure/create-wip-policy-using-intune.md b/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md
similarity index 96%
rename from windows/keep-secure/create-wip-policy-using-intune.md
rename to windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md
index a4d71f320a..87beae20a0 100644
--- a/windows/keep-secure/create-wip-policy-using-intune.md
+++ b/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md
@@ -53,8 +53,6 @@ The steps to add your apps are based on the type of template being applied. You
>[!Important]
>WIP-aware apps are expected to prevent enterprise data from going to unprotected network locations and to avoid encrypting personal data. On the other hand, WIP-unaware apps might not respect the corporate network boundary, and WIP-unaware apps will encrypt all files they create or modify. This means that they could encrypt personal data and cause data loss during the revocation process.
Care must be taken to get a support statement from the software provider that their app is safe with WIP before adding it to your **Allowed apps** list. If you don’t get this statement, it’s possible that you could experience app compat issues due to an app losing the ability to access a necessary file after revocation.
->[!Note]
->If you want to use **File hash** or **Path** rules, instead of **Publisher** rules, you must follow the steps in the [Add apps to your Windows Information Protection (WIP) policy by using the Microsoft Azure Intune custom URI functionality](add-apps-to-protected-list-using-custom-uri.md) topic.
#### Add a Recommended app to your Allowed apps list
For this example, we’re going to add Microsoft Edge, a recommended app, to the **Allowed apps** list.
@@ -106,9 +104,6 @@ If you don't know the publisher or product name, you can find them for both desk
**To find the publisher and product name values for Store apps without installing them**
1. Go to the [Windows Store for Business](https://go.microsoft.com/fwlink/p/?LinkID=722910) website, and find your app. For example, *Microsoft Power BI*.
- >[!NOTE]
- >If your app is already installed on desktop devices, you can use the AppLocker local security policy MMC snap-in to gather the info for adding the app to the protected apps list. For info about how to do this, see the [Add apps to your Windows Information Protection (WIP) policy by using the Microsoft Azure Intune custom URI functionality](add-apps-to-protected-list-using-custom-uri.md) topic.
-
2. Copy the ID value from the app URL. For example, Microsoft Power BI ID URL is https://www.microsoft.com/en-us/store/p/microsoft-power-bi/9nblgggzlxn1, and you'd copy the ID value, `9nblgggzlxn1`.
3. In a browser, run the Store for Business portal web API, to return a JavaScript Object Notation (JSON) file that includes the publisher and product name values. For example, run https://bspmts.mp.microsoft.com/v1/public/catalog/Retail/Products/9nblgggzlxn1/applockerdata, where `9nblgggzlxn1` is replaced with your ID value.
@@ -417,12 +412,12 @@ There are no default locations included with WIP, you must add each of your netw
Proxy servers
proxy.contoso.com:80;proxy2.contoso.com:443
-
Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.
This list shouldn’t include any servers listed in the Proxy servers list, which are used for non-WIP-protected traffic.
If you have multiple resources, you must separate them using the ";" delimiter.
+
Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.
This list shouldn’t include any servers listed in the Internal proxy servers list, which are used for non-WIP-protected traffic.
If you have multiple resources, you must separate them using the ";" delimiter.
Specify the proxy servers your devices will go through to reach your cloud resources.
Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.
This list shouldn’t include any servers listed in the Enterprise Proxy Servers list, which are used for non-WIP-protected traffic.
If you have multiple resources, you must separate them using the ";" delimiter.
+
Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.
This list shouldn’t include any servers listed in the Proxy servers list, which are used for WIP-protected traffic.
If you have multiple resources, you must separate them using the ";" delimiter.
IPv4 ranges
@@ -510,7 +505,6 @@ Optionally, if you don’t want everyone in your organization to be able to shar
>For more info about setting the **AllowAzureRMSForEDP** and the **RMSTemplateIDForEDP** MDM settings, see the [EnterpriseDataProtection CSP](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/enterprisedataprotection-csp) topic. For more info about setting up and using a custom template, see [Configuring custom templates for the Azure Rights Management service](https://docs.microsoft.com/en-us/information-protection/deploy-use/configure-custom-templates) topic.
## Related topics
-- [Add apps to your Windows Information Protection (WIP) policy by using the Microsoft Azure Intune custom URI functionality](add-apps-to-protected-list-using-custom-uri.md)
- [Deploy your Windows Information Protection (WIP) policy](deploy-wip-policy-using-intune.md)
- [Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Azure Intune](create-vpn-and-wip-policy-using-intune.md)
- [General guidance and best practices for Windows Information Protection (WIP)](guidance-and-best-practices-wip.md)
diff --git a/windows/keep-secure/create-wip-policy-using-sccm.md b/windows/threat-protection/windows-information-protection/create-wip-policy-using-sccm.md
similarity index 100%
rename from windows/keep-secure/create-wip-policy-using-sccm.md
rename to windows/threat-protection/windows-information-protection/create-wip-policy-using-sccm.md
diff --git a/windows/keep-secure/deploy-wip-policy-using-intune.md b/windows/threat-protection/windows-information-protection/deploy-wip-policy-using-intune.md
similarity index 93%
rename from windows/keep-secure/deploy-wip-policy-using-intune.md
rename to windows/threat-protection/windows-information-protection/deploy-wip-policy-using-intune.md
index 15976bd8a0..1f45e69882 100644
--- a/windows/keep-secure/deploy-wip-policy-using-intune.md
+++ b/windows/threat-protection/windows-information-protection/deploy-wip-policy-using-intune.md
@@ -38,8 +38,6 @@ After you’ve created your Windows Information Protection (WIP) policy, you'll
## Related topics
- [Create a Windows Information Protection (WIP) policy using Microsoft Azure Intune](create-wip-policy-using-intune.md)
-- [Add apps to your Windows Information Protection (WIP) policy by using the Microsoft Azure Intune custom URI functionality](add-apps-to-protected-list-using-custom-uri.md)
-
- [Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Azure Intune](create-vpn-and-wip-policy-using-intune.md)
- [General guidance and best practices for Windows Information Protection (WIP)](guidance-and-best-practices-wip.md)
diff --git a/windows/keep-secure/enlightened-microsoft-apps-and-wip.md b/windows/threat-protection/windows-information-protection/enlightened-microsoft-apps-and-wip.md
similarity index 100%
rename from windows/keep-secure/enlightened-microsoft-apps-and-wip.md
rename to windows/threat-protection/windows-information-protection/enlightened-microsoft-apps-and-wip.md
diff --git a/windows/keep-secure/guidance-and-best-practices-wip.md b/windows/threat-protection/windows-information-protection/guidance-and-best-practices-wip.md
similarity index 100%
rename from windows/keep-secure/guidance-and-best-practices-wip.md
rename to windows/threat-protection/windows-information-protection/guidance-and-best-practices-wip.md
diff --git a/windows/threat-protection/windows-information-protection/images/intune-add-applocker-xml-file.png b/windows/threat-protection/windows-information-protection/images/intune-add-applocker-xml-file.png
new file mode 100644
index 0000000000..3ceabfd15a
Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/intune-add-applocker-xml-file.png differ
diff --git a/windows/threat-protection/windows-information-protection/images/intune-add-classic-apps.png b/windows/threat-protection/windows-information-protection/images/intune-add-classic-apps.png
new file mode 100644
index 0000000000..09bbda3a06
Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/intune-add-classic-apps.png differ
diff --git a/windows/threat-protection/windows-information-protection/images/intune-add-uwp-apps.png b/windows/threat-protection/windows-information-protection/images/intune-add-uwp-apps.png
new file mode 100644
index 0000000000..17a97b8d3a
Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/intune-add-uwp-apps.png differ
diff --git a/windows/keep-secure/images/intune-add-uwp.png b/windows/threat-protection/windows-information-protection/images/intune-add-uwp.png
similarity index 100%
rename from windows/keep-secure/images/intune-add-uwp.png
rename to windows/threat-protection/windows-information-protection/images/intune-add-uwp.png
diff --git a/windows/threat-protection/windows-information-protection/images/intune-addapps.png b/windows/threat-protection/windows-information-protection/images/intune-addapps.png
new file mode 100644
index 0000000000..52e3983adf
Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/intune-addapps.png differ
diff --git a/windows/keep-secure/images/intune-applocker-before-begin.png b/windows/threat-protection/windows-information-protection/images/intune-applocker-before-begin.png
similarity index 100%
rename from windows/keep-secure/images/intune-applocker-before-begin.png
rename to windows/threat-protection/windows-information-protection/images/intune-applocker-before-begin.png
diff --git a/windows/keep-secure/images/intune-applocker-permissions.png b/windows/threat-protection/windows-information-protection/images/intune-applocker-permissions.png
similarity index 100%
rename from windows/keep-secure/images/intune-applocker-permissions.png
rename to windows/threat-protection/windows-information-protection/images/intune-applocker-permissions.png
diff --git a/windows/keep-secure/images/intune-applocker-publisher-with-app.png b/windows/threat-protection/windows-information-protection/images/intune-applocker-publisher-with-app.png
similarity index 100%
rename from windows/keep-secure/images/intune-applocker-publisher-with-app.png
rename to windows/threat-protection/windows-information-protection/images/intune-applocker-publisher-with-app.png
diff --git a/windows/keep-secure/images/intune-applocker-publisher.png b/windows/threat-protection/windows-information-protection/images/intune-applocker-publisher.png
similarity index 100%
rename from windows/keep-secure/images/intune-applocker-publisher.png
rename to windows/threat-protection/windows-information-protection/images/intune-applocker-publisher.png
diff --git a/windows/keep-secure/images/intune-applocker-select-apps.png b/windows/threat-protection/windows-information-protection/images/intune-applocker-select-apps.png
similarity index 100%
rename from windows/keep-secure/images/intune-applocker-select-apps.png
rename to windows/threat-protection/windows-information-protection/images/intune-applocker-select-apps.png
diff --git a/windows/threat-protection/windows-information-protection/images/intune-corporate-identity.png b/windows/threat-protection/windows-information-protection/images/intune-corporate-identity.png
new file mode 100644
index 0000000000..808de2db0e
Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/intune-corporate-identity.png differ
diff --git a/windows/threat-protection/windows-information-protection/images/intune-createnewpolicy.png b/windows/threat-protection/windows-information-protection/images/intune-createnewpolicy.png
new file mode 100644
index 0000000000..3f7b7af6b6
Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/intune-createnewpolicy.png differ
diff --git a/windows/threat-protection/windows-information-protection/images/intune-data-recovery.png b/windows/threat-protection/windows-information-protection/images/intune-data-recovery.png
new file mode 100644
index 0000000000..f889dbca48
Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/intune-data-recovery.png differ
diff --git a/windows/keep-secure/images/intune-deploy-vpn.png b/windows/threat-protection/windows-information-protection/images/intune-deploy-vpn.png
similarity index 100%
rename from windows/keep-secure/images/intune-deploy-vpn.png
rename to windows/threat-protection/windows-information-protection/images/intune-deploy-vpn.png
diff --git a/windows/threat-protection/windows-information-protection/images/intune-empty-addapps.png b/windows/threat-protection/windows-information-protection/images/intune-empty-addapps.png
new file mode 100644
index 0000000000..7987e91454
Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/intune-empty-addapps.png differ
diff --git a/windows/threat-protection/windows-information-protection/images/intune-generalinfo.png b/windows/threat-protection/windows-information-protection/images/intune-generalinfo.png
new file mode 100644
index 0000000000..70e726d379
Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/intune-generalinfo.png differ
diff --git a/windows/keep-secure/images/intune-groupselection.png b/windows/threat-protection/windows-information-protection/images/intune-groupselection.png
similarity index 100%
rename from windows/keep-secure/images/intune-groupselection.png
rename to windows/threat-protection/windows-information-protection/images/intune-groupselection.png
diff --git a/windows/keep-secure/images/intune-groupselection_vpnlink.png b/windows/threat-protection/windows-information-protection/images/intune-groupselection_vpnlink.png
similarity index 100%
rename from windows/keep-secure/images/intune-groupselection_vpnlink.png
rename to windows/threat-protection/windows-information-protection/images/intune-groupselection_vpnlink.png
diff --git a/windows/keep-secure/images/intune-local-security-export.png b/windows/threat-protection/windows-information-protection/images/intune-local-security-export.png
similarity index 100%
rename from windows/keep-secure/images/intune-local-security-export.png
rename to windows/threat-protection/windows-information-protection/images/intune-local-security-export.png
diff --git a/windows/keep-secure/images/intune-local-security-snapin-updated.png b/windows/threat-protection/windows-information-protection/images/intune-local-security-snapin-updated.png
similarity index 100%
rename from windows/keep-secure/images/intune-local-security-snapin-updated.png
rename to windows/threat-protection/windows-information-protection/images/intune-local-security-snapin-updated.png
diff --git a/windows/keep-secure/images/intune-local-security-snapin.png b/windows/threat-protection/windows-information-protection/images/intune-local-security-snapin.png
similarity index 100%
rename from windows/keep-secure/images/intune-local-security-snapin.png
rename to windows/threat-protection/windows-information-protection/images/intune-local-security-snapin.png
diff --git a/windows/keep-secure/images/intune-managedeployment.png b/windows/threat-protection/windows-information-protection/images/intune-managedeployment.png
similarity index 100%
rename from windows/keep-secure/images/intune-managedeployment.png
rename to windows/threat-protection/windows-information-protection/images/intune-managedeployment.png
diff --git a/windows/threat-protection/windows-information-protection/images/intune-network-detection-boxes.png b/windows/threat-protection/windows-information-protection/images/intune-network-detection-boxes.png
new file mode 100644
index 0000000000..bc801a8521
Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/intune-network-detection-boxes.png differ
diff --git a/windows/threat-protection/windows-information-protection/images/intune-networklocation.png b/windows/threat-protection/windows-information-protection/images/intune-networklocation.png
new file mode 100644
index 0000000000..64d9ebda26
Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/intune-networklocation.png differ
diff --git a/windows/threat-protection/windows-information-protection/images/intune-optional-settings.png b/windows/threat-protection/windows-information-protection/images/intune-optional-settings.png
new file mode 100644
index 0000000000..3ec8bec32d
Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/intune-optional-settings.png differ
diff --git a/windows/threat-protection/windows-information-protection/images/intune-protection-mode.png b/windows/threat-protection/windows-information-protection/images/intune-protection-mode.png
new file mode 100644
index 0000000000..b3340d6e4f
Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/intune-protection-mode.png differ
diff --git a/windows/keep-secure/images/intune-vpn-authentication.png b/windows/threat-protection/windows-information-protection/images/intune-vpn-authentication.png
similarity index 100%
rename from windows/keep-secure/images/intune-vpn-authentication.png
rename to windows/threat-protection/windows-information-protection/images/intune-vpn-authentication.png
diff --git a/windows/keep-secure/images/intune-vpn-createpolicy.png b/windows/threat-protection/windows-information-protection/images/intune-vpn-createpolicy.png
similarity index 100%
rename from windows/keep-secure/images/intune-vpn-createpolicy.png
rename to windows/threat-protection/windows-information-protection/images/intune-vpn-createpolicy.png
diff --git a/windows/keep-secure/images/intune-vpn-customconfig.png b/windows/threat-protection/windows-information-protection/images/intune-vpn-customconfig.png
similarity index 100%
rename from windows/keep-secure/images/intune-vpn-customconfig.png
rename to windows/threat-protection/windows-information-protection/images/intune-vpn-customconfig.png
diff --git a/windows/keep-secure/images/intune-vpn-omaurisettings.png b/windows/threat-protection/windows-information-protection/images/intune-vpn-omaurisettings.png
similarity index 100%
rename from windows/keep-secure/images/intune-vpn-omaurisettings.png
rename to windows/threat-protection/windows-information-protection/images/intune-vpn-omaurisettings.png
diff --git a/windows/keep-secure/images/intune-vpn-titledescription.png b/windows/threat-protection/windows-information-protection/images/intune-vpn-titledescription.png
similarity index 100%
rename from windows/keep-secure/images/intune-vpn-titledescription.png
rename to windows/threat-protection/windows-information-protection/images/intune-vpn-titledescription.png
diff --git a/windows/keep-secure/images/intune-vpn-vpnsettings.png b/windows/threat-protection/windows-information-protection/images/intune-vpn-vpnsettings.png
similarity index 100%
rename from windows/keep-secure/images/intune-vpn-vpnsettings.png
rename to windows/threat-protection/windows-information-protection/images/intune-vpn-vpnsettings.png
diff --git a/windows/keep-secure/images/intune-vpn-wipmodeid.png b/windows/threat-protection/windows-information-protection/images/intune-vpn-wipmodeid.png
similarity index 100%
rename from windows/keep-secure/images/intune-vpn-wipmodeid.png
rename to windows/threat-protection/windows-information-protection/images/intune-vpn-wipmodeid.png
diff --git a/windows/keep-secure/images/wip-applocker-default-rule-warning.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-default-rule-warning.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-default-rule-warning.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-default-rule-warning.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-1.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-1.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-1.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-1.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-app-and-permissions-desktop.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-app-and-permissions-desktop.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-app-and-permissions-desktop.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-app-and-permissions-desktop.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-app-and-permissions.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-app-and-permissions.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-app-and-permissions.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-app-and-permissions.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-auto-generate-rules.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-auto-generate-rules.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-auto-generate-rules.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-auto-generate-rules.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-create.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-create.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-create.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-create.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-export-rules-desktop.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-export-rules-desktop.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-export-rules-desktop.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-export-rules-desktop.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-export-rules.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-export-rules.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-export-rules.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-export-rules.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-export.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-export.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-export.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-export.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-review-rules.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-review-rules.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-review-rules.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-review-rules.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-rule-preferences.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-rule-preferences.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-rule-preferences.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-rule-preferences.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-wizard-1.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-wizard-1.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-wizard-1.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-wizard-1.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-wizard-2.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-wizard-2.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-wizard-2.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-wizard-2.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-wizard-3.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-wizard-3.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-wizard-3.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-wizard-3.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-wizard-4.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-wizard-4.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-wizard-4.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-wizard-4.png
diff --git a/windows/keep-secure/images/wip-applocker-secpol-wizard-5.png b/windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-wizard-5.png
similarity index 100%
rename from windows/keep-secure/images/wip-applocker-secpol-wizard-5.png
rename to windows/threat-protection/windows-information-protection/images/wip-applocker-secpol-wizard-5.png
diff --git a/windows/keep-secure/images/wip-azure-add-desktop-apps.png b/windows/threat-protection/windows-information-protection/images/wip-azure-add-desktop-apps.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-add-desktop-apps.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-add-desktop-apps.png
diff --git a/windows/keep-secure/images/wip-azure-add-recommended-apps.png b/windows/threat-protection/windows-information-protection/images/wip-azure-add-recommended-apps.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-add-recommended-apps.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-add-recommended-apps.png
diff --git a/windows/keep-secure/images/wip-azure-add-store-apps.png b/windows/threat-protection/windows-information-protection/images/wip-azure-add-store-apps.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-add-store-apps.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-add-store-apps.png
diff --git a/windows/keep-secure/images/wip-azure-add-uri-desktop-apps.png b/windows/threat-protection/windows-information-protection/images/wip-azure-add-uri-desktop-apps.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-add-uri-desktop-apps.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-add-uri-desktop-apps.png
diff --git a/windows/keep-secure/images/wip-azure-add-uri-store-apps.png b/windows/threat-protection/windows-information-protection/images/wip-azure-add-uri-store-apps.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-add-uri-store-apps.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-add-uri-store-apps.png
diff --git a/windows/keep-secure/images/wip-azure-add-user-groups.png b/windows/threat-protection/windows-information-protection/images/wip-azure-add-user-groups.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-add-user-groups.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-add-user-groups.png
diff --git a/windows/keep-secure/images/wip-azure-advanced-settings-efsdra.png b/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-efsdra.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-advanced-settings-efsdra.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-efsdra.png
diff --git a/windows/keep-secure/images/wip-azure-advanced-settings-network-autodetect.png b/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-network-autodetect.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-advanced-settings-network-autodetect.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-network-autodetect.png
diff --git a/windows/keep-secure/images/wip-azure-advanced-settings-network.png b/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-network.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-advanced-settings-network.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-network.png
diff --git a/windows/keep-secure/images/wip-azure-advanced-settings-optional.png b/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-optional.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-advanced-settings-optional.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-optional.png
diff --git a/windows/keep-secure/images/wip-azure-allowed-apps-pane.png b/windows/threat-protection/windows-information-protection/images/wip-azure-allowed-apps-pane.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-allowed-apps-pane.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-allowed-apps-pane.png
diff --git a/windows/keep-secure/images/wip-azure-allowed-apps-with-apps.png b/windows/threat-protection/windows-information-protection/images/wip-azure-allowed-apps-with-apps.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-allowed-apps-with-apps.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-allowed-apps-with-apps.png
diff --git a/windows/keep-secure/images/wip-azure-configure-desktop-apps-using-uri.png b/windows/threat-protection/windows-information-protection/images/wip-azure-configure-desktop-apps-using-uri.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-configure-desktop-apps-using-uri.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-configure-desktop-apps-using-uri.png
diff --git a/windows/keep-secure/images/wip-azure-configure-store-apps-using-uri.png b/windows/threat-protection/windows-information-protection/images/wip-azure-configure-store-apps-using-uri.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-configure-store-apps-using-uri.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-configure-store-apps-using-uri.png
diff --git a/windows/keep-secure/images/wip-azure-import-apps.png b/windows/threat-protection/windows-information-protection/images/wip-azure-import-apps.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-import-apps.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-import-apps.png
diff --git a/windows/keep-secure/images/wip-azure-portal-add-policy.png b/windows/threat-protection/windows-information-protection/images/wip-azure-portal-add-policy.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-portal-add-policy.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-portal-add-policy.png
diff --git a/windows/keep-secure/images/wip-azure-portal-start.png b/windows/threat-protection/windows-information-protection/images/wip-azure-portal-start.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-portal-start.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-portal-start.png
diff --git a/windows/keep-secure/images/wip-azure-required-settings-corp-identity.png b/windows/threat-protection/windows-information-protection/images/wip-azure-required-settings-corp-identity.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-required-settings-corp-identity.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-required-settings-corp-identity.png
diff --git a/windows/keep-secure/images/wip-azure-required-settings-protection-mode.png b/windows/threat-protection/windows-information-protection/images/wip-azure-required-settings-protection-mode.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-required-settings-protection-mode.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-required-settings-protection-mode.png
diff --git a/windows/keep-secure/images/wip-azure-vpn-configure-policy.png b/windows/threat-protection/windows-information-protection/images/wip-azure-vpn-configure-policy.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-vpn-configure-policy.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-vpn-configure-policy.png
diff --git a/windows/keep-secure/images/wip-azure-vpn-custom-omauri.png b/windows/threat-protection/windows-information-protection/images/wip-azure-vpn-custom-omauri.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-vpn-custom-omauri.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-vpn-custom-omauri.png
diff --git a/windows/keep-secure/images/wip-azure-vpn-device-policy.png b/windows/threat-protection/windows-information-protection/images/wip-azure-vpn-device-policy.png
similarity index 100%
rename from windows/keep-secure/images/wip-azure-vpn-device-policy.png
rename to windows/threat-protection/windows-information-protection/images/wip-azure-vpn-device-policy.png
diff --git a/windows/keep-secure/images/wip-intune-app-reconfig-warning.png b/windows/threat-protection/windows-information-protection/images/wip-intune-app-reconfig-warning.png
similarity index 100%
rename from windows/keep-secure/images/wip-intune-app-reconfig-warning.png
rename to windows/threat-protection/windows-information-protection/images/wip-intune-app-reconfig-warning.png
diff --git a/windows/keep-secure/images/wip-sccm-add-network-domain.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-add-network-domain.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-add-network-domain.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-add-network-domain.png
diff --git a/windows/keep-secure/images/wip-sccm-addapplockerfile.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-addapplockerfile.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-addapplockerfile.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-addapplockerfile.png
diff --git a/windows/keep-secure/images/wip-sccm-adddesktopapp.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-adddesktopapp.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-adddesktopapp.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-adddesktopapp.png
diff --git a/windows/keep-secure/images/wip-sccm-additionalsettings.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-additionalsettings.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-additionalsettings.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-additionalsettings.png
diff --git a/windows/keep-secure/images/wip-sccm-addpolicy.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-addpolicy.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-addpolicy.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-addpolicy.png
diff --git a/windows/keep-secure/images/wip-sccm-adduniversalapp.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-adduniversalapp.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-adduniversalapp.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-adduniversalapp.png
diff --git a/windows/keep-secure/images/wip-sccm-appmgmt.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-appmgmt.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-appmgmt.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-appmgmt.png
diff --git a/windows/keep-secure/images/wip-sccm-corp-identity.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-corp-identity.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-corp-identity.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-corp-identity.png
diff --git a/windows/keep-secure/images/wip-sccm-devicesettings.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-devicesettings.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-devicesettings.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-devicesettings.png
diff --git a/windows/keep-secure/images/wip-sccm-dra.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-dra.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-dra.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-dra.png
diff --git a/windows/keep-secure/images/wip-sccm-generalscreen.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-generalscreen.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-generalscreen.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-generalscreen.png
diff --git a/windows/keep-secure/images/wip-sccm-network-domain.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-network-domain.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-network-domain.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-network-domain.png
diff --git a/windows/keep-secure/images/wip-sccm-optsettings.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-optsettings.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-optsettings.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-optsettings.png
diff --git a/windows/keep-secure/images/wip-sccm-summaryscreen.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-summaryscreen.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-summaryscreen.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-summaryscreen.png
diff --git a/windows/keep-secure/images/wip-sccm-supportedplat.png b/windows/threat-protection/windows-information-protection/images/wip-sccm-supportedplat.png
similarity index 100%
rename from windows/keep-secure/images/wip-sccm-supportedplat.png
rename to windows/threat-protection/windows-information-protection/images/wip-sccm-supportedplat.png
diff --git a/windows/keep-secure/images/wip-select-column.png b/windows/threat-protection/windows-information-protection/images/wip-select-column.png
similarity index 100%
rename from windows/keep-secure/images/wip-select-column.png
rename to windows/threat-protection/windows-information-protection/images/wip-select-column.png
diff --git a/windows/keep-secure/images/wip-taskmgr.png b/windows/threat-protection/windows-information-protection/images/wip-taskmgr.png
similarity index 100%
rename from windows/keep-secure/images/wip-taskmgr.png
rename to windows/threat-protection/windows-information-protection/images/wip-taskmgr.png
diff --git a/windows/keep-secure/limitations-with-wip.md b/windows/threat-protection/windows-information-protection/limitations-with-wip.md
similarity index 100%
rename from windows/keep-secure/limitations-with-wip.md
rename to windows/threat-protection/windows-information-protection/limitations-with-wip.md
diff --git a/windows/keep-secure/mandatory-settings-for-wip.md b/windows/threat-protection/windows-information-protection/mandatory-settings-for-wip.md
similarity index 100%
rename from windows/keep-secure/mandatory-settings-for-wip.md
rename to windows/threat-protection/windows-information-protection/mandatory-settings-for-wip.md
diff --git a/windows/keep-secure/overview-create-wip-policy.md b/windows/threat-protection/windows-information-protection/overview-create-wip-policy.md
similarity index 100%
rename from windows/keep-secure/overview-create-wip-policy.md
rename to windows/threat-protection/windows-information-protection/overview-create-wip-policy.md
diff --git a/windows/keep-secure/protect-enterprise-data-using-wip.md b/windows/threat-protection/windows-information-protection/protect-enterprise-data-using-wip.md
similarity index 95%
rename from windows/keep-secure/protect-enterprise-data-using-wip.md
rename to windows/threat-protection/windows-information-protection/protect-enterprise-data-using-wip.md
index 3920cecbbc..534d29dde5 100644
--- a/windows/keep-secure/protect-enterprise-data-using-wip.md
+++ b/windows/threat-protection/windows-information-protection/protect-enterprise-data-using-wip.md
@@ -121,7 +121,7 @@ WIP currently addresses these enterprise scenarios:
### WIP-protection modes
Enterprise data is automatically encrypted after it’s loaded on a device from an enterprise source or if an employee marks the data as corporate. Then, when the enterprise data is written to disk, WIP uses the Windows-provided Encrypting File System (EFS) to protect it and associate it with your enterprise identity.
-Your WIP policy includes a list of trusted apps that are allowed to access and process corporate data. This list of apps is implemented through the [AppLocker](applocker-overview.md) functionality, controlling what apps are allowed to run and letting the Windows operating system know that the apps can edit corporate data. Apps included on this list don’t have to be modified to open corporate data because their presence on the list allows Windows to determine whether to grant them access. However, new for Windows 10, app developers can use a new set of application programming interfaces (APIs) to create *enlightened* apps that can use and edit both enterprise and personal data. A huge benefit to working with enlightened apps is that dual-use apps, like Microsoft Word, can be used with less concern about encrypting personal data by mistake because the APIs allow the app to determine whether data is owned by the enterprise or if it’s personally owned.
+Your WIP policy includes a list of trusted apps that are allowed to access and process corporate data. This list of apps is implemented through the [AppLocker](/windows/device-security/applocker/applocker-overview) functionality, controlling what apps are allowed to run and letting the Windows operating system know that the apps can edit corporate data. Apps included on this list don’t have to be modified to open corporate data because their presence on the list allows Windows to determine whether to grant them access. However, new for Windows 10, app developers can use a new set of application programming interfaces (APIs) to create *enlightened* apps that can use and edit both enterprise and personal data. A huge benefit to working with enlightened apps is that dual-use apps, like Microsoft Word, can be used with less concern about encrypting personal data by mistake because the APIs allow the app to determine whether data is owned by the enterprise or if it’s personally owned.
You can set your WIP policy to use 1 of 4 protection and management modes:
diff --git a/windows/keep-secure/recommended-network-definitions-for-wip.md b/windows/threat-protection/windows-information-protection/recommended-network-definitions-for-wip.md
similarity index 100%
rename from windows/keep-secure/recommended-network-definitions-for-wip.md
rename to windows/threat-protection/windows-information-protection/recommended-network-definitions-for-wip.md
diff --git a/windows/keep-secure/testing-scenarios-for-wip.md b/windows/threat-protection/windows-information-protection/testing-scenarios-for-wip.md
similarity index 100%
rename from windows/keep-secure/testing-scenarios-for-wip.md
rename to windows/threat-protection/windows-information-protection/testing-scenarios-for-wip.md
diff --git a/windows/keep-secure/using-owa-with-wip.md b/windows/threat-protection/windows-information-protection/using-owa-with-wip.md
similarity index 100%
rename from windows/keep-secure/using-owa-with-wip.md
rename to windows/threat-protection/windows-information-protection/using-owa-with-wip.md
diff --git a/windows/keep-secure/wip-app-enterprise-context.md b/windows/threat-protection/windows-information-protection/wip-app-enterprise-context.md
similarity index 100%
rename from windows/keep-secure/wip-app-enterprise-context.md
rename to windows/threat-protection/windows-information-protection/wip-app-enterprise-context.md
diff --git a/windows/update/TOC.md b/windows/update/TOC.md
deleted file mode 100644
index b16ed8c89e..0000000000
--- a/windows/update/TOC.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# [Update Windows 10](index.md)
-## [Quick guide to Windows as a service](waas-quick-start.md)
-## [Overview of Windows as a service](waas-overview.md)
-## [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md)
-## [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md)
-## [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md)
-## [Monitor Windows Updates with Update Compliance](update-compliance-monitor.md)
-### [Get started with Update Compliance](update-compliance-get-started.md)
-### [Use Update Compliance](update-compliance-using.md)
-## [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md)
-### [Configure Delivery Optimization for Windows 10 updates](waas-delivery-optimization.md)
-### [Configure BranchCache for Windows 10 updates](waas-branchcache.md)
-## [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md)
-## [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md)
-### [Configure Windows Update for Business](waas-configure-wufb.md)
-### [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
-### [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-### [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
-## [Manage Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
-## [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
-## [Manage device restarts after updates](waas-restart.md)
-## [Windows Insider Program for Business](waas-windows-insider-for-business.md)
-### [Windows Insider Program for Business using Azure Active Directory](waas-windows-insider-for-business-aad.md)
-### [Windows Insider Program for Business Frequently Asked Questions](waas-windows-insider-for-business-faq.md)
-## [Change history for Update Windows 10](change-history-for-update-windows-10.md)
-
diff --git a/windows/update/images/ActionCenterXML.jpg b/windows/update/images/ActionCenterXML.jpg
deleted file mode 100644
index b9832b2708..0000000000
Binary files a/windows/update/images/ActionCenterXML.jpg and /dev/null differ
diff --git a/windows/update/images/AppsXML.jpg b/windows/update/images/AppsXML.jpg
deleted file mode 100644
index ecc1869bb5..0000000000
Binary files a/windows/update/images/AppsXML.jpg and /dev/null differ
diff --git a/windows/update/images/AppsXML.png b/windows/update/images/AppsXML.png
deleted file mode 100644
index 3981543264..0000000000
Binary files a/windows/update/images/AppsXML.png and /dev/null differ
diff --git a/windows/update/images/ButtonsXML.jpg b/windows/update/images/ButtonsXML.jpg
deleted file mode 100644
index 238eca7e68..0000000000
Binary files a/windows/update/images/ButtonsXML.jpg and /dev/null differ
diff --git a/windows/update/images/CSPRunnerXML.jpg b/windows/update/images/CSPRunnerXML.jpg
deleted file mode 100644
index 071b316a9e..0000000000
Binary files a/windows/update/images/CSPRunnerXML.jpg and /dev/null differ
diff --git a/windows/update/images/ICDstart-option.PNG b/windows/update/images/ICDstart-option.PNG
deleted file mode 100644
index 1ba49bb261..0000000000
Binary files a/windows/update/images/ICDstart-option.PNG and /dev/null differ
diff --git a/windows/update/images/MenuItemsXML.png b/windows/update/images/MenuItemsXML.png
deleted file mode 100644
index cc681250bb..0000000000
Binary files a/windows/update/images/MenuItemsXML.png and /dev/null differ
diff --git a/windows/update/images/SettingsXML.png b/windows/update/images/SettingsXML.png
deleted file mode 100644
index 98a324bdea..0000000000
Binary files a/windows/update/images/SettingsXML.png and /dev/null differ
diff --git a/windows/update/images/StartGrid.jpg b/windows/update/images/StartGrid.jpg
deleted file mode 100644
index 36136f3201..0000000000
Binary files a/windows/update/images/StartGrid.jpg and /dev/null differ
diff --git a/windows/update/images/StartGridPinnedApps.jpg b/windows/update/images/StartGridPinnedApps.jpg
deleted file mode 100644
index fbade52f53..0000000000
Binary files a/windows/update/images/StartGridPinnedApps.jpg and /dev/null differ
diff --git a/windows/update/images/TilesXML.png b/windows/update/images/TilesXML.png
deleted file mode 100644
index cec52bbbf7..0000000000
Binary files a/windows/update/images/TilesXML.png and /dev/null differ
diff --git a/windows/update/images/aadj1.jpg b/windows/update/images/aadj1.jpg
deleted file mode 100644
index 2348fc4c84..0000000000
Binary files a/windows/update/images/aadj1.jpg and /dev/null differ
diff --git a/windows/update/images/aadj2.jpg b/windows/update/images/aadj2.jpg
deleted file mode 100644
index 39486bfc66..0000000000
Binary files a/windows/update/images/aadj2.jpg and /dev/null differ
diff --git a/windows/update/images/aadj3.jpg b/windows/update/images/aadj3.jpg
deleted file mode 100644
index 80e1f5762f..0000000000
Binary files a/windows/update/images/aadj3.jpg and /dev/null differ
diff --git a/windows/update/images/aadj4.jpg b/windows/update/images/aadj4.jpg
deleted file mode 100644
index 0db2910012..0000000000
Binary files a/windows/update/images/aadj4.jpg and /dev/null differ
diff --git a/windows/update/images/aadjbrowser.jpg b/windows/update/images/aadjbrowser.jpg
deleted file mode 100644
index c8d909688e..0000000000
Binary files a/windows/update/images/aadjbrowser.jpg and /dev/null differ
diff --git a/windows/update/images/aadjcal.jpg b/windows/update/images/aadjcal.jpg
deleted file mode 100644
index 1858886f5f..0000000000
Binary files a/windows/update/images/aadjcal.jpg and /dev/null differ
diff --git a/windows/update/images/aadjcalmail.jpg b/windows/update/images/aadjcalmail.jpg
deleted file mode 100644
index 5a5661259a..0000000000
Binary files a/windows/update/images/aadjcalmail.jpg and /dev/null differ
diff --git a/windows/update/images/aadjmail1.jpg b/windows/update/images/aadjmail1.jpg
deleted file mode 100644
index 89b1fcc3b7..0000000000
Binary files a/windows/update/images/aadjmail1.jpg and /dev/null differ
diff --git a/windows/update/images/aadjmail2.jpg b/windows/update/images/aadjmail2.jpg
deleted file mode 100644
index 0608010c6a..0000000000
Binary files a/windows/update/images/aadjmail2.jpg and /dev/null differ
diff --git a/windows/update/images/aadjmail3.jpg b/windows/update/images/aadjmail3.jpg
deleted file mode 100644
index d7154a7e0e..0000000000
Binary files a/windows/update/images/aadjmail3.jpg and /dev/null differ
diff --git a/windows/update/images/aadjonedrive.jpg b/windows/update/images/aadjonedrive.jpg
deleted file mode 100644
index 6fb1196d5f..0000000000
Binary files a/windows/update/images/aadjonedrive.jpg and /dev/null differ
diff --git a/windows/update/images/aadjonenote.jpg b/windows/update/images/aadjonenote.jpg
deleted file mode 100644
index 4ccd207f9f..0000000000
Binary files a/windows/update/images/aadjonenote.jpg and /dev/null differ
diff --git a/windows/update/images/aadjonenote2.jpg b/windows/update/images/aadjonenote2.jpg
deleted file mode 100644
index 1b6941e638..0000000000
Binary files a/windows/update/images/aadjonenote2.jpg and /dev/null differ
diff --git a/windows/update/images/aadjonenote3.jpg b/windows/update/images/aadjonenote3.jpg
deleted file mode 100644
index 3ac6911046..0000000000
Binary files a/windows/update/images/aadjonenote3.jpg and /dev/null differ
diff --git a/windows/update/images/aadjpin.jpg b/windows/update/images/aadjpin.jpg
deleted file mode 100644
index dac6cfec30..0000000000
Binary files a/windows/update/images/aadjpin.jpg and /dev/null differ
diff --git a/windows/update/images/aadjppt.jpg b/windows/update/images/aadjppt.jpg
deleted file mode 100644
index 268d5fe662..0000000000
Binary files a/windows/update/images/aadjppt.jpg and /dev/null differ
diff --git a/windows/update/images/aadjverify.jpg b/windows/update/images/aadjverify.jpg
deleted file mode 100644
index 7b30210f39..0000000000
Binary files a/windows/update/images/aadjverify.jpg and /dev/null differ
diff --git a/windows/update/images/aadjword.jpg b/windows/update/images/aadjword.jpg
deleted file mode 100644
index db2a58406e..0000000000
Binary files a/windows/update/images/aadjword.jpg and /dev/null differ
diff --git a/windows/update/images/aadjwsfb.jpg b/windows/update/images/aadjwsfb.jpg
deleted file mode 100644
index 428f1a26d4..0000000000
Binary files a/windows/update/images/aadjwsfb.jpg and /dev/null differ
diff --git a/windows/update/images/apprule.png b/windows/update/images/apprule.png
deleted file mode 100644
index ec5417849a..0000000000
Binary files a/windows/update/images/apprule.png and /dev/null differ
diff --git a/windows/update/images/appwarning.png b/windows/update/images/appwarning.png
deleted file mode 100644
index 877d8afebd..0000000000
Binary files a/windows/update/images/appwarning.png and /dev/null differ
diff --git a/windows/update/images/backicon.png b/windows/update/images/backicon.png
deleted file mode 100644
index 3007e448b1..0000000000
Binary files a/windows/update/images/backicon.png and /dev/null differ
diff --git a/windows/update/images/checklistdone.png b/windows/update/images/checklistdone.png
deleted file mode 100644
index 7e53f74d0e..0000000000
Binary files a/windows/update/images/checklistdone.png and /dev/null differ
diff --git a/windows/update/images/choose-package.png b/windows/update/images/choose-package.png
deleted file mode 100644
index 2bf7a18648..0000000000
Binary files a/windows/update/images/choose-package.png and /dev/null differ
diff --git a/windows/update/images/config-policy.png b/windows/update/images/config-policy.png
deleted file mode 100644
index b9cba70af6..0000000000
Binary files a/windows/update/images/config-policy.png and /dev/null differ
diff --git a/windows/update/images/config-source.png b/windows/update/images/config-source.png
deleted file mode 100644
index 58938bacf7..0000000000
Binary files a/windows/update/images/config-source.png and /dev/null differ
diff --git a/windows/update/images/configconflict.png b/windows/update/images/configconflict.png
deleted file mode 100644
index 011a2d76e7..0000000000
Binary files a/windows/update/images/configconflict.png and /dev/null differ
diff --git a/windows/update/images/connect-aad.png b/windows/update/images/connect-aad.png
deleted file mode 100644
index 8583866165..0000000000
Binary files a/windows/update/images/connect-aad.png and /dev/null differ
diff --git a/windows/update/images/csp-placeholder.png b/windows/update/images/csp-placeholder.png
deleted file mode 100644
index fe6bcf4720..0000000000
Binary files a/windows/update/images/csp-placeholder.png and /dev/null differ
diff --git a/windows/update/images/cspinicd.png b/windows/update/images/cspinicd.png
deleted file mode 100644
index a60ad9e2bf..0000000000
Binary files a/windows/update/images/cspinicd.png and /dev/null differ
diff --git a/windows/update/images/csptable.png b/windows/update/images/csptable.png
deleted file mode 100644
index ee210cad69..0000000000
Binary files a/windows/update/images/csptable.png and /dev/null differ
diff --git a/windows/update/images/deploymentworkflow.png b/windows/update/images/deploymentworkflow.png
deleted file mode 100644
index b665a0bfea..0000000000
Binary files a/windows/update/images/deploymentworkflow.png and /dev/null differ
diff --git a/windows/update/images/export-mgt-desktop.png b/windows/update/images/export-mgt-desktop.png
deleted file mode 100644
index 13349c3b4e..0000000000
Binary files a/windows/update/images/export-mgt-desktop.png and /dev/null differ
diff --git a/windows/update/images/export-mgt-mobile.png b/windows/update/images/export-mgt-mobile.png
deleted file mode 100644
index 6a74c23e59..0000000000
Binary files a/windows/update/images/export-mgt-mobile.png and /dev/null differ
diff --git a/windows/update/images/express-settings.png b/windows/update/images/express-settings.png
deleted file mode 100644
index 99e9c4825a..0000000000
Binary files a/windows/update/images/express-settings.png and /dev/null differ
diff --git a/windows/update/images/fig1-deferupgrades.png b/windows/update/images/fig1-deferupgrades.png
deleted file mode 100644
index f8c52b943e..0000000000
Binary files a/windows/update/images/fig1-deferupgrades.png and /dev/null differ
diff --git a/windows/update/images/fig2-deploymenttimeline.png b/windows/update/images/fig2-deploymenttimeline.png
deleted file mode 100644
index a8061d2f15..0000000000
Binary files a/windows/update/images/fig2-deploymenttimeline.png and /dev/null differ
diff --git a/windows/update/images/fig3-overlaprelease.png b/windows/update/images/fig3-overlaprelease.png
deleted file mode 100644
index 58747a35cf..0000000000
Binary files a/windows/update/images/fig3-overlaprelease.png and /dev/null differ
diff --git a/windows/update/images/funfacts.png b/windows/update/images/funfacts.png
deleted file mode 100644
index 71355ec370..0000000000
Binary files a/windows/update/images/funfacts.png and /dev/null differ
diff --git a/windows/update/images/genrule.png b/windows/update/images/genrule.png
deleted file mode 100644
index 1d68f1ad0b..0000000000
Binary files a/windows/update/images/genrule.png and /dev/null differ
diff --git a/windows/update/images/gp-branch.png b/windows/update/images/gp-branch.png
deleted file mode 100644
index 997bcc830a..0000000000
Binary files a/windows/update/images/gp-branch.png and /dev/null differ
diff --git a/windows/update/images/gp-exclude-drivers.png b/windows/update/images/gp-exclude-drivers.png
deleted file mode 100644
index 0010749139..0000000000
Binary files a/windows/update/images/gp-exclude-drivers.png and /dev/null differ
diff --git a/windows/update/images/gp-feature.png b/windows/update/images/gp-feature.png
deleted file mode 100644
index b862d545d4..0000000000
Binary files a/windows/update/images/gp-feature.png and /dev/null differ
diff --git a/windows/update/images/gp-quality.png b/windows/update/images/gp-quality.png
deleted file mode 100644
index d7ff30172d..0000000000
Binary files a/windows/update/images/gp-quality.png and /dev/null differ
diff --git a/windows/update/images/icd-adv-shared-pc.PNG b/windows/update/images/icd-adv-shared-pc.PNG
deleted file mode 100644
index a8da5fa78a..0000000000
Binary files a/windows/update/images/icd-adv-shared-pc.PNG and /dev/null differ
diff --git a/windows/update/images/icd-school.PNG b/windows/update/images/icd-school.PNG
deleted file mode 100644
index e6a944a193..0000000000
Binary files a/windows/update/images/icd-school.PNG and /dev/null differ
diff --git a/windows/update/images/icd-simple.PNG b/windows/update/images/icd-simple.PNG
deleted file mode 100644
index 7ae8a1728b..0000000000
Binary files a/windows/update/images/icd-simple.PNG and /dev/null differ
diff --git a/windows/update/images/icdbrowse.png b/windows/update/images/icdbrowse.png
deleted file mode 100644
index 53c91074c7..0000000000
Binary files a/windows/update/images/icdbrowse.png and /dev/null differ
diff --git a/windows/update/images/identitychoices.png b/windows/update/images/identitychoices.png
deleted file mode 100644
index 9a69c04f20..0000000000
Binary files a/windows/update/images/identitychoices.png and /dev/null differ
diff --git a/windows/update/images/launchicon.png b/windows/update/images/launchicon.png
deleted file mode 100644
index d469c68a2c..0000000000
Binary files a/windows/update/images/launchicon.png and /dev/null differ
diff --git a/windows/update/images/license-terms.png b/windows/update/images/license-terms.png
deleted file mode 100644
index 8dd34b0a18..0000000000
Binary files a/windows/update/images/license-terms.png and /dev/null differ
diff --git a/windows/update/images/lockdownapps.png b/windows/update/images/lockdownapps.png
deleted file mode 100644
index ad928d87bc..0000000000
Binary files a/windows/update/images/lockdownapps.png and /dev/null differ
diff --git a/windows/update/images/lockscreen.png b/windows/update/images/lockscreen.png
deleted file mode 100644
index 68c64e15ec..0000000000
Binary files a/windows/update/images/lockscreen.png and /dev/null differ
diff --git a/windows/update/images/lockscreenpolicy.png b/windows/update/images/lockscreenpolicy.png
deleted file mode 100644
index 30b6a7ae9d..0000000000
Binary files a/windows/update/images/lockscreenpolicy.png and /dev/null differ
diff --git a/windows/update/images/mdm-diag-report-powershell.PNG b/windows/update/images/mdm-diag-report-powershell.PNG
deleted file mode 100644
index 86f5b49211..0000000000
Binary files a/windows/update/images/mdm-diag-report-powershell.PNG and /dev/null differ
diff --git a/windows/update/images/mdm.png b/windows/update/images/mdm.png
deleted file mode 100644
index 8ebcc00526..0000000000
Binary files a/windows/update/images/mdm.png and /dev/null differ
diff --git a/windows/update/images/mobile-start-layout.png b/windows/update/images/mobile-start-layout.png
deleted file mode 100644
index d1055d6c87..0000000000
Binary files a/windows/update/images/mobile-start-layout.png and /dev/null differ
diff --git a/windows/update/images/oma-uri-shared-pc.png b/windows/update/images/oma-uri-shared-pc.png
deleted file mode 100644
index 68f9fa3b32..0000000000
Binary files a/windows/update/images/oma-uri-shared-pc.png and /dev/null differ
diff --git a/windows/update/images/oobe.jpg b/windows/update/images/oobe.jpg
deleted file mode 100644
index 53a5dab6bf..0000000000
Binary files a/windows/update/images/oobe.jpg and /dev/null differ
diff --git a/windows/update/images/package.png b/windows/update/images/package.png
deleted file mode 100644
index f5e975e3e9..0000000000
Binary files a/windows/update/images/package.png and /dev/null differ
diff --git a/windows/update/images/phoneprovision.png b/windows/update/images/phoneprovision.png
deleted file mode 100644
index 01ada29ac9..0000000000
Binary files a/windows/update/images/phoneprovision.png and /dev/null differ
diff --git a/windows/update/images/policytocsp.png b/windows/update/images/policytocsp.png
deleted file mode 100644
index 80ca76cb62..0000000000
Binary files a/windows/update/images/policytocsp.png and /dev/null differ
diff --git a/windows/update/images/powericon.png b/windows/update/images/powericon.png
deleted file mode 100644
index b497ff859d..0000000000
Binary files a/windows/update/images/powericon.png and /dev/null differ
diff --git a/windows/update/images/priv-telemetry-levels.png b/windows/update/images/priv-telemetry-levels.png
deleted file mode 100644
index 9581cee54d..0000000000
Binary files a/windows/update/images/priv-telemetry-levels.png and /dev/null differ
diff --git a/windows/update/images/prov.jpg b/windows/update/images/prov.jpg
deleted file mode 100644
index 1593ccb36b..0000000000
Binary files a/windows/update/images/prov.jpg and /dev/null differ
diff --git a/windows/update/images/provisioning-csp-assignedaccess.png b/windows/update/images/provisioning-csp-assignedaccess.png
deleted file mode 100644
index 14d49cdd89..0000000000
Binary files a/windows/update/images/provisioning-csp-assignedaccess.png and /dev/null differ
diff --git a/windows/update/images/resetdevice.png b/windows/update/images/resetdevice.png
deleted file mode 100644
index 4e265c3f8d..0000000000
Binary files a/windows/update/images/resetdevice.png and /dev/null differ
diff --git a/windows/update/images/settings-table.png b/windows/update/images/settings-table.png
deleted file mode 100644
index ada56513fc..0000000000
Binary files a/windows/update/images/settings-table.png and /dev/null differ
diff --git a/windows/update/images/settingsicon.png b/windows/update/images/settingsicon.png
deleted file mode 100644
index 0ad27fc558..0000000000
Binary files a/windows/update/images/settingsicon.png and /dev/null differ
diff --git a/windows/update/images/setupmsg.jpg b/windows/update/images/setupmsg.jpg
deleted file mode 100644
index 12935483c5..0000000000
Binary files a/windows/update/images/setupmsg.jpg and /dev/null differ
diff --git a/windows/update/images/sign-in-prov.png b/windows/update/images/sign-in-prov.png
deleted file mode 100644
index 55c9276203..0000000000
Binary files a/windows/update/images/sign-in-prov.png and /dev/null differ
diff --git a/windows/update/images/spotlight.png b/windows/update/images/spotlight.png
deleted file mode 100644
index 515269740b..0000000000
Binary files a/windows/update/images/spotlight.png and /dev/null differ
diff --git a/windows/update/images/spotlight2.png b/windows/update/images/spotlight2.png
deleted file mode 100644
index 27401c1a2b..0000000000
Binary files a/windows/update/images/spotlight2.png and /dev/null differ
diff --git a/windows/update/images/start-pinned-app.png b/windows/update/images/start-pinned-app.png
deleted file mode 100644
index e1e4a24a00..0000000000
Binary files a/windows/update/images/start-pinned-app.png and /dev/null differ
diff --git a/windows/update/images/startannotated.png b/windows/update/images/startannotated.png
deleted file mode 100644
index d46f3a70c2..0000000000
Binary files a/windows/update/images/startannotated.png and /dev/null differ
diff --git a/windows/update/images/starticon.png b/windows/update/images/starticon.png
deleted file mode 100644
index fa8cbdff10..0000000000
Binary files a/windows/update/images/starticon.png and /dev/null differ
diff --git a/windows/update/images/startlayoutpolicy.jpg b/windows/update/images/startlayoutpolicy.jpg
deleted file mode 100644
index d3c8d054fe..0000000000
Binary files a/windows/update/images/startlayoutpolicy.jpg and /dev/null differ
diff --git a/windows/update/images/starttemplate.jpg b/windows/update/images/starttemplate.jpg
deleted file mode 100644
index 900eed08c5..0000000000
Binary files a/windows/update/images/starttemplate.jpg and /dev/null differ
diff --git a/windows/update/images/taskbar-blank.png b/windows/update/images/taskbar-blank.png
deleted file mode 100644
index 185027f2fd..0000000000
Binary files a/windows/update/images/taskbar-blank.png and /dev/null differ
diff --git a/windows/update/images/taskbar-default-plus.png b/windows/update/images/taskbar-default-plus.png
deleted file mode 100644
index 8afcebac09..0000000000
Binary files a/windows/update/images/taskbar-default-plus.png and /dev/null differ
diff --git a/windows/update/images/taskbar-default-removed.png b/windows/update/images/taskbar-default-removed.png
deleted file mode 100644
index b3ff924e9f..0000000000
Binary files a/windows/update/images/taskbar-default-removed.png and /dev/null differ
diff --git a/windows/update/images/taskbar-default.png b/windows/update/images/taskbar-default.png
deleted file mode 100644
index 41c6c72258..0000000000
Binary files a/windows/update/images/taskbar-default.png and /dev/null differ
diff --git a/windows/update/images/taskbar-generic.png b/windows/update/images/taskbar-generic.png
deleted file mode 100644
index 6d47a6795a..0000000000
Binary files a/windows/update/images/taskbar-generic.png and /dev/null differ
diff --git a/windows/update/images/taskbar-region-defr.png b/windows/update/images/taskbar-region-defr.png
deleted file mode 100644
index 6d707b16f4..0000000000
Binary files a/windows/update/images/taskbar-region-defr.png and /dev/null differ
diff --git a/windows/update/images/taskbar-region-other.png b/windows/update/images/taskbar-region-other.png
deleted file mode 100644
index fab367ef7a..0000000000
Binary files a/windows/update/images/taskbar-region-other.png and /dev/null differ
diff --git a/windows/update/images/taskbar-region-usuk.png b/windows/update/images/taskbar-region-usuk.png
deleted file mode 100644
index 6bba65ee81..0000000000
Binary files a/windows/update/images/taskbar-region-usuk.png and /dev/null differ
diff --git a/windows/update/images/taskbarSTARTERBLANK.png b/windows/update/images/taskbarSTARTERBLANK.png
deleted file mode 100644
index e206bdc196..0000000000
Binary files a/windows/update/images/taskbarSTARTERBLANK.png and /dev/null differ
diff --git a/windows/update/images/trust-package.png b/windows/update/images/trust-package.png
deleted file mode 100644
index 8a293ea4da..0000000000
Binary files a/windows/update/images/trust-package.png and /dev/null differ
diff --git a/windows/update/images/twain.png b/windows/update/images/twain.png
deleted file mode 100644
index 53cd5eadc7..0000000000
Binary files a/windows/update/images/twain.png and /dev/null differ
diff --git a/windows/update/images/uc-01.png b/windows/update/images/uc-01.png
deleted file mode 100644
index 7f4df9f6d7..0000000000
Binary files a/windows/update/images/uc-01.png and /dev/null differ
diff --git a/windows/update/images/uc-02.png b/windows/update/images/uc-02.png
deleted file mode 100644
index 8317f051c3..0000000000
Binary files a/windows/update/images/uc-02.png and /dev/null differ
diff --git a/windows/update/images/uc-02a.png b/windows/update/images/uc-02a.png
deleted file mode 100644
index d12544e3a0..0000000000
Binary files a/windows/update/images/uc-02a.png and /dev/null differ
diff --git a/windows/update/images/uc-03.png b/windows/update/images/uc-03.png
deleted file mode 100644
index 58494c4128..0000000000
Binary files a/windows/update/images/uc-03.png and /dev/null differ
diff --git a/windows/update/images/uc-03a.png b/windows/update/images/uc-03a.png
deleted file mode 100644
index 39412fc8f3..0000000000
Binary files a/windows/update/images/uc-03a.png and /dev/null differ
diff --git a/windows/update/images/uc-04.png b/windows/update/images/uc-04.png
deleted file mode 100644
index ef9a37d379..0000000000
Binary files a/windows/update/images/uc-04.png and /dev/null differ
diff --git a/windows/update/images/uc-04a.png b/windows/update/images/uc-04a.png
deleted file mode 100644
index 537d4bbe72..0000000000
Binary files a/windows/update/images/uc-04a.png and /dev/null differ
diff --git a/windows/update/images/uc-05.png b/windows/update/images/uc-05.png
deleted file mode 100644
index 21c8e9f9e0..0000000000
Binary files a/windows/update/images/uc-05.png and /dev/null differ
diff --git a/windows/update/images/uc-05a.png b/windows/update/images/uc-05a.png
deleted file mode 100644
index 2271181622..0000000000
Binary files a/windows/update/images/uc-05a.png and /dev/null differ
diff --git a/windows/update/images/uc-06.png b/windows/update/images/uc-06.png
deleted file mode 100644
index 03a559800b..0000000000
Binary files a/windows/update/images/uc-06.png and /dev/null differ
diff --git a/windows/update/images/uc-06a.png b/windows/update/images/uc-06a.png
deleted file mode 100644
index 15df1cfea0..0000000000
Binary files a/windows/update/images/uc-06a.png and /dev/null differ
diff --git a/windows/update/images/uc-07.png b/windows/update/images/uc-07.png
deleted file mode 100644
index de1ae35e82..0000000000
Binary files a/windows/update/images/uc-07.png and /dev/null differ
diff --git a/windows/update/images/uc-07a.png b/windows/update/images/uc-07a.png
deleted file mode 100644
index c0f2d9fd73..0000000000
Binary files a/windows/update/images/uc-07a.png and /dev/null differ
diff --git a/windows/update/images/uc-08.png b/windows/update/images/uc-08.png
deleted file mode 100644
index 877fcd64c0..0000000000
Binary files a/windows/update/images/uc-08.png and /dev/null differ
diff --git a/windows/update/images/uc-08a.png b/windows/update/images/uc-08a.png
deleted file mode 100644
index 89da287d3d..0000000000
Binary files a/windows/update/images/uc-08a.png and /dev/null differ
diff --git a/windows/update/images/uc-09.png b/windows/update/images/uc-09.png
deleted file mode 100644
index 37d7114f19..0000000000
Binary files a/windows/update/images/uc-09.png and /dev/null differ
diff --git a/windows/update/images/uc-09a.png b/windows/update/images/uc-09a.png
deleted file mode 100644
index f6b6ec5b60..0000000000
Binary files a/windows/update/images/uc-09a.png and /dev/null differ
diff --git a/windows/update/images/uc-10.png b/windows/update/images/uc-10.png
deleted file mode 100644
index 3ab72d10d2..0000000000
Binary files a/windows/update/images/uc-10.png and /dev/null differ
diff --git a/windows/update/images/uc-10a.png b/windows/update/images/uc-10a.png
deleted file mode 100644
index 1c6b8b01dc..0000000000
Binary files a/windows/update/images/uc-10a.png and /dev/null differ
diff --git a/windows/update/images/uc-11.png b/windows/update/images/uc-11.png
deleted file mode 100644
index 8b4fc568ea..0000000000
Binary files a/windows/update/images/uc-11.png and /dev/null differ
diff --git a/windows/update/images/uc-12.png b/windows/update/images/uc-12.png
deleted file mode 100644
index 4198684c99..0000000000
Binary files a/windows/update/images/uc-12.png and /dev/null differ
diff --git a/windows/update/images/uc-13.png b/windows/update/images/uc-13.png
deleted file mode 100644
index 117f9b9fd8..0000000000
Binary files a/windows/update/images/uc-13.png and /dev/null differ
diff --git a/windows/update/images/uc-14.png b/windows/update/images/uc-14.png
deleted file mode 100644
index 66047984e7..0000000000
Binary files a/windows/update/images/uc-14.png and /dev/null differ
diff --git a/windows/update/images/uc-15.png b/windows/update/images/uc-15.png
deleted file mode 100644
index c241cd9117..0000000000
Binary files a/windows/update/images/uc-15.png and /dev/null differ
diff --git a/windows/update/images/uc-16.png b/windows/update/images/uc-16.png
deleted file mode 100644
index e7aff4d4ed..0000000000
Binary files a/windows/update/images/uc-16.png and /dev/null differ
diff --git a/windows/update/images/uc-17.png b/windows/update/images/uc-17.png
deleted file mode 100644
index cb8e42ca5e..0000000000
Binary files a/windows/update/images/uc-17.png and /dev/null differ
diff --git a/windows/update/images/uc-18.png b/windows/update/images/uc-18.png
deleted file mode 100644
index 5eff59adc9..0000000000
Binary files a/windows/update/images/uc-18.png and /dev/null differ
diff --git a/windows/update/images/uc-19.png b/windows/update/images/uc-19.png
deleted file mode 100644
index 791900eafc..0000000000
Binary files a/windows/update/images/uc-19.png and /dev/null differ
diff --git a/windows/update/images/uc-20.png b/windows/update/images/uc-20.png
deleted file mode 100644
index 7dbb027b9f..0000000000
Binary files a/windows/update/images/uc-20.png and /dev/null differ
diff --git a/windows/update/images/uc-21.png b/windows/update/images/uc-21.png
deleted file mode 100644
index 418db41fe4..0000000000
Binary files a/windows/update/images/uc-21.png and /dev/null differ
diff --git a/windows/update/images/uc-22.png b/windows/update/images/uc-22.png
deleted file mode 100644
index 2ca5c47a61..0000000000
Binary files a/windows/update/images/uc-22.png and /dev/null differ
diff --git a/windows/update/images/uc-23.png b/windows/update/images/uc-23.png
deleted file mode 100644
index 58b82db82d..0000000000
Binary files a/windows/update/images/uc-23.png and /dev/null differ
diff --git a/windows/update/images/uc-24.png b/windows/update/images/uc-24.png
deleted file mode 100644
index 00bc61e3e1..0000000000
Binary files a/windows/update/images/uc-24.png and /dev/null differ
diff --git a/windows/update/images/uc-25.png b/windows/update/images/uc-25.png
deleted file mode 100644
index 4e0f0bdb03..0000000000
Binary files a/windows/update/images/uc-25.png and /dev/null differ
diff --git a/windows/update/images/uev-adk-select-uev-feature.png b/windows/update/images/uev-adk-select-uev-feature.png
deleted file mode 100644
index 1556f115c0..0000000000
Binary files a/windows/update/images/uev-adk-select-uev-feature.png and /dev/null differ
diff --git a/windows/update/images/uev-archdiagram.png b/windows/update/images/uev-archdiagram.png
deleted file mode 100644
index eae098e666..0000000000
Binary files a/windows/update/images/uev-archdiagram.png and /dev/null differ
diff --git a/windows/update/images/uev-checklist-box.gif b/windows/update/images/uev-checklist-box.gif
deleted file mode 100644
index 8af13c51d1..0000000000
Binary files a/windows/update/images/uev-checklist-box.gif and /dev/null differ
diff --git a/windows/update/images/uev-deployment-preparation.png b/windows/update/images/uev-deployment-preparation.png
deleted file mode 100644
index b665a0bfea..0000000000
Binary files a/windows/update/images/uev-deployment-preparation.png and /dev/null differ
diff --git a/windows/update/images/uev-generator-process.png b/windows/update/images/uev-generator-process.png
deleted file mode 100644
index e16cedd0a7..0000000000
Binary files a/windows/update/images/uev-generator-process.png and /dev/null differ
diff --git a/windows/update/images/w10servicing-f1-branches.png b/windows/update/images/w10servicing-f1-branches.png
deleted file mode 100644
index ac4a549aed..0000000000
Binary files a/windows/update/images/w10servicing-f1-branches.png and /dev/null differ
diff --git a/windows/update/images/waas-active-hours-policy.PNG b/windows/update/images/waas-active-hours-policy.PNG
deleted file mode 100644
index af80ef6652..0000000000
Binary files a/windows/update/images/waas-active-hours-policy.PNG and /dev/null differ
diff --git a/windows/update/images/waas-active-hours.PNG b/windows/update/images/waas-active-hours.PNG
deleted file mode 100644
index c262c302ed..0000000000
Binary files a/windows/update/images/waas-active-hours.PNG and /dev/null differ
diff --git a/windows/update/images/waas-auto-update-policy.PNG b/windows/update/images/waas-auto-update-policy.PNG
deleted file mode 100644
index 52a1629cbf..0000000000
Binary files a/windows/update/images/waas-auto-update-policy.PNG and /dev/null differ
diff --git a/windows/update/images/waas-do-fig1.png b/windows/update/images/waas-do-fig1.png
deleted file mode 100644
index 2a2b6872e9..0000000000
Binary files a/windows/update/images/waas-do-fig1.png and /dev/null differ
diff --git a/windows/update/images/waas-do-fig2.png b/windows/update/images/waas-do-fig2.png
deleted file mode 100644
index cc42b328eb..0000000000
Binary files a/windows/update/images/waas-do-fig2.png and /dev/null differ
diff --git a/windows/update/images/waas-do-fig3.png b/windows/update/images/waas-do-fig3.png
deleted file mode 100644
index d9182d3b20..0000000000
Binary files a/windows/update/images/waas-do-fig3.png and /dev/null differ
diff --git a/windows/update/images/waas-do-fig4.png b/windows/update/images/waas-do-fig4.png
deleted file mode 100644
index a66741ed90..0000000000
Binary files a/windows/update/images/waas-do-fig4.png and /dev/null differ
diff --git a/windows/update/images/waas-overview-patch.png b/windows/update/images/waas-overview-patch.png
deleted file mode 100644
index 6ac0a03227..0000000000
Binary files a/windows/update/images/waas-overview-patch.png and /dev/null differ
diff --git a/windows/update/images/waas-restart-policy.PNG b/windows/update/images/waas-restart-policy.PNG
deleted file mode 100644
index 936f9aeb08..0000000000
Binary files a/windows/update/images/waas-restart-policy.PNG and /dev/null differ
diff --git a/windows/update/images/waas-rings.png b/windows/update/images/waas-rings.png
deleted file mode 100644
index 041a59ce87..0000000000
Binary files a/windows/update/images/waas-rings.png and /dev/null differ
diff --git a/windows/update/images/waas-sccm-fig1.png b/windows/update/images/waas-sccm-fig1.png
deleted file mode 100644
index 6bf2b1c621..0000000000
Binary files a/windows/update/images/waas-sccm-fig1.png and /dev/null differ
diff --git a/windows/update/images/waas-sccm-fig10.png b/windows/update/images/waas-sccm-fig10.png
deleted file mode 100644
index ad3b5c922f..0000000000
Binary files a/windows/update/images/waas-sccm-fig10.png and /dev/null differ
diff --git a/windows/update/images/waas-sccm-fig11.png b/windows/update/images/waas-sccm-fig11.png
deleted file mode 100644
index 6c4f905630..0000000000
Binary files a/windows/update/images/waas-sccm-fig11.png and /dev/null differ
diff --git a/windows/update/images/waas-sccm-fig12.png b/windows/update/images/waas-sccm-fig12.png
deleted file mode 100644
index 87464dd5f1..0000000000
Binary files a/windows/update/images/waas-sccm-fig12.png and /dev/null differ
diff --git a/windows/update/images/waas-sccm-fig2.png b/windows/update/images/waas-sccm-fig2.png
deleted file mode 100644
index c83e7bc781..0000000000
Binary files a/windows/update/images/waas-sccm-fig2.png and /dev/null differ
diff --git a/windows/update/images/waas-sccm-fig3.png b/windows/update/images/waas-sccm-fig3.png
deleted file mode 100644
index dcbc83b8ff..0000000000
Binary files a/windows/update/images/waas-sccm-fig3.png and /dev/null differ
diff --git a/windows/update/images/waas-sccm-fig4.png b/windows/update/images/waas-sccm-fig4.png
deleted file mode 100644
index 782c5ca6ef..0000000000
Binary files a/windows/update/images/waas-sccm-fig4.png and /dev/null differ
diff --git a/windows/update/images/waas-sccm-fig5.png b/windows/update/images/waas-sccm-fig5.png
deleted file mode 100644
index cb399a6c6f..0000000000
Binary files a/windows/update/images/waas-sccm-fig5.png and /dev/null differ
diff --git a/windows/update/images/waas-sccm-fig6.png b/windows/update/images/waas-sccm-fig6.png
deleted file mode 100644
index 77dd02d61e..0000000000
Binary files a/windows/update/images/waas-sccm-fig6.png and /dev/null differ
diff --git a/windows/update/images/waas-sccm-fig7.png b/windows/update/images/waas-sccm-fig7.png
deleted file mode 100644
index a74c7c8133..0000000000
Binary files a/windows/update/images/waas-sccm-fig7.png and /dev/null differ
diff --git a/windows/update/images/waas-sccm-fig8.png b/windows/update/images/waas-sccm-fig8.png
deleted file mode 100644
index 2dfaf75ddf..0000000000
Binary files a/windows/update/images/waas-sccm-fig8.png and /dev/null differ
diff --git a/windows/update/images/waas-sccm-fig9.png b/windows/update/images/waas-sccm-fig9.png
deleted file mode 100644
index 311d79dc94..0000000000
Binary files a/windows/update/images/waas-sccm-fig9.png and /dev/null differ
diff --git a/windows/update/images/waas-strategy-fig1a.png b/windows/update/images/waas-strategy-fig1a.png
deleted file mode 100644
index 7a924c43bc..0000000000
Binary files a/windows/update/images/waas-strategy-fig1a.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig1.png b/windows/update/images/waas-wsus-fig1.png
deleted file mode 100644
index 14bf35958a..0000000000
Binary files a/windows/update/images/waas-wsus-fig1.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig10.png b/windows/update/images/waas-wsus-fig10.png
deleted file mode 100644
index 3efa119693..0000000000
Binary files a/windows/update/images/waas-wsus-fig10.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig11.png b/windows/update/images/waas-wsus-fig11.png
deleted file mode 100644
index ae6d79221a..0000000000
Binary files a/windows/update/images/waas-wsus-fig11.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig12.png b/windows/update/images/waas-wsus-fig12.png
deleted file mode 100644
index 47479ea1df..0000000000
Binary files a/windows/update/images/waas-wsus-fig12.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig13.png b/windows/update/images/waas-wsus-fig13.png
deleted file mode 100644
index f0b1578094..0000000000
Binary files a/windows/update/images/waas-wsus-fig13.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig14.png b/windows/update/images/waas-wsus-fig14.png
deleted file mode 100644
index b5b930ddad..0000000000
Binary files a/windows/update/images/waas-wsus-fig14.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig15.png b/windows/update/images/waas-wsus-fig15.png
deleted file mode 100644
index 95e38c039e..0000000000
Binary files a/windows/update/images/waas-wsus-fig15.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig16.png b/windows/update/images/waas-wsus-fig16.png
deleted file mode 100644
index 3848ac1772..0000000000
Binary files a/windows/update/images/waas-wsus-fig16.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig17.png b/windows/update/images/waas-wsus-fig17.png
deleted file mode 100644
index 5511da3e5c..0000000000
Binary files a/windows/update/images/waas-wsus-fig17.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig18.png b/windows/update/images/waas-wsus-fig18.png
deleted file mode 100644
index f9ac774754..0000000000
Binary files a/windows/update/images/waas-wsus-fig18.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig19.png b/windows/update/images/waas-wsus-fig19.png
deleted file mode 100644
index f69d793afe..0000000000
Binary files a/windows/update/images/waas-wsus-fig19.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig2.png b/windows/update/images/waas-wsus-fig2.png
deleted file mode 100644
index 167774a6c9..0000000000
Binary files a/windows/update/images/waas-wsus-fig2.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig20.png b/windows/update/images/waas-wsus-fig20.png
deleted file mode 100644
index ea6bbb350a..0000000000
Binary files a/windows/update/images/waas-wsus-fig20.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig3.png b/windows/update/images/waas-wsus-fig3.png
deleted file mode 100644
index 272e8c05e9..0000000000
Binary files a/windows/update/images/waas-wsus-fig3.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig4.png b/windows/update/images/waas-wsus-fig4.png
deleted file mode 100644
index bb5f27e3da..0000000000
Binary files a/windows/update/images/waas-wsus-fig4.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig5.png b/windows/update/images/waas-wsus-fig5.png
deleted file mode 100644
index 23faf303c6..0000000000
Binary files a/windows/update/images/waas-wsus-fig5.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig6.png b/windows/update/images/waas-wsus-fig6.png
deleted file mode 100644
index 7857351d19..0000000000
Binary files a/windows/update/images/waas-wsus-fig6.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig7.png b/windows/update/images/waas-wsus-fig7.png
deleted file mode 100644
index e7f02649d2..0000000000
Binary files a/windows/update/images/waas-wsus-fig7.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig8.png b/windows/update/images/waas-wsus-fig8.png
deleted file mode 100644
index da5f620425..0000000000
Binary files a/windows/update/images/waas-wsus-fig8.png and /dev/null differ
diff --git a/windows/update/images/waas-wsus-fig9.png b/windows/update/images/waas-wsus-fig9.png
deleted file mode 100644
index f3d5a4eb6a..0000000000
Binary files a/windows/update/images/waas-wsus-fig9.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-gp-broad.png b/windows/update/images/waas-wufb-gp-broad.png
deleted file mode 100644
index 92b71c8936..0000000000
Binary files a/windows/update/images/waas-wufb-gp-broad.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-gp-cb2-settings.png b/windows/update/images/waas-wufb-gp-cb2-settings.png
deleted file mode 100644
index ae6ed4d856..0000000000
Binary files a/windows/update/images/waas-wufb-gp-cb2-settings.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-gp-cb2.png b/windows/update/images/waas-wufb-gp-cb2.png
deleted file mode 100644
index 006a8c02d3..0000000000
Binary files a/windows/update/images/waas-wufb-gp-cb2.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-gp-cbb1-settings.png b/windows/update/images/waas-wufb-gp-cbb1-settings.png
deleted file mode 100644
index c9e1029b8b..0000000000
Binary files a/windows/update/images/waas-wufb-gp-cbb1-settings.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-gp-cbb2-settings.png b/windows/update/images/waas-wufb-gp-cbb2-settings.png
deleted file mode 100644
index e5aff1cc89..0000000000
Binary files a/windows/update/images/waas-wufb-gp-cbb2-settings.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-gp-cbb2q-settings.png b/windows/update/images/waas-wufb-gp-cbb2q-settings.png
deleted file mode 100644
index 33a02165c6..0000000000
Binary files a/windows/update/images/waas-wufb-gp-cbb2q-settings.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-gp-create.png b/windows/update/images/waas-wufb-gp-create.png
deleted file mode 100644
index d74eec4b2e..0000000000
Binary files a/windows/update/images/waas-wufb-gp-create.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-gp-edit-defer.png b/windows/update/images/waas-wufb-gp-edit-defer.png
deleted file mode 100644
index c697b42ffd..0000000000
Binary files a/windows/update/images/waas-wufb-gp-edit-defer.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-gp-edit.png b/windows/update/images/waas-wufb-gp-edit.png
deleted file mode 100644
index 1b8d21a175..0000000000
Binary files a/windows/update/images/waas-wufb-gp-edit.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-gp-scope-cb2.png b/windows/update/images/waas-wufb-gp-scope-cb2.png
deleted file mode 100644
index fcacdbea57..0000000000
Binary files a/windows/update/images/waas-wufb-gp-scope-cb2.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-gp-scope.png b/windows/update/images/waas-wufb-gp-scope.png
deleted file mode 100644
index a04d8194df..0000000000
Binary files a/windows/update/images/waas-wufb-gp-scope.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-intune-cb2a.png b/windows/update/images/waas-wufb-intune-cb2a.png
deleted file mode 100644
index 3e8c1ce19e..0000000000
Binary files a/windows/update/images/waas-wufb-intune-cb2a.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-intune-cbb1a.png b/windows/update/images/waas-wufb-intune-cbb1a.png
deleted file mode 100644
index bc394fe563..0000000000
Binary files a/windows/update/images/waas-wufb-intune-cbb1a.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-intune-cbb2a.png b/windows/update/images/waas-wufb-intune-cbb2a.png
deleted file mode 100644
index a980e0e43a..0000000000
Binary files a/windows/update/images/waas-wufb-intune-cbb2a.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-intune-step11a.png b/windows/update/images/waas-wufb-intune-step11a.png
deleted file mode 100644
index 7291484c93..0000000000
Binary files a/windows/update/images/waas-wufb-intune-step11a.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-intune-step19a.png b/windows/update/images/waas-wufb-intune-step19a.png
deleted file mode 100644
index de132abd28..0000000000
Binary files a/windows/update/images/waas-wufb-intune-step19a.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-intune-step2a.png b/windows/update/images/waas-wufb-intune-step2a.png
deleted file mode 100644
index 9a719b8fda..0000000000
Binary files a/windows/update/images/waas-wufb-intune-step2a.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-intune-step7a.png b/windows/update/images/waas-wufb-intune-step7a.png
deleted file mode 100644
index daa96ba18c..0000000000
Binary files a/windows/update/images/waas-wufb-intune-step7a.png and /dev/null differ
diff --git a/windows/update/images/waas-wufb-update-compliance.png b/windows/update/images/waas-wufb-update-compliance.png
deleted file mode 100644
index 0c1bbaea7c..0000000000
Binary files a/windows/update/images/waas-wufb-update-compliance.png and /dev/null differ
diff --git a/windows/update/images/who-owns-pc.png b/windows/update/images/who-owns-pc.png
deleted file mode 100644
index d3ce1def8d..0000000000
Binary files a/windows/update/images/who-owns-pc.png and /dev/null differ
diff --git a/windows/update/images/wifisense-grouppolicy.png b/windows/update/images/wifisense-grouppolicy.png
deleted file mode 100644
index 1142d834bd..0000000000
Binary files a/windows/update/images/wifisense-grouppolicy.png and /dev/null differ
diff --git a/windows/update/images/wifisense-registry.png b/windows/update/images/wifisense-registry.png
deleted file mode 100644
index cbb1fa8347..0000000000
Binary files a/windows/update/images/wifisense-registry.png and /dev/null differ
diff --git a/windows/update/images/wifisense-settingscreens.png b/windows/update/images/wifisense-settingscreens.png
deleted file mode 100644
index cbb6903177..0000000000
Binary files a/windows/update/images/wifisense-settingscreens.png and /dev/null differ
diff --git a/windows/update/images/win10-mobile-mdm-fig1.png b/windows/update/images/win10-mobile-mdm-fig1.png
deleted file mode 100644
index 6ddac1df99..0000000000
Binary files a/windows/update/images/win10-mobile-mdm-fig1.png and /dev/null differ
diff --git a/windows/update/images/win10servicing-fig2-featureupgrade.png b/windows/update/images/win10servicing-fig2-featureupgrade.png
deleted file mode 100644
index e4dc76b44f..0000000000
Binary files a/windows/update/images/win10servicing-fig2-featureupgrade.png and /dev/null differ
diff --git a/windows/update/images/win10servicing-fig3.png b/windows/update/images/win10servicing-fig3.png
deleted file mode 100644
index 688f92b173..0000000000
Binary files a/windows/update/images/win10servicing-fig3.png and /dev/null differ
diff --git a/windows/update/images/win10servicing-fig4-upgradereleases.png b/windows/update/images/win10servicing-fig4-upgradereleases.png
deleted file mode 100644
index 961c8bebe2..0000000000
Binary files a/windows/update/images/win10servicing-fig4-upgradereleases.png and /dev/null differ
diff --git a/windows/update/images/win10servicing-fig5.png b/windows/update/images/win10servicing-fig5.png
deleted file mode 100644
index dc4b2fc5b2..0000000000
Binary files a/windows/update/images/win10servicing-fig5.png and /dev/null differ
diff --git a/windows/update/images/win10servicing-fig6.png b/windows/update/images/win10servicing-fig6.png
deleted file mode 100644
index 4cdc5f9c6f..0000000000
Binary files a/windows/update/images/win10servicing-fig6.png and /dev/null differ
diff --git a/windows/update/images/win10servicing-fig7.png b/windows/update/images/win10servicing-fig7.png
deleted file mode 100644
index 0a9a851449..0000000000
Binary files a/windows/update/images/win10servicing-fig7.png and /dev/null differ
diff --git a/windows/update/images/wsfb-distribute.png b/windows/update/images/wsfb-distribute.png
deleted file mode 100644
index d0482f6ebe..0000000000
Binary files a/windows/update/images/wsfb-distribute.png and /dev/null differ
diff --git a/windows/update/images/wsfb-firstrun.png b/windows/update/images/wsfb-firstrun.png
deleted file mode 100644
index 2673567a1e..0000000000
Binary files a/windows/update/images/wsfb-firstrun.png and /dev/null differ
diff --git a/windows/update/images/wsfb-inventory-viewlicense.png b/windows/update/images/wsfb-inventory-viewlicense.png
deleted file mode 100644
index 9fafad1aff..0000000000
Binary files a/windows/update/images/wsfb-inventory-viewlicense.png and /dev/null differ
diff --git a/windows/update/images/wsfb-inventory.png b/windows/update/images/wsfb-inventory.png
deleted file mode 100644
index b060fb30e4..0000000000
Binary files a/windows/update/images/wsfb-inventory.png and /dev/null differ
diff --git a/windows/update/images/wsfb-inventoryaddprivatestore.png b/windows/update/images/wsfb-inventoryaddprivatestore.png
deleted file mode 100644
index bb1152e35b..0000000000
Binary files a/windows/update/images/wsfb-inventoryaddprivatestore.png and /dev/null differ
diff --git a/windows/update/images/wsfb-landing.png b/windows/update/images/wsfb-landing.png
deleted file mode 100644
index beae0b52af..0000000000
Binary files a/windows/update/images/wsfb-landing.png and /dev/null differ
diff --git a/windows/update/images/wsfb-licenseassign.png b/windows/update/images/wsfb-licenseassign.png
deleted file mode 100644
index 5904abb3b9..0000000000
Binary files a/windows/update/images/wsfb-licenseassign.png and /dev/null differ
diff --git a/windows/update/images/wsfb-licensedetails.png b/windows/update/images/wsfb-licensedetails.png
deleted file mode 100644
index 53e0f5c935..0000000000
Binary files a/windows/update/images/wsfb-licensedetails.png and /dev/null differ
diff --git a/windows/update/images/wsfb-licensereclaim.png b/windows/update/images/wsfb-licensereclaim.png
deleted file mode 100644
index 9f94cd3600..0000000000
Binary files a/windows/update/images/wsfb-licensereclaim.png and /dev/null differ
diff --git a/windows/update/images/wsfb-manageinventory.png b/windows/update/images/wsfb-manageinventory.png
deleted file mode 100644
index 9a544ddc21..0000000000
Binary files a/windows/update/images/wsfb-manageinventory.png and /dev/null differ
diff --git a/windows/update/images/wsfb-offline-distribute-mdm.png b/windows/update/images/wsfb-offline-distribute-mdm.png
deleted file mode 100644
index ec0e77a9a9..0000000000
Binary files a/windows/update/images/wsfb-offline-distribute-mdm.png and /dev/null differ
diff --git a/windows/update/images/wsfb-onboard-1.png b/windows/update/images/wsfb-onboard-1.png
deleted file mode 100644
index 012e91a845..0000000000
Binary files a/windows/update/images/wsfb-onboard-1.png and /dev/null differ
diff --git a/windows/update/images/wsfb-onboard-2.png b/windows/update/images/wsfb-onboard-2.png
deleted file mode 100644
index 2ff98fb1f7..0000000000
Binary files a/windows/update/images/wsfb-onboard-2.png and /dev/null differ
diff --git a/windows/update/images/wsfb-onboard-3.png b/windows/update/images/wsfb-onboard-3.png
deleted file mode 100644
index ed9a61d353..0000000000
Binary files a/windows/update/images/wsfb-onboard-3.png and /dev/null differ
diff --git a/windows/update/images/wsfb-onboard-4.png b/windows/update/images/wsfb-onboard-4.png
deleted file mode 100644
index d99185ddc6..0000000000
Binary files a/windows/update/images/wsfb-onboard-4.png and /dev/null differ
diff --git a/windows/update/images/wsfb-onboard-5.png b/windows/update/images/wsfb-onboard-5.png
deleted file mode 100644
index 68049f4425..0000000000
Binary files a/windows/update/images/wsfb-onboard-5.png and /dev/null differ
diff --git a/windows/update/images/wsfb-onboard-7.png b/windows/update/images/wsfb-onboard-7.png
deleted file mode 100644
index 38b7348b21..0000000000
Binary files a/windows/update/images/wsfb-onboard-7.png and /dev/null differ
diff --git a/windows/update/images/wsfb-online-distribute-mdm.png b/windows/update/images/wsfb-online-distribute-mdm.png
deleted file mode 100644
index 4b0f7cbf3a..0000000000
Binary files a/windows/update/images/wsfb-online-distribute-mdm.png and /dev/null differ
diff --git a/windows/update/images/wsfb-paid-app-temp.png b/windows/update/images/wsfb-paid-app-temp.png
deleted file mode 100644
index 89e3857d07..0000000000
Binary files a/windows/update/images/wsfb-paid-app-temp.png and /dev/null differ
diff --git a/windows/update/images/wsfb-permissions-assignrole.png b/windows/update/images/wsfb-permissions-assignrole.png
deleted file mode 100644
index de2e1785ba..0000000000
Binary files a/windows/update/images/wsfb-permissions-assignrole.png and /dev/null differ
diff --git a/windows/update/images/wsfb-private-store-gpo.PNG b/windows/update/images/wsfb-private-store-gpo.PNG
deleted file mode 100644
index 5e7fe44ec2..0000000000
Binary files a/windows/update/images/wsfb-private-store-gpo.PNG and /dev/null differ
diff --git a/windows/update/images/wsfb-privatestore.png b/windows/update/images/wsfb-privatestore.png
deleted file mode 100644
index 74c9f1690d..0000000000
Binary files a/windows/update/images/wsfb-privatestore.png and /dev/null differ
diff --git a/windows/update/images/wsfb-privatestoreapps.png b/windows/update/images/wsfb-privatestoreapps.png
deleted file mode 100644
index 1ddb543796..0000000000
Binary files a/windows/update/images/wsfb-privatestoreapps.png and /dev/null differ
diff --git a/windows/update/images/wsfb-renameprivatestore.png b/windows/update/images/wsfb-renameprivatestore.png
deleted file mode 100644
index c6db282581..0000000000
Binary files a/windows/update/images/wsfb-renameprivatestore.png and /dev/null differ
diff --git a/windows/update/images/wsfb-settings-mgmt.png b/windows/update/images/wsfb-settings-mgmt.png
deleted file mode 100644
index 2a7b590d19..0000000000
Binary files a/windows/update/images/wsfb-settings-mgmt.png and /dev/null differ
diff --git a/windows/update/images/wsfb-settings-permissions.png b/windows/update/images/wsfb-settings-permissions.png
deleted file mode 100644
index 63d04d270b..0000000000
Binary files a/windows/update/images/wsfb-settings-permissions.png and /dev/null differ
diff --git a/windows/update/images/wsfb-wsappaddacct.png b/windows/update/images/wsfb-wsappaddacct.png
deleted file mode 100644
index 5c0bd9a4ce..0000000000
Binary files a/windows/update/images/wsfb-wsappaddacct.png and /dev/null differ
diff --git a/windows/update/images/wsfb-wsappprivatestore.png b/windows/update/images/wsfb-wsappprivatestore.png
deleted file mode 100644
index 9c29e7604c..0000000000
Binary files a/windows/update/images/wsfb-wsappprivatestore.png and /dev/null differ
diff --git a/windows/update/images/wsfb-wsappsignin.png b/windows/update/images/wsfb-wsappsignin.png
deleted file mode 100644
index c2c2631a94..0000000000
Binary files a/windows/update/images/wsfb-wsappsignin.png and /dev/null differ
diff --git a/windows/update/images/wsfb-wsappworkacct.png b/windows/update/images/wsfb-wsappworkacct.png
deleted file mode 100644
index 5eb9035124..0000000000
Binary files a/windows/update/images/wsfb-wsappworkacct.png and /dev/null differ
diff --git a/windows/update/images/wufb-config1a.png b/windows/update/images/wufb-config1a.png
deleted file mode 100644
index 1514b87528..0000000000
Binary files a/windows/update/images/wufb-config1a.png and /dev/null differ
diff --git a/windows/update/images/wufb-config2.png b/windows/update/images/wufb-config2.png
deleted file mode 100644
index f54eef9a50..0000000000
Binary files a/windows/update/images/wufb-config2.png and /dev/null differ
diff --git a/windows/update/images/wufb-config3a.png b/windows/update/images/wufb-config3a.png
deleted file mode 100644
index 538028cfdc..0000000000
Binary files a/windows/update/images/wufb-config3a.png and /dev/null differ
diff --git a/windows/update/images/wufb-do.png b/windows/update/images/wufb-do.png
deleted file mode 100644
index 8d6c9d0b8a..0000000000
Binary files a/windows/update/images/wufb-do.png and /dev/null differ
diff --git a/windows/update/images/wufb-groups.png b/windows/update/images/wufb-groups.png
deleted file mode 100644
index 13cdea04b0..0000000000
Binary files a/windows/update/images/wufb-groups.png and /dev/null differ
diff --git a/windows/update/images/wufb-pause-feature.png b/windows/update/images/wufb-pause-feature.png
deleted file mode 100644
index afeac43e29..0000000000
Binary files a/windows/update/images/wufb-pause-feature.png and /dev/null differ
diff --git a/windows/update/images/wufb-qual.png b/windows/update/images/wufb-qual.png
deleted file mode 100644
index 4a93408522..0000000000
Binary files a/windows/update/images/wufb-qual.png and /dev/null differ
diff --git a/windows/update/images/wufb-sccm.png b/windows/update/images/wufb-sccm.png
deleted file mode 100644
index 1d568c1fe4..0000000000
Binary files a/windows/update/images/wufb-sccm.png and /dev/null differ
diff --git a/windows/whats-new/whats-new-windows-10-version-1507-and-1511.md b/windows/whats-new/whats-new-windows-10-version-1507-and-1511.md
index a909347a7b..09d1e54940 100644
--- a/windows/whats-new/whats-new-windows-10-version-1507-and-1511.md
+++ b/windows/whats-new/whats-new-windows-10-version-1507-and-1511.md
@@ -23,7 +23,7 @@ Below is a list of some of the new and updated features included in the initial
With Windows 10, you can create provisioning packages that let you quickly and efficiently configure a device without having to install a new image. Windows provisioning makes it easy for IT administrators to configure end-user devices without imaging. Using Windows Provisioning, an IT administrator can easily specify desired configuration and settings required to enroll the devices into management (through a wizard-driven user interface) and then apply that configuration to target devices in a matter of minutes. It is best suited for small- to medium-sized businesses with deployments that range from tens to a few hundred computers.
-[Learn more about provisioning in Windows 10.](../deploy/provisioning-packages.md)
+[Learn more about provisioning in Windows 10.](/windows/configuration/provisioning-packages/provisioning-packages)
## Security
@@ -36,7 +36,7 @@ With Windows 10, you can create provisioning packages that let you quickly and e
- A new [AppLocker](http://msdn.microsoft.com/library/windows/hardware/dn920019.aspx) configuration service provider was add to allow you to enable AppLocker rules by using an MDM server.
- You can manage Windows 10 Mobile devices by using the new [AppLocker CSP](http://msdn.microsoft.com/library/windows/hardware/dn920019.aspx).
-[Learn how to manage AppLocker within your organization](../keep-secure/applocker-overview.md).
+[Learn how to manage AppLocker within your organization](/windows/device-security/applocker/applocker-overview).
### Bitlocker
@@ -56,7 +56,7 @@ With Windows 10, you can create provisioning packages that let you quickly and e
- **DMA port protection**. You can use the [DataProtection/AllowDirectMemoryAccess](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#dataprotection-allowdirectmemoryaccess) MDM policy to block DMA ports when the device is starting up. Also, when a device is locked, all unused DMA ports are turned off, but any devices that are already plugged into a DMA port will continue to work. When the device is unlocked, all DMA ports are turned back on.
- **New Group Policy for configuring pre-boot recovery**. You can now configure the pre-boot recovery message and recover URL that is shown on the pre-boot recovery screen. For more info, see the [Configure pre-boot recovery message and URL](https://technet.microsoft.com/itpro/windows/keep-secure/bitlocker-group-policy-settings#bkmk-configurepreboot) section in "BitLocker Group Policy settings."
-[Learn how to deploy and manage BitLocker within your organization](../keep-secure/bitlocker-overview.md).
+[Learn how to deploy and manage BitLocker within your organization](/windows/device-security/bitlocker/bitlocker-overview).
### Credential Guard
@@ -69,16 +69,16 @@ With Windows 10, you can create provisioning packages that let you quickly and e
- **Enable Credential Guard without UEFI lock**. You can enable Credential Guard by using the registry. This allows you to disable Credential Guard remotely. However, we recommend that Credential Guard is enabled with UEFI lock. You can configure this by using Group Policy.
- **CredSSP/TsPkg credential delegation**. CredSSP/TsPkg cannot delegate default credentials when Credential Guard is enabled.
-[Learn how to deploy and manage Credential Guard within your organization](../keep-secure/credential-guard.md).
+[Learn how to deploy and manage Credential Guard within your organization](/windows/access-protection/credential-guard/credential-guard).
### Easier certificate management
-For Windows 10-based devices, you can use your MDM server to directly deploy client authentication certificates using Personal Information Exchange (PFX), in addition to enrolling using Simple Certificate Enrollment Protocol (SCEP), including certificates to enable Windows Hello for Business in your enterprise. You'll be able to use MDM to enroll, renew, and delete certificates. As in Windows Phone 8.1, you can use the [Certificates app](https://go.microsoft.com/fwlink/p/?LinkId=615824) to review the details of certificates on your device. [Learn how to install digital certificates on Windows 10 Mobile.](~/keep-secure/installing-digital-certificates-on-windows-10-mobile.md)
+For Windows 10-based devices, you can use your MDM server to directly deploy client authentication certificates using Personal Information Exchange (PFX), in addition to enrolling using Simple Certificate Enrollment Protocol (SCEP), including certificates to enable Windows Hello for Business in your enterprise. You'll be able to use MDM to enroll, renew, and delete certificates. As in Windows Phone 8.1, you can use the [Certificates app](https://go.microsoft.com/fwlink/p/?LinkId=615824) to review the details of certificates on your device. [Learn how to install digital certificates on Windows 10 Mobile.](/windows/access-protection/installing-digital-certificates-on-windows-10-mobile)
### Microsoft Passport
-In Windows 10, [Microsoft Passport](~/keep-secure/manage-identity-verification-using-microsoft-passport.md) replaces passwords with strong two-factor authentication that consists of an enrolled device and a Windows Hello (biometric) or PIN.
+In Windows 10, [Microsoft Passport](/windows/access-protection/hello-for-business/hello-identity-verification) replaces passwords with strong two-factor authentication that consists of an enrolled device and a Windows Hello (biometric) or PIN.
Microsoft Passport lets users authenticate to a Microsoft account, an Active Directory account, a Microsoft Azure Active Directory (AD) account, or non-Microsoft service that supports Fast ID Online (FIDO) authentication. After an initial two-step verification during Microsoft Passport enrollment, a Microsoft Passport is set up on the user's device and the user sets a gesture, which can be Windows Hello or a PIN. The user provides the gesture to verify identity; Windows then uses Microsoft Passport to authenticate users and help them to access protected resources and services.
@@ -97,9 +97,9 @@ In Windows 10, security auditing has added some improvements:
##### New audit subcategories
In Windows 10, two new audit subcategories were added to the Advanced Audit Policy Configuration to provide greater granularity in audit events:
-- [Audit Group Membership](../keep-secure/audit-group-membership.md) Found in the Logon/Logoff audit category, the Audit Group Membership subcategory allows you to audit the group membership information in a user's logon token. Events in this subcategory are generated when group memberships are enumerated or queried on the PC where the logon session was created. For an interactive logon, the security audit event is generated on the PC that the user logged on to. For a network logon, such as accessing a shared folder on the network, the security audit event is generated on the PC hosting the resource.
+- [Audit Group Membership](/windows/device-security/auditing/audit-group-membership) Found in the Logon/Logoff audit category, the Audit Group Membership subcategory allows you to audit the group membership information in a user's logon token. Events in this subcategory are generated when group memberships are enumerated or queried on the PC where the logon session was created. For an interactive logon, the security audit event is generated on the PC that the user logged on to. For a network logon, such as accessing a shared folder on the network, the security audit event is generated on the PC hosting the resource.
When this setting is configured, one or more security audit events are generated for each successful logon. You must also enable the **Audit Logon** setting under **Advanced Audit Policy Configuration\\System Audit Policies\\Logon/Logoff**. Multiple events are generated if the group membership information cannot fit in a single security audit event.
-- [Audit PNP Activity](../keep-secure/audit-pnp-activity.md) Found in the Detailed Tracking category, the Audit PNP Activity subcategory allows you to audit when plug and play detects an external device.
+- [Audit PNP Activity](/windows/device-security/auditing/audit-pnp-activity) Found in the Detailed Tracking category, the Audit PNP Activity subcategory allows you to audit when plug and play detects an external device.
Only Success audits are recorded for this category. If you do not configure this policy setting, no audit event is generated when an external device is detected by plug and play.
A PnP audit event can be used to track down changes in system hardware and will be logged on the PC where the change took place. A list of hardware vendor IDs are included in the event.
@@ -188,7 +188,7 @@ Event ID 4826 has been added to track the following changes to the Boot Configur
Event ID 6416 has been added to track when an external device is detected through Plug and Play. One important scenario is if an external device that contains malware is inserted into a high-value machine that doesn’t expect this type of action, such as a domain controller.
-[Learn how to manage your security audit policies within your organization](../keep-secure/security-auditing-overview.md).
+[Learn how to manage your security audit policies within your organization](/windows/device-security/auditing/security-auditing-overview).
### Trusted Platform Module
@@ -200,9 +200,9 @@ Event ID 6416 has been added to track when an external device is detected throug
The following sections describe the new and changed functionality in the TPM for Windows 10:
- [Device health attestation](#bkmk-dha)
-- [Microsoft Passport](microsoft-passport.md) support
-- [Device Guard](../keep-secure/introduction-to-device-guard-virtualization-based-security-and-code-integrity-policies.md) support
-- [Credential Guard](../keep-secure/credential-guard.md) support
+- [Microsoft Passport](/windows/access-protection/hello-for-business/hello-identity-verification) support
+- [Device Guard](/windows/access-protection/device-guard/introduction-to-device-guard-virtualization-based-security-and-code-integrity-policies) support
+- [Credential Guard](/windows/access-protection/credential-guard/credential-guard) support
### Device health attestation
@@ -214,7 +214,7 @@ Some things that you can check on the device are:
> **Note** The device must be running Windows 10 and it must support at least TPM 2.0.
-[Learn how to deploy and manage TPM within your organization](../keep-secure/trusted-platform-module-overview.md).
+[Learn how to deploy and manage TPM within your organization](/windows/device-security/tpm//trusted-platform-module-overview).
### User Account Control
@@ -222,7 +222,7 @@ User Account Control (UAC) helps prevent malware from damaging a computer and he
You should not turn off UAC because this is not a supported scenario for devices running Windows 10. If you do turn off UAC, all Univeral Windows Platform apps stop working. You must always set the **HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\System\\EnableLUA** registry value to 1. If you need to provide auto elevation for programmatic access or installation, you could set the **HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\System\\ConsentPromptBehaviorAdmin** registry value to 0, which is the same as setting the UAC slider Never Notify. This is not recommended for devices running Windows 10.
-For more info about how manage UAC, see [UAC Group Policy Settings and Registry Key Settings](../keep-secure/user-account-control-group-policy-and-registry-key-settings.md).
+For more info about how manage UAC, see [UAC Group Policy Settings and Registry Key Settings](/windows/access-protection/user-account-control/user-account-control-group-policy-and-registry-key-settings).
In Windows 10, User Account Control has added some improvements.
@@ -230,7 +230,7 @@ In Windows 10, User Account Control has added some improvements.
- **Integration with the Antimalware Scan Interface (AMSI)**. The [AMSI](http://msdn.microsoft.com/library/windows/desktop/dn889587.aspx) scans all UAC elevation requests for malware. If malware is detected, the admin privilege is blocked.
-[Learn how to manage User Account Control within your organization](../keep-secure/user-account-control-overview.md).
+[Learn how to manage User Account Control within your organization](/windows/access-protection/user-account-control/user-account-control-overview).
### VPN profile options
@@ -242,7 +242,7 @@ Windows 10 provides a set of VPN features that both increase enterprise security
- Lock down VPN
- Integration with Microsoft Passport for Work
-[Learn more about the VPN options in Windows 10.](../keep-secure/vpn-profile-options.md)
+[Learn more about the VPN options in Windows 10.](/windows/access-protection/vpn/vpn-profile-options)
## Management
@@ -298,16 +298,16 @@ Lockdown settings can also be configured for device look and feel, such as a the
### Customized Start layout
-A standard, customized Start layout can be useful on devices that are common to multiple users and devices that are locked down for specialized purposes. Starting in Windows 10, version 1511, administrators can configure a *partial* Start layout, which applies specified tile groups while allowing users to create and customize their own tile groups. Learn how to [customize and export Start layout](../manage/customize-and-export-start-layout.md).
+A standard, customized Start layout can be useful on devices that are common to multiple users and devices that are locked down for specialized purposes. Starting in Windows 10, version 1511, administrators can configure a *partial* Start layout, which applies specified tile groups while allowing users to create and customize their own tile groups. Learn how to [customize and export Start layout](/windows/configuration/customize-and-export-start-layout).
-Administrators can also use mobile device management (MDM) or Group Policy to disable the use of [Windows Spotlight on the lock screen](../configure/windows-spotlight.md).
+Administrators can also use mobile device management (MDM) or Group Policy to disable the use of [Windows Spotlight on the lock screen](/windows/configuration/windows-spotlight).
### Windows Store for Business
**New in Windows 10, version 1511**
With the Windows Store for Business, organizations can make volume purchases of Windows apps. The Store for Business provides app purchases based on organizational identity, flexible distribution options, and the ability to reclaim or re-use licenses. Organizations can also use the Store for Business to create a private store for their employees that includes apps from the Store, as well private Line-of-Business (LOB) apps.
-For more information, see [Windows Store for Business overview](../manage/windows-store-for-business-overview.md).
+For more information, see [Windows Store for Business overview](/microsoft-store/windows-store-for-business-overview).
## Updates
@@ -325,9 +325,9 @@ By using [Group Policy Objects](https://go.microsoft.com/fwlink/p/?LinkId=699279
Together, these Windows Update for Business features help reduce device management costs, provide controls over update deployment, offer quicker access to security updates, as well as provide access to the latest innovations from Microsoft on an ongoing basis. Windows Update for Business is a free service for all Windows 10 Pro, Enterprise, and Education editions, and can be used independent of, or in conjunction with, existing device management solutions such as [Windows Server Update Services (WSUS)](http://technet.microsoft.com/library/hh852345.aspx) and [System Center Configuration Manager](http://technet.microsoft.com/library/gg682129.aspx).
-Learn more about [Windows Update for Business](../plan/windows-update-for-business.md).
+Learn more about [Windows Update for Business](/windows/deployment/update/waas-manage-updates-wufb).
-For more information about updating Windows 10, see [Windows 10 servicing options for updates and upgrades](../manage/introduction-to-windows-10-servicing.md).
+For more information about updating Windows 10, see [Windows 10 servicing options for updates and upgrades](/windows/deployment/update/waas-servicing-strategy-windows-10-updates).
## Microsoft Edge
Microsoft Edge takes you beyond just browsing to actively engaging with the web through features like Web Note, Reading View, and Cortana.
diff --git a/windows/whats-new/whats-new-windows-10-version-1607.md b/windows/whats-new/whats-new-windows-10-version-1607.md
index 789934408c..07612029c5 100644
--- a/windows/whats-new/whats-new-windows-10-version-1607.md
+++ b/windows/whats-new/whats-new-windows-10-version-1607.md
@@ -25,11 +25,11 @@ In previous versions of the Windows 10 Assessment and Deployment Kit (ADK), you
Windows ICD now includes simplified workflows for creating provisioning packages:
-- [Simple provisioning to set up common settings for Active Directory-joined devices](~/deploy/provision-pcs-for-initial-deployment.md)
-- [Advanced provisioning to deploy certificates and apps](~/deploy/provision-pcs-with-apps-and-certificates.md)
+- [Simple provisioning to set up common settings for Active Directory-joined devices](/windows/configuration/provisioning-packages/provision-pcs-for-initial-deployment)
+- [Advanced provisioning to deploy certificates and apps](/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates)
- [School provisioning to set up classroom devices for Active Directory](https://technet.microsoft.com/en-us/edu/windows/set-up-students-pcs-to-join-domain)
-[Learn more about using provisioning packages in Windows 10.](../deploy/provisioning-packages.md)
+[Learn more about using provisioning packages in Windows 10.](/windows/configuration/provisioning-packages/provisioning-packages)
### Windows Upgrade Analytics
@@ -49,7 +49,7 @@ Use Upgrade Analytics to get:
The Upgrade Analytics workflow steps you through the discovery and rationalization process until you have a list of computers that are upgrade-ready.
-[Learn more about planning and managing Windows upgrades with Windows Upgrade Analytics.](../deploy/manage-windows-upgrades-with-upgrade-analytics.md)
+[Learn more about planning and managing Windows upgrades with Windows Upgrade Analytics.](/windows/deployment/upgrade/manage-windows-upgrades-with-upgrade-analytics)
## Windows updates
@@ -77,12 +77,12 @@ Additional changes for Windows Hello in Windows 10, version 1607:
- Beginning in version 1607, Windows Hello as a convenience PIN is disabled by default on all domain-joined computers. To enable a convenience PIN for Windows 10, version 1607, enable the Group Policy setting **Turn on convenience PIN sign-in**.
-[Learn more about Windows Hello for Business.](../keep-secure/manage-identity-verification-using-microsoft-passport.md)
+[Learn more about Windows Hello for Business.](/windows/access-protection/hello-for-business/hello-identity-verification)
### VPN
- The VPN client can integrate with the Conditional Access Framework, a cloud-pased policy engine built into Azure Active Directory, to provide a device compliance option for remote clients.
-- The VPN client can integrate with Windows Information Protection (WIP) policy to provide additional security. [Learn more about Windows Information Protection](../keep-secure/protect-enterprise-data-using-edp.md), previously known as Enterprise Data Protection.
+- The VPN client can integrate with Windows Information Protection (WIP) policy to provide additional security. [Learn more about Windows Information Protection](/windows/threat-protection/windows-information-protection/protect-enterprise-data-using-wip), previously known as Enterprise Data Protection.
- New VPNv2 configuration service provider (CSP) adds configuration settings. For details, see [What's new in MDM enrollment and management](https://msdn.microsoft.com/en-us/library/windows/hardware/mt299056%28v=vs.85%29.aspx#whatsnew_1607)
- Microsoft Intune: *VPN Profile (Windows 10 Desktop and Mobile and later)* policy template includes support for native VPN plug-ins.
@@ -100,28 +100,28 @@ Windows Information Protection (WIP) helps to protect against this potential dat
### Windows Defender
Several new features and management options have been added to Windows Defender in Windows 10, version 1607.
-- [Windows Defender Offline in Windows 10](../keep-secure/windows-defender-offline.md) can be run directly from within Windows, without having to create bootable media.
-- [Use PowerShell cmdlets for Windows Defender](../keep-secure/use-powershell-cmdlets-windows-defender-for-windows-10.md) to configure options and run scans.
-- [Enable the Block at First Sight feature in Windows 10](../keep-secure/windows-defender-block-at-first-sight.md) to leverage the Windows Defender cloud for near-instant protection against new malware.
-- [Configure enhanced notifications for Windows Defender in Windows 10](../keep-secure/windows-defender-enhanced-notifications.md) to see more informaiton about threat detections and removal.
-- [Run a Windows Defender scan from the command line](../keep-secure/run-cmd-scan-windows-defender-for-windows-10.md).
-- [Detect and block Potentially Unwanted Applications with Windows Defender](../keep-secure/enable-pua-windows-defender-for-windows-10.md) during download and install times.
+- [Windows Defender Offline in Windows 10](/windows/threat-protection/windows-defender-antivirus/windows-defender-offline) can be run directly from within Windows, without having to create bootable media.
+- [Use PowerShell cmdlets for Windows Defender](/windows/threat-protection/windows-defender-antivirus/use-powershell-cmdlets-windows-defender-antivirus) to configure options and run scans.
+- [Enable the Block at First Sight feature in Windows 10](/windows/threat-protection/windows-defender-antivirus/windows-defender-block-at-first-sight) to leverage the Windows Defender cloud for near-instant protection against new malware.
+- [Configure enhanced notifications for Windows Defender in Windows 10](/windows/threat-protection/windows-defender-antivirus/configure-notifications-windows-defender-antivirus) to see more informaiton about threat detections and removal.
+- [Run a Windows Defender scan from the command line](/windows/threat-protection/windows-defender-antivirus/command-line-arguments-windows-defender-antivirus).
+- [Detect and block Potentially Unwanted Applications with Windows Defender](/windows/threat-protection/windows-defender-antivirus/detect-block-potentially-unwanted-apps-windows-defender-antivirus) during download and install times.
### Windows Defender Advanced Threat Protection (ATP)
With the growing threat from more sophisticated targeted attacks, a new security solution is imperative in securing an increasingly complex network ecosystem. Windows Defender Advanced Threat Protection (Windows Defender ATP) is a security service, built into Windows 10 that enables enterprise customers detect, investigate, and respond to advanced threats on their networks.
-[Learn more about Windows Defender Advanced Threat Protection (ATP)](../keep-secure/windows-defender-advanced-threat-protection.md).
+[Learn more about Windows Defender Advanced Threat Protection (ATP)](/windows/threat-protection/windows-defender-atp/windows-defender-advanced-threat-protection).
## Management
### Use Remote Desktop Connection for PCs joined to Azure Active Directory
-From its release, Windows 10 has supported remote connections to PCs that are joined to Active Directory. Starting in Windows 10, version 1607, you can also connect to a remote PC that is joined to Azure Active Directory (Azure AD). [Learn about the requirements and supported configurations.](../manage/connect-to-remote-aadj-pc.md)
+From its release, Windows 10 has supported remote connections to PCs that are joined to Active Directory. Starting in Windows 10, version 1607, you can also connect to a remote PC that is joined to Azure Active Directory (Azure AD). [Learn about the requirements and supported configurations.](/windows/client-management/connect-to-remote-aadj-pc)
### Taskbar configuration
-Enterprise administrators can add and remove pinned apps from the taskbar. Users can pin apps, unpin apps, and change the order of pinned apps on the taskbar after the enterprise configuration is applied. [Learn how to configure the taskbar.](../manage/windows-10-start-layout-options-and-policies.md)
+Enterprise administrators can add and remove pinned apps from the taskbar. Users can pin apps, unpin apps, and change the order of pinned apps on the taskbar after the enterprise configuration is applied. [Learn how to configure the taskbar.](/windows/configuration/windows-10-start-layout-options-and-policies)
### Mobile device management and configuration service providers (CSPs)
@@ -129,7 +129,7 @@ Numerous settings have been added to the Windows 10 CSPs to expand MDM capabilit
### Shared PC mode
-Windows 10, Version 1607, introduces shared PC mode, which optimizes Windows 10 for shared use scenarios, such as touchdown spaces in an enterprise and temporary customer use in retail. You can apply shared PC mode to Windows 10 Pro, Education, and Enterprise. [Learn how to set up a shared or guest PC.](../configure/set-up-shared-or-guest-pc.md)
+Windows 10, Version 1607, introduces shared PC mode, which optimizes Windows 10 for shared use scenarios, such as touchdown spaces in an enterprise and temporary customer use in retail. You can apply shared PC mode to Windows 10 Pro, Education, and Enterprise. [Learn how to set up a shared or guest PC.](/windows/configuration/set-up-shared-or-guest-pc)
### Application Virtualization (App-V) for Windows 10
@@ -137,7 +137,7 @@ Application Virtualization (App-V) enables organizations to deliver Win32 applic
With the release of Windows 10, version 1607, App-V is included with the Windows 10 for Enterprise edition. If you are new to Windows 10 and App-V or if you're upgrading from a previous version of App-V, you’ll need to download, activate, and install server- and client-side components to start delivering virtual applications to users.
-[Learn how to deliver virtual applications with App-V.](../manage/appv-getting-started.md)
+[Learn how to deliver virtual applications with App-V.](/windows/application-management/app-v/appv-getting-started)
### User Experience Virtualization (UE-V) for Windows 10
@@ -147,7 +147,7 @@ With User Experience Virtualization (UE-V), you can capture user-customized Wind
With the release of Windows 10, version 1607, UE-V is included with the Windows 10 for Enterprise edition. If you are new to Windows 10 and UE-V or upgrading from a previous version of UE-V, you’ll need to download, activate, and install server- and client-side components to start synchronizing user-customized settings across devices.
-[Learn how to synchronize user-customized settings with UE-V.](../manage/uev-for-windows.md)
+[Learn how to synchronize user-customized settings with UE-V.](/windows/configuration/ue-v/uev-for-windows)
## Learn more
diff --git a/windows/whats-new/whats-new-windows-10-version-1703.md b/windows/whats-new/whats-new-windows-10-version-1703.md
index 285eefdb36..bdea6ed7a1 100644
--- a/windows/whats-new/whats-new-windows-10-version-1703.md
+++ b/windows/whats-new/whats-new-windows-10-version-1703.md
@@ -33,12 +33,12 @@ Both the desktop and kiosk wizards include an option to remove pre-installed sof

-[Learn more about Windows Configuration Designer.](../configure/provisioning-packages.md)
+[Learn more about Windows Configuration Designer.](/windows/configuration/provisioning-packages/provisioning-packages)
### Azure Active Directory join in bulk
-Using the new wizards in Windows Configuration Designer, you can [create provisioning packages to enroll devices in Azure Active Directory](../configure/provisioning-packages.md#configuration-designer-wizards). Azure AD join in bulk is available in the desktop, mobile, kiosk, and Surface Hub wizards.
+Using the new wizards in Windows Configuration Designer, you can [create provisioning packages to enroll devices in Azure Active Directory](/windows/configuration/provisioning-packages/provisioning-packages#configuration-designer-wizards). Azure AD join in bulk is available in the desktop, mobile, kiosk, and Surface Hub wizards.

@@ -51,16 +51,16 @@ The following new Group Policy and mobile device management (MDM) settings are a
- **Do not use diagnostic data for tailored experiences**
- **Turn off the Windows Welcome Experience**
-[Learn more about Windows Spotlight.](../configure/windows-spotlight.md)
+[Learn more about Windows Spotlight.](/windows/configuration/windows-spotlight)
### Start and taskbar layout
Enterprises have been able to apply customized Start and taskbar layouts to devices running Windows 10 Enterprise and Education. In Windows 10, version 1703, customized Start and taskbar layout can also be applied to Windows 10 Pro.
-Previously, the customized taskbar could only be deployed using Group Policy or provisioning packages. Windows 10, version 1703, adds support for customized taskbars to [MDM](../configure/customize-windows-10-start-screens-by-using-mobile-device-management.md).
+Previously, the customized taskbar could only be deployed using Group Policy or provisioning packages. Windows 10, version 1703, adds support for customized taskbars to [MDM](/windows/configuration/customize-windows-10-start-screens-by-using-mobile-device-management).
-[Additional MDM policy settings are available for Start and taskbar layout](../configure/windows-10-start-layout-options-and-policies.md). New MDM policy settings include:
+[Additional MDM policy settings are available for Start and taskbar layout](/windows/configuration/windows-10-start-layout-options-and-policies). New MDM policy settings include:
- Settings for the User tile: [**Start/HideUserTile**](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#start-hideusertile), [**Start/HideSwitchAccount**](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#start-hideswitchaccount), [**Start/HideSignOut**](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#start-hidesignout), [**Start/HideLock**](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#start-hidelock), and [**Start/HideChangeAccountSettings**](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#start-hidechangeaccountsettings)
- Settings for Power: [**Start/HidePowerButton**](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#start-hidepowerbutton), [**Start/HideHibernate**](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#start-hidehibernate), [**Start/HideRestart**](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#start-hiderestart), [**Start/HideShutDown**](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#start-hideshutdown), and [**Start/HideSleep**](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#start-hidesleep)
@@ -75,7 +75,7 @@ Cortana is Microsoft’s personal digital assistant, who helps busy people get t
Using Azure AD also means that you can remove an employee’s profile (for example, when an employee leaves your organization) while respecting Windows Information Protection (WIP) policies and ignoring enterprise content, such as emails, calendar items, and people lists that are marked as enterprise data.
-For more info about Cortana at work, see (../configure/cortana-at-work-overview.md)
+For more info about Cortana at work, see (/windows/configuration/cortana-at-work/cortana-at-work-overview)
## Deployment
@@ -88,7 +88,7 @@ The GPT partition format is newer and enables the use of larger and more disk pa
Additional security features of Windows 10 that are enabled when you boot in UEFI mode include: Secure Boot, Early Launch Anti-malware (ELAM) driver, Windows Trusted Boot, Measured Boot, Device Guard, Credential Guard, and BitLocker Network Unlock.
-For details, see [MBR2GPT.EXE](../deploy/mbr-to-gpt.md).
+For details, see [MBR2GPT.EXE](/windows/deployment/mbr-to-gpt).
## Security
@@ -97,7 +97,7 @@ For details, see [MBR2GPT.EXE](../deploy/mbr-to-gpt.md).
New features in Windows Defender Advanced Threat Protection (ATP) for Windows 10, version 1703 include:
- **Detection**
Enhancements to the detection capabilities include:
- - [Use the threat intelligence API to create custom alerts](../keep-secure/use-custom-ti-windows-defender-advanced-threat-protection.md) - Understand threat intelligence concepts, enable the threat intel application, and create custom threat intelligence alerts for your organization.
+ - [Use the threat intelligence API to create custom alerts](/windows/threat-protection/windows-defender-atp/use-custom-ti-windows-defender-advanced-threat-protection) - Understand threat intelligence concepts, enable the threat intel application, and create custom threat intelligence alerts for your organization.
- Improvements on OS memory and kernel sensors to enable detection of attackers who are using in-memory and kernel-level attacks
- Upgraded detections of ransomware and other advanced attacks
- Historical detection capability ensures new detection rules apply to up to six months of stored data to detect previous attacks that might not have been noticed
@@ -106,59 +106,59 @@ New features in Windows Defender Advanced Threat Protection (ATP) for Windows 10
Enterprise customers can now take advantage of the entire Windows security stack with Windows Defender Antivirus detections and Device Guard blocks being surfaced in the Windows Defender ATP portal. Other capabilities have been added to help you gain a holistic view on investigations.
Other investigation enhancements include:
- - [Investigate a user account](../keep-secure/investigate-user-windows-defender-advanced-threat-protection.md) - Identify user accounts with the most active alerts and investigate cases of potential compromised credentials.
- - [Alert process tree](../keep-secure/investigate-alerts-windows-defender-advanced-threat-protection.md#alert-process-tree) - Aggregates multiple detections and related events into a single view to reduce case resolution time.
- - [Pull alerts using REST API](../keep-secure/pull-alerts-using-rest-api-windows-defender-advanced-threat-protection.md) - Use REST API to pull alerts from Windows Defender ATP.
+ - [Investigate a user account](/windows/threat-protection/windows-defender-atp/investigate-user-windows-defender-advanced-threat-protection) - Identify user accounts with the most active alerts and investigate cases of potential compromised credentials.
+ - [Alert process tree](/windows/threat-protection/windows-defender-atp/investigate-alerts-windows-defender-advanced-threat-protection#alert-process-tree) - Aggregates multiple detections and related events into a single view to reduce case resolution time.
+ - [Pull alerts using REST API](/windows/threat-protection/windows-defender-atp/pull-alerts-using-rest-api-windows-defender-advanced-threat-protection) - Use REST API to pull alerts from Windows Defender ATP.
- **Response**
When detecting an attack, security response teams can now take immediate action to contain a breach:
- - [Take response actions on a machine](../keep-secure/respond-machine-alerts-windows-defender-advanced-threat-protection.md) - Quickly respond to detected attacks by isolating machines or collecting an investigation package.
- - [Take response actions on a file](../keep-secure/respond-file-alerts-windows-defender-advanced-threat-protection.md) - Quickly respond to detected attacks by stopping and quarantining files or blocking a file.
+ - [Take response actions on a machine](/windows/threat-protection/windows-defender-atp/respond-machine-alerts-windows-defender-advanced-threat-protection) - Quickly respond to detected attacks by isolating machines or collecting an investigation package.
+ - [Take response actions on a file](/windows/threat-protection/windows-defender-atp/respond-file-alerts-windows-defender-advanced-threat-protection) - Quickly respond to detected attacks by stopping and quarantining files or blocking a file.
- **Other features**
- - [Check sensor health state](../keep-secure/check-sensor-status-windows-defender-advanced-threat-protection.md) - Check an endpoint's ability to provide sensor data and communicate with the Windows Defender ATP service and fix known issues.
+ - [Check sensor health state](/windows/threat-protection/windows-defender-atp/check-sensor-status-windows-defender-advanced-threat-protection) - Check an endpoint's ability to provide sensor data and communicate with the Windows Defender ATP service and fix known issues.
You can read more about ransomware mitigations and detection capability in Windows Defender Advanced Threat Protection in the blog: [Averting ransomware epidemics in corporate networks with Windows Defender ATP](https://blogs.technet.microsoft.com/mmpc/2017/01/30/averting-ransomware-epidemics-in-corporate-networks-with-windows-defender-atp/).
Get a quick, but in-depth overview of Windows Defender ATP for Windows 10 and the new capabilities in Windows 10, version 1703 see (Windows Defender ATP for Windows 10 Creators Update)[https://technet.microsoft.com/en-au/windows/mt782787].
### Windows Defender Antivirus
-Windows Defender is now called Windows Defender Antivirus, and we've [increased the breadth of the documentation library for enterprise security admins](../keep-secure/windows-defender-antivirus-in-windows-10.md).
+Windows Defender is now called Windows Defender Antivirus, and we've [increased the breadth of the documentation library for enterprise security admins](/windows/threat-protection/windows-defender-antivirus/windows-defender-antivirus-in-windows-10).
The new library includes information on:
-- [Deploying and enabling AV protection](../keep-secure/deploy-windows-defender-antivirus.md)
-- [Managing updates](../keep-secure/manage-updates-baselines-windows-defender-antivirus.md)
-- [Reporting](../keep-secure/report-monitor-windows-defender-antivirus.md)
-- [Configuring features](../keep-secure/configure-windows-defender-antivirus-features.md)
-- [Troubleshooting](../keep-secure/troubleshoot-windows-defender-antivirus.md)
+- [Deploying and enabling AV protection](/windows/threat-protection/windows-defender-antivirus/deploy-windows-defender-antivirus)
+- [Managing updates](/windows/threat-protection/windows-defender-antivirus/manage-updates-baselines-windows-defender-antivirus)
+- [Reporting](/windows/threat-protection/windows-defender-antivirus/report-monitor-windows-defender-antivirus)
+- [Configuring features](/windows/threat-protection/windows-defender-antivirus/configure-windows-defender-antivirus-features)
+- [Troubleshooting](/windows/threat-protection/windows-defender-antivirus/troubleshoot-windows-defender-antivirus)
Some of the highlights of the new library include:
-- [Evaluation guide for Windows Defender AV](../keep-secure/evaluate-windows-defender-antivirus.md)
-- [Deployment guide for Windows Defender AV in a virtual desktop infrastructure environment](../keep-secure/deployment-vdi-windows-defender-antivirus.md)
+- [Evaluation guide for Windows Defender AV](/windows/threat-protection/windows-defender-antivirus//evaluate-windows-defender-antivirus)
+- [Deployment guide for Windows Defender AV in a virtual desktop infrastructure environment](/windows/threat-protection/windows-defender-antivirus/deployment-vdi-windows-defender-antivirus)
New features for Windows Defender AV in Windows 10, version 1703 include:
-- [Updates to how the Block at First Sight feature can be configured](../keep-secure/configure-block-at-first-sight-windows-defender-antivirus.md)
-- [The ability to specify the level of cloud-protection](../keep-secure/specify-cloud-protection-level-windows-defender-antivirus.md)
-- [Windows Defender Antivirus protection in the Windows Defender Security Center app](../keep-secure/windows-defender-security-center-antivirus.md)
+- [Updates to how the Block at First Sight feature can be configured](/windows/windows-defender-antivirus/configure-block-at-first-sight-windows-defender-antivirus)
+- [The ability to specify the level of cloud-protection](/windows/windows-defender-antivirus/specify-cloud-protection-level-windows-defender-antivirus)
+- [Windows Defender Antivirus protection in the Windows Defender Security Center app](/windows/windows-defender-antivirus/windows-defender-security-center-antivirus)
-In Windows 10, version 1607, we [invested heavily in helping to protect against ransomware](https://blogs.windows.com/business/2016/11/11/defending-against-ransomware-with-windows-10-anniversary-update/#UJlHc6SZ2Zm44jCt.97), and we continue that investment in version 1703 with [updated behavior monitoring and always-on real-time protection](../keep-secure/configure-real-time-protection-windows-defender-antivirus.md).
+In Windows 10, version 1607, we [invested heavily in helping to protect against ransomware](https://blogs.windows.com/business/2016/11/11/defending-against-ransomware-with-windows-10-anniversary-update/#UJlHc6SZ2Zm44jCt.97), and we continue that investment in version 1703 with [updated beahvior monitoring and always-on real-time protection](/windows/windows-defender-antivirus/configure-real-time-protection-windows-defender-antivirus).
You can read more about ransomware mitigations and detection capability in Windows Defender AV in the [Ransomware Protection in Windows 10 Anniversary Update whitepaper (PDF)](http://wincom.blob.core.windows.net/documents/Ransomware_protection_in_Windows_10_Anniversary_Update.pdf) and at the [Microsoft Malware Protection Center blog](https://blogs.technet.microsoft.com/mmpc/category/research/ransomware/).
### Device Guard and Credential Guard
Additional security qualifications for Device Guard and Credential Guard help protect vulnerabilities in UEFI runtime.
-For more information, see [Device Guard Requirements](../keep-secure/requirements-and-deployment-planning-guidelines-for-device-guard.md#device-guard-requirements-for-improved-security) and [Credential Guard Security Considerations](../keep-secure/credential-guard-requirements.md#security-considerations).
+For more information, see [Device Guard Requirements](/windows/access-protection/device-guard/requirements-and-deployment-planning-guidelines-for-device-guard) and [Credential Guard Security Considerations](/windows/access-protection/credential-guard//credential-guard-requirements#security-considerations).
### Group Policy Security Options
-The security setting [**Interactive logon: Display user information when the session is locked**](../keep-secure/interactive-logon-display-user-information-when-the-session-is-locked.md) has been updated to work in conjunction with the **Privacy** setting in **Settings** > **Accounts** > **Sign-in options**.
+The security setting [**Interactive logon: Display user information when the session is locked**](/windows/device-security/security-policy-settings/interactive-logon-display-user-information-when-the-session-is-locked) has been updated to work in conjunction with the **Privacy** setting in **Settings** > **Accounts** > **Sign-in options**.
A new security policy setting
-[**Interactive logon: Don't display username at sign-in**](../keep-secure/interactive-logon-dont-display-username-at-sign-in.md) has been introduced in Windows 10 version 1703. This security policy setting determines whether the username is displayed during sign in. It works in conjunction with the **Privacy** setting in **Settings** > **Accounts** > **Sign-in options**. The setting only affects the **Other user** tile.
+[**Interactive logon: Don't display username at sign-in**](/windows/device-security/security-policy-settings/interactive-logon-dont-display-username-at-sign-in) has been introduced in Windows 10 version 1703. This security policy setting determines whether the username is displayed during sign in. It works in conjunction with the **Privacy** setting in **Settings** > **Accounts** > **Sign-in options**. The setting only affects the **Other user** tile.
### Windows Hello for Business
@@ -168,23 +168,25 @@ For Windows Phone devices, an administrator is able to initiate a remote PIN res
For Windows desktops, users are able to reset a forgotten PIN through **Settings > Accounts > Sign-in options**.
-For more details, check out [What if I forget my PIN?](../keep-secure/hello-why-pin-is-better-than-password.md#what-if-i-forget-my-pin).
+For more details, check out [What if I forget my PIN?](/windows/access-protection/hello-for-business/hello-why-pin-is-better-than-password#what-if-i-forget-my-pin).
## Update
### Windows Update for Business
-The pause feature has been changed, and now requires a start date to set up. Users are now able to pause through **Settings > Update & security > Windows Update > Advanced options** in case a policy has not been configured. We have also increased the pause limit on quality updates to 35 days. You can find more information on pause in [Pause Feature Updates](../update/waas-configure-wufb.md#pause-feature-updates) and [Pause Quality Updates](../update/waas-configure-wufb.md#pause-quality-updates).
+The pause feature has been changed, and now requires a start date to set up. Users are now able to pause through **Settings > Update & security > Windows Update > Advanced options** in case a policy has not been configured. We have also increased the pause limit on quality updates to 35 days. You can find more information on pause in [Pause Feature Updates](/windows/deployment/update/waas-configure-wufb#pause-feature-updates) and [Pause Quality Updates](/windows/deployment/update/waas-configure-wufb#pause-quality-updates).
+
+
+Windows Update for Business managed devices are now able to defer feature update installation by up to 365 days (it used to be 180 days). In settings, users are able to select their branch readiness level and update deferal periods. See [Configure devices for Current Branch (CB) or Current Branch for Business (CBB)](/windows/deployment/update/waas-configure-wufb#configure-devices-for-current-branch-or-current-branch-for-business), [Configure when devices receive Feature Updates](/windows/deployment/update/waas-configure-wufb#configure-when-devices-receive-feature-updates) and [Configure when devices receive Quality Updates](/windows/deployment/update/waas-configure-wufb#configure-when-devices-receive-quality-updates) for details.
-Windows Update for Business managed devices are now able to defer feature update installation by up to 365 days (it used to be 180 days). In settings, users are able to select their branch readiness level and update deferral periods. See [Configure devices for Current Branch (CB) or Current Branch for Business (CBB)](../update/waas-configure-wufb.md#configure-devices-for-current-branch-or-current-branch-for-business), [Configure when devices receive Feature Updates](../update/waas-configure-wufb.md#configure-when-devices-receive-feature-updates) and [Configure when devices receive Quality Updates](../update/waas-configure-wufb.md#configure-when-devices-receive-quality-updates) for details.
### Windows Insider for Business
-We recently added the option to download Windows 10 Insider Preview builds using your corporate credentials in Azure Active Directory (AAD). By enrolling devices in AAD, you increase the visibility of feedback submitted by users in your organization – especially on features that support your specific business needs. For details, see [Windows Insider Program for Business](../update/waas-windows-insider-for-business.md).
+We recently added the option to download Windows 10 Insider Preview builds using your corporate credentials in Azure Active Directory (AAD). By enrolling devices in AAD, you increase the visibility of feedback submitted by users in your organization – especially on features that support your specific business needs. For details, see [Windows Insider Program for Business](/windows/deployment/update/waas-windows-insider-for-business).
### Optimize update delivery
-With changes delivered in Windows 10, version 1703, [Express updates](../update/waas-optimize-windows-10-updates.md#express-update-delivery) are now fully supported with System Center Configuration Manager, starting with version 1702 of Configuration Manager, as well as with other third-party updating and management products that [implement this new functionality](https://technet.microsoft.com/windows-server-docs/management/windows-server-update-services/deploy/express-update-delivery-isv-support). This is in addition to current Express support on Windows Update, Windows Update for Business and WSUS.
+With changes delivered in Windows 10, version 1703, [Express updates](/windows/deployment/update/waas-optimize-windows-10-updates#express-update-delivery) are now fully supported with System Center Configuration Manager, starting with version 1702 of Configuration Manager, as well as with other third-party updating and management products that [implement this new functionality](https://technet.microsoft.com/windows-server-docs/management/windows-server-update-services/deploy/express-update-delivery-isv-support). This is in addition to current Express support on Windows Update, Windows Update for Business and WSUS.
>[!NOTE]
> The above changes can be made available to Windows 10, version 1607, by installing the April 2017 cumulative update.
@@ -192,23 +194,25 @@ With changes delivered in Windows 10, version 1703, [Express updates](../update/
Delivery Optimization policies now enable you to configure additional restrictions to have more control in various scenarios.
Added policies include:
-- [Allow uploads while the device is on battery while under set Battery level](../update/waas-delivery-optimization.md#allow-uploads-while-the-device-is-on-battery-while-under-set-battery-level)
-- [Enable Peer Caching while the device connects via VPN](../update/waas-delivery-optimization.md#enable-peer-caching-while-the-device-connects-via-vpn)
-- [Minimum RAM (inclusive) allowed to use Peer Caching](../update/waas-delivery-optimization.md#minimum-ram-allowed-to-use-peer-caching)
-- [Minimum disk size allowed to use Peer Caching](../update/waas-delivery-optimization.md#minimum-disk-size-allowed-to-use-peer-caching)
-- [Minimum Peer Caching Content File Size](../update/waas-delivery-optimization.md#minimum-peer-caching-content-file-size)
+- [Allow uploads while the device is on battery while under set Battery level](/windows/deployment/update/waas-delivery-optimization#allow-uploads-while-the-device-is-on-battery-while-under-set-battery-level)
+- [Enable Peer Caching while the device connects via VPN](/windows/deployment/update/waas-delivery-optimization#enable-peer-caching-while-the-device-connects-via-vpn)
+- [Minimum RAM (inclusive) allowed to use Peer Caching](/windows/deployment/update/waas-delivery-optimization#minimum-ram-allowed-to-use-peer-caching)
+- [Minimum disk size allowed to use Peer Caching](/windows/deployment/update/waas-delivery-optimization#minimum-disk-size-allowed-to-use-peer-caching)
+- [Minimum Peer Caching Content File Size](/windows/deployment/update/waas-delivery-optimization#minimum-peer-caching-content-file-size)
-To check out all the details, see [Configure Delivery Optimization for Windows 10 updates](../update/waas-delivery-optimization.md)
+To check out all the details, see [Configure Delivery Optimization for Windows 10 updates](/windows/deployment/update/waas-delivery-optimization)
### Uninstalled in-box apps no longer automatically reinstall
-Starting with Windows 10, version 1703, in-box apps that were uninstalled by the user won't automatically reinstall as part of the next feature update installation process. (Apps de-provisioned by IT administrators will still be reinstalled)
+Starting with Windows 10, version 1703, in-box apps that were uninstalled by the user won't automatically reinstall as part of the feature update installation process.
+
+Additionally, apps de-provisioned by admins on Windows 10, version 1703 machines will stay de-provisioned after future feature update installations. This will not apply to the update from Windows 10, version 1607 (or earlier) to version 1703.
## Management
### New MDM capabilities
-Windows 10, version 1703 adds many new [configuration service providers (CSPs)](../configure/how-it-pros-can-use-configuration-service-providers.md) that provide new capabilities for managing Windows 10 devices using MDM or provisioning packages. Among other things, these CSPs enable you to configure a few hundred of the most useful Group Policy settings via MDM - see [Policy CSP - ADMX-backed policies](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-admx-backed).
+Windows 10, version 1703 adds many new [configuration service providers (CSPs)](/windows/configuration/provisioning-packages/how-it-pros-can-use-configuration-service-providers) that provide new capabilities for managing Windows 10 devices using MDM or provisioning packages. Among other things, these CSPs enable you to configure a few hundred of the most useful Group Policy settings via MDM - see [Policy CSP - ADMX-backed policies](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-admx-backed).
Some of the other new CSPs are:
@@ -242,27 +246,27 @@ In Windows 10, version 1703, we continue our work to improve the diagnostic expe
Previous versions of the Microsoft Application Virtualization Sequencer (App-V Sequencer) have required you to manually create your sequencing environment. Windows 10, version 1703 introduces two new PowerShell cmdlets, New-AppVSequencerVM and Connect-AppvSequencerVM, which automatically create your sequencing environment for you, including provisioning your virtual machine. Additionally, the App-V Sequencer has been updated to let you sequence or update multiple apps at the same time, while automatically capturing and storing your customizations as an App-V project template (.appvt) file, and letting you use PowerShell or Group Policy settings to automatically cleanup your unpublished packages after a device restart.
For more info, see the following topics:
-- [Automatically provision your sequencing environment using Microsoft Application Virtualization Sequencer (App-V Sequencer)](../manage/appv-auto-provision-a-vm.md)
-- [Automatically sequence multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)](../manage/appv-auto-batch-sequencing.md)
-- [Automatically update multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)](../manage/appv-auto-batch-updating.md)
-- [Automatically cleanup unpublished packages on the App-V client](../manage/appv-auto-clean-unpublished-packages.md)
+- [Automatically provision your sequencing environment using Microsoft Application Virtualization Sequencer (App-V Sequencer)](/windows/application-management/app-v/appv-auto-provision-a-vm)
+- [Automatically sequence multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)](/windows/application-management/app-v/appv-auto-batch-sequencing)
+- [Automatically update multiple apps at the same time using Microsoft Application Virtualization Sequencer (App-V Sequencer)](/windows/application-management/app-v/appv-auto-batch-updating)
+- [Automatically cleanup unpublished packages on the App-V client](/windows/application-management/app-v/appv-auto-clean-unpublished-packages)
### Windows diagnostic data
Learn more about the diagnostic data that's collected at the Basic level and some examples of the types of data that is collected at the Full level.
-- [Windows 10, version 1703 basic level Windows diagnostic events and fields](../configure/basic-level-windows-diagnostic-events-and-fields.md)
-- [Windows 10, version 1703 Diagnostic Data](../configure/windows-diagnostic-data.md)
+- [Windows 10, version 1703 basic level Windows diagnostic events and fields](/windows/configuration/basic-level-windows-diagnostic-events-and-fields)
+- [Windows 10, version 1703 Diagnostic Data](/windows/configuration/windows-diagnostic-data)
## Windows 10 Mobile enhancements
### Lockdown Designer
-The Lockdown Designer app helps you configure and create a lockdown XML file to apply to devices running Windows 10 Mobile, and includes a remote simulation to help you determine the layout for tiles on the Start screen. Using Lockdown Designer is easier than [manually creating a lockdown XML file](../configure/lockdown-xml.md).
+The Lockdown Designer app helps you configure and create a lockdown XML file to apply to devices running Windows 10 Mobile, and includes a remote simulation to help you determine the layout for tiles on the Start screen. Using Lockdown Designer is easier than [manually creating a lockdown XML file](/windows/configuration/mobile-devices/lockdown-xml).

-[Learn more about the Lockdown Designer app.](../configure/mobile-lockdown-designer.md)
+[Learn more about the Lockdown Designer app.](/windows/configuration/mobile-devices/mobile-lockdown-designer)
### Other enhancements
@@ -292,7 +296,7 @@ The development of Upgrade Readiness has been heavily influenced by input from t
For more information about Upgrade Readiness, see the following topics:
- [Windows Analytics blog](https://blogs.technet.microsoft.com/upgradeanalytics/)
-- [Manage Windows upgrades with Upgrade Readiness](../deploy/manage-windows-upgrades-with-upgrade-readiness.md)
+- [Manage Windows upgrades with Upgrade Readiness](/windows/deployment/upgrade/manage-windows-upgrades-with-upgrade-readiness)
### Update Compliance
@@ -301,4 +305,4 @@ Update Compliance helps you to keep Windows 10 devices in your organization secu
Update Compliance is a solution built using OMS Log Analytics that provides information about installation status of monthly quality and feature updates. Details are provided about the deployment progress of existing updates and the status of future updates. Information is also provided about devices that might need attention to resolve issues.
-For more information about Update Compliance, see [Monitor Windows Updates with Update Compliance](../manage/update-compliance-monitor.md).
+For more information about Update Compliance, see [Monitor Windows Updates with Update Compliance](/windows/deployment/update/update-compliance-monitor).