diff --git a/windows/client-management/toc.yml b/windows/client-management/toc.yml
index 74837fc166..2cf74ef48d 100644
--- a/windows/client-management/toc.yml
+++ b/windows/client-management/toc.yml
@@ -5,51 +5,48 @@ items:
       - name: Mobile device management (MDM)
         expanded: true
         items:
-          - name: Overview
-            items:
-              - name: MDM overview
-                href: mdm-overview.md
-              - name: What's new in MDM enrollment and management
-                href: new-in-windows-mdm-enrollment-management.md
+          - name: What is MDM?
+            href: mdm-overview.md
+          - name: What's new in MDM enrollment and management
+            href: new-in-windows-mdm-enrollment-management.md
+          - name: Transitioning to modern management
+            href: manage-windows-10-in-your-organization-modern-management.md
           - name: Azure Active Directory integration with MDM
             href: azure-active-directory-integration-with-mdm.md
+          - name: Enroll devices
             items:
-              - name: Add an Azure AD tenant and Azure AD subscription
-                href: add-an-azure-ad-tenant-and-azure-ad-subscription.md
-              - name: Register your free Azure Active Directory subscription
-                href: register-your-free-azure-active-directory-subscription.md
-          - name: Device enrollment
-            href: mobile-device-enrollment.md
+              - name: Enrollment overview
+                href: mobile-device-enrollment.md
+              - name: Enrollment methods
+                items:
+                  - name: Manual enrollment
+                    href: mdm-enrollment-of-windows-devices.md
+                  - name: Automatic enrollment via Azure AD
+                    href: azure-ad-and-microsoft-intune-automatic-mdm-enrollment-in-the-new-portal.md
+                  - name: Group Policy enrollment
+                    href: enroll-a-windows-10-device-automatically-using-group-policy.md
+                  - name: Bulk enrollment
+                    href: bulk-enrollment-using-windows-provisioning-tool.md
+                  - name: Federated authentication enrollment
+                    href: federated-authentication-device-enrollment.md
+                  - name: Certificate authentication enrollment
+                    href: certificate-authentication-device-enrollment.md
+                  - name: On-premises authentication enrollment
+                    href: on-premise-authentication-device-enrollment.md
+          - name: Manage devices
             items:
-              - name: MDM enrollment of Windows devices
-                href: mdm-enrollment-of-windows-devices.md
-              - name: "Azure AD and Microsoft Intune: Automatic MDM enrollment"
-                href: azure-ad-and-microsoft-intune-automatic-mdm-enrollment-in-the-new-portal.md
-              - name: Enroll a Windows 10 device automatically using Group Policy
-                href: enroll-a-windows-10-device-automatically-using-group-policy.md
-              - name: Bulk enrollment
-                href: bulk-enrollment-using-windows-provisioning-tool.md
-              - name: Federated authentication device enrollment
-                href: federated-authentication-device-enrollment.md
-              - name: Certificate authentication device enrollment
-                href: certificate-authentication-device-enrollment.md
-              - name: On-premises authentication device enrollment
-                href: on-premise-authentication-device-enrollment.md
-              - name: Disconnecting a device from MDM (unenrollment)
-                href: disconnecting-from-mdm-unenrollment.md
-          - name: Enterprise settings, policies, and app management
-            href: windows-mdm-enterprise-settings.md
-            items:
-              - name: Enterprise app management
+              - name: Manage settings
+                href: windows-mdm-enterprise-settings.md
+              - name: Manage apps
                 href: enterprise-app-management.md
-              - name: Deploy and configure App-V apps using MDM
-                href: appv-deploy-and-config.md
-              - name: Mobile device management (MDM) for device updates
+              - name: Manage updates
                 href: device-update-management.md
               - name: Secured-Core PC Configuration Lock
                 href: config-lock.md
               - name: Certificate renewal
                 href: certificate-renewal-windows-mdm.md
+          - name: Disconnecting a device from MDM (unenrollment)
+            href: disconnecting-from-mdm-unenrollment.md
           - name: Diagnose MDM failures in Windows 10
             href: diagnose-mdm-failures-in-windows-10.md
           - name: Push notification support for device management
@@ -80,10 +77,7 @@ items:
             href: manage-settings-app-with-group-policy.md
           - name: What version of Windows am I running
             href: windows-version-search.md
-          - name: Transitioning to modern management
-            href: manage-windows-10-in-your-organization-modern-management.md
           - name: Windows libraries
             href: windows-libraries.md
       - name: Troubleshoot Windows clients
         href: /troubleshoot/windows-client/welcome-windows-client
-