diff --git a/README.md b/README.md
index 93787d8eb5..1ea27077fa 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ Still have questions? Join our [weekly office hours](./COMMUNITY.md#public-commu
- **Multiple Agent Provider Support**: Support for various LLM providers with more being added continuously
- [Python examples](./python/samples/02-agents/providers/) | [.NET examples](./dotnet/samples/02-agents/AgentProviders/)
- **Middleware**: Flexible middleware system for request/response processing, exception handling, and custom pipelines
- - [Python middleware](./python/samples/02-agents/middleware/) | [.NET middleware](./dotnet/samples/02-agents/Agents/Agent_Step14_Middleware/)
+ - [Python middleware](./python/samples/02-agents/middleware/) | [.NET middleware](./dotnet/samples/02-agents/Agents/Agent_Step11_Middleware/)
### 💬 **We want your feedback!**
diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
index bcb5ad0917..8064cd4460 100644
--- a/dotnet/agent-framework-dotnet.slnx
+++ b/dotnet/agent-framework-dotnet.slnx
@@ -38,23 +38,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj b/dotnet/samples/02-agents/Agents/Agent_Step01_UsingFunctionToolsWithApprovals/Agent_Step01_UsingFunctionToolsWithApprovals.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step01_UsingFunctionToolsWithApprovals/Agent_Step01_UsingFunctionToolsWithApprovals.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step01_UsingFunctionToolsWithApprovals/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step01_UsingFunctionToolsWithApprovals/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/AIAgentBuilderExtensions.cs b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/AIAgentBuilderExtensions.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/AIAgentBuilderExtensions.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/AIAgentBuilderExtensions.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/Agent_Step02_StructuredOutput.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/Agent_Step02_StructuredOutput.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/README.md b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/README.md
similarity index 98%
rename from dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/README.md
rename to dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/README.md
index 2eee8a6765..5652fe9b0a 100644
--- a/dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/README.md
+++ b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/README.md
@@ -36,7 +36,7 @@ $env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults to gpt-4o-
Navigate to the sample directory and run:
```powershell
-cd dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput
+cd dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput
dotnet run
```
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/StructuredOutputAgent.cs b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/StructuredOutputAgent.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/StructuredOutputAgent.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/StructuredOutputAgent.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/StructuredOutputAgentOptions.cs b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/StructuredOutputAgentOptions.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/StructuredOutputAgentOptions.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/StructuredOutputAgentOptions.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/StructuredOutputAgentResponse.cs b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/StructuredOutputAgentResponse.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step05_StructuredOutput/StructuredOutputAgentResponse.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/StructuredOutputAgentResponse.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj b/dotnet/samples/02-agents/Agents/Agent_Step03_PersistedConversations/Agent_Step03_PersistedConversations.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step03_PersistedConversations/Agent_Step03_PersistedConversations.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step06_PersistedConversations/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step03_PersistedConversations/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step06_PersistedConversations/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step03_PersistedConversations/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step07_3rdPartyChatHistoryStorage/Agent_Step07_3rdPartyChatHistoryStorage.csproj b/dotnet/samples/02-agents/Agents/Agent_Step04_3rdPartyChatHistoryStorage/Agent_Step04_3rdPartyChatHistoryStorage.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step07_3rdPartyChatHistoryStorage/Agent_Step07_3rdPartyChatHistoryStorage.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step04_3rdPartyChatHistoryStorage/Agent_Step04_3rdPartyChatHistoryStorage.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step07_3rdPartyChatHistoryStorage/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step04_3rdPartyChatHistoryStorage/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step07_3rdPartyChatHistoryStorage/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step04_3rdPartyChatHistoryStorage/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step08_Observability/Agent_Step08_Observability.csproj b/dotnet/samples/02-agents/Agents/Agent_Step05_Observability/Agent_Step05_Observability.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step08_Observability/Agent_Step08_Observability.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step05_Observability/Agent_Step05_Observability.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step08_Observability/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step05_Observability/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step08_Observability/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step05_Observability/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step09_DependencyInjection/Agent_Step09_DependencyInjection.csproj b/dotnet/samples/02-agents/Agents/Agent_Step06_DependencyInjection/Agent_Step06_DependencyInjection.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step09_DependencyInjection/Agent_Step09_DependencyInjection.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step06_DependencyInjection/Agent_Step06_DependencyInjection.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step09_DependencyInjection/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step06_DependencyInjection/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step09_DependencyInjection/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step06_DependencyInjection/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step10_AsMcpTool/Agent_Step10_AsMcpTool.csproj b/dotnet/samples/02-agents/Agents/Agent_Step07_AsMcpTool/Agent_Step07_AsMcpTool.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step10_AsMcpTool/Agent_Step10_AsMcpTool.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step07_AsMcpTool/Agent_Step07_AsMcpTool.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step10_AsMcpTool/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step07_AsMcpTool/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step10_AsMcpTool/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step07_AsMcpTool/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step10_AsMcpTool/README.md b/dotnet/samples/02-agents/Agents/Agent_Step07_AsMcpTool/README.md
similarity index 96%
rename from dotnet/samples/02-agents/Agents/Agent_Step10_AsMcpTool/README.md
rename to dotnet/samples/02-agents/Agents/Agent_Step07_AsMcpTool/README.md
index 56701066d1..518673f04b 100644
--- a/dotnet/samples/02-agents/Agents/Agent_Step10_AsMcpTool/README.md
+++ b/dotnet/samples/02-agents/Agents/Agent_Step07_AsMcpTool/README.md
@@ -10,7 +10,7 @@ Alternatively, use the QuickstartClient sample from this repository: https://git
To use the [MCP Inspector](https://modelcontextprotocol.io/docs/tools/inspector), follow these steps:
-1. Open a terminal in the Agent_Step10_AsMcpTool project directory.
+1. Open a terminal in the Agent_Step07_AsMcpTool project directory.
1. Run the `npx @modelcontextprotocol/inspector dotnet run --framework net10.0` command to start the MCP Inspector. Make sure you have [node.js](https://nodejs.org/en/download/) and npm installed.
```bash
npx @modelcontextprotocol/inspector dotnet run --framework net10.0
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step11_UsingImages/Agent_Step11_UsingImages.csproj b/dotnet/samples/02-agents/Agents/Agent_Step08_UsingImages/Agent_Step08_UsingImages.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step11_UsingImages/Agent_Step11_UsingImages.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step08_UsingImages/Agent_Step08_UsingImages.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step11_UsingImages/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step08_UsingImages/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step11_UsingImages/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step08_UsingImages/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step11_UsingImages/README.md b/dotnet/samples/02-agents/Agents/Agent_Step08_UsingImages/README.md
similarity index 98%
rename from dotnet/samples/02-agents/Agents/Agent_Step11_UsingImages/README.md
rename to dotnet/samples/02-agents/Agents/Agent_Step08_UsingImages/README.md
index 49d1bff4a2..e70c09f513 100644
--- a/dotnet/samples/02-agents/Agents/Agent_Step11_UsingImages/README.md
+++ b/dotnet/samples/02-agents/Agents/Agent_Step08_UsingImages/README.md
@@ -37,7 +37,7 @@ $env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-4o" # Replace with your model deployment
Navigate to the sample directory and run:
```powershell
-cd Agent_Step11_UsingImages
+cd Agent_Step08_UsingImages
dotnet run
```
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step12_AsFunctionTool/Agent_Step12_AsFunctionTool.csproj b/dotnet/samples/02-agents/Agents/Agent_Step09_AsFunctionTool/Agent_Step09_AsFunctionTool.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step12_AsFunctionTool/Agent_Step12_AsFunctionTool.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step09_AsFunctionTool/Agent_Step09_AsFunctionTool.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step12_AsFunctionTool/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step09_AsFunctionTool/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step12_AsFunctionTool/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step09_AsFunctionTool/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step13_BackgroundResponsesWithToolsAndPersistence/Agent_Step13_BackgroundResponsesWithToolsAndPersistence.csproj b/dotnet/samples/02-agents/Agents/Agent_Step10_BackgroundResponsesWithToolsAndPersistence/Agent_Step10_BackgroundResponsesWithToolsAndPersistence.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step13_BackgroundResponsesWithToolsAndPersistence/Agent_Step13_BackgroundResponsesWithToolsAndPersistence.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step10_BackgroundResponsesWithToolsAndPersistence/Agent_Step10_BackgroundResponsesWithToolsAndPersistence.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step13_BackgroundResponsesWithToolsAndPersistence/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step10_BackgroundResponsesWithToolsAndPersistence/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step13_BackgroundResponsesWithToolsAndPersistence/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step10_BackgroundResponsesWithToolsAndPersistence/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step13_BackgroundResponsesWithToolsAndPersistence/README.md b/dotnet/samples/02-agents/Agents/Agent_Step10_BackgroundResponsesWithToolsAndPersistence/README.md
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step13_BackgroundResponsesWithToolsAndPersistence/README.md
rename to dotnet/samples/02-agents/Agents/Agent_Step10_BackgroundResponsesWithToolsAndPersistence/README.md
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step14_Middleware/Agent_Step14_Middleware.csproj b/dotnet/samples/02-agents/Agents/Agent_Step11_Middleware/Agent_Step11_Middleware.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step14_Middleware/Agent_Step14_Middleware.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step11_Middleware/Agent_Step11_Middleware.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step14_Middleware/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step11_Middleware/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step14_Middleware/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step11_Middleware/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step14_Middleware/README.md b/dotnet/samples/02-agents/Agents/Agent_Step11_Middleware/README.md
similarity index 95%
rename from dotnet/samples/02-agents/Agents/Agent_Step14_Middleware/README.md
rename to dotnet/samples/02-agents/Agents/Agent_Step11_Middleware/README.md
index 690ab7aa5e..4bce37fdc5 100644
--- a/dotnet/samples/02-agents/Agents/Agent_Step14_Middleware/README.md
+++ b/dotnet/samples/02-agents/Agents/Agent_Step11_Middleware/README.md
@@ -36,7 +36,7 @@ Attempting to use function middleware on agents that do not wrap a ChatClientAge
Use PowerShell:
```powershell
-cd dotnet/samples/02-agents/Agents/Agent_Step14_Middleware
+cd dotnet/samples/02-agents/Agents/Agent_Step11_Middleware
dotnet run
```
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step15_Plugins/Agent_Step15_Plugins.csproj b/dotnet/samples/02-agents/Agents/Agent_Step12_Plugins/Agent_Step12_Plugins.csproj
similarity index 92%
rename from dotnet/samples/02-agents/Agents/Agent_Step15_Plugins/Agent_Step15_Plugins.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step12_Plugins/Agent_Step12_Plugins.csproj
index ae2f9ac194..122c2e77a4 100644
--- a/dotnet/samples/02-agents/Agents/Agent_Step15_Plugins/Agent_Step15_Plugins.csproj
+++ b/dotnet/samples/02-agents/Agents/Agent_Step12_Plugins/Agent_Step12_Plugins.csproj
@@ -7,7 +7,7 @@
enable
enable
$(NoWarn);CA1812
- Agent_Step15_Plugins
+ Agent_Step12_Plugins
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step15_Plugins/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step12_Plugins/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step15_Plugins/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step12_Plugins/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step16_ChatReduction/Agent_Step16_ChatReduction.csproj b/dotnet/samples/02-agents/Agents/Agent_Step13_ChatReduction/Agent_Step13_ChatReduction.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step16_ChatReduction/Agent_Step16_ChatReduction.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step13_ChatReduction/Agent_Step13_ChatReduction.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step16_ChatReduction/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step13_ChatReduction/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step16_ChatReduction/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step13_ChatReduction/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step17_BackgroundResponses/Agent_Step17_BackgroundResponses.csproj b/dotnet/samples/02-agents/Agents/Agent_Step14_BackgroundResponses/Agent_Step14_BackgroundResponses.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step17_BackgroundResponses/Agent_Step17_BackgroundResponses.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step14_BackgroundResponses/Agent_Step14_BackgroundResponses.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step17_BackgroundResponses/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step14_BackgroundResponses/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step17_BackgroundResponses/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step14_BackgroundResponses/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step17_BackgroundResponses/README.md b/dotnet/samples/02-agents/Agents/Agent_Step14_BackgroundResponses/README.md
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step17_BackgroundResponses/README.md
rename to dotnet/samples/02-agents/Agents/Agent_Step14_BackgroundResponses/README.md
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step18_DeepResearch/Agent_Step18_DeepResearch.csproj b/dotnet/samples/02-agents/Agents/Agent_Step15_DeepResearch/Agent_Step15_DeepResearch.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step18_DeepResearch/Agent_Step18_DeepResearch.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step15_DeepResearch/Agent_Step15_DeepResearch.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step18_DeepResearch/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step15_DeepResearch/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step18_DeepResearch/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step15_DeepResearch/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step18_DeepResearch/README.md b/dotnet/samples/02-agents/Agents/Agent_Step15_DeepResearch/README.md
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step18_DeepResearch/README.md
rename to dotnet/samples/02-agents/Agents/Agent_Step15_DeepResearch/README.md
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step19_Declarative/Agent_Step19_Declarative.csproj b/dotnet/samples/02-agents/Agents/Agent_Step16_Declarative/Agent_Step16_Declarative.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step19_Declarative/Agent_Step19_Declarative.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step16_Declarative/Agent_Step16_Declarative.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step19_Declarative/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step16_Declarative/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step19_Declarative/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step16_Declarative/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step20_AdditionalAIContext/Agent_Step20_AdditionalAIContext.csproj b/dotnet/samples/02-agents/Agents/Agent_Step17_AdditionalAIContext/Agent_Step17_AdditionalAIContext.csproj
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step20_AdditionalAIContext/Agent_Step20_AdditionalAIContext.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step17_AdditionalAIContext/Agent_Step17_AdditionalAIContext.csproj
diff --git a/dotnet/samples/02-agents/Agents/Agent_Step20_AdditionalAIContext/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step17_AdditionalAIContext/Program.cs
similarity index 100%
rename from dotnet/samples/02-agents/Agents/Agent_Step20_AdditionalAIContext/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step17_AdditionalAIContext/Program.cs
diff --git a/dotnet/samples/02-agents/Agents/README.md b/dotnet/samples/02-agents/Agents/README.md
index e9079210d6..cdc65c59ec 100644
--- a/dotnet/samples/02-agents/Agents/README.md
+++ b/dotnet/samples/02-agents/Agents/README.md
@@ -27,23 +27,23 @@ Before you begin, ensure you have the following prerequisites:
|Sample|Description|
|---|---|
|[Using OpenAPI function tools with a simple agent](https://github.com/microsoft/semantic-kernel/tree/main/dotnet/samples/AgentFrameworkMigration/AzureOpenAI/Step04_ToolCall_WithOpenAPI)|This sample demonstrates how to create function tools from an OpenAPI spec and use them with a simple agent (note that this sample is in the Semantic Kernel repository)|
-|[Using function tools with approvals](./Agent_Step04_UsingFunctionToolsWithApprovals/)|This sample demonstrates how to use function tools where approvals require human in the loop approvals before execution|
-|[Structured output with a simple agent](./Agent_Step05_StructuredOutput/)|This sample demonstrates how to use structured output with a simple agent|
-|[Persisted conversations with a simple agent](./Agent_Step06_PersistedConversations/)|This sample demonstrates how to persist conversations and reload them later. This is useful for cases where an agent is hosted in a stateless service|
-|[3rd party chat history storage with a simple agent](./Agent_Step07_3rdPartyChatHistoryStorage/)|This sample demonstrates how to store chat history in a 3rd party storage solution|
-|[Observability with a simple agent](./Agent_Step08_Observability/)|This sample demonstrates how to add telemetry to a simple agent|
-|[Dependency injection with a simple agent](./Agent_Step09_DependencyInjection/)|This sample demonstrates how to add and resolve an agent with a dependency injection container|
-|[Exposing a simple agent as MCP tool](./Agent_Step10_AsMcpTool/)|This sample demonstrates how to expose an agent as an MCP tool|
-|[Using images with a simple agent](./Agent_Step11_UsingImages/)|This sample demonstrates how to use image multi-modality with an AI agent|
-|[Exposing a simple agent as a function tool](./Agent_Step12_AsFunctionTool/)|This sample demonstrates how to expose an agent as a function tool|
-|[Background responses with tools and persistence](./Agent_Step13_BackgroundResponsesWithToolsAndPersistence/)|This sample demonstrates advanced background response scenarios including function calling during background operations and state persistence|
-|[Using middleware with an agent](./Agent_Step14_Middleware/)|This sample demonstrates how to use middleware with an agent|
-|[Using plugins with an agent](./Agent_Step15_Plugins/)|This sample demonstrates how to use plugins with an agent|
-|[Reducing chat history size](./Agent_Step16_ChatReduction/)|This sample demonstrates how to reduce the chat history to constrain its size, where chat history is maintained locally|
-|[Background responses](./Agent_Step17_BackgroundResponses/)|This sample demonstrates how to use background responses for long-running operations with polling and resumption support|
-|[Deep research with an agent](./Agent_Step18_DeepResearch/)|This sample demonstrates how to use the Deep Research Tool to perform comprehensive research on complex topics|
-|[Declarative agent](./Agent_Step19_Declarative/)|This sample demonstrates how to declaratively define an agent.|
-|[Providing additional AI Context to an agent using multiple AIContextProviders](./Agent_Step20_AdditionalAIContext/)|This sample demonstrates how to inject additional AI context into a ChatClientAgent using multiple custom AIContextProvider components that are attached to the agent.|
+|[Using function tools with approvals](./Agent_Step01_UsingFunctionToolsWithApprovals/)|This sample demonstrates how to use function tools where approvals require human in the loop approvals before execution|
+|[Structured output with a simple agent](./Agent_Step02_StructuredOutput/)|This sample demonstrates how to use structured output with a simple agent|
+|[Persisted conversations with a simple agent](./Agent_Step03_PersistedConversations/)|This sample demonstrates how to persist conversations and reload them later. This is useful for cases where an agent is hosted in a stateless service|
+|[3rd party chat history storage with a simple agent](./Agent_Step04_3rdPartyChatHistoryStorage/)|This sample demonstrates how to store chat history in a 3rd party storage solution|
+|[Observability with a simple agent](./Agent_Step05_Observability/)|This sample demonstrates how to add telemetry to a simple agent|
+|[Dependency injection with a simple agent](./Agent_Step06_DependencyInjection/)|This sample demonstrates how to add and resolve an agent with a dependency injection container|
+|[Exposing a simple agent as MCP tool](./Agent_Step07_AsMcpTool/)|This sample demonstrates how to expose an agent as an MCP tool|
+|[Using images with a simple agent](./Agent_Step08_UsingImages/)|This sample demonstrates how to use image multi-modality with an AI agent|
+|[Exposing a simple agent as a function tool](./Agent_Step09_AsFunctionTool/)|This sample demonstrates how to expose an agent as a function tool|
+|[Background responses with tools and persistence](./Agent_Step10_BackgroundResponsesWithToolsAndPersistence/)|This sample demonstrates advanced background response scenarios including function calling during background operations and state persistence|
+|[Using middleware with an agent](./Agent_Step11_Middleware/)|This sample demonstrates how to use middleware with an agent|
+|[Using plugins with an agent](./Agent_Step12_Plugins/)|This sample demonstrates how to use plugins with an agent|
+|[Reducing chat history size](./Agent_Step13_ChatReduction/)|This sample demonstrates how to reduce the chat history to constrain its size, where chat history is maintained locally|
+|[Background responses](./Agent_Step14_BackgroundResponses/)|This sample demonstrates how to use background responses for long-running operations with polling and resumption support|
+|[Deep research with an agent](./Agent_Step15_DeepResearch/)|This sample demonstrates how to use the Deep Research Tool to perform comprehensive research on complex topics|
+|[Declarative agent](./Agent_Step16_Declarative/)|This sample demonstrates how to declaratively define an agent.|
+|[Providing additional AI Context to an agent using multiple AIContextProviders](./Agent_Step17_AdditionalAIContext/)|This sample demonstrates how to inject additional AI context into a ChatClientAgent using multiple custom AIContextProvider components that are attached to the agent.|
## Running the samples from the console
diff --git a/dotnet/samples/03-workflows/Agents/GroupChatToolApproval/README.md b/dotnet/samples/03-workflows/Agents/GroupChatToolApproval/README.md
index ce97694972..f569b836e9 100644
--- a/dotnet/samples/03-workflows/Agents/GroupChatToolApproval/README.md
+++ b/dotnet/samples/03-workflows/Agents/GroupChatToolApproval/README.md
@@ -65,6 +65,6 @@ The sample will show:
## Related Samples
-- [Agent Function Tools with Approvals](../../../02-agents/Agents/Agent_Step04_UsingFunctionToolsWithApprovals) - Basic function approval pattern
+- [Agent Function Tools with Approvals](../../../02-agents/Agents/Agent_Step01_UsingFunctionToolsWithApprovals) - Basic function approval pattern
- [Agent Workflow Patterns](../../_StartHere/03_AgentWorkflowPatterns) - Group chat without approvals
- [Human-in-the-Loop Basic](../../HumanInTheLoop/HumanInTheLoopBasic) - Workflow-level human interaction