diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
index 70cc3d7d3b..00a28f07b2 100644
--- a/.openpublishing.publish.config.json
+++ b/.openpublishing.publish.config.json
@@ -2,46 +2,13 @@
   "build_entry_point": "",
   "docsets_to_publish": [
     {
-      "docset_name": "bcs-VSTS",
-      "build_source_folder": "bcs",
-      "build_output_subfolder": "bcs-VSTS",
-      "locale": "en-us",
-      "monikers": [],
-      "moniker_ranges": [],
-      "open_to_public_contributors": false,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes"
-    },
-    {
-      "docset_name": "education-VSTS",
+      "docset_name": "education",
       "build_source_folder": "education",
-      "build_output_subfolder": "education-VSTS",
-      "locale": "en-us",
-      "monikers": [],
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
-    },
-    {
-      "docset_name": "eula-vsts",
-      "build_source_folder": "windows/eulas",
-      "build_output_subfolder": "eula-vsts",
+      "build_output_subfolder": "education",
       "locale": "en-us",
       "monikers": [],
       "moniker_ranges": [],
-      "open_to_public_contributors": false,
+      "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
         "ManagedReference": "Content",
@@ -51,44 +18,12 @@
       "template_folder": "_themes"
     },
     {
-      "docset_name": "gdpr",
-      "build_source_folder": "gdpr",
-      "build_output_subfolder": "gdpr",
-      "locale": "en-us",
-      "monikers": [],
-      "moniker_ranges": [],
-      "open_to_public_contributors": false,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes"
-    },
-    {
-      "docset_name": "internet-explorer-VSTS",
-      "build_source_folder": "browsers/internet-explorer",
-      "build_output_subfolder": "internet-explorer-VSTS",
-      "locale": "en-us",
-      "monikers": [],
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
-    },
-    {
-      "docset_name": "itpro-hololens-VSTS",
+      "docset_name": "hololens",
       "build_source_folder": "devices/hololens",
-      "build_output_subfolder": "itpro-hololens-VSTS",
+      "build_output_subfolder": "hololens",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -96,35 +31,32 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "keep-secure-VSTS",
+      "docset_name": "internet-explorer",
+      "build_source_folder": "browsers/internet-explorer",
+      "build_output_subfolder": "internet-explorer",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [],
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
+    },
+    {
+      "docset_name": "keep-secure",
       "build_source_folder": "windows/keep-secure",
-      "build_output_subfolder": "keep-secure-VSTS",
-      "locale": "en-us",
-      "monikers": [],
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
-    },
-    {
-      "docset_name": "known-issues",
-      "build_source_folder": "windows/known-issues",
-      "build_output_subfolder": "known-issues",
+      "build_output_subfolder": "keep-secure",
       "locale": "en-us",
       "monikers": [],
       "moniker_ranges": [],
-      "open_to_public_contributors": false,
+      "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
         "ManagedReference": "Content",
@@ -134,11 +66,12 @@
       "template_folder": "_themes"
     },
     {
-      "docset_name": "mdop-VSTS",
+      "docset_name": "mdop",
       "build_source_folder": "mdop",
-      "build_output_subfolder": "mdop-VSTS",
+      "build_output_subfolder": "mdop",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -146,31 +79,12 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "microsoft-edge-VSTS",
+      "docset_name": "microsoft-edge",
       "build_source_folder": "browsers/edge",
-      "build_output_subfolder": "microsoft-edge-VSTS",
-      "locale": "en-us",
-      "monikers": [],
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
-    },
-    {
-      "docset_name": "privacy",
-      "build_source_folder": "windows/privacy",
-      "build_output_subfolder": "privacy",
+      "build_output_subfolder": "microsoft-edge",
       "locale": "en-us",
       "monikers": [],
       "moniker_ranges": [],
@@ -184,28 +98,12 @@
       "template_folder": "_themes"
     },
     {
-      "docset_name": "security",
-      "build_source_folder": "windows/security",
-      "build_output_subfolder": "security",
-      "locale": "en-us",
-      "monikers": [],
-      "moniker_ranges": [],
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content",
-        "LandingData": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes"
-    },
-    {
-      "docset_name": "smb-VSTS",
+      "docset_name": "smb",
       "build_source_folder": "smb",
-      "build_output_subfolder": "smb-VSTS",
+      "build_output_subfolder": "smb",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -213,16 +111,15 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "store-for-business-VSTS",
+      "docset_name": "store-for-business",
       "build_source_folder": "store-for-business",
-      "build_output_subfolder": "store-for-business-VSTS",
+      "build_output_subfolder": "store-for-business",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -230,33 +127,15 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "surface-hub-VSTS",
-      "build_source_folder": "devices/surface-hub",
-      "build_output_subfolder": "surface-hub-VSTS",
-      "locale": "en-us",
-      "monikers": [],
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
-    },
-    {
-      "docset_name": "surface-VSTS",
+      "docset_name": "surface",
       "build_source_folder": "devices/surface",
-      "build_output_subfolder": "surface-VSTS",
+      "build_output_subfolder": "surface",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -264,16 +143,31 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "win-access-protection-VSTS",
+      "docset_name": "surface-hub",
+      "build_source_folder": "devices/surface-hub",
+      "build_output_subfolder": "surface-hub",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [],
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
+    },
+    {
+      "docset_name": "win-access-protection",
       "build_source_folder": "windows/access-protection",
-      "build_output_subfolder": "win-access-protection-VSTS",
+      "build_output_subfolder": "win-access-protection",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -281,16 +175,15 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "win-app-management-VSTS",
+      "docset_name": "win-app-management",
       "build_source_folder": "windows/application-management",
-      "build_output_subfolder": "win-app-management-VSTS",
+      "build_output_subfolder": "win-app-management",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -298,16 +191,15 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "win-client-management-VSTS",
+      "docset_name": "win-client-management",
       "build_source_folder": "windows/client-management",
-      "build_output_subfolder": "win-client-management-VSTS",
+      "build_output_subfolder": "win-client-management",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -315,16 +207,15 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "win-configuration-VSTS",
+      "docset_name": "win-configuration",
       "build_source_folder": "windows/configuration",
-      "build_output_subfolder": "win-configuration-VSTS",
+      "build_output_subfolder": "win-configuration",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -332,16 +223,15 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "win-development-VSTS",
+      "docset_name": "win-deployment",
       "build_source_folder": "windows/deployment",
-      "build_output_subfolder": "win-development-VSTS",
+      "build_output_subfolder": "win-deployment",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -349,16 +239,15 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "win-device-security-VSTS",
+      "docset_name": "win-device-security",
       "build_source_folder": "windows/device-security",
-      "build_output_subfolder": "win-device-security-VSTS",
+      "build_output_subfolder": "win-device-security",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -366,16 +255,15 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "windows-configure-VSTS",
+      "docset_name": "windows-configure",
       "build_source_folder": "windows/configure",
-      "build_output_subfolder": "windows-configure-VSTS",
+      "build_output_subfolder": "windows-configure",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -383,16 +271,15 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "windows-deploy-VSTS",
+      "docset_name": "windows-deploy",
       "build_source_folder": "windows/deploy",
-      "build_output_subfolder": "windows-deploy-VSTS",
+      "build_output_subfolder": "windows-deploy",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -400,16 +287,15 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "windows-hub-VSTS",
+      "docset_name": "windows-hub",
       "build_source_folder": "windows/hub",
-      "build_output_subfolder": "windows-hub-VSTS",
+      "build_output_subfolder": "windows-hub",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -417,16 +303,15 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "windows-manage-VSTS",
+      "docset_name": "windows-manage",
       "build_source_folder": "windows/manage",
-      "build_output_subfolder": "windows-manage-VSTS",
+      "build_output_subfolder": "windows-manage",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -434,16 +319,15 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "windows-plan-VSTS",
+      "docset_name": "windows-plan",
       "build_source_folder": "windows/plan",
-      "build_output_subfolder": "windows-plan-VSTS",
+      "build_output_subfolder": "windows-plan",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -451,16 +335,47 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "windows-update-VSTS",
+      "docset_name": "windows-privacy",
+      "build_source_folder": "windows/privacy",
+      "build_output_subfolder": "windows-privacy",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [],
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
+    },
+    {
+      "docset_name": "windows-security",
+      "build_source_folder": "windows/security",
+      "build_output_subfolder": "windows-security",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [],
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
+    },
+    {
+      "docset_name": "windows-update",
       "build_source_folder": "windows/update",
-      "build_output_subfolder": "windows-update-VSTS",
+      "build_output_subfolder": "windows-update",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -468,16 +383,15 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "win-threat-protection-VSTS",
+      "docset_name": "win-threat-protection",
       "build_source_folder": "windows/threat-protection",
-      "build_output_subfolder": "win-threat-protection-VSTS",
+      "build_output_subfolder": "win-threat-protection",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -485,16 +399,15 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "win-whats-new-VSTS",
+      "docset_name": "win-whats-new",
       "build_source_folder": "windows/whats-new",
-      "build_output_subfolder": "win-whats-new-VSTS",
+      "build_output_subfolder": "win-whats-new",
       "locale": "en-us",
       "monikers": [],
+      "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -502,9 +415,7 @@
         "RestApi": "Content"
       },
       "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
+      "template_folder": "_themes"
     }
   ],
   "notification_subscribers": [
@@ -544,10 +455,6 @@
     "master": [
       "Publish",
       "Pdf"
-    ],
-    "atp-api-danm": [
-      "Publish",
-      "Pdf"
     ]
   },
   "need_generate_pdf_url_template": true,
@@ -558,4 +465,4 @@
   },
   "need_generate_pdf": false,
   "need_generate_intellisense": false
-}
\ No newline at end of file
+}
diff --git a/browsers/edge/docfx.json b/browsers/edge/docfx.json
index 58807f7d8a..981615d98b 100644
--- a/browsers/edge/docfx.json
+++ b/browsers/edge/docfx.json
@@ -24,7 +24,8 @@
         "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "Win.microsoft-edge"
+			  "depot_name": "Win.microsoft-edge",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
     },
@@ -34,4 +35,4 @@
     "dest": "browsers/edge",
     "markdownEngineName": "dfm"
   }
-}
\ No newline at end of file
+}
diff --git a/browsers/internet-explorer/docfx.json b/browsers/internet-explorer/docfx.json
index 0c42ef4158..4446936eb1 100644
--- a/browsers/internet-explorer/docfx.json
+++ b/browsers/internet-explorer/docfx.json
@@ -27,7 +27,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "Win.internet-explorer"
+			  "depot_name": "Win.internet-explorer",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
     },
@@ -37,4 +38,4 @@
     "dest": "edges/internet-explorer",
     "markdownEngineName": "dfm"
   }
-}
\ No newline at end of file
+}
diff --git a/devices/hololens/docfx.json b/devices/hololens/docfx.json
index 06af992034..dddf3dbe50 100644
--- a/devices/hololens/docfx.json
+++ b/devices/hololens/docfx.json
@@ -40,7 +40,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "Win.itpro-hololens"
+			  "depot_name": "Win.itpro-hololens",
+			  "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
diff --git a/devices/surface-hub/docfx.json b/devices/surface-hub/docfx.json
index 88d3dc2f7e..9feee3c192 100644
--- a/devices/surface-hub/docfx.json
+++ b/devices/surface-hub/docfx.json
@@ -29,7 +29,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "Win.surface-hub"
+			  "depot_name": "Win.surface-hub",
+			  "folder_relative_path_in_docset": "./"
 			}
 		}
     },
@@ -39,4 +40,4 @@
     "dest": "devices/surface-hub",
     "markdownEngineName": "dfm"
   }
-}
\ No newline at end of file
+}
diff --git a/devices/surface/docfx.json b/devices/surface/docfx.json
index 9bae9c245d..41fee61550 100644
--- a/devices/surface/docfx.json
+++ b/devices/surface/docfx.json
@@ -26,7 +26,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "Win.surface"
+			  "depot_name": "Win.surface",
+			  "folder_relative_path_in_docset": "./"	
 			}
 		}
     },
@@ -36,4 +37,4 @@
     "dest": "devices/surface",
     "markdownEngineName": "dfm"
   }
-}
\ No newline at end of file
+}
diff --git a/education/docfx.json b/education/docfx.json
index 87d94a2065..aed16babee 100644
--- a/education/docfx.json
+++ b/education/docfx.json
@@ -26,7 +26,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
         "_op_documentIdPathDepotMapping": {
           "./": {
-            "depot_name": "Win.education"
+            "depot_name": "Win.education",
+	    "folder_relative_path_in_docset": "./"
           }
        }
     },
diff --git a/mdop/docfx.json b/mdop/docfx.json
index 38b354ec49..60c7cbf596 100644
--- a/mdop/docfx.json
+++ b/mdop/docfx.json
@@ -27,7 +27,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "Win.mdop"
+			  "depot_name": "Win.mdop",
+			  "folder_relative_path_in_docset": "./"
 			}
 		}
     },
@@ -37,4 +38,4 @@
     "dest": "mdop",
     "markdownEngineName": "dfm"
   }
-}
\ No newline at end of file
+}
diff --git a/smb/docfx.json b/smb/docfx.json
index 56500f0150..b86df232d5 100644
--- a/smb/docfx.json
+++ b/smb/docfx.json
@@ -36,7 +36,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "TechNet.smb"
+			  "depot_name": "TechNet.smb",
+			  "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -45,4 +46,4 @@
     "dest": "smb",
     "markdownEngineName": "dfm"
   }
-}
\ No newline at end of file
+}
diff --git a/store-for-business/docfx.json b/store-for-business/docfx.json
index e02715ff1f..c36c5dff04 100644
--- a/store-for-business/docfx.json
+++ b/store-for-business/docfx.json
@@ -43,7 +43,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.store-for-business"
+			  "depot_name": "MSDN.store-for-business",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -52,4 +53,4 @@
     "dest": "store-for-business",
     "markdownEngineName": "dfm"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/access-protection/docfx.json b/windows/access-protection/docfx.json
index f27666d0fd..b394742538 100644
--- a/windows/access-protection/docfx.json
+++ b/windows/access-protection/docfx.json
@@ -38,7 +38,8 @@
 		"ms.author": "justinha",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.win-access-protection"
+			  "depot_name": "MSDN.win-access-protection",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -46,4 +47,4 @@
     "template": [],
     "dest": "win-access-protection"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/application-management/docfx.json b/windows/application-management/docfx.json
index 8cb7d083a0..cf14d39f29 100644
--- a/windows/application-management/docfx.json
+++ b/windows/application-management/docfx.json
@@ -41,7 +41,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.win-app-management"
+			  "depot_name": "MSDN.win-app-management",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -50,4 +51,4 @@
     "dest": "win-app-management",
     "markdownEngineName": "dfm"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/client-management/docfx.json b/windows/client-management/docfx.json
index f68b218456..54140237f9 100644
--- a/windows/client-management/docfx.json
+++ b/windows/client-management/docfx.json
@@ -40,7 +40,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.win-client-management"
+			  "depot_name": "MSDN.win-client-management",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -49,4 +50,4 @@
     "dest": "win-client-management",
     "markdownEngineName": "dfm"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/configuration/docfx.json b/windows/configuration/docfx.json
index 67eda5ee5a..bd41749bd6 100644
--- a/windows/configuration/docfx.json
+++ b/windows/configuration/docfx.json
@@ -41,7 +41,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.win-configuration"
+			  "depot_name": "MSDN.win-configuration",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -50,4 +51,4 @@
     "dest": "win-configuration",
     "markdownEngineName": "dfm"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/deploy/docfx.json b/windows/deploy/docfx.json
index dd8b79a04e..9f1758ca22 100644
--- a/windows/deploy/docfx.json
+++ b/windows/deploy/docfx.json
@@ -32,7 +32,8 @@
     "globalMetadata": {
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.windows-deploy"
+			  "depot_name": "MSDN.windows-deploy",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -40,4 +41,4 @@
     "template": [],
     "dest": "windows-deploy"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/deployment/docfx.json b/windows/deployment/docfx.json
index 45f759e8f4..c44cab89c5 100644
--- a/windows/deployment/docfx.json
+++ b/windows/deployment/docfx.json
@@ -42,7 +42,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.win-development"
+			  "depot_name": "MSDN.win-development",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -51,4 +52,4 @@
     "dest": "win-development",
     "markdownEngineName": "dfm"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/deployment/images/wada.PNG b/windows/deployment/images/wada.PNG
deleted file mode 100644
index 1c715e8f0e..0000000000
Binary files a/windows/deployment/images/wada.PNG and /dev/null differ
diff --git a/windows/device-security/docfx.json b/windows/device-security/docfx.json
index acfa4df08b..bac00186ea 100644
--- a/windows/device-security/docfx.json
+++ b/windows/device-security/docfx.json
@@ -39,7 +39,8 @@
 		"ms.date": "04/05/2017",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.win-device-security"
+			  "depot_name": "MSDN.win-device-security",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -47,4 +48,4 @@
     "template": [],
     "dest": "win-device-security"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/hub/docfx.json b/windows/hub/docfx.json
index a44aea3b51..292438cfe3 100644
--- a/windows/hub/docfx.json
+++ b/windows/hub/docfx.json
@@ -44,7 +44,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.windows-hub"
+			  "depot_name": "MSDN.windows-hub",
+                           "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -53,4 +54,4 @@
     "dest": "windows-hub",
     "markdownEngineName": "dfm"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/keep-secure/docfx.json b/windows/keep-secure/docfx.json
index c69d3e3f49..e7c4c32d2a 100644
--- a/windows/keep-secure/docfx.json
+++ b/windows/keep-secure/docfx.json
@@ -32,7 +32,8 @@
     "globalMetadata": {
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.keep-secure"
+			  "depot_name": "MSDN.keep-secure",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -40,4 +41,4 @@
     "template": [],
     "dest": "keep-secure"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/manage/docfx.json b/windows/manage/docfx.json
index eee8740627..36d3bfc69c 100644
--- a/windows/manage/docfx.json
+++ b/windows/manage/docfx.json
@@ -32,7 +32,8 @@
     "globalMetadata": {
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.windows-manage"
+			  "depot_name": "MSDN.windows-manage",
+			  "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -40,4 +41,4 @@
     "template": [],
     "dest": "windows-manage"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/plan/docfx.json b/windows/plan/docfx.json
index 4a303a21bc..1a52d12cc9 100644
--- a/windows/plan/docfx.json
+++ b/windows/plan/docfx.json
@@ -32,7 +32,8 @@
     "globalMetadata": {
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.windows-plan"
+			  "depot_name": "MSDN.windows-plan",
+			  "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -40,4 +41,4 @@
     "template": [],
     "dest": "windows-plan"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/privacy/docfx.json b/windows/privacy/docfx.json
index 98296c6b76..9221109b4d 100644
--- a/windows/privacy/docfx.json
+++ b/windows/privacy/docfx.json
@@ -36,13 +36,19 @@
       "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
       "ms.technology": "windows",
       "ms.topic": "article",
-		  "feedback_system": "GitHub",
+      "feedback_system": "GitHub",
       "feedback_github_repo": "MicrosoftDocs/windows-itpro-docs",
-      "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app"
+      "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
+      "_op_documentIdPathDepotMapping": {
+			"./": {
+			  "depot_name": "MSDN.privacy",
+                          "folder_relative_path_in_docset": "./"
+			}
+		}
     },
     "fileMetadata": {},
     "template": [],
     "dest": "privacy",
     "markdownEngineName": "markdig"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/privacy/windows-diagnostic-data.md b/windows/privacy/windows-diagnostic-data.md
index 2b73716da2..dcf4d2be83 100644
--- a/windows/privacy/windows-diagnostic-data.md
+++ b/windows/privacy/windows-diagnostic-data.md
@@ -22,13 +22,13 @@ Applies to:
 - Windows 10, version 1803
 - Windows 10, version 1709
 
-Microsoft uses Windows diagnostic data to keep Windows secure and up-to-date, troubleshoot problems, and make product improvements. For users who have turned on "Tailored experiences", it can also be used to offer you personalized tips, ads, and recommendations to enhance Microsoft products and services for your needs. This article describes all types of diagnostic data collected by Windows at the Full level (inclusive of data collected at Basic), with comprehensive examples of data we collect per each type. For additional, detailed technical descriptions of Basic data items, see [Windows 10, version 1803 Basic level diagnostic events and fields](https://docs.microsoft.com/windows/configuration/basic-level-windows-diagnostic-events-and-fields).
+Microsoft uses Windows diagnostic data to keep Windows secure and up-to-date, troubleshoot problems, and make product improvements. For users who have turned on "Tailored experiences", it can also be used to offer you personalized tips, ads, and recommendations to enhance Microsoft products and services for your needs. This article describes all types of diagnostic data collected by Windows at the Full level (inclusive of data collected at Basic), with comprehensive examples of data we collect per each type. For additional, detailed technical descriptions of Basic data items, see [Windows 10, version 1809 Basic level diagnostic events and fields](https://docs.microsoft.com/windows/configuration/basic-level-windows-diagnostic-events-and-fields).
 
 In addition, this article provides references to equivalent definitions for the data types and examples from [ISO/IEC 19944:2017 Information technology -- Cloud computing -- Cloud services and devices: Data flow, data categories and data use](https://www.iso.org/standard/66674.html). Each data type also has a Data Use statement, for diagnostics and for Tailored experiences on the device, using the terms as defined by the standard. These Data Use statements define the purposes for which Microsoft processes each type of Windows diagnostic data, using a uniform set of definitions referenced at the end of this document and based on the ISO standard. Reference to the ISO standard provides additional clarity about the information collected, and allows easy comparison with other services or guidance that also references the standard.
 
 The data covered in this article is grouped into the following types:
 
-- Common data (diagnostic header information)
+- Common data extensions (diagnostic header information)
 - Device, Connectivity, and Configuration data
 - Product and Service Usage data
 - Product and Service Performance data
@@ -36,15 +36,15 @@ The data covered in this article is grouped into the following types:
 - Browsing History data
 - Inking, Typing, and Speech Utterance data
 
-## Common data
+## Common data extensions
 Most diagnostic events contain a header of common data. In each example, the info in parentheses provides the equivalent definition for ISO/IEC 19944:2017.
 
-**Data Use for Common data**
+**Data Use for Common data extensions**
 Header data supports the use of data associated with all diagnostic events. Therefore, Common data is used to [provide](#provide) Windows 10, and may be used to [improve](#improve), [personalize](#personalize), [recommend](#recommend), [offer](#offer), or [promote](#promote) Microsoft and third-party products and services, depending on the uses described in the **Data Use** statements for each data category.
 
-### Data Description for Common data type
+### Data Description for Common data extensions type
 
-#### Common data type
+#### Common data extensions type
 
 Information that is added to most diagnostic events, if relevant and available:
 
@@ -506,6 +506,6 @@ Use of the specified data categories to promote a product or service in or on a
 
 Here are the list of data identification qualifiers and the ISO/IEC 19944:2017 reference:
 
-- **<a name="#pseudo">Pseudonymized Data</a>** 8.3.3 Pseudonymized data. Microsoft usage notes are as defined.
-- **<a name="#anon">Anonymized Data</a>** 8.3.5 Anonymized data. Microsoft usage notes are as defined.
-- **<a name="#aggregate">Aggregated Data</a>** 8.3.6 Aggregated data. Microsoft usage notes are as defined.
\ No newline at end of file
+- **<a name="pseudo">Pseudonymized Data</a>** 8.3.3 Pseudonymized data. Microsoft usage notes are as defined.
+- **<a name="anon">Anonymized Data</a>** 8.3.5 Anonymized data. Microsoft usage notes are as defined.
+- **<a name="aggregate">Aggregated Data</a>** 8.3.6 Aggregated data. Microsoft usage notes are as defined.
\ No newline at end of file
diff --git a/windows/security/docfx.json b/windows/security/docfx.json
index 018d611769..961279662e 100644
--- a/windows/security/docfx.json
+++ b/windows/security/docfx.json
@@ -38,12 +38,18 @@
 	  "ms.topic": "article",
 	  "feedback_system": "GitHub",
 	  "feedback_github_repo": "MicrosoftDocs/windows-itpro-docs",
-      "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
-	  "ms.author": "justinha"
+          "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
+	  "ms.author": "justinha",
+	  "_op_documentIdPathDepotMapping": {
+			"./": {
+			  "depot_name": "MSDN.security",
+                          "folder_relative_path_in_docset": "./"
+			}
+		}
     },
     "fileMetadata": {},
     "template": [],
     "dest": "security",
     "markdownEngineName": "dfm"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/threat-protection/docfx.json b/windows/threat-protection/docfx.json
index 055e983ab5..ca62dbde8c 100644
--- a/windows/threat-protection/docfx.json
+++ b/windows/threat-protection/docfx.json
@@ -39,7 +39,8 @@
 		"ms.date": "04/05/2017",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.win-threat-protection"
+			  "depot_name": "MSDN.win-threat-protection",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -47,4 +48,4 @@
     "template": [],
     "dest": "win-threat-protection"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/update/docfx.json b/windows/update/docfx.json
index e95b5a9ccc..0e654307a9 100644
--- a/windows/update/docfx.json
+++ b/windows/update/docfx.json
@@ -32,7 +32,8 @@
     "globalMetadata": {
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.windows-update"
+			  "depot_name": "MSDN.windows-update",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -40,4 +41,4 @@
     "template": [],
     "dest": "windows-update"
   }
-}
\ No newline at end of file
+}
diff --git a/windows/whats-new/docfx.json b/windows/whats-new/docfx.json
index 15581c3398..8095c10abd 100644
--- a/windows/whats-new/docfx.json
+++ b/windows/whats-new/docfx.json
@@ -41,7 +41,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.win-whats-new"
+			  "depot_name": "MSDN.win-whats-new",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -50,4 +51,4 @@
     "dest": "win-whats-new",
     "markdownEngineName": "dfm"
   }
-}
\ No newline at end of file
+}