diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
index b7f54e782503a..544d70a2731f4 100644
--- a/.openpublishing.publish.config.json
+++ b/.openpublishing.publish.config.json
@@ -125,9 +125,10 @@
     ".openpublishing.redirection.fsharp.json",
     ".openpublishing.redirection.fundamentals.json",
     ".openpublishing.redirection.machine-learning.json",
+    ".openpublishing.redirection.navigate.json",
     ".openpublishing.redirection.orleans.json",
     ".openpublishing.redirection.standard.json",
     ".openpublishing.redirection.visual-basic.json"
   ],
   "need_generate_intellisense": false
-}
\ No newline at end of file
+}
diff --git a/.openpublishing.redirection.core.json b/.openpublishing.redirection.core.json
index 6533ed21ccc4f..beba5e9a18631 100644
--- a/.openpublishing.redirection.core.json
+++ b/.openpublishing.redirection.core.json
@@ -877,6 +877,18 @@
             "source_path_from_root": "/docs/core/packages.md",
             "redirect_url": "/dotnet/core/deploying"
         },
+        {
+            "source_path_from_root": "/docs/core/porting/github-copilot-app-modernization-faq.yml",
+            "redirect_url": "/dotnet/core/porting/github-copilot-app-modernization/faq"
+        },
+        {
+            "source_path_from_root": "/docs/core/porting/github-copilot-app-modernization-overview.md",
+            "redirect_url": "/dotnet/core/porting/github-copilot-app-modernization/overview"
+        },
+        {
+            "source_path_from_root": "/docs/core/porting/how-to-upgrade-with-github-copilot.md",
+            "redirect_url": "/dotnet/core/porting/github-copilot-app-modernization/how-to-upgrade-with-github-copilot"
+        },
         {
             "source_path_from_root": "/docs/core/porting/libraries.md",
             "redirect_url": "/dotnet/core/porting/"
diff --git a/.openpublishing.redirection.navigate.json b/.openpublishing.redirection.navigate.json
new file mode 100644
index 0000000000000..4dff98a7795d6
--- /dev/null
+++ b/.openpublishing.redirection.navigate.json
@@ -0,0 +1,8 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/docs/navigate/github-copilot-modernize/index.yml",
+            "redirect_url": "/dotnet/core/porting/github-copilot-app-modernization/index"
+        }
+    ]
+}
diff --git a/docs/azure/migration/appmod/containerization.md b/docs/azure/migration/appmod/containerization.md
index a312fddb46f11..67aeeea8885a0 100644
--- a/docs/azure/migration/appmod/containerization.md
+++ b/docs/azure/migration/appmod/containerization.md
@@ -22,7 +22,7 @@ In this quickstart, you learn how to containerize your project using GitHub Copi
 
 Before you begin, make sure you have:
 
-[!INCLUDE[github-copilot-app-mod-prereqs](../../../includes/github-copilot-app-mod-prereqs.md)]
+[!INCLUDE[github-copilot-app-mod-prereqs](../../../core/porting/github-copilot-app-modernization/includes/prereqs.md)]
 
 ## Containerize your project
 
diff --git a/docs/azure/migration/appmod/deploy.md b/docs/azure/migration/appmod/deploy.md
index 8095816a4b1e4..efdd051b53ad3 100644
--- a/docs/azure/migration/appmod/deploy.md
+++ b/docs/azure/migration/appmod/deploy.md
@@ -14,7 +14,7 @@ In this quickstart, you learn how to deploy your project to Azure with GitHub Co
 
 ## Prerequisites
 
-[!INCLUDE[github-copilot-app-mod-prereqs](../../../includes/github-copilot-app-mod-prereqs.md)]
+[!INCLUDE[github-copilot-app-mod-prereqs](../../../core/porting/github-copilot-app-modernization/includes/prereqs.md)]
 
 ## Deploy your project
 
diff --git a/docs/azure/migration/appmod/quickstart.md b/docs/azure/migration/appmod/quickstart.md
index 1f8707728439d..d26f57f561bee 100644
--- a/docs/azure/migration/appmod/quickstart.md
+++ b/docs/azure/migration/appmod/quickstart.md
@@ -19,7 +19,7 @@ In this quickstart, you assess and migrate a .NET project by using GitHub Copilo
 
 ## Prerequisites
 
-[!INCLUDE[github-copilot-app-mod-prereqs](../../../includes/github-copilot-app-mod-prereqs.md)]
+[!INCLUDE[github-copilot-app-mod-prereqs](../../../core/porting/github-copilot-app-modernization/includes/prereqs.md)]
 
 ## Assess app readiness
 
@@ -108,4 +108,4 @@ You can choose one of the predefined options and send it in the chat:
 ## Next Steps
 
 - [Predefined Tasks](predefined-tasks.md)
-- [Frequently Asked Questions](../../../core/porting/github-copilot-app-modernization-faq.yml)
+- [Frequently Asked Questions](../../../core/porting/github-copilot-app-modernization/faq.yml)
diff --git a/docs/azure/toc.yml b/docs/azure/toc.yml
index b92abe92f9705..d0eee40a27fc0 100644
--- a/docs/azure/toc.yml
+++ b/docs/azure/toc.yml
@@ -27,9 +27,9 @@ items:
     - name: GitHub Copilot app modernization for .NET
       items:
         - name: Overview
-          href: ../core/porting/github-copilot-app-modernization-overview.md?toc=/dotnet/azure/toc.json&bc=/dotnet/breadcrumb/toc.json
+          href: ../core/porting/github-copilot-app-modernization/overview.md?toc=/dotnet/azure/toc.json&bc=/dotnet/breadcrumb/toc.json
         - name: FAQ
-          href: ../core/porting/github-copilot-app-modernization-faq.yml?toc=/dotnet/azure/toc.json&bc=/dotnet/breadcrumb/toc.json
+          href: ../core/porting/github-copilot-app-modernization/faq.yml?toc=/dotnet/azure/toc.json&bc=/dotnet/breadcrumb/toc.json
         - name: Predefined Tasks
           href: ./migration/appmod/predefined-tasks.md
         - name: Quickstart - Assess and migrate a .NET project
diff --git a/docs/core/install/upgrade.md b/docs/core/install/upgrade.md
index 2bd94c9918ee8..8fa3fee613b96 100644
--- a/docs/core/install/upgrade.md
+++ b/docs/core/install/upgrade.md
@@ -39,7 +39,7 @@ Here's how to do it:
 - The same pattern applies for the `<TargetFrameworks>` property if it is being used.
 
 > [!TIP]
-> The [GitHub Copilot app modernization - upgrade](../porting/github-copilot-app-modernization-overview.md) capability can make these changes automatically.
+> The [GitHub Copilot app modernization - upgrade](../porting/github-copilot-app-modernization/overview.md) capability can make these changes automatically.
 
 The next step is to build the project (or solution) with the new SDK. If additional changes are needed, the SDK will provide warnings and errors that guide you.
 
diff --git a/docs/core/porting/framework-overview.md b/docs/core/porting/framework-overview.md
index feca7a9b36dbb..dbfdd8026f804 100644
--- a/docs/core/porting/framework-overview.md
+++ b/docs/core/porting/framework-overview.md
@@ -125,7 +125,7 @@ Even if you use a tool to help port your application, you should review the [Con
 
 ### GitHub Copilot app modernization assistant
 
-[GitHub Copilot app modernization](github-copilot-app-modernization-overview.md) is a GitHub Copilot chat assistant that helps you plan and upgrade projects to newer versions of .NET, migrate to Azure, update dependencies, and apply code fixes. Azure migration is powered by [Application and code assessment for .NET](../../azure/migration/appcat/app-code-assessment-toolkit.md)
+[GitHub Copilot app modernization](github-copilot-app-modernization/overview.md) is a GitHub Copilot chat assistant that helps you plan and upgrade projects to newer versions of .NET, migrate to Azure, update dependencies, and apply code fixes. Azure migration is powered by [Application and code assessment for .NET](../../azure/migration/appcat/app-code-assessment-toolkit.md)
 
 This chat assistant supports the following upgrade paths:
 
@@ -190,7 +190,7 @@ For more information, see [Platform compatibility analyzer](../../standard/analy
 
 When porting your application to .NET, consider the following suggestions in order:
 
-✔️ CONSIDER using the [GitHub Copilot app modernization](github-copilot-app-modernization-overview.md) to upgrade your projects. GitHub Copilot is powerful at identifying and fixing incompatibilities when porting. It automates most of the manual steps detailed in this article and gives you a great starting point for continuing your upgrade path.
+✔️ CONSIDER using the [GitHub Copilot app modernization](github-copilot-app-modernization/overview.md) to upgrade your projects. GitHub Copilot is powerful at identifying and fixing incompatibilities when porting. It automates most of the manual steps detailed in this article and gives you a great starting point for continuing your upgrade path.
 
 ✔️ CONSIDER examining your dependencies first. Your dependencies must target .NET, .NET Standard, or .NET Core.
 
@@ -210,7 +210,7 @@ When porting your application to .NET, consider the following suggestions in ord
 
 ## See also
 
-- [What is GitHub Copilot app modernization](github-copilot-app-modernization-overview.md)
+- [What is GitHub Copilot app modernization](github-copilot-app-modernization/overview.md)
 - [ASP.NET to ASP.NET Core migration](/aspnet/core/migration/proper-to-2x)
 - [Upgrade a WPF desktop app to .NET](/dotnet/desktop/wpf/migration/)
 - [Upgrade a Windows Forms app to .NET](/dotnet/desktop/winforms/migration/)
diff --git a/docs/core/porting/github-copilot-app-modernization-faq.yml b/docs/core/porting/github-copilot-app-modernization/faq.yml
similarity index 96%
rename from docs/core/porting/github-copilot-app-modernization-faq.yml
rename to docs/core/porting/github-copilot-app-modernization/faq.yml
index f678be56a7706..b033fa1d96064 100644
--- a/docs/core/porting/github-copilot-app-modernization-faq.yml
+++ b/docs/core/porting/github-copilot-app-modernization/faq.yml
@@ -10,7 +10,7 @@ metadata:
 
 title: GitHub Copilot app modernization FAQ
 summary: |
-  GitHub Copilot app modernization is an interactive GitHub Copilot agent that adds powerful capabilities to Visual Studio. This article answers frequently asked questions. For more information about the modernization agent, see [What is GitHub Copilot app modernization](github-copilot-app-modernization-overview.md).
+  GitHub Copilot app modernization is an interactive GitHub Copilot agent that adds powerful capabilities to Visual Studio. This article answers frequently asked questions. For more information about the modernization agent, see [What is GitHub Copilot app modernization](overview.md).
 
   The tool requires one of the following GitHub Copilot subscriptions:
 
@@ -107,7 +107,7 @@ sections:
           - Logging
           - Security
 
-          For more information about these scenarios, see [Predefined tasks for migration](github-copilot-app-modernization-overview.md#predefined-tasks-for-migration).
+          For more information about these scenarios, see [Predefined tasks for migration](overview.md#predefined-tasks-for-migration).
 
       - question: Can I monitor assessment progress?
         answer: |
@@ -125,4 +125,4 @@ sections:
 additionalContent: |
     ## Related content
 
-    To learn more, see [What is GitHub Copilot app modernization?](github-copilot-app-modernization-overview.md).
+    To learn more, see [What is GitHub Copilot app modernization?](overview.md).
diff --git a/docs/core/porting/how-to-upgrade-with-github-copilot.md b/docs/core/porting/github-copilot-app-modernization/how-to-upgrade-with-github-copilot.md
similarity index 84%
rename from docs/core/porting/how-to-upgrade-with-github-copilot.md
rename to docs/core/porting/github-copilot-app-modernization/how-to-upgrade-with-github-copilot.md
index 6689a5a1f8712..1321d1b21ee8c 100644
--- a/docs/core/porting/how-to-upgrade-with-github-copilot.md
+++ b/docs/core/porting/github-copilot-app-modernization/how-to-upgrade-with-github-copilot.md
@@ -21,13 +21,13 @@ The modernization agent analyzes your projects and dependencies, creates an upgr
 
 Before you begin, ensure you have the following requirements:
 
-[!INCLUDE[github-copilot-app-mod-prereqs](../../includes/github-copilot-app-mod-prereqs.md)]
+[!INCLUDE[github-copilot-app-mod-prereqs](./includes/prereqs.md)]
 
 ## Start the upgrade process
 
 The first step to upgrading is generating a plan by interacting with GitHub Copilot. Follow these steps to initiate the upgrade:
 
-[!INCLUDE[github-copilot-how-to-initiate](./includes/github-copilot-how-to-initiate.md)]
+[!INCLUDE[github-copilot-how-to-initiate](./includes/how-to-initiate.md)]
 
 ## Generate an upgrade plan
 
@@ -95,14 +95,14 @@ The following example shows the report of a completed upgrade that contained a t
 
 ## Project modifications
 
-| Project name                                   | Old Target Framework    | New Target Framework         | Commits                   |
-|:-----------------------------------------------|:-----------------------:|:----------------------------:|---------------------------|
-| RazorMovie                                     |   net6.0                | net9.0                       | af8cf633, aa61a18d        |
-| MvcMovie                                       |   net6.0                | net9.0                       | cc8c9015                  |
-| WpfMovie                                       |   net6.0-windows        | net9.0-windows               | 9c4b13f9                  |
-| RazorMovie.Tests                               |   net6.0                | net9.0                       | b8d85e97                  |
-| MvcMovie.Tests                                 |   net6.0                | net9.0                       | b8d85e97                  |
-| WpfMovie.Tests                                 |   net6.0-windows        | net9.0-windows7.0            | b8d85e97                  |
+| Project name     | Old Target Framework | New Target Framework | Commits            |
+|:-----------------|:--------------------:|:--------------------:|--------------------|
+| RazorMovie       | net6.0               | net9.0               | af8cf633, aa61a18d |
+| MvcMovie         | net6.0               | net9.0               | cc8c9015           |
+| WpfMovie         | net6.0-windows       | net9.0-windows       | 9c4b13f9           |
+| RazorMovie.Tests | net6.0               | net9.0               | b8d85e97           |
+| MvcMovie.Tests   | net6.0               | net9.0               | b8d85e97           |
+| WpfMovie.Tests   | net6.0-windows       | net9.0-windows7.0    | b8d85e97           |
 
 ## NuGet Packages
 
@@ -153,4 +153,4 @@ After completing the upgrade process:
 
 ## Related content
 
-- [GitHub Copilot app modernization FAQ](github-copilot-app-modernization-faq.yml)
+- [GitHub Copilot app modernization FAQ](faq.yml)
diff --git a/docs/core/porting/includes/github-copilot-how-to-initiate.md b/docs/core/porting/github-copilot-app-modernization/includes/how-to-initiate.md
similarity index 100%
rename from docs/core/porting/includes/github-copilot-how-to-initiate.md
rename to docs/core/porting/github-copilot-app-modernization/includes/how-to-initiate.md
diff --git a/docs/includes/github-copilot-app-mod-prereqs.md b/docs/core/porting/github-copilot-app-modernization/includes/prereqs.md
similarity index 97%
rename from docs/includes/github-copilot-app-mod-prereqs.md
rename to docs/core/porting/github-copilot-app-modernization/includes/prereqs.md
index c8d3832c08cc4..bf2fd086c8516 100644
--- a/docs/includes/github-copilot-app-mod-prereqs.md
+++ b/docs/core/porting/github-copilot-app-modernization/includes/prereqs.md
@@ -1,30 +1,30 @@
----
-author: adegeo
-ms.author: adegeo
-ms.date: 09/23/2025
-ms.topic: include
-# Shared by Azure.NET app mod and .NET app mod
----
-
-- Windows Operating System
-- [Visual Studio 2022 version 17.14.16 or newer](https://visualstudio.microsoft.com/downloads/).
-- [.NET desktop development workload](/visualstudio/install/modify-visual-studio?view=vs-2022&preserve-view=true#change-workloads-or-individual-components) with the following optional components enabled:
-
-  - GitHub Copilot
-  - GitHub Copilot app modernization for .NET
-
-- Copilot license and supported subscription plan:
-
-  [Sign in to Visual Studio using a GitHub account](/visualstudio/ide/work-with-github-accounts) with [Copilot access](https://docs.github.com/copilot/about-github-copilot/what-is-github-copilot#getting-access-to-copilot).
-
-  Supported subscription plans:
-
-  - Copilot Pro
-  - Copilot Pro+
-  - Copilot Business
-  - Copilot Enterprise
-
-  > [!IMPORTANT]
-  > If you change subscriptions, you must restart Visual Studio.
-
-- Code must be written in C#.
+---
+author: adegeo
+ms.author: adegeo
+ms.date: 09/23/2025
+ms.topic: include
+# Shared by Azure.NET app mod and .NET app mod
+---
+
+- Windows Operating System
+- [Visual Studio 2022 version 17.14.16 or newer](https://visualstudio.microsoft.com/downloads/).
+- [.NET desktop development workload](/visualstudio/install/modify-visual-studio?view=vs-2022&preserve-view=true#change-workloads-or-individual-components) with the following optional components enabled:
+
+  - GitHub Copilot
+  - GitHub Copilot app modernization for .NET
+
+- Copilot license and supported subscription plan:
+
+  [Sign in to Visual Studio using a GitHub account](/visualstudio/ide/work-with-github-accounts) with [Copilot access](https://docs.github.com/copilot/about-github-copilot/what-is-github-copilot#getting-access-to-copilot).
+
+  Supported subscription plans:
+
+  - Copilot Pro
+  - Copilot Pro+
+  - Copilot Business
+  - Copilot Enterprise
+
+  > [!IMPORTANT]
+  > If you change subscriptions, you must restart Visual Studio.
+
+- Code must be written in C#.
diff --git a/docs/navigate/github-copilot-modernize/index.yml b/docs/core/porting/github-copilot-app-modernization/index.yml
similarity index 65%
rename from docs/navigate/github-copilot-modernize/index.yml
rename to docs/core/porting/github-copilot-app-modernization/index.yml
index 16425d73be024..f7424027a2162 100644
--- a/docs/navigate/github-copilot-modernize/index.yml
+++ b/docs/core/porting/github-copilot-app-modernization/index.yml
@@ -16,30 +16,30 @@ landingContent:
       - linkListType: overview
         links:
           - text: Upgrade .NET apps
-            url: ../../core/porting/github-copilot-app-modernization-overview.md
+            url: overview.md
           - text: FAQ
-            url: ../../core/porting/github-copilot-app-modernization-faq.yml
+            url: faq.yml
       - linkListType: how-to-guide
         links:
           - text: How to upgrade a .NET app
-            url: ../../core/porting/how-to-upgrade-with-github-copilot.md
+            url: how-to-upgrade-with-github-copilot.md
 
   - title: Migrate .NET apps to Azure
     linkLists:
       - linkListType: overview
         links:
           - text: Migrate .NET apps to Azure (app modernization)
-            url: ../../azure/migration/appmod/overview.md?toc=/dotnet/navigate/github-copilot-modernize/toc.json&bc=/dotnet/breadcrumb/toc.json
+            url: ../../../azure/migration/appmod/overview.md?toc=/dotnet/navigate/github-copilot-modernize/toc.json&bc=/dotnet/breadcrumb/toc.json
           - text: Azure migration quickstart
-            url: ../../azure/migration/appmod/quickstart.md?toc=/dotnet/navigate/github-copilot-modernize/toc.json&bc=/dotnet/breadcrumb/toc.json
+            url: ../../../azure/migration/appmod/quickstart.md?toc=/dotnet/navigate/github-copilot-modernize/toc.json&bc=/dotnet/breadcrumb/toc.json
       - linkListType: sample
         links:
           - text: Migration sample
-            url: ../../azure/migration/appmod/sample.md?toc=/dotnet/navigate/github-copilot-modernize/toc.json&bc=/dotnet/breadcrumb/toc.json
+            url: ../../../azure/migration/appmod/sample.md?toc=/dotnet/navigate/github-copilot-modernize/toc.json&bc=/dotnet/breadcrumb/toc.json
       - linkListType: concept
         links:
           - text: Azure migration FAQ
-            url: ../../azure/migration/appmod/faq.md?toc=/dotnet/navigate/github-copilot-modernize/toc.json&bc=/dotnet/breadcrumb/toc.json
+            url: ../../../azure/migration/appmod/faq.md?toc=/dotnet/navigate/github-copilot-modernize/toc.json&bc=/dotnet/breadcrumb/toc.json
 
   - title: Get help and community
     linkLists:
diff --git a/docs/core/porting/github-copilot-app-modernization-overview.md b/docs/core/porting/github-copilot-app-modernization/overview.md
similarity index 96%
rename from docs/core/porting/github-copilot-app-modernization-overview.md
rename to docs/core/porting/github-copilot-app-modernization/overview.md
index a485a4cf16514..a65bf8bbdb4b5 100644
--- a/docs/core/porting/github-copilot-app-modernization-overview.md
+++ b/docs/core/porting/github-copilot-app-modernization/overview.md
@@ -44,13 +44,13 @@ Feedback is important to Microsoft and the efficiency of this agent. Use the [Su
 
 The following items are required before you can use GitHub Copilot app modernization:
 
-[!INCLUDE[github-copilot-app-mod-prereqs](../../includes/github-copilot-app-mod-prereqs.md)]
+[!INCLUDE[github-copilot-app-mod-prereqs](./includes/prereqs.md)]
 
 ## How to start an upgrade or migration
 
 To start an upgrade or migration, interact with GitHub Copilot, following these steps:
 
-[!INCLUDE[github-copilot-how-to-initiate](./includes/github-copilot-how-to-initiate.md)]
+[!INCLUDE[github-copilot-how-to-initiate](./includes/how-to-initiate.md)]
 
 ## Upgrade .NET projects
 
@@ -170,5 +170,5 @@ The tool only collects data about project types, intent to upgrade, and upgrade
 ## Related content
 
 - [How to upgrade a .NET app with GitHub Copilot app modernization](how-to-upgrade-with-github-copilot.md)
-- [Quickstart to migrate a .NET Project](../../azure/migration/appmod/quickstart.md)
-- [GitHub Copilot app modernization FAQ](github-copilot-app-modernization-faq.yml)
+- [Quickstart to migrate a .NET Project](../../../azure/migration/appmod/quickstart.md)
+- [GitHub Copilot app modernization FAQ](faq.yml)
diff --git a/docs/core/porting/github-copilot-app-modernization/toc.yml b/docs/core/porting/github-copilot-app-modernization/toc.yml
new file mode 100644
index 0000000000000..0cec370c48808
--- /dev/null
+++ b/docs/core/porting/github-copilot-app-modernization/toc.yml
@@ -0,0 +1,22 @@
+items:
+  - name: GitHub Copilot app modernization for .NET
+    href: index.yml
+  - name: Overview
+    href: overview.md
+  - name: FAQ
+    href: faq.yml
+    displayName: copilot, upgrade
+
+  - name: Upgrade .NET apps
+    expanded: true
+    items:
+      - name: How to upgrade with GitHub Copilot
+        href: how-to-upgrade-with-github-copilot.md
+
+  - name: Migrate .NET apps to Azure
+    expanded: true
+    items:
+      - name: Migrate a .NET project
+        href: ../../../azure/migration/appmod/quickstart.md?toc=/dotnet/core/porting/github-copilot-app-modernization/toc.json&bc=/dotnet/breadcrumb/toc.json
+      - name: Migration sample
+        href: ../../../azure/migration/appmod/sample.md?toc=/dotnet/core/porting/github-copilot-app-modernization/toc.json&bc=/dotnet/breadcrumb/toc.json
diff --git a/docs/core/porting/includes/github-copilot-suggestion.md b/docs/core/porting/includes/github-copilot-suggestion.md
index 80440322bdcbb..1f413f4860abb 100644
--- a/docs/core/porting/includes/github-copilot-suggestion.md
+++ b/docs/core/porting/includes/github-copilot-suggestion.md
@@ -6,4 +6,4 @@ ms.topic: include
 ---
 
 > [!IMPORTANT]
-> Try the [GitHub Copilot app modernization chat agent](../github-copilot-app-modernization-overview.md). This agent analyzes your projects and dependencies, produces a step-by-step migration plan with targeted recommendations and automated code fixes, and commits each change so you can validate or roll back. It automates common porting tasks—updating project files, replacing deprecated APIs, and resolving build issues—so you can modernize faster with less manual effort. For more information, see [What is GitHub Copilot app modernization](../github-copilot-app-modernization-overview.md).
+> Try the [GitHub Copilot app modernization chat agent](../github-copilot-app-modernization/overview.md). This agent analyzes your projects and dependencies, produces a step-by-step migration plan with targeted recommendations and automated code fixes, and commits each change so you can validate or roll back. It automates common porting tasks—updating project files, replacing deprecated APIs, and resolving build issues—so you can modernize faster with less manual effort. For more information, see [What is GitHub Copilot app modernization](../github-copilot-app-modernization/overview.md).
diff --git a/docs/core/porting/index.md b/docs/core/porting/index.md
index fb7e37918b3e8..cdfba9455fe45 100644
--- a/docs/core/porting/index.md
+++ b/docs/core/porting/index.md
@@ -42,4 +42,4 @@ The GitHub Copilot app modernization agent provides an AI-assisted, end-to-end e
 
 Use the GitHub Copilot app modernization agent when you want a guided, AI-powered path to assess, remediate, and modernize codebases—particularly for projects that have many dependencies, rely on Windows-specific APIs, or when you plan to containerize or migrate services to the cloud.
 
-For more information, see [What is GitHub Copilot app modernization](github-copilot-app-modernization-overview.md).
+For more information, see [What is GitHub Copilot app modernization](github-copilot-app-modernization/overview.md).
diff --git a/docs/core/porting/modernize.md b/docs/core/porting/modernize.md
index f40a1cde968cd..3c6e90761dec2 100644
--- a/docs/core/porting/modernize.md
+++ b/docs/core/porting/modernize.md
@@ -10,7 +10,7 @@ ms.custom: sfi-ropc-nochange
 
 # Modernize after upgrading to .NET from .NET Framework
 
-In this article, you'll learn about different ways you can modernize your app after it's been upgraded from .NET Framework to .NET. Use the [GitHub Copilot app modernization](github-copilot-app-modernization-overview.md) assistant to upgrade your app to .NET.
+In this article, you'll learn about different ways you can modernize your app after it's been upgraded from .NET Framework to .NET. Use the [GitHub Copilot app modernization](github-copilot-app-modernization/overview.md) assistant to upgrade your app to .NET.
 
 ## Missing APIs
 
diff --git a/docs/core/porting/porting-approaches.md b/docs/core/porting/porting-approaches.md
index b3d444953161f..cc9e60ea14511 100644
--- a/docs/core/porting/porting-approaches.md
+++ b/docs/core/porting/porting-approaches.md
@@ -7,7 +7,7 @@ ms.date: 09/15/2025
 ---
 # Create a porting plan
 
-Before you jump straight into the code, take the time to go through the recommended pre-migration steps. This article gives you insight into the kinds of issues you may come across, and helps you decide on an approach that makes the most sense.
+Before you jump straight into the code, take the time to go through the recommended pre-migration steps. This article gives you insight into the kinds of issues you might come across, and helps you decide on an approach that makes the most sense.
 
 [!INCLUDE[](../../../includes/deprecating-api-port.md)]
 
@@ -27,7 +27,7 @@ This approach works well for small projects or projects that don't use many .NET
 
 Although it's unstructured, this code-focused approach often resolves issues quickly. A project that contains only data models might be an ideal candidate for this approach.
 
-### Stay on the .NET Framework until portability issues are resolved
+### Stay on .NET Framework until portability issues are resolved
 
 This approach might be the best if you prefer to have code that compiles during the entire process. The approach is as follows:
 
@@ -98,5 +98,5 @@ If you start with the base of your library and move outward from the base and te
 
 ## Next steps
 
-- [What is GitHub Copilot app modernization](github-copilot-app-modernization-overview.md)
+- [What is GitHub Copilot app modernization](github-copilot-app-modernization/overview.md)
 - [Organize your project to support both .NET Framework and .NET Core](project-structure.md)
diff --git a/docs/core/porting/third-party-deps.md b/docs/core/porting/third-party-deps.md
index 56f04fa14422c..006b89713bf61 100644
--- a/docs/core/porting/third-party-deps.md
+++ b/docs/core/porting/third-party-deps.md
@@ -95,7 +95,7 @@ The .NET Team would like to know which libraries are the most important to suppo
 
 ## Analyze non-NuGet dependencies
 
-You might have a dependency that isn't a NuGet package, such as a DLL in the file system. You can determine the portability of that dependency with the [GitHub Copilot app modernization agent](github-copilot-app-modernization-overview.md).
+You might have a dependency that isn't a NuGet package, such as a DLL in the file system. You can determine the portability of that dependency with the [GitHub Copilot app modernization agent](github-copilot-app-modernization/overview.md).
 
 ## Next steps
 
diff --git a/docs/navigate/github-copilot-modernize/toc.yml b/docs/navigate/github-copilot-modernize/toc.yml
deleted file mode 100644
index 0ef3ac5cea48b..0000000000000
--- a/docs/navigate/github-copilot-modernize/toc.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-items:
-  - name: GitHub Copilot app modernization for .NET
-    href: index.yml
-  - name: Overview
-    href: ../../core/porting/github-copilot-app-modernization-overview.md
-  - name: FAQ
-    href: ../../core/porting/github-copilot-app-modernization-faq.yml
-    displayName: copilot, upgrade
-
-  - name: Upgrade .NET apps
-    expanded: true
-    items:
-      - name: How to upgrade with GitHub Copilot
-        href: ../../core/porting/how-to-upgrade-with-github-copilot.md
-
-  - name: Migrate .NET apps to Azure
-    expanded: true
-    items:
-      - name: Migrate a .NET project
-        href: ../../azure/migration/appmod/quickstart.md?toc=/dotnet/navigate/github-copilot-modernize/toc.json&bc=/dotnet/breadcrumb/toc.json
-      - name: Migration sample
-        href: ../../azure/migration/appmod/sample.md?toc=/dotnet/navigate/github-copilot-modernize/toc.json&bc=/dotnet/breadcrumb/toc.json
-      - name: Troubleshooting
-        href: /dotnet/core/porting/github-copilot-app-modernization-faq?toc=/dotnet/azure/toc.json&bc=/dotnet/breadcrumb/toc.json?toc=/dotnet/navigate/github-copilot-modernize/toc.json&bc=/dotnet/breadcrumb/toc.json
diff --git a/docs/navigate/migration-guide/index.yml b/docs/navigate/migration-guide/index.yml
index 7fa63436eb2d4..d470a969900a2 100644
--- a/docs/navigate/migration-guide/index.yml
+++ b/docs/navigate/migration-guide/index.yml
@@ -18,7 +18,7 @@ landingContent:
           - text: Upgrade apps to the latest version of .NET
             url: ../../core/porting/index.md
           - text: Use GitHub Copilot to assist in upgrading
-            url: ../../core/porting/github-copilot-app-modernization-overview.md?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
+            url: ../../core/porting/github-copilot-app-modernization/overview.md?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
           - text: Plan your .NET Framework upgrade
             url: ../../core/porting/framework-overview.md
       - linkListType: concept
@@ -34,13 +34,13 @@ landingContent:
       - linkListType: overview
         links:
           - text: GitHub Copilot app modernization overview
-            url: ../../core/porting/github-copilot-app-modernization-overview.md?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
+            url: ../../core/porting/github-copilot-app-modernization/overview.md?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
           - text: GitHub Copilot app modernization FAQ
-            url: ../../core/porting/github-copilot-app-modernization-faq.yml?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
+            url: ../../core/porting/github-copilot-app-modernization/faq.yml?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
       - linkListType: concept
         links:
           - text: Using Copilot to speed up porting and modernization
-            url: ../../core/porting/github-copilot-app-modernization-overview.md?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json#how-does-it-work
+            url: ../../core/porting/github-copilot-app-modernization/overview.md?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json#how-does-it-work
 
   - title: Migrate .NET apps to Azure
     linkLists:
@@ -57,7 +57,7 @@ landingContent:
       - linkListType: concept
         links:
           - text: Azure migration FAQ
-            url: ../../core/porting/github-copilot-app-modernization-faq.yml?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
+            url: ../../core/porting/github-copilot-app-modernization/faq.yml?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
 
   - title: Get help and community
     linkLists:
diff --git a/docs/navigate/migration-guide/toc.yml b/docs/navigate/migration-guide/toc.yml
index eef3388bb70c7..09e36f97555ad 100644
--- a/docs/navigate/migration-guide/toc.yml
+++ b/docs/navigate/migration-guide/toc.yml
@@ -7,16 +7,16 @@ items:
     expanded: true
     items:
       - name: Overview
-        href: ../../core/porting/github-copilot-app-modernization-overview.md?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
+        href: ../../core/porting/github-copilot-app-modernization/overview.md?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
         displayName: copilot, upgrade
       - name: FAQ
-        href: ../../core/porting/github-copilot-app-modernization-faq.yml?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
+        href: ../../core/porting/github-copilot-app-modernization/faq.yml?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
         displayName: copilot, upgrade
       - name: Upgrade .NET apps
         expanded: false
         items:
           - name: How to upgrade with GitHub Copilot
-            href: ../../core/porting/how-to-upgrade-with-github-copilot.md?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
+            href: ../../core/porting/github-copilot-app-modernization/how-to-upgrade-with-github-copilot.md?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
             displayName: copilot, upgrade
       - name: Migrate .NET apps to Azure
         expanded: false
@@ -25,15 +25,13 @@ items:
             href: ../../azure/migration/appmod/quickstart.md?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
           - name: Migration sample
             href: ../../azure/migration/appmod/sample.md?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
-          - name: Troubleshooting
-            href: /dotnet/core/porting/github-copilot-app-modernization-faq?toc=/dotnet/azure/toc.json&bc=/dotnet/breadcrumb/toc.json?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
 
   - name: Plan an upgrade from .NET Framework
     items:
       - name: Overview
         href: ../../core/porting/framework-overview.md
       - name: Upgrade with GitHub Copilot
-        href: ../../core/porting/github-copilot-app-modernization-overview.md?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
+        href: ../../core/porting/github-copilot-app-modernization/overview.md?toc=/dotnet/navigate/migration-guide/toc.json&bc=/dotnet/breadcrumb/toc.json
         displayName: copilot, upgrade, modernization
       - name: General information
         items: