diff --git a/.github/labeler.yml b/.github/labeler.yml
index 5663961c58..fb55fcf926 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -23,7 +23,7 @@ workflows:
- any-glob-to-any-file:
- dotnet/src/Microsoft.Agents.AI.Workflows/**
- dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/**
- - dotnet/samples/GettingStarted/Workflow/**
+ - dotnet/samples/03-workflows/**
- python/packages/main/agent_framework/_workflow/**
- python/samples/getting_started/workflow/**
diff --git a/README.md b/README.md
index 2b40333063..1c41003080 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Still have questions? Join our [weekly office hours](./COMMUNITY.md#public-commu
### ✨ **Highlights**
- **Graph-based Workflows**: Connect agents and deterministic functions using data flows with streaming, checkpointing, human-in-the-loop, and time-travel capabilities
- - [Python workflows](./python/samples/03-workflows/) | [.NET workflows](./dotnet/samples/GettingStarted/Workflows/)
+ - [Python workflows](./python/samples/03-workflows/) | [.NET workflows](./dotnet/samples/03-workflows/)
- **AF Labs**: Experimental packages for cutting-edge features including benchmarking, reinforcement learning, and research initiatives
- [Labs directory](./python/packages/lab/)
- **DevUI**: Interactive developer UI for agent development, testing, and debugging workflows
@@ -73,11 +73,11 @@ Still have questions? Join our [weekly office hours](./COMMUNITY.md#public-commu
- **Python and C#/.NET Support**: Full framework support for both Python and C#/.NET implementations with consistent APIs
- [Python packages](./python/packages/) | [.NET source](./dotnet/src/)
- **Observability**: Built-in OpenTelemetry integration for distributed tracing, monitoring, and debugging
- - [Python observability](./python/samples/02-agents/observability/) | [.NET telemetry](./dotnet/samples/GettingStarted/AgentOpenTelemetry/)
+ - [Python observability](./python/samples/02-agents/observability/) | [.NET telemetry](./dotnet/samples/02-agents/AgentOpenTelemetry/)
- **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/GettingStarted/AgentProviders/)
+ - [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/GettingStarted/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!**
@@ -169,9 +169,9 @@ Console.WriteLine(await agent.RunAsync("Write a haiku about Microsoft Agent Fram
### .NET
-- [Getting Started with Agents](./dotnet/samples/GettingStarted/Agents): basic agent creation and tool usage
-- [Agent Provider Samples](./dotnet/samples/GettingStarted/AgentProviders): samples showing different agent providers
-- [Workflow Samples](./dotnet/samples/GettingStarted/Workflows): advanced multi-agent patterns and workflow orchestration
+- [Getting Started with Agents](./dotnet/samples/02-agents/Agents): basic agent creation and tool usage
+- [Agent Provider Samples](./dotnet/samples/02-agents/AgentProviders): samples showing different agent providers
+- [Workflow Samples](./dotnet/samples/03-workflows): advanced multi-agent patterns and workflow orchestration
## Contributor Resources
diff --git a/docs/features/durable-agents/README.md b/docs/features/durable-agents/README.md
index 326e66743b..525c447ebc 100644
--- a/docs/features/durable-agents/README.md
+++ b/docs/features/durable-agents/README.md
@@ -219,7 +219,7 @@ When using the [Durable Task Scheduler](https://learn.microsoft.com/azure/azure-
## Samples
-- **.NET** – [Console app samples](../../../dotnet/samples/Durable/Agents/ConsoleApps/) and [Azure Functions samples](../../../dotnet/samples/Durable/Agents/AzureFunctions/) covering single-agent, chaining, concurrency, conditionals, human-in-the-loop, long-running tools, MCP tool exposure, and reliable streaming.
+- **.NET** – [Console app samples](../../../dotnet/samples/04-hosting/DurableAgents/ConsoleApps/) and [Azure Functions samples](../../../dotnet/samples/04-hosting/DurableAgents/AzureFunctions/) covering single-agent, chaining, concurrency, conditionals, human-in-the-loop, long-running tools, MCP tool exposure, and reliable streaming.
- **Python** – [Durable Task samples](../../../python/samples/04-hosting/durabletask/) covering single-agent, multi-agent, streaming, chaining, concurrency, conditionals, and human-in-the-loop.
## Packages
diff --git a/dotnet/README.md b/dotnet/README.md
index c6f3750286..328dfdf684 100644
--- a/dotnet/README.md
+++ b/dotnet/README.md
@@ -1,11 +1,5 @@
# Get Started with Microsoft Agent Framework for C# Developers
-## Samples
-
-- [Getting Started with Agents](./samples/GettingStarted/Agents): basic agent creation and tool usage
-- [Agent Provider Samples](./samples/GettingStarted/AgentProviders): samples showing different agent providers
-- [Workflow Samples](./samples/GettingStarted/Workflows): advanced multi-agent patterns and workflow orchestration
-
## Quickstart
### Basic Agent - .NET
@@ -28,9 +22,9 @@ Console.WriteLine(await agent.RunAsync("Write a haiku about Microsoft Agent Fram
## Examples & Samples
-- [Getting Started with Agents](./samples/GettingStarted/Agents): basic agent creation and tool usage
-- [Agent Provider Samples](./samples/GettingStarted/AgentProviders): samples showing different agent providers
-- [Workflow Samples](./samples/GettingStarted/Workflows): advanced multi-agent patterns and workflow orchestration
+- [Getting Started with Agents](./samples/02-agents/Agents): basic agent creation and tool usage
+- [Agent Provider Samples](./samples/02-agents/AgentProviders): samples showing different agent providers
+- [Workflow Samples](./samples/03-workflows): advanced multi-agent patterns and workflow orchestration
## Agent Framework Documentation
diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
index adc941d582..dbd542ee1b 100644
--- a/dotnet/agent-framework-dotnet.slnx
+++ b/dotnet/agent-framework-dotnet.slnx
@@ -7,224 +7,179 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -232,51 +187,96 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj b/dotnet/samples/01-get-started/01_hello_agent/01_hello_agent.csproj
similarity index 80%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj
rename to dotnet/samples/01-get-started/01_hello_agent/01_hello_agent.csproj
index 0f9de7c359..b32de63906 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj
+++ b/dotnet/samples/01-get-started/01_hello_agent/01_hello_agent.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Program.cs b/dotnet/samples/01-get-started/01_hello_agent/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Program.cs
rename to dotnet/samples/01-get-started/01_hello_agent/Program.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj b/dotnet/samples/01-get-started/02_add_tools/02_add_tools.csproj
similarity index 80%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj
rename to dotnet/samples/01-get-started/02_add_tools/02_add_tools.csproj
index 0f9de7c359..b32de63906 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj
+++ b/dotnet/samples/01-get-started/02_add_tools/02_add_tools.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Program.cs b/dotnet/samples/01-get-started/02_add_tools/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Program.cs
rename to dotnet/samples/01-get-started/02_add_tools/Program.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj b/dotnet/samples/01-get-started/03_multi_turn/03_multi_turn.csproj
similarity index 80%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj
rename to dotnet/samples/01-get-started/03_multi_turn/03_multi_turn.csproj
index 0f9de7c359..b32de63906 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj
+++ b/dotnet/samples/01-get-started/03_multi_turn/03_multi_turn.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Program.cs b/dotnet/samples/01-get-started/03_multi_turn/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Program.cs
rename to dotnet/samples/01-get-started/03_multi_turn/Program.cs
diff --git a/dotnet/samples/01-get-started/04_memory/04_memory.csproj b/dotnet/samples/01-get-started/04_memory/04_memory.csproj
new file mode 100644
index 0000000000..b32de63906
--- /dev/null
+++ b/dotnet/samples/01-get-started/04_memory/04_memory.csproj
@@ -0,0 +1,21 @@
+
+
+
+ Exe
+ net10.0
+
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/Program.cs b/dotnet/samples/01-get-started/04_memory/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/Program.cs
rename to dotnet/samples/01-get-started/04_memory/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointAndRehydrate/CheckpointAndRehydrate.csproj b/dotnet/samples/01-get-started/05_first_workflow/05_first_workflow.csproj
similarity index 69%
rename from dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointAndRehydrate/CheckpointAndRehydrate.csproj
rename to dotnet/samples/01-get-started/05_first_workflow/05_first_workflow.csproj
index 2f41070759..8430479a72 100644
--- a/dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointAndRehydrate/CheckpointAndRehydrate.csproj
+++ b/dotnet/samples/01-get-started/05_first_workflow/05_first_workflow.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/Program.cs b/dotnet/samples/01-get-started/05_first_workflow/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/Program.cs
rename to dotnet/samples/01-get-started/05_first_workflow/Program.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/01_SingleAgent.csproj b/dotnet/samples/01-get-started/06_host_your_agent/06_host_your_agent.csproj
similarity index 85%
rename from dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/01_SingleAgent.csproj
rename to dotnet/samples/01-get-started/06_host_your_agent/06_host_your_agent.csproj
index 0c0e4f7fe0..99f78cc1ab 100644
--- a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/01_SingleAgent.csproj
+++ b/dotnet/samples/01-get-started/06_host_your_agent/06_host_your_agent.csproj
@@ -36,7 +36,7 @@
-->
-
-
+
+
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/Program.cs b/dotnet/samples/01-get-started/06_host_your_agent/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/Program.cs
rename to dotnet/samples/01-get-started/06_host_your_agent/Program.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/README.md b/dotnet/samples/01-get-started/06_host_your_agent/README.md
similarity index 91%
rename from dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/README.md
rename to dotnet/samples/01-get-started/06_host_your_agent/README.md
index d4ac968978..6f7587a30c 100644
--- a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/README.md
+++ b/dotnet/samples/01-get-started/06_host_your_agent/README.md
@@ -10,7 +10,7 @@ This sample demonstrates how to use the Durable Agent Framework (DAFx) to create
## Environment Setup
-See the [README.md](../README.md) file in the parent directory for more information on how to configure the environment, including how to install and run common sample dependencies.
+See the [README.md](../../04-hosting/DurableAgents/AzureFunctions/README.md) file in the parent directory for more information on how to configure the environment, including how to install and run common sample dependencies.
## Running the Sample
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/demo.http b/dotnet/samples/01-get-started/06_host_your_agent/demo.http
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/demo.http
rename to dotnet/samples/01-get-started/06_host_your_agent/demo.http
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/host.json b/dotnet/samples/01-get-started/06_host_your_agent/host.json
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/host.json
rename to dotnet/samples/01-get-started/06_host_your_agent/host.json
diff --git a/dotnet/samples/GettingStarted/AGUI/README.md b/dotnet/samples/02-agents/AGUI/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/README.md
rename to dotnet/samples/02-agents/AGUI/README.md
diff --git a/dotnet/samples/GettingStarted/AGUI/Step01_GettingStarted/Client/Client.csproj b/dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Client/Client.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step01_GettingStarted/Client/Client.csproj
rename to dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Client/Client.csproj
diff --git a/dotnet/samples/GettingStarted/AGUI/Step01_GettingStarted/Client/Program.cs b/dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Client/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step01_GettingStarted/Client/Program.cs
rename to dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Client/Program.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step01_GettingStarted/Server/Program.cs b/dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Server/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step01_GettingStarted/Server/Program.cs
rename to dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Server/Program.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step01_GettingStarted/Server/Properties/launchSettings.json b/dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Server/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step01_GettingStarted/Server/Properties/launchSettings.json
rename to dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Server/Properties/launchSettings.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step01_GettingStarted/Server/Server.csproj b/dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Server/Server.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step01_GettingStarted/Server/Server.csproj
rename to dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Server/Server.csproj
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/appsettings.Development.json b/dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Server/appsettings.Development.json
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/appsettings.Development.json
rename to dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Server/appsettings.Development.json
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/appsettings.json b/dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Server/appsettings.json
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/appsettings.json
rename to dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Server/appsettings.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step02_BackendTools/Client/Client.csproj b/dotnet/samples/02-agents/AGUI/Step02_BackendTools/Client/Client.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step02_BackendTools/Client/Client.csproj
rename to dotnet/samples/02-agents/AGUI/Step02_BackendTools/Client/Client.csproj
diff --git a/dotnet/samples/GettingStarted/AGUI/Step02_BackendTools/Client/Program.cs b/dotnet/samples/02-agents/AGUI/Step02_BackendTools/Client/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step02_BackendTools/Client/Program.cs
rename to dotnet/samples/02-agents/AGUI/Step02_BackendTools/Client/Program.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step02_BackendTools/Server/Program.cs b/dotnet/samples/02-agents/AGUI/Step02_BackendTools/Server/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step02_BackendTools/Server/Program.cs
rename to dotnet/samples/02-agents/AGUI/Step02_BackendTools/Server/Program.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step02_BackendTools/Server/Properties/launchSettings.json b/dotnet/samples/02-agents/AGUI/Step02_BackendTools/Server/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step02_BackendTools/Server/Properties/launchSettings.json
rename to dotnet/samples/02-agents/AGUI/Step02_BackendTools/Server/Properties/launchSettings.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step02_BackendTools/Server/Server.csproj b/dotnet/samples/02-agents/AGUI/Step02_BackendTools/Server/Server.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step02_BackendTools/Server/Server.csproj
rename to dotnet/samples/02-agents/AGUI/Step02_BackendTools/Server/Server.csproj
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AppHost/appsettings.Development.json b/dotnet/samples/02-agents/AGUI/Step02_BackendTools/Server/appsettings.Development.json
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AppHost/appsettings.Development.json
rename to dotnet/samples/02-agents/AGUI/Step02_BackendTools/Server/appsettings.Development.json
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/appsettings.json b/dotnet/samples/02-agents/AGUI/Step02_BackendTools/Server/appsettings.json
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/appsettings.json
rename to dotnet/samples/02-agents/AGUI/Step02_BackendTools/Server/appsettings.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step03_FrontendTools/Client/Client.csproj b/dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Client/Client.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step03_FrontendTools/Client/Client.csproj
rename to dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Client/Client.csproj
diff --git a/dotnet/samples/GettingStarted/AGUI/Step03_FrontendTools/Client/Program.cs b/dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Client/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step03_FrontendTools/Client/Program.cs
rename to dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Client/Program.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step03_FrontendTools/Server/Program.cs b/dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Server/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step03_FrontendTools/Server/Program.cs
rename to dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Server/Program.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step03_FrontendTools/Server/Properties/launchSettings.json b/dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Server/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step03_FrontendTools/Server/Properties/launchSettings.json
rename to dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Server/Properties/launchSettings.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step03_FrontendTools/Server/Server.csproj b/dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Server/Server.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step03_FrontendTools/Server/Server.csproj
rename to dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Server/Server.csproj
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/appsettings.Development.json b/dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Server/appsettings.Development.json
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/appsettings.Development.json
rename to dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Server/appsettings.Development.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step01_GettingStarted/Server/appsettings.json b/dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Server/appsettings.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step01_GettingStarted/Server/appsettings.json
rename to dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Server/appsettings.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Client/Client.csproj b/dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Client/Client.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Client/Client.csproj
rename to dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Client/Client.csproj
diff --git a/dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Client/Program.cs b/dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Client/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Client/Program.cs
rename to dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Client/Program.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Client/ServerFunctionApprovalClientAgent.cs b/dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Client/ServerFunctionApprovalClientAgent.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Client/ServerFunctionApprovalClientAgent.cs
rename to dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Client/ServerFunctionApprovalClientAgent.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Server/Program.cs b/dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Server/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Server/Program.cs
rename to dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Server/Program.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Server/Properties/launchSettings.json b/dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Server/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Server/Properties/launchSettings.json
rename to dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Server/Properties/launchSettings.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Server/Server.csproj b/dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Server/Server.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Server/Server.csproj
rename to dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Server/Server.csproj
diff --git a/dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Server/ServerFunctionApprovalServerAgent.cs b/dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Server/ServerFunctionApprovalServerAgent.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Server/ServerFunctionApprovalServerAgent.cs
rename to dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Server/ServerFunctionApprovalServerAgent.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/appsettings.Development.json b/dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Server/appsettings.Development.json
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/appsettings.Development.json
rename to dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Server/appsettings.Development.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step02_BackendTools/Server/appsettings.json b/dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Server/appsettings.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step02_BackendTools/Server/appsettings.json
rename to dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Server/appsettings.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Client/Client.csproj b/dotnet/samples/02-agents/AGUI/Step05_StateManagement/Client/Client.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Client/Client.csproj
rename to dotnet/samples/02-agents/AGUI/Step05_StateManagement/Client/Client.csproj
diff --git a/dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Client/Program.cs b/dotnet/samples/02-agents/AGUI/Step05_StateManagement/Client/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Client/Program.cs
rename to dotnet/samples/02-agents/AGUI/Step05_StateManagement/Client/Program.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Client/StatefulAgent.cs b/dotnet/samples/02-agents/AGUI/Step05_StateManagement/Client/StatefulAgent.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Client/StatefulAgent.cs
rename to dotnet/samples/02-agents/AGUI/Step05_StateManagement/Client/StatefulAgent.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/Program.cs b/dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/Program.cs
rename to dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/Program.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/Properties/launchSettings.json b/dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/Properties/launchSettings.json
rename to dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/Properties/launchSettings.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/RecipeModels.cs b/dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/RecipeModels.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/RecipeModels.cs
rename to dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/RecipeModels.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/Server.csproj b/dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/Server.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/Server.csproj
rename to dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/Server.csproj
diff --git a/dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/SharedStateAgent.cs b/dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/SharedStateAgent.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/SharedStateAgent.cs
rename to dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/SharedStateAgent.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step01_GettingStarted/Server/appsettings.Development.json b/dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/appsettings.Development.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step01_GettingStarted/Server/appsettings.Development.json
rename to dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/appsettings.Development.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step03_FrontendTools/Server/appsettings.json b/dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/appsettings.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step03_FrontendTools/Server/appsettings.json
rename to dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/appsettings.json
diff --git a/dotnet/samples/GettingStarted/AgentOpenTelemetry/AgentOpenTelemetry.csproj b/dotnet/samples/02-agents/AgentOpenTelemetry/AgentOpenTelemetry.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentOpenTelemetry/AgentOpenTelemetry.csproj
rename to dotnet/samples/02-agents/AgentOpenTelemetry/AgentOpenTelemetry.csproj
diff --git a/dotnet/samples/GettingStarted/AgentOpenTelemetry/Program.cs b/dotnet/samples/02-agents/AgentOpenTelemetry/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentOpenTelemetry/Program.cs
rename to dotnet/samples/02-agents/AgentOpenTelemetry/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentOpenTelemetry/README.md b/dotnet/samples/02-agents/AgentOpenTelemetry/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentOpenTelemetry/README.md
rename to dotnet/samples/02-agents/AgentOpenTelemetry/README.md
diff --git a/dotnet/samples/GettingStarted/AgentOpenTelemetry/start-demo.ps1 b/dotnet/samples/02-agents/AgentOpenTelemetry/start-demo.ps1
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentOpenTelemetry/start-demo.ps1
rename to dotnet/samples/02-agents/AgentOpenTelemetry/start-demo.ps1
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/Agent_With_A2A.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_A2A/Agent_With_A2A.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/Agent_With_A2A.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_A2A/Agent_With_A2A.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_A2A/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_A2A/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_A2A/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_A2A/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_A2A/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_Anthropic/Agent_With_Anthropic.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_Anthropic/Agent_With_Anthropic.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_Anthropic/Agent_With_Anthropic.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_Anthropic/Agent_With_Anthropic.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_Anthropic/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_Anthropic/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_Anthropic/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_Anthropic/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_Anthropic/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_Anthropic/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_Anthropic/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_Anthropic/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgentsPersistent/Agent_With_AzureAIAgentsPersistent.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureAIAgentsPersistent/Agent_With_AzureAIAgentsPersistent.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgentsPersistent/Agent_With_AzureAIAgentsPersistent.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureAIAgentsPersistent/Agent_With_AzureAIAgentsPersistent.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgentsPersistent/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureAIAgentsPersistent/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgentsPersistent/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureAIAgentsPersistent/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgentsPersistent/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureAIAgentsPersistent/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureAIAgentsPersistent/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureAIAgentsPersistent/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureAIProject/Agent_With_AzureAIProject.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureAIProject/Agent_With_AzureAIProject.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureAIProject/Agent_With_AzureAIProject.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureAIProject/Agent_With_AzureAIProject.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureAIProject/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureAIProject/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureAIProject/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureAIProject/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureAIProject/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureAIProject/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureAIProject/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureAIProject/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureFoundryModel/Agent_With_AzureFoundryModel.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureFoundryModel/Agent_With_AzureFoundryModel.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureFoundryModel/Agent_With_AzureFoundryModel.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureFoundryModel/Agent_With_AzureFoundryModel.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureFoundryModel/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureFoundryModel/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureFoundryModel/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureFoundryModel/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureFoundryModel/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureFoundryModel/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureFoundryModel/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureFoundryModel/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Agent_With_AzureOpenAIChatCompletion.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Agent_With_AzureOpenAIChatCompletion.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Agent_With_AzureOpenAIChatCompletion.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Agent_With_AzureOpenAIChatCompletion.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureOpenAIChatCompletion/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIChatCompletion/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureOpenAIChatCompletion/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/Agent_With_AzureOpenAIResponses.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureOpenAIResponses/Agent_With_AzureOpenAIResponses.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/Agent_With_AzureOpenAIResponses.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureOpenAIResponses/Agent_With_AzureOpenAIResponses.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureOpenAIResponses/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureOpenAIResponses/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_AzureOpenAIResponses/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_AzureOpenAIResponses/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_AzureOpenAIResponses/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/Agent_With_CustomImplementation.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_CustomImplementation/Agent_With_CustomImplementation.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/Agent_With_CustomImplementation.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_CustomImplementation/Agent_With_CustomImplementation.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_CustomImplementation/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_CustomImplementation/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_CustomImplementation/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_CustomImplementation/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_CustomImplementation/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_GitHubCopilot/Agent_With_GitHubCopilot.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_GitHubCopilot/Agent_With_GitHubCopilot.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_GitHubCopilot/Agent_With_GitHubCopilot.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_GitHubCopilot/Agent_With_GitHubCopilot.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_GitHubCopilot/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_GitHubCopilot/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_GitHubCopilot/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_GitHubCopilot/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_GitHubCopilot/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_GitHubCopilot/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_GitHubCopilot/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_GitHubCopilot/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_GoogleGemini/Agent_With_GoogleGemini.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_GoogleGemini/Agent_With_GoogleGemini.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_GoogleGemini/Agent_With_GoogleGemini.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_GoogleGemini/Agent_With_GoogleGemini.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_GoogleGemini/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_GoogleGemini/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_GoogleGemini/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_GoogleGemini/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_GoogleGemini/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_GoogleGemini/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_GoogleGemini/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_GoogleGemini/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_ONNX/Agent_With_ONNX.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_ONNX/Agent_With_ONNX.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_ONNX/Agent_With_ONNX.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_ONNX/Agent_With_ONNX.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_ONNX/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_ONNX/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_ONNX/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_ONNX/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_ONNX/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_ONNX/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_ONNX/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_ONNX/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_Ollama/Agent_With_Ollama.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_Ollama/Agent_With_Ollama.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_Ollama/Agent_With_Ollama.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_Ollama/Agent_With_Ollama.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_Ollama/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_Ollama/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_Ollama/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_Ollama/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_Ollama/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_Ollama/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_Ollama/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_Ollama/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/Agent_With_OpenAIAssistants.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIAssistants/Agent_With_OpenAIAssistants.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/Agent_With_OpenAIAssistants.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIAssistants/Agent_With_OpenAIAssistants.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIAssistants/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIAssistants/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIAssistants/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIAssistants/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIAssistants/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIChatCompletion/Agent_With_OpenAIChatCompletion.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIChatCompletion/Agent_With_OpenAIChatCompletion.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIChatCompletion/Agent_With_OpenAIChatCompletion.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIChatCompletion/Agent_With_OpenAIChatCompletion.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIChatCompletion/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIChatCompletion/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIChatCompletion/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIChatCompletion/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIChatCompletion/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIChatCompletion/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIChatCompletion/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIChatCompletion/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIResponses/Agent_With_OpenAIResponses.csproj b/dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIResponses/Agent_With_OpenAIResponses.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIResponses/Agent_With_OpenAIResponses.csproj
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIResponses/Agent_With_OpenAIResponses.csproj
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIResponses/Program.cs b/dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIResponses/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIResponses/Program.cs
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIResponses/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIResponses/README.md b/dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIResponses/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/Agent_With_OpenAIResponses/README.md
rename to dotnet/samples/02-agents/AgentProviders/Agent_With_OpenAIResponses/README.md
diff --git a/dotnet/samples/GettingStarted/AgentProviders/README.md b/dotnet/samples/02-agents/AgentProviders/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentProviders/README.md
rename to dotnet/samples/02-agents/AgentProviders/README.md
diff --git a/dotnet/samples/GettingStarted/AgentSkills/Agent_Step01_BasicSkills/Agent_Step01_BasicSkills.csproj b/dotnet/samples/02-agents/AgentSkills/Agent_Step01_BasicSkills/Agent_Step01_BasicSkills.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentSkills/Agent_Step01_BasicSkills/Agent_Step01_BasicSkills.csproj
rename to dotnet/samples/02-agents/AgentSkills/Agent_Step01_BasicSkills/Agent_Step01_BasicSkills.csproj
diff --git a/dotnet/samples/GettingStarted/AgentSkills/Agent_Step01_BasicSkills/Program.cs b/dotnet/samples/02-agents/AgentSkills/Agent_Step01_BasicSkills/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentSkills/Agent_Step01_BasicSkills/Program.cs
rename to dotnet/samples/02-agents/AgentSkills/Agent_Step01_BasicSkills/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentSkills/Agent_Step01_BasicSkills/README.md b/dotnet/samples/02-agents/AgentSkills/Agent_Step01_BasicSkills/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentSkills/Agent_Step01_BasicSkills/README.md
rename to dotnet/samples/02-agents/AgentSkills/Agent_Step01_BasicSkills/README.md
diff --git a/dotnet/samples/GettingStarted/AgentSkills/Agent_Step01_BasicSkills/skills/expense-report/SKILL.md b/dotnet/samples/02-agents/AgentSkills/Agent_Step01_BasicSkills/skills/expense-report/SKILL.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentSkills/Agent_Step01_BasicSkills/skills/expense-report/SKILL.md
rename to dotnet/samples/02-agents/AgentSkills/Agent_Step01_BasicSkills/skills/expense-report/SKILL.md
diff --git a/dotnet/samples/GettingStarted/AgentSkills/Agent_Step01_BasicSkills/skills/expense-report/assets/expense-report-template.md b/dotnet/samples/02-agents/AgentSkills/Agent_Step01_BasicSkills/skills/expense-report/assets/expense-report-template.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentSkills/Agent_Step01_BasicSkills/skills/expense-report/assets/expense-report-template.md
rename to dotnet/samples/02-agents/AgentSkills/Agent_Step01_BasicSkills/skills/expense-report/assets/expense-report-template.md
diff --git a/dotnet/samples/GettingStarted/AgentSkills/Agent_Step01_BasicSkills/skills/expense-report/references/POLICY_FAQ.md b/dotnet/samples/02-agents/AgentSkills/Agent_Step01_BasicSkills/skills/expense-report/references/POLICY_FAQ.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentSkills/Agent_Step01_BasicSkills/skills/expense-report/references/POLICY_FAQ.md
rename to dotnet/samples/02-agents/AgentSkills/Agent_Step01_BasicSkills/skills/expense-report/references/POLICY_FAQ.md
diff --git a/dotnet/samples/GettingStarted/AgentSkills/README.md b/dotnet/samples/02-agents/AgentSkills/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentSkills/README.md
rename to dotnet/samples/02-agents/AgentSkills/README.md
diff --git a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step01_Running/Agent_Anthropic_Step01_Running.csproj b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step01_Running/Agent_Anthropic_Step01_Running.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step01_Running/Agent_Anthropic_Step01_Running.csproj
rename to dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step01_Running/Agent_Anthropic_Step01_Running.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step01_Running/Program.cs b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step01_Running/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step01_Running/Program.cs
rename to dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step01_Running/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step01_Running/README.md b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step01_Running/README.md
similarity index 95%
rename from dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step01_Running/README.md
rename to dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step01_Running/README.md
index 4800650bd9..9e7a59a663 100644
--- a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step01_Running/README.md
+++ b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step01_Running/README.md
@@ -29,7 +29,7 @@ $env:ANTHROPIC_MODEL="your-anthropic-model" # Replace with your Anthropic model
Navigate to the AgentWithAnthropic sample directory and run:
```powershell
-cd dotnet\samples\GettingStarted\AgentWithAnthropic
+cd dotnet\samples/02-agents/AgentWithAnthropic
dotnet run --project .\Agent_Anthropic_Step01_Running
```
diff --git a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/Agent_Anthropic_Step02_Reasoning.csproj b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/Agent_Anthropic_Step02_Reasoning.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/Agent_Anthropic_Step02_Reasoning.csproj
rename to dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/Agent_Anthropic_Step02_Reasoning.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/Program.cs b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/Program.cs
rename to dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/README.md b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/README.md
similarity index 96%
rename from dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/README.md
rename to dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/README.md
index ae088b2386..ee753baccb 100644
--- a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/README.md
+++ b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/README.md
@@ -31,7 +31,7 @@ $env:ANTHROPIC_MODEL="your-anthropic-model" # Replace with your Anthropic model
Navigate to the AgentWithAnthropic sample directory and run:
```powershell
-cd dotnet\samples\GettingStarted\AgentWithAnthropic
+cd dotnet\samples/02-agents/AgentWithAnthropic
dotnet run --project .\Agent_Anthropic_Step02_Reasoning
```
diff --git a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/Agent_Anthropic_Step03_UsingFunctionTools.csproj b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/Agent_Anthropic_Step03_UsingFunctionTools.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/Agent_Anthropic_Step03_UsingFunctionTools.csproj
rename to dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/Agent_Anthropic_Step03_UsingFunctionTools.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/Program.cs b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/Program.cs
rename to dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/README.md b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/README.md
similarity index 96%
rename from dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/README.md
rename to dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/README.md
index 6c905864ef..1e6921a2f8 100644
--- a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/README.md
+++ b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/README.md
@@ -31,7 +31,7 @@ $env:ANTHROPIC_MODEL="your-anthropic-model" # Replace with your Anthropic model
Navigate to the AgentWithAnthropic sample directory and run:
```powershell
-cd dotnet\samples\GettingStarted\AgentWithAnthropic
+cd dotnet\samples/02-agents/AgentWithAnthropic
dotnet run --project .\Agent_Anthropic_Step03_UsingFunctionTools
```
diff --git a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/Agent_Anthropic_Step04_UsingSkills.csproj b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/Agent_Anthropic_Step04_UsingSkills.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/Agent_Anthropic_Step04_UsingSkills.csproj
rename to dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/Agent_Anthropic_Step04_UsingSkills.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/Program.cs b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/Program.cs
rename to dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/README.md b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/README.md
similarity index 98%
rename from dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/README.md
rename to dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/README.md
index f94b16cac9..db9620a0cb 100644
--- a/dotnet/samples/GettingStarted/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/README.md
+++ b/dotnet/samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/README.md
@@ -32,7 +32,7 @@ $env:ANTHROPIC_MODEL="your-anthropic-model" # Replace with your Anthropic model
Navigate to the AgentWithAnthropic sample directory and run:
```powershell
-cd dotnet\samples\GettingStarted\AgentWithAnthropic
+cd dotnet\samples/02-agents/AgentWithAnthropic
dotnet run --project .\Agent_Anthropic_Step04_UsingSkills
```
diff --git a/dotnet/samples/GettingStarted/AgentWithAnthropic/README.md b/dotnet/samples/02-agents/AgentWithAnthropic/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithAnthropic/README.md
rename to dotnet/samples/02-agents/AgentWithAnthropic/README.md
diff --git a/dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/AgentWithMemory_Step01_ChatHistoryMemory.csproj b/dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/AgentWithMemory_Step01_ChatHistoryMemory.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/AgentWithMemory_Step01_ChatHistoryMemory.csproj
rename to dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/AgentWithMemory_Step01_ChatHistoryMemory.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/Program.cs b/dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/Program.cs
rename to dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step02_MemoryUsingMem0/AgentWithMemory_Step02_MemoryUsingMem0.csproj b/dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step02_MemoryUsingMem0/AgentWithMemory_Step02_MemoryUsingMem0.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step02_MemoryUsingMem0/AgentWithMemory_Step02_MemoryUsingMem0.csproj
rename to dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step02_MemoryUsingMem0/AgentWithMemory_Step02_MemoryUsingMem0.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step02_MemoryUsingMem0/Program.cs b/dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step02_MemoryUsingMem0/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step02_MemoryUsingMem0/Program.cs
rename to dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step02_MemoryUsingMem0/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/AgentWithMemory_Step04_MemoryUsingFoundry.csproj b/dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/AgentWithMemory_Step04_MemoryUsingFoundry.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/AgentWithMemory_Step04_MemoryUsingFoundry.csproj
rename to dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/AgentWithMemory_Step04_MemoryUsingFoundry.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/Program.cs b/dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/Program.cs
similarity index 99%
rename from dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/Program.cs
rename to dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/Program.cs
index b3533e6d1d..3c805f2399 100644
--- a/dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/Program.cs
+++ b/dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/Program.cs
@@ -15,7 +15,7 @@
string foundryEndpoint = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("FOUNDRY_PROJECT_ENDPOINT is not set.");
string memoryStoreName = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_MEMORY_STORE_NAME") ?? "memory-store-sample";
-string deploymentName = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_MODEL") ?? "gpt-4.1-mini";
+string deploymentName = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_MODEL") ?? "gpt-4o-mini";
string embeddingModelName = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_EMBEDDING_MODEL") ?? "text-embedding-ada-002";
// Create an AIProjectClient for Foundry with Azure Identity authentication.
diff --git a/dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/README.md b/dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/README.md
rename to dotnet/samples/02-agents/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/README.md
diff --git a/dotnet/samples/GettingStarted/AgentWithMemory/README.md b/dotnet/samples/02-agents/AgentWithMemory/README.md
similarity index 83%
rename from dotnet/samples/GettingStarted/AgentWithMemory/README.md
rename to dotnet/samples/02-agents/AgentWithMemory/README.md
index 6e36ba0511..82e50e10b3 100644
--- a/dotnet/samples/GettingStarted/AgentWithMemory/README.md
+++ b/dotnet/samples/02-agents/AgentWithMemory/README.md
@@ -6,5 +6,5 @@ These samples show how to create an agent with the Agent Framework that uses Mem
|---|---|
|[Chat History memory](./AgentWithMemory_Step01_ChatHistoryMemory/)|This sample demonstrates how to enable an agent to remember messages from previous conversations.|
|[Memory with MemoryStore](./AgentWithMemory_Step02_MemoryUsingMem0/)|This sample demonstrates how to create and run an agent that uses the Mem0 service to extract and retrieve individual memories.|
-|[Custom Memory Implementation](./AgentWithMemory_Step03_CustomMemory/)|This sample demonstrates how to create a custom memory component and attach it to an agent.|
+|[Custom Memory Implementation](../../01-get-started/04_memory/)|This sample demonstrates how to create a custom memory component and attach it to an agent.|
|[Memory with Azure AI Foundry](./AgentWithMemory_Step04_MemoryUsingFoundry/)|This sample demonstrates how to create and run an agent that uses Azure AI Foundry's managed memory service to extract and retrieve individual memories.|
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Agent_OpenAI_Step01_Running.csproj b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Agent_OpenAI_Step01_Running.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Agent_OpenAI_Step01_Running.csproj
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Agent_OpenAI_Step01_Running.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Program.cs b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Program.cs
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step02_Reasoning/Agent_OpenAI_Step02_Reasoning.csproj b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step02_Reasoning/Agent_OpenAI_Step02_Reasoning.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step02_Reasoning/Agent_OpenAI_Step02_Reasoning.csproj
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step02_Reasoning/Agent_OpenAI_Step02_Reasoning.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step02_Reasoning/Program.cs b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step02_Reasoning/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step02_Reasoning/Program.cs
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step02_Reasoning/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/Agent_OpenAI_Step03_CreateFromChatClient.csproj b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/Agent_OpenAI_Step03_CreateFromChatClient.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/Agent_OpenAI_Step03_CreateFromChatClient.csproj
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/Agent_OpenAI_Step03_CreateFromChatClient.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/OpenAIChatClientAgent.cs b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/OpenAIChatClientAgent.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/OpenAIChatClientAgent.cs
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/OpenAIChatClientAgent.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/Program.cs b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/Program.cs
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/README.md b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/README.md
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/README.md
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient.csproj b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient.csproj
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/OpenAIResponseClientAgent.cs b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/OpenAIResponseClientAgent.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/OpenAIResponseClientAgent.cs
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/OpenAIResponseClientAgent.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/Program.cs b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/Program.cs
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/README.md b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/README.md
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/README.md
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation/Agent_OpenAI_Step05_Conversation.csproj b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation/Agent_OpenAI_Step05_Conversation.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation/Agent_OpenAI_Step05_Conversation.csproj
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation/Agent_OpenAI_Step05_Conversation.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation/Program.cs b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation/Program.cs
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation/README.md b/dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation/README.md
rename to dotnet/samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation/README.md
diff --git a/dotnet/samples/GettingStarted/AgentWithOpenAI/README.md b/dotnet/samples/02-agents/AgentWithOpenAI/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithOpenAI/README.md
rename to dotnet/samples/02-agents/AgentWithOpenAI/README.md
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/AgentWithRAG_Step01_BasicTextRAG.csproj b/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/AgentWithRAG_Step01_BasicTextRAG.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/AgentWithRAG_Step01_BasicTextRAG.csproj
rename to dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/AgentWithRAG_Step01_BasicTextRAG.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs b/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs
rename to dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchDocument.cs b/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchDocument.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchDocument.cs
rename to dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchDocument.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchStore.cs b/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchStore.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchStore.cs
rename to dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchStore.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchStoreOptions.cs b/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchStoreOptions.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchStoreOptions.cs
rename to dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchStoreOptions.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchStoreUpsertOptions.cs b/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchStoreUpsertOptions.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchStoreUpsertOptions.cs
rename to dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/TextSearchStore/TextSearchStoreUpsertOptions.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/AgentWithRAG_Step02_CustomVectorStoreRAG.csproj b/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/AgentWithRAG_Step02_CustomVectorStoreRAG.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/AgentWithRAG_Step02_CustomVectorStoreRAG.csproj
rename to dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/AgentWithRAG_Step02_CustomVectorStoreRAG.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/Program.cs b/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/Program.cs
rename to dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/README.md b/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/README.md
rename to dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/README.md
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/AgentWithRAG_Step03_CustomRAGDataSource.csproj b/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/AgentWithRAG_Step03_CustomRAGDataSource.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/AgentWithRAG_Step03_CustomRAGDataSource.csproj
rename to dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/AgentWithRAG_Step03_CustomRAGDataSource.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/Program.cs b/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/Program.cs
rename to dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/AgentWithRAG_Step04_FoundryServiceRAG.csproj b/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/AgentWithRAG_Step04_FoundryServiceRAG.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/AgentWithRAG_Step04_FoundryServiceRAG.csproj
rename to dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/AgentWithRAG_Step04_FoundryServiceRAG.csproj
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/Program.cs b/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/Program.cs
rename to dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/Program.cs
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/contoso-outdoors-knowledge-base.md b/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/contoso-outdoors-knowledge-base.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/contoso-outdoors-knowledge-base.md
rename to dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step04_FoundryServiceRAG/contoso-outdoors-knowledge-base.md
diff --git a/dotnet/samples/GettingStarted/AgentWithRAG/README.md b/dotnet/samples/02-agents/AgentWithRAG/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithRAG/README.md
rename to dotnet/samples/02-agents/AgentWithRAG/README.md
diff --git a/dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/AgentWithMemory_Step03_CustomMemory.csproj b/dotnet/samples/02-agents/Agents/Agent_Step01_UsingFunctionToolsWithApprovals/Agent_Step01_UsingFunctionToolsWithApprovals.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/AgentWithMemory_Step03_CustomMemory.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step01_UsingFunctionToolsWithApprovals/Agent_Step01_UsingFunctionToolsWithApprovals.csproj
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step01_UsingFunctionToolsWithApprovals/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step01_UsingFunctionToolsWithApprovals/Program.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/AIAgentBuilderExtensions.cs b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/AIAgentBuilderExtensions.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/AIAgentBuilderExtensions.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/AIAgentBuilderExtensions.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Agent_Step01_Running.csproj b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/Agent_Step02_StructuredOutput.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Agent_Step01_Running.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/Agent_Step02_StructuredOutput.csproj
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/Program.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/README.md b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/README.md
rename to dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/README.md
index 2471e92194..5652fe9b0a 100644
--- a/dotnet/samples/GettingStarted/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/GettingStarted/Agents/Agent_Step05_StructuredOutput
+cd dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput
dotnet run
```
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/StructuredOutputAgent.cs b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/StructuredOutputAgent.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/StructuredOutputAgent.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/StructuredOutputAgent.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/StructuredOutputAgentOptions.cs b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/StructuredOutputAgentOptions.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/StructuredOutputAgentOptions.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/StructuredOutputAgentOptions.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/StructuredOutputAgentResponse.cs b/dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/StructuredOutputAgentResponse.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/StructuredOutputAgentResponse.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step02_StructuredOutput/StructuredOutputAgentResponse.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj b/dotnet/samples/02-agents/Agents/Agent_Step03_PersistedConversations/Agent_Step03_PersistedConversations.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step03_PersistedConversations/Agent_Step03_PersistedConversations.csproj
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step03_PersistedConversations/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step03_PersistedConversations/Program.cs
diff --git a/dotnet/samples/GettingStarted/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/GettingStarted/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/GettingStarted/Agents/Agent_Step07_3rdPartyChatHistoryStorage/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step04_3rdPartyChatHistoryStorage/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step07_3rdPartyChatHistoryStorage/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step04_3rdPartyChatHistoryStorage/Program.cs
diff --git a/dotnet/samples/GettingStarted/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/GettingStarted/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/GettingStarted/Agents/Agent_Step08_Observability/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step05_Observability/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step08_Observability/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step05_Observability/Program.cs
diff --git a/dotnet/samples/GettingStarted/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/GettingStarted/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/GettingStarted/Agents/Agent_Step09_DependencyInjection/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step06_DependencyInjection/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step09_DependencyInjection/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step06_DependencyInjection/Program.cs
diff --git a/dotnet/samples/GettingStarted/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/GettingStarted/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/GettingStarted/Agents/Agent_Step10_AsMcpTool/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step07_AsMcpTool/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step07_AsMcpTool/Program.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/README.md b/dotnet/samples/02-agents/Agents/Agent_Step07_AsMcpTool/README.md
similarity index 96%
rename from dotnet/samples/GettingStarted/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/GettingStarted/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/GettingStarted/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/GettingStarted/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/GettingStarted/Agents/Agent_Step11_UsingImages/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step08_UsingImages/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step11_UsingImages/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step08_UsingImages/Program.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step11_UsingImages/README.md b/dotnet/samples/02-agents/Agents/Agent_Step08_UsingImages/README.md
similarity index 98%
rename from dotnet/samples/GettingStarted/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/GettingStarted/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/GettingStarted/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/GettingStarted/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/GettingStarted/Agents/Agent_Step12_AsFunctionTool/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step09_AsFunctionTool/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step12_AsFunctionTool/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step09_AsFunctionTool/Program.cs
diff --git a/dotnet/samples/GettingStarted/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/GettingStarted/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/GettingStarted/Agents/Agent_Step13_BackgroundResponsesWithToolsAndPersistence/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step10_BackgroundResponsesWithToolsAndPersistence/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step13_BackgroundResponsesWithToolsAndPersistence/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step10_BackgroundResponsesWithToolsAndPersistence/Program.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step13_BackgroundResponsesWithToolsAndPersistence/README.md b/dotnet/samples/02-agents/Agents/Agent_Step10_BackgroundResponsesWithToolsAndPersistence/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step13_BackgroundResponsesWithToolsAndPersistence/README.md
rename to dotnet/samples/02-agents/Agents/Agent_Step10_BackgroundResponsesWithToolsAndPersistence/README.md
diff --git a/dotnet/samples/GettingStarted/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/GettingStarted/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/GettingStarted/Agents/Agent_Step14_Middleware/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step11_Middleware/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step14_Middleware/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step11_Middleware/Program.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step14_Middleware/README.md b/dotnet/samples/02-agents/Agents/Agent_Step11_Middleware/README.md
similarity index 95%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step14_Middleware/README.md
rename to dotnet/samples/02-agents/Agents/Agent_Step11_Middleware/README.md
index d7193b6982..4bce37fdc5 100644
--- a/dotnet/samples/GettingStarted/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/GettingStarted/Agents/Agent_Step14_Middleware
+cd dotnet/samples/02-agents/Agents/Agent_Step11_Middleware
dotnet run
```
diff --git a/dotnet/samples/GettingStarted/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/GettingStarted/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/GettingStarted/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/GettingStarted/Agents/Agent_Step15_Plugins/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step12_Plugins/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step15_Plugins/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step12_Plugins/Program.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj b/dotnet/samples/02-agents/Agents/Agent_Step13_ChatReduction/Agent_Step13_ChatReduction.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj
rename to dotnet/samples/02-agents/Agents/Agent_Step13_ChatReduction/Agent_Step13_ChatReduction.csproj
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step16_ChatReduction/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step13_ChatReduction/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step16_ChatReduction/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step13_ChatReduction/Program.cs
diff --git a/dotnet/samples/GettingStarted/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/GettingStarted/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/GettingStarted/Agents/Agent_Step17_BackgroundResponses/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step14_BackgroundResponses/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step17_BackgroundResponses/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step14_BackgroundResponses/Program.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step17_BackgroundResponses/README.md b/dotnet/samples/02-agents/Agents/Agent_Step14_BackgroundResponses/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step17_BackgroundResponses/README.md
rename to dotnet/samples/02-agents/Agents/Agent_Step14_BackgroundResponses/README.md
diff --git a/dotnet/samples/GettingStarted/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/GettingStarted/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/GettingStarted/Agents/Agent_Step18_DeepResearch/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step15_DeepResearch/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step18_DeepResearch/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step15_DeepResearch/Program.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step18_DeepResearch/README.md b/dotnet/samples/02-agents/Agents/Agent_Step15_DeepResearch/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step18_DeepResearch/README.md
rename to dotnet/samples/02-agents/Agents/Agent_Step15_DeepResearch/README.md
diff --git a/dotnet/samples/GettingStarted/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/GettingStarted/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/GettingStarted/Agents/Agent_Step19_Declarative/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step16_Declarative/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step19_Declarative/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step16_Declarative/Program.cs
diff --git a/dotnet/samples/GettingStarted/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/GettingStarted/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/GettingStarted/Agents/Agent_Step20_AdditionalAIContext/Program.cs b/dotnet/samples/02-agents/Agents/Agent_Step17_AdditionalAIContext/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step20_AdditionalAIContext/Program.cs
rename to dotnet/samples/02-agents/Agents/Agent_Step17_AdditionalAIContext/Program.cs
diff --git a/dotnet/samples/GettingStarted/Agents/README.md b/dotnet/samples/02-agents/Agents/README.md
similarity index 75%
rename from dotnet/samples/GettingStarted/Agents/README.md
rename to dotnet/samples/02-agents/Agents/README.md
index 64af82a23e..cdc65c59ec 100644
--- a/dotnet/samples/GettingStarted/Agents/README.md
+++ b/dotnet/samples/02-agents/Agents/README.md
@@ -26,27 +26,24 @@ Before you begin, ensure you have the following prerequisites:
|Sample|Description|
|---|---|
-|[Running a simple agent](./Agent_Step01_Running/)|This sample demonstrates how to create and run a basic agent with instructions|
-|[Multi-turn conversation with a simple agent](./Agent_Step02_MultiturnConversation/)|This sample demonstrates how to implement a multi-turn conversation with a simple agent|
-|[Using function tools with a simple agent](./Agent_Step03_UsingFunctionTools/)|This sample demonstrates how to use function tools with a simple agent|
|[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/GettingStarted/DeclarativeAgents/ChatClient/DeclarativeChatClientAgents.csproj b/dotnet/samples/02-agents/DeclarativeAgents/ChatClient/DeclarativeChatClientAgents.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/DeclarativeAgents/ChatClient/DeclarativeChatClientAgents.csproj
rename to dotnet/samples/02-agents/DeclarativeAgents/ChatClient/DeclarativeChatClientAgents.csproj
diff --git a/dotnet/samples/GettingStarted/DeclarativeAgents/ChatClient/Program.cs b/dotnet/samples/02-agents/DeclarativeAgents/ChatClient/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/DeclarativeAgents/ChatClient/Program.cs
rename to dotnet/samples/02-agents/DeclarativeAgents/ChatClient/Program.cs
diff --git a/dotnet/samples/GettingStarted/DeclarativeAgents/ChatClient/Properties/launchSettings.json b/dotnet/samples/02-agents/DeclarativeAgents/ChatClient/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/GettingStarted/DeclarativeAgents/ChatClient/Properties/launchSettings.json
rename to dotnet/samples/02-agents/DeclarativeAgents/ChatClient/Properties/launchSettings.json
diff --git a/dotnet/samples/GettingStarted/DevUI/DevUI_Step01_BasicUsage/DevUI_Step01_BasicUsage.csproj b/dotnet/samples/02-agents/DevUI/DevUI_Step01_BasicUsage/DevUI_Step01_BasicUsage.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/DevUI/DevUI_Step01_BasicUsage/DevUI_Step01_BasicUsage.csproj
rename to dotnet/samples/02-agents/DevUI/DevUI_Step01_BasicUsage/DevUI_Step01_BasicUsage.csproj
diff --git a/dotnet/samples/GettingStarted/DevUI/DevUI_Step01_BasicUsage/Program.cs b/dotnet/samples/02-agents/DevUI/DevUI_Step01_BasicUsage/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/DevUI/DevUI_Step01_BasicUsage/Program.cs
rename to dotnet/samples/02-agents/DevUI/DevUI_Step01_BasicUsage/Program.cs
diff --git a/dotnet/samples/GettingStarted/DevUI/DevUI_Step01_BasicUsage/Properties/launchSettings.json b/dotnet/samples/02-agents/DevUI/DevUI_Step01_BasicUsage/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/GettingStarted/DevUI/DevUI_Step01_BasicUsage/Properties/launchSettings.json
rename to dotnet/samples/02-agents/DevUI/DevUI_Step01_BasicUsage/Properties/launchSettings.json
diff --git a/dotnet/samples/GettingStarted/DevUI/DevUI_Step01_BasicUsage/README.md b/dotnet/samples/02-agents/DevUI/DevUI_Step01_BasicUsage/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/DevUI/DevUI_Step01_BasicUsage/README.md
rename to dotnet/samples/02-agents/DevUI/DevUI_Step01_BasicUsage/README.md
diff --git a/dotnet/samples/GettingStarted/DevUI/README.md b/dotnet/samples/02-agents/DevUI/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/DevUI/README.md
rename to dotnet/samples/02-agents/DevUI/README.md
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming/FoundryAgents_Evaluations_Step01_RedTeaming.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming/FoundryAgents_Evaluations_Step01_RedTeaming.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming/FoundryAgents_Evaluations_Step01_RedTeaming.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming/FoundryAgents_Evaluations_Step01_RedTeaming.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming/README.md
similarity index 98%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming/README.md
index f46c7af8ef..5c91f33992 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming/README.md
@@ -41,7 +41,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming
+cd dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step01_RedTeaming
dotnet run
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection/FoundryAgents_Evaluations_Step02_SelfReflection.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection/FoundryAgents_Evaluations_Step02_SelfReflection.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection/FoundryAgents_Evaluations_Step02_SelfReflection.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection/FoundryAgents_Evaluations_Step02_SelfReflection.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection/README.md
similarity index 98%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection/README.md
index 8dcb22bd3c..a5caade60b 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection/README.md
@@ -49,7 +49,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Mod
Navigate to the sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection
+cd dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Evaluations_Step02_SelfReflection
dotnet run
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.1_Basics/FoundryAgents_Step01.1_Basics.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step01.1_Basics/FoundryAgents_Step01.1_Basics.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.1_Basics/FoundryAgents_Step01.1_Basics.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step01.1_Basics/FoundryAgents_Step01.1_Basics.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.1_Basics/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step01.1_Basics/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.1_Basics/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step01.1_Basics/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.1_Basics/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step01.1_Basics/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.1_Basics/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step01.1_Basics/README.md
index ce56e05755..1423227772 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.1_Basics/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step01.1_Basics/README.md
@@ -28,7 +28,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step01.1_Basics
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.2_Running/FoundryAgents_Step01.2_Running.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step01.2_Running/FoundryAgents_Step01.2_Running.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.2_Running/FoundryAgents_Step01.2_Running.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step01.2_Running/FoundryAgents_Step01.2_Running.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.2_Running/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step01.2_Running/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.2_Running/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step01.2_Running/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.2_Running/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step01.2_Running/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.2_Running/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step01.2_Running/README.md
index 53254e1975..0e55500ace 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step01.2_Running/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step01.2_Running/README.md
@@ -31,7 +31,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step01.2_Running
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/FoundryAgents_Step02_MultiturnConversation.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/FoundryAgents_Step02_MultiturnConversation.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/FoundryAgents_Step02_MultiturnConversation.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/FoundryAgents_Step02_MultiturnConversation.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/README.md
similarity index 98%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/README.md
index 6611287bd9..deede817bc 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step02_MultiturnConversation/README.md
@@ -33,7 +33,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step02_MultiturnConversation
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/FoundryAgents_Step03_UsingFunctionTools.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/FoundryAgents_Step03_UsingFunctionTools.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/FoundryAgents_Step03_UsingFunctionTools.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/FoundryAgents_Step03_UsingFunctionTools.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/README.md
index 35bef8a999..b428b05ca1 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step03_UsingFunctionTools/README.md
@@ -32,7 +32,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step03.1_UsingFunctionTools
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/FoundryAgents_Step04_UsingFunctionToolsWithApprovals.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/FoundryAgents_Step04_UsingFunctionToolsWithApprovals.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/FoundryAgents_Step04_UsingFunctionToolsWithApprovals.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/FoundryAgents_Step04_UsingFunctionToolsWithApprovals.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/README.md
index 5a797acd0f..eedf3dd854 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step04_UsingFunctionToolsWithApprovals/README.md
@@ -32,7 +32,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step04_UsingFunctionToolsWithApprovals
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step05_StructuredOutput/FoundryAgents_Step05_StructuredOutput.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step05_StructuredOutput/FoundryAgents_Step05_StructuredOutput.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step05_StructuredOutput/FoundryAgents_Step05_StructuredOutput.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step05_StructuredOutput/FoundryAgents_Step05_StructuredOutput.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step05_StructuredOutput/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step05_StructuredOutput/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step05_StructuredOutput/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step05_StructuredOutput/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step05_StructuredOutput/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step05_StructuredOutput/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step05_StructuredOutput/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step05_StructuredOutput/README.md
index 956a2542e9..ac29f46645 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step05_StructuredOutput/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step05_StructuredOutput/README.md
@@ -32,7 +32,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step05_StructuredOutput
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step06_PersistedConversations/FoundryAgents_Step06_PersistedConversations.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step06_PersistedConversations/FoundryAgents_Step06_PersistedConversations.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step06_PersistedConversations/FoundryAgents_Step06_PersistedConversations.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step06_PersistedConversations/FoundryAgents_Step06_PersistedConversations.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step06_PersistedConversations/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step06_PersistedConversations/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step06_PersistedConversations/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step06_PersistedConversations/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step06_PersistedConversations/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step06_PersistedConversations/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step06_PersistedConversations/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step06_PersistedConversations/README.md
index 29c2233748..f0dd76eb53 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step06_PersistedConversations/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step06_PersistedConversations/README.md
@@ -32,7 +32,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step06_PersistedConversations
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step07_Observability/FoundryAgents_Step07_Observability.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step07_Observability/FoundryAgents_Step07_Observability.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step07_Observability/FoundryAgents_Step07_Observability.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step07_Observability/FoundryAgents_Step07_Observability.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step07_Observability/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step07_Observability/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step07_Observability/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step07_Observability/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step07_Observability/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step07_Observability/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step07_Observability/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step07_Observability/README.md
index 30f7014dff..1d09c14e9e 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step07_Observability/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step07_Observability/README.md
@@ -35,7 +35,7 @@ $env:APPLICATIONINSIGHTS_CONNECTION_STRING="your-connection-string" # Optional,
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step07_Observability
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step08_DependencyInjection/FoundryAgents_Step08_DependencyInjection.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step08_DependencyInjection/FoundryAgents_Step08_DependencyInjection.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step08_DependencyInjection/FoundryAgents_Step08_DependencyInjection.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step08_DependencyInjection/FoundryAgents_Step08_DependencyInjection.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step08_DependencyInjection/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step08_DependencyInjection/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step08_DependencyInjection/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step08_DependencyInjection/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step08_DependencyInjection/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step08_DependencyInjection/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step08_DependencyInjection/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step08_DependencyInjection/README.md
index 580821bb0a..6cc0563191 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step08_DependencyInjection/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step08_DependencyInjection/README.md
@@ -33,7 +33,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step08_DependencyInjection
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/FoundryAgents_Step09_UsingMcpClientAsTools.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/FoundryAgents_Step09_UsingMcpClientAsTools.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/FoundryAgents_Step09_UsingMcpClientAsTools.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/FoundryAgents_Step09_UsingMcpClientAsTools.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/README.md
index b2d923fc2f..67c4a7f4d1 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step09_UsingMcpClientAsTools/README.md
@@ -33,7 +33,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step09_UsingMcpClientAsTools
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step10_UsingImages/Assets/walkway.jpg b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step10_UsingImages/Assets/walkway.jpg
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step10_UsingImages/Assets/walkway.jpg
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step10_UsingImages/Assets/walkway.jpg
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step10_UsingImages/FoundryAgents_Step10_UsingImages.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step10_UsingImages/FoundryAgents_Step10_UsingImages.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step10_UsingImages/FoundryAgents_Step10_UsingImages.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step10_UsingImages/FoundryAgents_Step10_UsingImages.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step10_UsingImages/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step10_UsingImages/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step10_UsingImages/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step10_UsingImages/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step10_UsingImages/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step10_UsingImages/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step10_UsingImages/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step10_UsingImages/README.md
index d90f5cf208..3b1039b84a 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step10_UsingImages/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step10_UsingImages/README.md
@@ -38,7 +38,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o" # Replace with your model de
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step10_UsingImages
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/FoundryAgents_Step11_AsFunctionTool.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/FoundryAgents_Step11_AsFunctionTool.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/FoundryAgents_Step11_AsFunctionTool.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/FoundryAgents_Step11_AsFunctionTool.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/README.md
index 4b64b7e712..4e5a213bc6 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step11_AsFunctionTool/README.md
@@ -32,7 +32,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step11_AsFunctionTool
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step12_Middleware/FoundryAgents_Step12_Middleware.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step12_Middleware/FoundryAgents_Step12_Middleware.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step12_Middleware/FoundryAgents_Step12_Middleware.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step12_Middleware/FoundryAgents_Step12_Middleware.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step12_Middleware/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step12_Middleware/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step12_Middleware/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step12_Middleware/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step12_Middleware/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step12_Middleware/README.md
similarity index 98%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step12_Middleware/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step12_Middleware/README.md
index eaaafe7ab1..ff5e82b6bc 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step12_Middleware/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step12_Middleware/README.md
@@ -39,7 +39,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step12_Middleware
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step13_Plugins/FoundryAgents_Step13_Plugins.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step13_Plugins/FoundryAgents_Step13_Plugins.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step13_Plugins/FoundryAgents_Step13_Plugins.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step13_Plugins/FoundryAgents_Step13_Plugins.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step13_Plugins/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step13_Plugins/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step13_Plugins/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step13_Plugins/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step13_Plugins/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step13_Plugins/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step13_Plugins/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step13_Plugins/README.md
index 0aeccf5789..56678b47a6 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step13_Plugins/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step13_Plugins/README.md
@@ -32,7 +32,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step13_Plugins
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/FoundryAgents_Step14_CodeInterpreter.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/FoundryAgents_Step14_CodeInterpreter.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/FoundryAgents_Step14_CodeInterpreter.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/FoundryAgents_Step14_CodeInterpreter.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/README.md
index a3dd4d50b9..bc332cd647 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step14_CodeInterpreter/README.md
@@ -33,7 +33,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step14_CodeInterpreter
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/Assets/cua_browser_search.png b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/Assets/cua_browser_search.png
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/Assets/cua_browser_search.png
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/Assets/cua_browser_search.png
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/Assets/cua_search_results.png b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/Assets/cua_search_results.png
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/Assets/cua_search_results.png
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/Assets/cua_search_results.png
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/Assets/cua_search_typed.png b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/Assets/cua_search_typed.png
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/Assets/cua_search_typed.png
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/Assets/cua_search_typed.png
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/ComputerUseUtil.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/ComputerUseUtil.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/ComputerUseUtil.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/ComputerUseUtil.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/FoundryAgents_Step15_ComputerUse.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/FoundryAgents_Step15_ComputerUse.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/FoundryAgents_Step15_ComputerUse.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/FoundryAgents_Step15_ComputerUse.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/README.md
similarity index 98%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/README.md
index a44227f6c7..5cb34a1ed6 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step15_ComputerUse/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step15_ComputerUse/README.md
@@ -44,7 +44,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="computer-use-preview" # Optional, d
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step15_ComputerUse
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step18_FileSearch/FoundryAgents_Step18_FileSearch.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step18_FileSearch/FoundryAgents_Step18_FileSearch.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step18_FileSearch/FoundryAgents_Step18_FileSearch.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step18_FileSearch/FoundryAgents_Step18_FileSearch.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step18_FileSearch/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step18_FileSearch/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step18_FileSearch/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step18_FileSearch/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step18_FileSearch/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step18_FileSearch/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step18_FileSearch/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step18_FileSearch/README.md
index e8f431ba44..8ef4111239 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step18_FileSearch/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step18_FileSearch/README.md
@@ -33,7 +33,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step18_FileSearch
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step19_OpenAPITools/FoundryAgents_Step19_OpenAPITools.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step19_OpenAPITools/FoundryAgents_Step19_OpenAPITools.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step19_OpenAPITools/FoundryAgents_Step19_OpenAPITools.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step19_OpenAPITools/FoundryAgents_Step19_OpenAPITools.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step19_OpenAPITools/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step19_OpenAPITools/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step19_OpenAPITools/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step19_OpenAPITools/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step19_OpenAPITools/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step19_OpenAPITools/README.md
similarity index 95%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step19_OpenAPITools/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step19_OpenAPITools/README.md
index e7a2f2cb52..f866eefbdb 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step19_OpenAPITools/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step19_OpenAPITools/README.md
@@ -1,4 +1,4 @@
-# Using OpenAPI Tools with AI Agents
+# Using OpenAPI Tools with AI Agents
This sample demonstrates how to use OpenAPI tools with AI agents. OpenAPI tools allow agents to call external REST APIs defined by OpenAPI specifications.
@@ -32,7 +32,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step19_OpenAPITools
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step27_LocalMCP/FoundryAgents_Step27_LocalMCP.csproj b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step27_LocalMCP/FoundryAgents_Step27_LocalMCP.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step27_LocalMCP/FoundryAgents_Step27_LocalMCP.csproj
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step27_LocalMCP/FoundryAgents_Step27_LocalMCP.csproj
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step27_LocalMCP/Program.cs b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step27_LocalMCP/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step27_LocalMCP/Program.cs
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step27_LocalMCP/Program.cs
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step27_LocalMCP/README.md b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step27_LocalMCP/README.md
similarity index 97%
rename from dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step27_LocalMCP/README.md
rename to dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step27_LocalMCP/README.md
index e8883b7e95..6f426d89b6 100644
--- a/dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step27_LocalMCP/README.md
+++ b/dotnet/samples/02-agents/FoundryAgents/FoundryAgents_Step27_LocalMCP/README.md
@@ -32,7 +32,7 @@ $env:AZURE_FOUNDRY_PROJECT_DEPLOYMENT_NAME="gpt-4o-mini" # Optional, defaults t
Navigate to the FoundryAgents sample directory and run:
```powershell
-cd dotnet/samples/GettingStarted/FoundryAgents
+cd dotnet/samples/02-agents/FoundryAgents
dotnet run --project .\FoundryAgents_Step27_LocalMCP
```
diff --git a/dotnet/samples/GettingStarted/FoundryAgents/README.md b/dotnet/samples/02-agents/FoundryAgents/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/FoundryAgents/README.md
rename to dotnet/samples/02-agents/FoundryAgents/README.md
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server/Agent_MCP_Server.csproj b/dotnet/samples/02-agents/ModelContextProtocol/Agent_MCP_Server/Agent_MCP_Server.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server/Agent_MCP_Server.csproj
rename to dotnet/samples/02-agents/ModelContextProtocol/Agent_MCP_Server/Agent_MCP_Server.csproj
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server/Program.cs b/dotnet/samples/02-agents/ModelContextProtocol/Agent_MCP_Server/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server/Program.cs
rename to dotnet/samples/02-agents/ModelContextProtocol/Agent_MCP_Server/Program.cs
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server/README.md b/dotnet/samples/02-agents/ModelContextProtocol/Agent_MCP_Server/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server/README.md
rename to dotnet/samples/02-agents/ModelContextProtocol/Agent_MCP_Server/README.md
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server_Auth/Agent_MCP_Server_Auth.csproj b/dotnet/samples/02-agents/ModelContextProtocol/Agent_MCP_Server_Auth/Agent_MCP_Server_Auth.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server_Auth/Agent_MCP_Server_Auth.csproj
rename to dotnet/samples/02-agents/ModelContextProtocol/Agent_MCP_Server_Auth/Agent_MCP_Server_Auth.csproj
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server_Auth/Program.cs b/dotnet/samples/02-agents/ModelContextProtocol/Agent_MCP_Server_Auth/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server_Auth/Program.cs
rename to dotnet/samples/02-agents/ModelContextProtocol/Agent_MCP_Server_Auth/Program.cs
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server_Auth/README.md b/dotnet/samples/02-agents/ModelContextProtocol/Agent_MCP_Server_Auth/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/ModelContextProtocol/Agent_MCP_Server_Auth/README.md
rename to dotnet/samples/02-agents/ModelContextProtocol/Agent_MCP_Server_Auth/README.md
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/FoundryAgent_Hosted_MCP/FoundryAgent_Hosted_MCP.csproj b/dotnet/samples/02-agents/ModelContextProtocol/FoundryAgent_Hosted_MCP/FoundryAgent_Hosted_MCP.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/ModelContextProtocol/FoundryAgent_Hosted_MCP/FoundryAgent_Hosted_MCP.csproj
rename to dotnet/samples/02-agents/ModelContextProtocol/FoundryAgent_Hosted_MCP/FoundryAgent_Hosted_MCP.csproj
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/FoundryAgent_Hosted_MCP/Program.cs b/dotnet/samples/02-agents/ModelContextProtocol/FoundryAgent_Hosted_MCP/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/ModelContextProtocol/FoundryAgent_Hosted_MCP/Program.cs
rename to dotnet/samples/02-agents/ModelContextProtocol/FoundryAgent_Hosted_MCP/Program.cs
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/FoundryAgent_Hosted_MCP/README.md b/dotnet/samples/02-agents/ModelContextProtocol/FoundryAgent_Hosted_MCP/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/ModelContextProtocol/FoundryAgent_Hosted_MCP/README.md
rename to dotnet/samples/02-agents/ModelContextProtocol/FoundryAgent_Hosted_MCP/README.md
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/README.md b/dotnet/samples/02-agents/ModelContextProtocol/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/ModelContextProtocol/README.md
rename to dotnet/samples/02-agents/ModelContextProtocol/README.md
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/ResponseAgent_Hosted_MCP/Program.cs b/dotnet/samples/02-agents/ModelContextProtocol/ResponseAgent_Hosted_MCP/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/ModelContextProtocol/ResponseAgent_Hosted_MCP/Program.cs
rename to dotnet/samples/02-agents/ModelContextProtocol/ResponseAgent_Hosted_MCP/Program.cs
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/ResponseAgent_Hosted_MCP/README.md b/dotnet/samples/02-agents/ModelContextProtocol/ResponseAgent_Hosted_MCP/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/ModelContextProtocol/ResponseAgent_Hosted_MCP/README.md
rename to dotnet/samples/02-agents/ModelContextProtocol/ResponseAgent_Hosted_MCP/README.md
diff --git a/dotnet/samples/GettingStarted/ModelContextProtocol/ResponseAgent_Hosted_MCP/ResponseAgent_Hosted_MCP.csproj b/dotnet/samples/02-agents/ModelContextProtocol/ResponseAgent_Hosted_MCP/ResponseAgent_Hosted_MCP.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/ModelContextProtocol/ResponseAgent_Hosted_MCP/ResponseAgent_Hosted_MCP.csproj
rename to dotnet/samples/02-agents/ModelContextProtocol/ResponseAgent_Hosted_MCP/ResponseAgent_Hosted_MCP.csproj
diff --git a/dotnet/samples/GettingStarted/README.md b/dotnet/samples/02-agents/README.md
similarity index 88%
rename from dotnet/samples/GettingStarted/README.md
rename to dotnet/samples/02-agents/README.md
index 6fe68fc94f..ee960a09a4 100644
--- a/dotnet/samples/GettingStarted/README.md
+++ b/dotnet/samples/02-agents/README.md
@@ -12,10 +12,9 @@ of the agent framework.
|[Agent Providers](./AgentProviders/README.md)|Getting started with creating agents using various providers|
|[Agents With Retrieval Augmented Generation (RAG)](./AgentWithRAG/README.md)|Adding Retrieval Augmented Generation (RAG) capabilities to your agents.|
|[Agents With Memory](./AgentWithMemory/README.md)|Adding Memory capabilities to your agents.|
-|[A2A](./A2A/README.md)|Getting started with A2A (Agent-to-Agent) specific features|
|[Agent Open Telemetry](./AgentOpenTelemetry/README.md)|Getting started with OpenTelemetry for agents|
|[Agent With OpenAI exchange types](./AgentWithOpenAI/README.md)|Using OpenAI exchange types with agents|
|[Agent With Anthropic](./AgentWithAnthropic/README.md)|Getting started with agents using Anthropic Claude|
-|[Workflow](./Workflows/README.md)|Getting started with Workflow|
+|[Workflow](../03-workflows/README.md)|Getting started with Workflow|
|[Model Context Protocol](./ModelContextProtocol/README.md)|Getting started with Model Context Protocol|
|[Agent Skills](./AgentSkills/README.md)|Getting started with Agent Skills|
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/CustomAgentExecutors/CustomAgentExecutors.csproj b/dotnet/samples/03-workflows/Agents/CustomAgentExecutors/CustomAgentExecutors.csproj
similarity index 61%
rename from dotnet/samples/GettingStarted/Workflows/Agents/CustomAgentExecutors/CustomAgentExecutors.csproj
rename to dotnet/samples/03-workflows/Agents/CustomAgentExecutors/CustomAgentExecutors.csproj
index 2ab222887c..6776b73b15 100644
--- a/dotnet/samples/GettingStarted/Workflows/Agents/CustomAgentExecutors/CustomAgentExecutors.csproj
+++ b/dotnet/samples/03-workflows/Agents/CustomAgentExecutors/CustomAgentExecutors.csproj
@@ -15,11 +15,11 @@
-
-
+
-
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/CustomAgentExecutors/Program.cs b/dotnet/samples/03-workflows/Agents/CustomAgentExecutors/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Agents/CustomAgentExecutors/Program.cs
rename to dotnet/samples/03-workflows/Agents/CustomAgentExecutors/Program.cs
diff --git a/dotnet/samples/03-workflows/Agents/FoundryAgent/FoundryAgent.csproj b/dotnet/samples/03-workflows/Agents/FoundryAgent/FoundryAgent.csproj
new file mode 100644
index 0000000000..30227d3f20
--- /dev/null
+++ b/dotnet/samples/03-workflows/Agents/FoundryAgent/FoundryAgent.csproj
@@ -0,0 +1,22 @@
+
+
+
+ Exe
+ net10.0
+
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/FoundryAgent/Program.cs b/dotnet/samples/03-workflows/Agents/FoundryAgent/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Agents/FoundryAgent/Program.cs
rename to dotnet/samples/03-workflows/Agents/FoundryAgent/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/GroupChatToolApproval/DeploymentGroupChatManager.cs b/dotnet/samples/03-workflows/Agents/GroupChatToolApproval/DeploymentGroupChatManager.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Agents/GroupChatToolApproval/DeploymentGroupChatManager.cs
rename to dotnet/samples/03-workflows/Agents/GroupChatToolApproval/DeploymentGroupChatManager.cs
diff --git a/dotnet/samples/03-workflows/Agents/GroupChatToolApproval/GroupChatToolApproval.csproj b/dotnet/samples/03-workflows/Agents/GroupChatToolApproval/GroupChatToolApproval.csproj
new file mode 100644
index 0000000000..e926a8375a
--- /dev/null
+++ b/dotnet/samples/03-workflows/Agents/GroupChatToolApproval/GroupChatToolApproval.csproj
@@ -0,0 +1,22 @@
+
+
+
+ Exe
+ net10.0
+
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/GroupChatToolApproval/Program.cs b/dotnet/samples/03-workflows/Agents/GroupChatToolApproval/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Agents/GroupChatToolApproval/Program.cs
rename to dotnet/samples/03-workflows/Agents/GroupChatToolApproval/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/GroupChatToolApproval/README.md b/dotnet/samples/03-workflows/Agents/GroupChatToolApproval/README.md
similarity index 91%
rename from dotnet/samples/GettingStarted/Workflows/Agents/GroupChatToolApproval/README.md
rename to dotnet/samples/03-workflows/Agents/GroupChatToolApproval/README.md
index 84c6baa83c..f569b836e9 100644
--- a/dotnet/samples/GettingStarted/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](../../../Agents/Agent_Step04_UsingFunctionToolsWithApprovals) - Basic function approval pattern
-- [Agent Workflow Patterns](../../_Foundational/04_AgentWorkflowPatterns) - Group chat without approvals
+- [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
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/Program.cs b/dotnet/samples/03-workflows/Agents/WorkflowAsAnAgent/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/Program.cs
rename to dotnet/samples/03-workflows/Agents/WorkflowAsAnAgent/Program.cs
diff --git a/dotnet/samples/03-workflows/Agents/WorkflowAsAnAgent/WorkflowAsAnAgent.csproj b/dotnet/samples/03-workflows/Agents/WorkflowAsAnAgent/WorkflowAsAnAgent.csproj
new file mode 100644
index 0000000000..e926a8375a
--- /dev/null
+++ b/dotnet/samples/03-workflows/Agents/WorkflowAsAnAgent/WorkflowAsAnAgent.csproj
@@ -0,0 +1,22 @@
+
+
+
+ Exe
+ net10.0
+
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/WorkflowFactory.cs b/dotnet/samples/03-workflows/Agents/WorkflowAsAnAgent/WorkflowFactory.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/WorkflowFactory.cs
rename to dotnet/samples/03-workflows/Agents/WorkflowAsAnAgent/WorkflowFactory.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Loop/Loop.csproj b/dotnet/samples/03-workflows/Checkpoint/CheckpointAndRehydrate/CheckpointAndRehydrate.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Loop/Loop.csproj
rename to dotnet/samples/03-workflows/Checkpoint/CheckpointAndRehydrate/CheckpointAndRehydrate.csproj
diff --git a/dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointAndRehydrate/Program.cs b/dotnet/samples/03-workflows/Checkpoint/CheckpointAndRehydrate/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointAndRehydrate/Program.cs
rename to dotnet/samples/03-workflows/Checkpoint/CheckpointAndRehydrate/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointAndRehydrate/WorkflowFactory.cs b/dotnet/samples/03-workflows/Checkpoint/CheckpointAndRehydrate/WorkflowFactory.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointAndRehydrate/WorkflowFactory.cs
rename to dotnet/samples/03-workflows/Checkpoint/CheckpointAndRehydrate/WorkflowFactory.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Visualization/Visualization.csproj b/dotnet/samples/03-workflows/Checkpoint/CheckpointAndResume/CheckpointAndResume.csproj
similarity index 75%
rename from dotnet/samples/GettingStarted/Workflows/Visualization/Visualization.csproj
rename to dotnet/samples/03-workflows/Checkpoint/CheckpointAndResume/CheckpointAndResume.csproj
index 57b1fef0e1..0de620de0c 100644
--- a/dotnet/samples/GettingStarted/Workflows/Visualization/Visualization.csproj
+++ b/dotnet/samples/03-workflows/Checkpoint/CheckpointAndResume/CheckpointAndResume.csproj
@@ -1,4 +1,4 @@
-
+
Exe
@@ -10,7 +10,6 @@
-
diff --git a/dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointAndResume/Program.cs b/dotnet/samples/03-workflows/Checkpoint/CheckpointAndResume/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointAndResume/Program.cs
rename to dotnet/samples/03-workflows/Checkpoint/CheckpointAndResume/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointAndResume/WorkflowFactory.cs b/dotnet/samples/03-workflows/Checkpoint/CheckpointAndResume/WorkflowFactory.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointAndResume/WorkflowFactory.cs
rename to dotnet/samples/03-workflows/Checkpoint/CheckpointAndResume/WorkflowFactory.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointWithHumanInTheLoop/CheckpointWithHumanInTheLoop.csproj b/dotnet/samples/03-workflows/Checkpoint/CheckpointWithHumanInTheLoop/CheckpointWithHumanInTheLoop.csproj
similarity index 69%
rename from dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointWithHumanInTheLoop/CheckpointWithHumanInTheLoop.csproj
rename to dotnet/samples/03-workflows/Checkpoint/CheckpointWithHumanInTheLoop/CheckpointWithHumanInTheLoop.csproj
index 2f41070759..0de620de0c 100644
--- a/dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointWithHumanInTheLoop/CheckpointWithHumanInTheLoop.csproj
+++ b/dotnet/samples/03-workflows/Checkpoint/CheckpointWithHumanInTheLoop/CheckpointWithHumanInTheLoop.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointWithHumanInTheLoop/Program.cs b/dotnet/samples/03-workflows/Checkpoint/CheckpointWithHumanInTheLoop/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointWithHumanInTheLoop/Program.cs
rename to dotnet/samples/03-workflows/Checkpoint/CheckpointWithHumanInTheLoop/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointWithHumanInTheLoop/WorkflowFactory.cs b/dotnet/samples/03-workflows/Checkpoint/CheckpointWithHumanInTheLoop/WorkflowFactory.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointWithHumanInTheLoop/WorkflowFactory.cs
rename to dotnet/samples/03-workflows/Checkpoint/CheckpointWithHumanInTheLoop/WorkflowFactory.cs
diff --git a/dotnet/samples/03-workflows/Concurrent/Concurrent/Concurrent.csproj b/dotnet/samples/03-workflows/Concurrent/Concurrent/Concurrent.csproj
new file mode 100644
index 0000000000..35897932e0
--- /dev/null
+++ b/dotnet/samples/03-workflows/Concurrent/Concurrent/Concurrent.csproj
@@ -0,0 +1,27 @@
+
+
+
+ Exe
+ net10.0
+
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Concurrent/Concurrent/Program.cs b/dotnet/samples/03-workflows/Concurrent/Concurrent/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Concurrent/Concurrent/Program.cs
rename to dotnet/samples/03-workflows/Concurrent/Concurrent/Program.cs
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step16_ChatReduction/Agent_Step16_ChatReduction.csproj b/dotnet/samples/03-workflows/Concurrent/MapReduce/MapReduce.csproj
similarity index 82%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step16_ChatReduction/Agent_Step16_ChatReduction.csproj
rename to dotnet/samples/03-workflows/Concurrent/MapReduce/MapReduce.csproj
index 0f9de7c359..21a7f8c176 100644
--- a/dotnet/samples/GettingStarted/Agents/Agent_Step16_ChatReduction/Agent_Step16_ChatReduction.csproj
+++ b/dotnet/samples/03-workflows/Concurrent/MapReduce/MapReduce.csproj
@@ -3,19 +3,18 @@
Exe
net10.0
-
+
enable
- enable
-
-
-
+
-
+
+
+
-
+
\ No newline at end of file
diff --git a/dotnet/samples/GettingStarted/Workflows/Concurrent/MapReduce/Program.cs b/dotnet/samples/03-workflows/Concurrent/MapReduce/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Concurrent/MapReduce/Program.cs
rename to dotnet/samples/03-workflows/Concurrent/MapReduce/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/01_EdgeCondition.csproj b/dotnet/samples/03-workflows/ConditionalEdges/01_EdgeCondition/01_EdgeCondition.csproj
similarity index 74%
rename from dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/01_EdgeCondition.csproj
rename to dotnet/samples/03-workflows/ConditionalEdges/01_EdgeCondition/01_EdgeCondition.csproj
index 422c1ca55f..f071e69f06 100644
--- a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/01_EdgeCondition.csproj
+++ b/dotnet/samples/03-workflows/ConditionalEdges/01_EdgeCondition/01_EdgeCondition.csproj
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/Program.cs b/dotnet/samples/03-workflows/ConditionalEdges/01_EdgeCondition/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/Program.cs
rename to dotnet/samples/03-workflows/ConditionalEdges/01_EdgeCondition/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/Resources.cs b/dotnet/samples/03-workflows/ConditionalEdges/01_EdgeCondition/Resources.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/ConditionalEdges/01_EdgeCondition/Resources.cs
rename to dotnet/samples/03-workflows/ConditionalEdges/01_EdgeCondition/Resources.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/02_SwitchCase.csproj b/dotnet/samples/03-workflows/ConditionalEdges/02_SwitchCase/02_SwitchCase.csproj
similarity index 74%
rename from dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/02_SwitchCase.csproj
rename to dotnet/samples/03-workflows/ConditionalEdges/02_SwitchCase/02_SwitchCase.csproj
index 422c1ca55f..f071e69f06 100644
--- a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/02_SwitchCase.csproj
+++ b/dotnet/samples/03-workflows/ConditionalEdges/02_SwitchCase/02_SwitchCase.csproj
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/Program.cs b/dotnet/samples/03-workflows/ConditionalEdges/02_SwitchCase/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/Program.cs
rename to dotnet/samples/03-workflows/ConditionalEdges/02_SwitchCase/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/Resources.cs b/dotnet/samples/03-workflows/ConditionalEdges/02_SwitchCase/Resources.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/ConditionalEdges/02_SwitchCase/Resources.cs
rename to dotnet/samples/03-workflows/ConditionalEdges/02_SwitchCase/Resources.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/03_MultiSelection.csproj b/dotnet/samples/03-workflows/ConditionalEdges/03_MultiSelection/03_MultiSelection.csproj
similarity index 74%
rename from dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/03_MultiSelection.csproj
rename to dotnet/samples/03-workflows/ConditionalEdges/03_MultiSelection/03_MultiSelection.csproj
index 422c1ca55f..f071e69f06 100644
--- a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/03_MultiSelection.csproj
+++ b/dotnet/samples/03-workflows/ConditionalEdges/03_MultiSelection/03_MultiSelection.csproj
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/Program.cs b/dotnet/samples/03-workflows/ConditionalEdges/03_MultiSelection/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/Program.cs
rename to dotnet/samples/03-workflows/ConditionalEdges/03_MultiSelection/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/Resources.cs b/dotnet/samples/03-workflows/ConditionalEdges/03_MultiSelection/Resources.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/Resources.cs
rename to dotnet/samples/03-workflows/ConditionalEdges/03_MultiSelection/Resources.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/ConfirmInput/ConfirmInput.csproj b/dotnet/samples/03-workflows/Declarative/ConfirmInput/ConfirmInput.csproj
similarity index 78%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/ConfirmInput/ConfirmInput.csproj
rename to dotnet/samples/03-workflows/Declarative/ConfirmInput/ConfirmInput.csproj
index da32d18b99..dac2f49921 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/ConfirmInput/ConfirmInput.csproj
+++ b/dotnet/samples/03-workflows/Declarative/ConfirmInput/ConfirmInput.csproj
@@ -1,4 +1,4 @@
-
+
Exe
@@ -25,8 +25,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/ConfirmInput/ConfirmInput.yaml b/dotnet/samples/03-workflows/Declarative/ConfirmInput/ConfirmInput.yaml
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/ConfirmInput/ConfirmInput.yaml
rename to dotnet/samples/03-workflows/Declarative/ConfirmInput/ConfirmInput.yaml
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/ConfirmInput/Program.cs b/dotnet/samples/03-workflows/Declarative/ConfirmInput/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/ConfirmInput/Program.cs
rename to dotnet/samples/03-workflows/Declarative/ConfirmInput/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/CustomerSupport/CustomerSupport.csproj b/dotnet/samples/03-workflows/Declarative/CustomerSupport/CustomerSupport.csproj
similarity index 73%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/CustomerSupport/CustomerSupport.csproj
rename to dotnet/samples/03-workflows/Declarative/CustomerSupport/CustomerSupport.csproj
index 583dbc6e8f..0bc83997d0 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/CustomerSupport/CustomerSupport.csproj
+++ b/dotnet/samples/03-workflows/Declarative/CustomerSupport/CustomerSupport.csproj
@@ -1,4 +1,4 @@
-
+
Exe
@@ -25,12 +25,12 @@
-
-
+
+
-
+
Always
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/CustomerSupport/Program.cs b/dotnet/samples/03-workflows/Declarative/CustomerSupport/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/CustomerSupport/Program.cs
rename to dotnet/samples/03-workflows/Declarative/CustomerSupport/Program.cs
diff --git a/dotnet/samples/03-workflows/Declarative/CustomerSupport/Properties/launchSettings.json b/dotnet/samples/03-workflows/Declarative/CustomerSupport/Properties/launchSettings.json
new file mode 100644
index 0000000000..0d3ba15fc1
--- /dev/null
+++ b/dotnet/samples/03-workflows/Declarative/CustomerSupport/Properties/launchSettings.json
@@ -0,0 +1,19 @@
+{
+ "profiles": {
+ "Default": {
+ "commandName": "Project"
+ },
+ "Reboot": {
+ "commandName": "Project",
+ "commandLineArgs": "\"My PC keeps rebooting and I can't use it.\""
+ },
+ "License": {
+ "commandName": "Project",
+ "commandLineArgs": "\"My M365 Office license key isn't activating.\""
+ },
+ "Windows": {
+ "commandName": "Project",
+ "commandLineArgs": "\"How do I change my mouse speed settings?\""
+ }
+ }
+}
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/CustomerSupport/TicketingPlugin.cs b/dotnet/samples/03-workflows/Declarative/CustomerSupport/TicketingPlugin.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/CustomerSupport/TicketingPlugin.cs
rename to dotnet/samples/03-workflows/Declarative/CustomerSupport/TicketingPlugin.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/DeepResearch/DeepResearch.csproj b/dotnet/samples/03-workflows/Declarative/DeepResearch/DeepResearch.csproj
similarity index 74%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/DeepResearch/DeepResearch.csproj
rename to dotnet/samples/03-workflows/Declarative/DeepResearch/DeepResearch.csproj
index 413fa56210..cd533a0707 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/DeepResearch/DeepResearch.csproj
+++ b/dotnet/samples/03-workflows/Declarative/DeepResearch/DeepResearch.csproj
@@ -1,4 +1,4 @@
-
+
Exe
@@ -25,12 +25,12 @@
-
-
+
+
-
+
Always
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/DeepResearch/Program.cs b/dotnet/samples/03-workflows/Declarative/DeepResearch/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/DeepResearch/Program.cs
rename to dotnet/samples/03-workflows/Declarative/DeepResearch/Program.cs
diff --git a/dotnet/samples/03-workflows/Declarative/DeepResearch/Properties/launchSettings.json b/dotnet/samples/03-workflows/Declarative/DeepResearch/Properties/launchSettings.json
new file mode 100644
index 0000000000..0c6de510b2
--- /dev/null
+++ b/dotnet/samples/03-workflows/Declarative/DeepResearch/Properties/launchSettings.json
@@ -0,0 +1,11 @@
+{
+ "profiles": {
+ "Default": {
+ "commandName": "Project"
+ },
+ "Bus Stop": {
+ "commandName": "Project",
+ "commandLineArgs": "\"What is the closest bus-stop that is next to ISHONI YAKINIKU in Seattle?\""
+ }
+ }
+}
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/DeepResearch/wttr.json b/dotnet/samples/03-workflows/Declarative/DeepResearch/wttr.json
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/DeepResearch/wttr.json
rename to dotnet/samples/03-workflows/Declarative/DeepResearch/wttr.json
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/ExecuteCode.csproj b/dotnet/samples/03-workflows/Declarative/ExecuteCode/ExecuteCode.csproj
similarity index 77%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/ExecuteCode.csproj
rename to dotnet/samples/03-workflows/Declarative/ExecuteCode/ExecuteCode.csproj
index 9725826c7a..6a9c4957c2 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/ExecuteCode.csproj
+++ b/dotnet/samples/03-workflows/Declarative/ExecuteCode/ExecuteCode.csproj
@@ -1,4 +1,4 @@
-
+
Exe
@@ -26,8 +26,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/Generated.cs b/dotnet/samples/03-workflows/Declarative/ExecuteCode/Generated.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/Generated.cs
rename to dotnet/samples/03-workflows/Declarative/ExecuteCode/Generated.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/Program.cs b/dotnet/samples/03-workflows/Declarative/ExecuteCode/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/Program.cs
rename to dotnet/samples/03-workflows/Declarative/ExecuteCode/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj b/dotnet/samples/03-workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj
similarity index 78%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj
rename to dotnet/samples/03-workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj
index 074a31121d..fce40b64d4 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj
+++ b/dotnet/samples/03-workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj
@@ -25,8 +25,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/Program.cs b/dotnet/samples/03-workflows/Declarative/ExecuteWorkflow/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/Program.cs
rename to dotnet/samples/03-workflows/Declarative/ExecuteWorkflow/Program.cs
diff --git a/dotnet/samples/03-workflows/Declarative/ExecuteWorkflow/Properties/launchSettings.json b/dotnet/samples/03-workflows/Declarative/ExecuteWorkflow/Properties/launchSettings.json
new file mode 100644
index 0000000000..b36e876ef8
--- /dev/null
+++ b/dotnet/samples/03-workflows/Declarative/ExecuteWorkflow/Properties/launchSettings.json
@@ -0,0 +1,32 @@
+{
+ "profiles": {
+ "Marketing": {
+ "commandName": "Project",
+ "commandLineArgs": "\"Marketing.yaml\" \"An eco-friendly stainless steel water bottle that keeps drinks cold for 24 hours\""
+ },
+ "MathChat": {
+ "commandName": "Project",
+ "commandLineArgs": "\"MathChat.yaml\" \"How would you compute the value of PI?\""
+ },
+ "Question": {
+ "commandName": "Project",
+ "commandLineArgs": "\"Question.yaml\" \"Iko\""
+ },
+ "Research": {
+ "commandName": "Project",
+ "commandLineArgs": "\"DeepResearch.yaml\" \"What is the closest bus-stop that is next to ISHONI YAKINIKU in Seattle?\""
+ },
+ "ResponseObject": {
+ "commandName": "Project",
+ "commandLineArgs": "\"ResponseObject.yaml\" \"Can you help me plan a trip somewhere soon?\""
+ },
+ "UserInput": {
+ "commandName": "Project",
+ "commandLineArgs": "\"UserInput.yaml\" \"Iko\""
+ },
+ "ParseValue": {
+ "commandName": "Project",
+ "commandLineArgs": "\"Pradeep-ParseValue-Number.yaml\" \"Test this case:\""
+ }
+ }
+}
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/FunctionTools/FunctionTools.csproj b/dotnet/samples/03-workflows/Declarative/FunctionTools/FunctionTools.csproj
similarity index 78%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/FunctionTools/FunctionTools.csproj
rename to dotnet/samples/03-workflows/Declarative/FunctionTools/FunctionTools.csproj
index f8a51cb0f2..f890fb30a8 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/FunctionTools/FunctionTools.csproj
+++ b/dotnet/samples/03-workflows/Declarative/FunctionTools/FunctionTools.csproj
@@ -1,4 +1,4 @@
-
+
Exe
@@ -25,8 +25,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/FunctionTools/FunctionTools.yaml b/dotnet/samples/03-workflows/Declarative/FunctionTools/FunctionTools.yaml
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/FunctionTools/FunctionTools.yaml
rename to dotnet/samples/03-workflows/Declarative/FunctionTools/FunctionTools.yaml
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/FunctionTools/MenuPlugin.cs b/dotnet/samples/03-workflows/Declarative/FunctionTools/MenuPlugin.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/FunctionTools/MenuPlugin.cs
rename to dotnet/samples/03-workflows/Declarative/FunctionTools/MenuPlugin.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/FunctionTools/Program.cs b/dotnet/samples/03-workflows/Declarative/FunctionTools/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/FunctionTools/Program.cs
rename to dotnet/samples/03-workflows/Declarative/FunctionTools/Program.cs
diff --git a/dotnet/samples/03-workflows/Declarative/FunctionTools/Properties/launchSettings.json b/dotnet/samples/03-workflows/Declarative/FunctionTools/Properties/launchSettings.json
new file mode 100644
index 0000000000..defb6318d3
--- /dev/null
+++ b/dotnet/samples/03-workflows/Declarative/FunctionTools/Properties/launchSettings.json
@@ -0,0 +1,11 @@
+{
+ "profiles": {
+ "Default": {
+ "commandName": "Project"
+ },
+ "Soup": {
+ "commandName": "Project",
+ "commandLineArgs": "\"What is the soup of the day?\""
+ }
+ }
+}
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/GenerateCode/GenerateCode.csproj b/dotnet/samples/03-workflows/Declarative/GenerateCode/GenerateCode.csproj
similarity index 84%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/GenerateCode/GenerateCode.csproj
rename to dotnet/samples/03-workflows/Declarative/GenerateCode/GenerateCode.csproj
index 117e27abd8..a85173d289 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/GenerateCode/GenerateCode.csproj
+++ b/dotnet/samples/03-workflows/Declarative/GenerateCode/GenerateCode.csproj
@@ -1,4 +1,4 @@
-
+
Exe
@@ -24,7 +24,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/GenerateCode/Program.cs b/dotnet/samples/03-workflows/Declarative/GenerateCode/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/GenerateCode/Program.cs
rename to dotnet/samples/03-workflows/Declarative/GenerateCode/Program.cs
diff --git a/dotnet/samples/03-workflows/Declarative/GenerateCode/Properties/launchSettings.json b/dotnet/samples/03-workflows/Declarative/GenerateCode/Properties/launchSettings.json
new file mode 100644
index 0000000000..692664eb00
--- /dev/null
+++ b/dotnet/samples/03-workflows/Declarative/GenerateCode/Properties/launchSettings.json
@@ -0,0 +1,28 @@
+{
+ "profiles": {
+ "Marketing": {
+ "commandName": "Project",
+ "commandLineArgs": "\"Marketing.yaml\""
+ },
+ "MathChat": {
+ "commandName": "Project",
+ "commandLineArgs": "\"MathChat.yaml\""
+ },
+ "Question": {
+ "commandName": "Project",
+ "commandLineArgs": "\"Question.yaml\""
+ },
+ "Research": {
+ "commandName": "Project",
+ "commandLineArgs": "\"DeepResearch.yaml\""
+ },
+ "ResponseObject": {
+ "commandName": "Project",
+ "commandLineArgs": "\"ResponseObject.yaml\""
+ },
+ "UserInput": {
+ "commandName": "Project",
+ "commandLineArgs": "\"UserInput.yaml\""
+ }
+ }
+}
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/HostedWorkflow/HostedWorkflow.csproj b/dotnet/samples/03-workflows/Declarative/HostedWorkflow/HostedWorkflow.csproj
similarity index 74%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/HostedWorkflow/HostedWorkflow.csproj
rename to dotnet/samples/03-workflows/Declarative/HostedWorkflow/HostedWorkflow.csproj
index 3cbd0ada95..f9379f38a3 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/HostedWorkflow/HostedWorkflow.csproj
+++ b/dotnet/samples/03-workflows/Declarative/HostedWorkflow/HostedWorkflow.csproj
@@ -1,4 +1,4 @@
-
+
Exe
@@ -26,12 +26,12 @@
-
-
+
+
-
+
Always
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/HostedWorkflow/Program.cs b/dotnet/samples/03-workflows/Declarative/HostedWorkflow/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/HostedWorkflow/Program.cs
rename to dotnet/samples/03-workflows/Declarative/HostedWorkflow/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/InputArguments/InputArguments.csproj b/dotnet/samples/03-workflows/Declarative/InputArguments/InputArguments.csproj
similarity index 78%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/InputArguments/InputArguments.csproj
rename to dotnet/samples/03-workflows/Declarative/InputArguments/InputArguments.csproj
index 5ef0b7e99e..45bc44eaf3 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/InputArguments/InputArguments.csproj
+++ b/dotnet/samples/03-workflows/Declarative/InputArguments/InputArguments.csproj
@@ -1,4 +1,4 @@
-
+
Exe
@@ -25,8 +25,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/InputArguments/InputArguments.yaml b/dotnet/samples/03-workflows/Declarative/InputArguments/InputArguments.yaml
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/InputArguments/InputArguments.yaml
rename to dotnet/samples/03-workflows/Declarative/InputArguments/InputArguments.yaml
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/InputArguments/Program.cs b/dotnet/samples/03-workflows/Declarative/InputArguments/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/InputArguments/Program.cs
rename to dotnet/samples/03-workflows/Declarative/InputArguments/Program.cs
diff --git a/dotnet/samples/03-workflows/Declarative/InputArguments/Properties/launchSettings.json b/dotnet/samples/03-workflows/Declarative/InputArguments/Properties/launchSettings.json
new file mode 100644
index 0000000000..f95e48286c
--- /dev/null
+++ b/dotnet/samples/03-workflows/Declarative/InputArguments/Properties/launchSettings.json
@@ -0,0 +1,11 @@
+{
+ "profiles": {
+ "Default": {
+ "commandName": "Project"
+ },
+ "Vacation": {
+ "commandName": "Project",
+ "commandLineArgs": "\"I'd like to go on vacation.\""
+ }
+ }
+}
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/InvokeFunctionTool/InvokeFunctionTool.csproj b/dotnet/samples/03-workflows/Declarative/InvokeFunctionTool/InvokeFunctionTool.csproj
similarity index 80%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/InvokeFunctionTool/InvokeFunctionTool.csproj
rename to dotnet/samples/03-workflows/Declarative/InvokeFunctionTool/InvokeFunctionTool.csproj
index 23e1c91e0a..67229da4b8 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/InvokeFunctionTool/InvokeFunctionTool.csproj
+++ b/dotnet/samples/03-workflows/Declarative/InvokeFunctionTool/InvokeFunctionTool.csproj
@@ -25,8 +25,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/InvokeFunctionTool/InvokeFunctionTool.yaml b/dotnet/samples/03-workflows/Declarative/InvokeFunctionTool/InvokeFunctionTool.yaml
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/InvokeFunctionTool/InvokeFunctionTool.yaml
rename to dotnet/samples/03-workflows/Declarative/InvokeFunctionTool/InvokeFunctionTool.yaml
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/InvokeFunctionTool/MenuPlugin.cs b/dotnet/samples/03-workflows/Declarative/InvokeFunctionTool/MenuPlugin.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/InvokeFunctionTool/MenuPlugin.cs
rename to dotnet/samples/03-workflows/Declarative/InvokeFunctionTool/MenuPlugin.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/InvokeFunctionTool/Program.cs b/dotnet/samples/03-workflows/Declarative/InvokeFunctionTool/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/InvokeFunctionTool/Program.cs
rename to dotnet/samples/03-workflows/Declarative/InvokeFunctionTool/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/Marketing/Marketing.csproj b/dotnet/samples/03-workflows/Declarative/Marketing/Marketing.csproj
similarity index 73%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/Marketing/Marketing.csproj
rename to dotnet/samples/03-workflows/Declarative/Marketing/Marketing.csproj
index ceba7b740b..20e5843554 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/Marketing/Marketing.csproj
+++ b/dotnet/samples/03-workflows/Declarative/Marketing/Marketing.csproj
@@ -1,4 +1,4 @@
-
+
Exe
@@ -25,12 +25,12 @@
-
-
+
+
-
+
Always
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/Marketing/Program.cs b/dotnet/samples/03-workflows/Declarative/Marketing/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/Marketing/Program.cs
rename to dotnet/samples/03-workflows/Declarative/Marketing/Program.cs
diff --git a/dotnet/samples/03-workflows/Declarative/Marketing/Properties/launchSettings.json b/dotnet/samples/03-workflows/Declarative/Marketing/Properties/launchSettings.json
new file mode 100644
index 0000000000..be4e107472
--- /dev/null
+++ b/dotnet/samples/03-workflows/Declarative/Marketing/Properties/launchSettings.json
@@ -0,0 +1,11 @@
+{
+ "profiles": {
+ "Default": {
+ "commandName": "Project"
+ },
+ "Water Bottle": {
+ "commandName": "Project",
+ "commandLineArgs": "\"An eco-friendly stainless steel water bottle that keeps drinks cold for 24 hours.\""
+ }
+ }
+}
diff --git a/dotnet/samples/03-workflows/Declarative/OpenAIChatAgent/Properties/launchSettings.json b/dotnet/samples/03-workflows/Declarative/OpenAIChatAgent/Properties/launchSettings.json
new file mode 100644
index 0000000000..b36e876ef8
--- /dev/null
+++ b/dotnet/samples/03-workflows/Declarative/OpenAIChatAgent/Properties/launchSettings.json
@@ -0,0 +1,32 @@
+{
+ "profiles": {
+ "Marketing": {
+ "commandName": "Project",
+ "commandLineArgs": "\"Marketing.yaml\" \"An eco-friendly stainless steel water bottle that keeps drinks cold for 24 hours\""
+ },
+ "MathChat": {
+ "commandName": "Project",
+ "commandLineArgs": "\"MathChat.yaml\" \"How would you compute the value of PI?\""
+ },
+ "Question": {
+ "commandName": "Project",
+ "commandLineArgs": "\"Question.yaml\" \"Iko\""
+ },
+ "Research": {
+ "commandName": "Project",
+ "commandLineArgs": "\"DeepResearch.yaml\" \"What is the closest bus-stop that is next to ISHONI YAKINIKU in Seattle?\""
+ },
+ "ResponseObject": {
+ "commandName": "Project",
+ "commandLineArgs": "\"ResponseObject.yaml\" \"Can you help me plan a trip somewhere soon?\""
+ },
+ "UserInput": {
+ "commandName": "Project",
+ "commandLineArgs": "\"UserInput.yaml\" \"Iko\""
+ },
+ "ParseValue": {
+ "commandName": "Project",
+ "commandLineArgs": "\"Pradeep-ParseValue-Number.yaml\" \"Test this case:\""
+ }
+ }
+}
diff --git a/dotnet/samples/03-workflows/Declarative/OpenAIResponseAgent/Properties/launchSettings.json b/dotnet/samples/03-workflows/Declarative/OpenAIResponseAgent/Properties/launchSettings.json
new file mode 100644
index 0000000000..b36e876ef8
--- /dev/null
+++ b/dotnet/samples/03-workflows/Declarative/OpenAIResponseAgent/Properties/launchSettings.json
@@ -0,0 +1,32 @@
+{
+ "profiles": {
+ "Marketing": {
+ "commandName": "Project",
+ "commandLineArgs": "\"Marketing.yaml\" \"An eco-friendly stainless steel water bottle that keeps drinks cold for 24 hours\""
+ },
+ "MathChat": {
+ "commandName": "Project",
+ "commandLineArgs": "\"MathChat.yaml\" \"How would you compute the value of PI?\""
+ },
+ "Question": {
+ "commandName": "Project",
+ "commandLineArgs": "\"Question.yaml\" \"Iko\""
+ },
+ "Research": {
+ "commandName": "Project",
+ "commandLineArgs": "\"DeepResearch.yaml\" \"What is the closest bus-stop that is next to ISHONI YAKINIKU in Seattle?\""
+ },
+ "ResponseObject": {
+ "commandName": "Project",
+ "commandLineArgs": "\"ResponseObject.yaml\" \"Can you help me plan a trip somewhere soon?\""
+ },
+ "UserInput": {
+ "commandName": "Project",
+ "commandLineArgs": "\"UserInput.yaml\" \"Iko\""
+ },
+ "ParseValue": {
+ "commandName": "Project",
+ "commandLineArgs": "\"Pradeep-ParseValue-Number.yaml\" \"Test this case:\""
+ }
+ }
+}
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/README.md b/dotnet/samples/03-workflows/Declarative/README.md
similarity index 95%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/README.md
rename to dotnet/samples/03-workflows/Declarative/README.md
index 665c37101e..e2afa58671 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/README.md
+++ b/dotnet/samples/03-workflows/Declarative/README.md
@@ -27,7 +27,7 @@ To set your secrets with .NET Secret Manager:
1. From the root of the repository, navigate the console to the project folder:
```
- cd dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow
+ cd dotnet/samples/03-workflows/Declarative/ExecuteWorkflow
```
2. Examine existing secret definitions:
@@ -86,7 +86,7 @@ To run the sampes from the command line:
1. From the root of the repository, navigate the console to the project folder:
```sh
- cd dotnet/samples/GettingStarted/Workflows/Declarative/Marketing
+ cd dotnet/samples/03-workflows/Declarative/Marketing
dotnet run Marketing
```
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/StudentTeacher/Program.cs b/dotnet/samples/03-workflows/Declarative/StudentTeacher/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/StudentTeacher/Program.cs
rename to dotnet/samples/03-workflows/Declarative/StudentTeacher/Program.cs
diff --git a/dotnet/samples/03-workflows/Declarative/StudentTeacher/Properties/launchSettings.json b/dotnet/samples/03-workflows/Declarative/StudentTeacher/Properties/launchSettings.json
new file mode 100644
index 0000000000..e428c6e5f3
--- /dev/null
+++ b/dotnet/samples/03-workflows/Declarative/StudentTeacher/Properties/launchSettings.json
@@ -0,0 +1,11 @@
+{
+ "profiles": {
+ "Default": {
+ "commandName": "Project"
+ },
+ "Compute PI": {
+ "commandName": "Project",
+ "commandLineArgs": "\"How would you compute the value of PI based on its fundamental definition?\""
+ }
+ }
+}
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/StudentTeacher/StudentTeacher.csproj b/dotnet/samples/03-workflows/Declarative/StudentTeacher/StudentTeacher.csproj
similarity index 73%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/StudentTeacher/StudentTeacher.csproj
rename to dotnet/samples/03-workflows/Declarative/StudentTeacher/StudentTeacher.csproj
index 862e39bd99..8136706b8d 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/StudentTeacher/StudentTeacher.csproj
+++ b/dotnet/samples/03-workflows/Declarative/StudentTeacher/StudentTeacher.csproj
@@ -1,4 +1,4 @@
-
+
Exe
@@ -25,12 +25,12 @@
-
-
+
+
-
+
Always
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/ToolApproval/Program.cs b/dotnet/samples/03-workflows/Declarative/ToolApproval/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/ToolApproval/Program.cs
rename to dotnet/samples/03-workflows/Declarative/ToolApproval/Program.cs
diff --git a/dotnet/samples/03-workflows/Declarative/ToolApproval/Properties/launchSettings.json b/dotnet/samples/03-workflows/Declarative/ToolApproval/Properties/launchSettings.json
new file mode 100644
index 0000000000..74291845be
--- /dev/null
+++ b/dotnet/samples/03-workflows/Declarative/ToolApproval/Properties/launchSettings.json
@@ -0,0 +1,11 @@
+{
+ "profiles": {
+ "Default": {
+ "commandName": "Project"
+ },
+ "Graph API": {
+ "commandName": "Project",
+ "commandLineArgs": "\"What is Microsoft Graph API used for?\""
+ }
+ }
+}
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/ToolApproval/ToolApproval.csproj b/dotnet/samples/03-workflows/Declarative/ToolApproval/ToolApproval.csproj
similarity index 78%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/ToolApproval/ToolApproval.csproj
rename to dotnet/samples/03-workflows/Declarative/ToolApproval/ToolApproval.csproj
index 1ebaa26645..a44e140f1f 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/ToolApproval/ToolApproval.csproj
+++ b/dotnet/samples/03-workflows/Declarative/ToolApproval/ToolApproval.csproj
@@ -1,4 +1,4 @@
-
+
Exe
@@ -25,8 +25,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/ToolApproval/ToolApproval.yaml b/dotnet/samples/03-workflows/Declarative/ToolApproval/ToolApproval.yaml
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/ToolApproval/ToolApproval.yaml
rename to dotnet/samples/03-workflows/Declarative/ToolApproval/ToolApproval.yaml
diff --git a/dotnet/samples/GettingStarted/Workflows/HumanInTheLoop/HumanInTheLoopBasic/HumanInTheLoopBasic.csproj b/dotnet/samples/03-workflows/HumanInTheLoop/HumanInTheLoopBasic/HumanInTheLoopBasic.csproj
similarity index 69%
rename from dotnet/samples/GettingStarted/Workflows/HumanInTheLoop/HumanInTheLoopBasic/HumanInTheLoopBasic.csproj
rename to dotnet/samples/03-workflows/HumanInTheLoop/HumanInTheLoopBasic/HumanInTheLoopBasic.csproj
index 2f41070759..0de620de0c 100644
--- a/dotnet/samples/GettingStarted/Workflows/HumanInTheLoop/HumanInTheLoopBasic/HumanInTheLoopBasic.csproj
+++ b/dotnet/samples/03-workflows/HumanInTheLoop/HumanInTheLoopBasic/HumanInTheLoopBasic.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Workflows/HumanInTheLoop/HumanInTheLoopBasic/Program.cs b/dotnet/samples/03-workflows/HumanInTheLoop/HumanInTheLoopBasic/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/HumanInTheLoop/HumanInTheLoopBasic/Program.cs
rename to dotnet/samples/03-workflows/HumanInTheLoop/HumanInTheLoopBasic/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/HumanInTheLoop/HumanInTheLoopBasic/WorkflowFactory.cs b/dotnet/samples/03-workflows/HumanInTheLoop/HumanInTheLoopBasic/WorkflowFactory.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/HumanInTheLoop/HumanInTheLoopBasic/WorkflowFactory.cs
rename to dotnet/samples/03-workflows/HumanInTheLoop/HumanInTheLoopBasic/WorkflowFactory.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointAndResume/CheckpointAndResume.csproj b/dotnet/samples/03-workflows/Loop/Loop.csproj
similarity index 69%
rename from dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointAndResume/CheckpointAndResume.csproj
rename to dotnet/samples/03-workflows/Loop/Loop.csproj
index 2f41070759..8430479a72 100644
--- a/dotnet/samples/GettingStarted/Workflows/Checkpoint/CheckpointAndResume/CheckpointAndResume.csproj
+++ b/dotnet/samples/03-workflows/Loop/Loop.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Loop/Program.cs b/dotnet/samples/03-workflows/Loop/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Loop/Program.cs
rename to dotnet/samples/03-workflows/Loop/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Observability/ApplicationInsights/ApplicationInsights.csproj b/dotnet/samples/03-workflows/Observability/ApplicationInsights/ApplicationInsights.csproj
similarity index 83%
rename from dotnet/samples/GettingStarted/Workflows/Observability/ApplicationInsights/ApplicationInsights.csproj
rename to dotnet/samples/03-workflows/Observability/ApplicationInsights/ApplicationInsights.csproj
index 4c91a01fad..0e868d5705 100644
--- a/dotnet/samples/GettingStarted/Workflows/Observability/ApplicationInsights/ApplicationInsights.csproj
+++ b/dotnet/samples/03-workflows/Observability/ApplicationInsights/ApplicationInsights.csproj
@@ -18,7 +18,7 @@
-
+
\ No newline at end of file
diff --git a/dotnet/samples/GettingStarted/Workflows/Observability/ApplicationInsights/Program.cs b/dotnet/samples/03-workflows/Observability/ApplicationInsights/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Observability/ApplicationInsights/Program.cs
rename to dotnet/samples/03-workflows/Observability/ApplicationInsights/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Observability/AspireDashboard/AspireDashboard.csproj b/dotnet/samples/03-workflows/Observability/AspireDashboard/AspireDashboard.csproj
similarity index 84%
rename from dotnet/samples/GettingStarted/Workflows/Observability/AspireDashboard/AspireDashboard.csproj
rename to dotnet/samples/03-workflows/Observability/AspireDashboard/AspireDashboard.csproj
index 57b34f3d69..73e0cf67fb 100644
--- a/dotnet/samples/GettingStarted/Workflows/Observability/AspireDashboard/AspireDashboard.csproj
+++ b/dotnet/samples/03-workflows/Observability/AspireDashboard/AspireDashboard.csproj
@@ -19,7 +19,7 @@
-
+
\ No newline at end of file
diff --git a/dotnet/samples/GettingStarted/Workflows/Observability/AspireDashboard/Program.cs b/dotnet/samples/03-workflows/Observability/AspireDashboard/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Observability/AspireDashboard/Program.cs
rename to dotnet/samples/03-workflows/Observability/AspireDashboard/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Observability/WorkflowAsAnAgent/Program.cs b/dotnet/samples/03-workflows/Observability/WorkflowAsAnAgent/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Observability/WorkflowAsAnAgent/Program.cs
rename to dotnet/samples/03-workflows/Observability/WorkflowAsAnAgent/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Observability/WorkflowAsAnAgent/WorkflowAsAnAgentObservability.csproj b/dotnet/samples/03-workflows/Observability/WorkflowAsAnAgent/WorkflowAsAnAgentObservability.csproj
similarity index 72%
rename from dotnet/samples/GettingStarted/Workflows/Observability/WorkflowAsAnAgent/WorkflowAsAnAgentObservability.csproj
rename to dotnet/samples/03-workflows/Observability/WorkflowAsAnAgent/WorkflowAsAnAgentObservability.csproj
index 6a2d02be9b..280631fdc9 100644
--- a/dotnet/samples/GettingStarted/Workflows/Observability/WorkflowAsAnAgent/WorkflowAsAnAgentObservability.csproj
+++ b/dotnet/samples/03-workflows/Observability/WorkflowAsAnAgent/WorkflowAsAnAgentObservability.csproj
@@ -22,11 +22,11 @@
-
-
+
-
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Observability/WorkflowAsAnAgent/WorkflowHelper.cs b/dotnet/samples/03-workflows/Observability/WorkflowAsAnAgent/WorkflowHelper.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Observability/WorkflowAsAnAgent/WorkflowHelper.cs
rename to dotnet/samples/03-workflows/Observability/WorkflowAsAnAgent/WorkflowHelper.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/README.md b/dotnet/samples/03-workflows/README.md
similarity index 68%
rename from dotnet/samples/GettingStarted/Workflows/README.md
rename to dotnet/samples/03-workflows/README.md
index f7704d0e42..2b8d375654 100644
--- a/dotnet/samples/GettingStarted/Workflows/README.md
+++ b/dotnet/samples/03-workflows/README.md
@@ -6,20 +6,19 @@ The getting started with workflow samples demonstrate the fundamental concepts a
### Foundational Concepts - Start Here
-Please begin with the [Foundational](./_Foundational) samples in order. These three samples introduce the core concepts of executors, edges, agents in workflows, streaming, and workflow construction.
+Please begin with the [Start Here](./_StartHere) samples in order. These three samples introduce the core concepts of executors, edges, agents in workflows, streaming, and workflow construction.
-> The folder name starts with an underscore (`_Foundational`) to ensure it appears first in the explorer view.
+> The folder name starts with an underscore (`_StartHere`) to ensure it appears first in the explorer view.
| Sample | Concepts |
|--------|----------|
-| [Executors and Edges](./_Foundational/01_ExecutorsAndEdges) | Minimal workflow with basic executors and edges |
-| [Streaming](./_Foundational/02_Streaming) | Extends workflows with event streaming |
-| [Agents](./_Foundational/03_AgentsInWorkflows) | Use agents in workflows |
-| [Agentic Workflow Patterns](./_Foundational/04_AgentWorkflowPatterns) | Demonstrates common agentic workflow patterns |
-| [Multi-Service Workflows](./_Foundational/05_MultiModelService) | Shows using multiple AI services in the same workflow |
-| [Sub-Workflows](./_Foundational/06_SubWorkflows) | Demonstrates composing workflows hierarchically by embedding workflows as executors |
-| [Mixed Workflow with Agents and Executors](./_Foundational/07_MixedWorkflowAgentsAndExecutors) | Shows how to mix agents and executors with adapter pattern for type conversion and protocol handling |
-| [Writer-Critic Workflow](./_Foundational/08_WriterCriticWorkflow) | Demonstrates iterative refinement with quality gates, max iteration safety, multiple message handlers, and conditional routing for feedback loops |
+| [Streaming](./_StartHere/01_Streaming) | Extends workflows with event streaming |
+| [Agents](./_StartHere/02_AgentsInWorkflows) | Use agents in workflows |
+| [Agentic Workflow Patterns](./_StartHere/03_AgentWorkflowPatterns) | Demonstrates common agentic workflow patterns |
+| [Multi-Service Workflows](./_StartHere/04_MultiModelService) | Shows using multiple AI services in the same workflow |
+| [Sub-Workflows](./_StartHere/05_SubWorkflows) | Demonstrates composing workflows hierarchically by embedding workflows as executors |
+| [Mixed Workflow with Agents and Executors](./_StartHere/06_MixedWorkflowAgentsAndExecutors) | Shows how to mix agents and executors with adapter pattern for type conversion and protocol handling |
+| [Writer-Critic Workflow](./_StartHere/07_WriterCriticWorkflow) | Demonstrates iterative refinement with quality gates, max iteration safety, multiple message handlers, and conditional routing for feedback loops |
Once completed, please proceed to other samples listed below.
diff --git a/dotnet/samples/GettingStarted/Workflows/Resources/Lorem_Ipsum.txt b/dotnet/samples/03-workflows/Resources/Lorem_Ipsum.txt
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Resources/Lorem_Ipsum.txt
rename to dotnet/samples/03-workflows/Resources/Lorem_Ipsum.txt
diff --git a/dotnet/samples/GettingStarted/Workflows/Resources/ambiguous_email.txt b/dotnet/samples/03-workflows/Resources/ambiguous_email.txt
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Resources/ambiguous_email.txt
rename to dotnet/samples/03-workflows/Resources/ambiguous_email.txt
diff --git a/dotnet/samples/GettingStarted/Workflows/Resources/email.txt b/dotnet/samples/03-workflows/Resources/email.txt
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Resources/email.txt
rename to dotnet/samples/03-workflows/Resources/email.txt
diff --git a/dotnet/samples/GettingStarted/Workflows/Resources/spam.txt b/dotnet/samples/03-workflows/Resources/spam.txt
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Resources/spam.txt
rename to dotnet/samples/03-workflows/Resources/spam.txt
diff --git a/dotnet/samples/GettingStarted/Workflows/SharedStates/Program.cs b/dotnet/samples/03-workflows/SharedStates/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/SharedStates/Program.cs
rename to dotnet/samples/03-workflows/SharedStates/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/SharedStates/Resources.cs b/dotnet/samples/03-workflows/SharedStates/Resources.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/SharedStates/Resources.cs
rename to dotnet/samples/03-workflows/SharedStates/Resources.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/SharedStates/SharedStates.csproj b/dotnet/samples/03-workflows/SharedStates/SharedStates.csproj
similarity index 79%
rename from dotnet/samples/GettingStarted/Workflows/SharedStates/SharedStates.csproj
rename to dotnet/samples/03-workflows/SharedStates/SharedStates.csproj
index 35f87e7ebe..f8d9efcc03 100644
--- a/dotnet/samples/GettingStarted/Workflows/SharedStates/SharedStates.csproj
+++ b/dotnet/samples/03-workflows/SharedStates/SharedStates.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/dotnet/samples/GettingStarted/Workflows/Visualization/Program.cs b/dotnet/samples/03-workflows/Visualization/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Visualization/Program.cs
rename to dotnet/samples/03-workflows/Visualization/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Visualization/README.md b/dotnet/samples/03-workflows/Visualization/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Visualization/README.md
rename to dotnet/samples/03-workflows/Visualization/README.md
diff --git a/dotnet/samples/GettingStarted/Workflows/Visualization/Resources/graphviz_render.png b/dotnet/samples/03-workflows/Visualization/Resources/graphviz_render.png
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Visualization/Resources/graphviz_render.png
rename to dotnet/samples/03-workflows/Visualization/Resources/graphviz_render.png
diff --git a/dotnet/samples/GettingStarted/Workflows/Visualization/Resources/mermaid_render.png b/dotnet/samples/03-workflows/Visualization/Resources/mermaid_render.png
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Visualization/Resources/mermaid_render.png
rename to dotnet/samples/03-workflows/Visualization/Resources/mermaid_render.png
diff --git a/dotnet/samples/03-workflows/Visualization/Visualization.csproj b/dotnet/samples/03-workflows/Visualization/Visualization.csproj
new file mode 100644
index 0000000000..7f9f03dff4
--- /dev/null
+++ b/dotnet/samples/03-workflows/Visualization/Visualization.csproj
@@ -0,0 +1,16 @@
+
+
+
+ Exe
+ net10.0
+
+ enable
+ enable
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/03-workflows/_StartHere/01_Streaming/01_Streaming.csproj b/dotnet/samples/03-workflows/_StartHere/01_Streaming/01_Streaming.csproj
new file mode 100644
index 0000000000..0de620de0c
--- /dev/null
+++ b/dotnet/samples/03-workflows/_StartHere/01_Streaming/01_Streaming.csproj
@@ -0,0 +1,15 @@
+
+
+
+ Exe
+ net10.0
+
+ enable
+ enable
+
+
+
+
+
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/02_Streaming/Program.cs b/dotnet/samples/03-workflows/_StartHere/01_Streaming/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/_Foundational/02_Streaming/Program.cs
rename to dotnet/samples/03-workflows/_StartHere/01_Streaming/Program.cs
diff --git a/dotnet/samples/03-workflows/_StartHere/02_AgentsInWorkflows/02_AgentsInWorkflows.csproj b/dotnet/samples/03-workflows/_StartHere/02_AgentsInWorkflows/02_AgentsInWorkflows.csproj
new file mode 100644
index 0000000000..e926a8375a
--- /dev/null
+++ b/dotnet/samples/03-workflows/_StartHere/02_AgentsInWorkflows/02_AgentsInWorkflows.csproj
@@ -0,0 +1,22 @@
+
+
+
+ Exe
+ net10.0
+
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/03_AgentsInWorkflows/Program.cs b/dotnet/samples/03-workflows/_StartHere/02_AgentsInWorkflows/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/_Foundational/03_AgentsInWorkflows/Program.cs
rename to dotnet/samples/03-workflows/_StartHere/02_AgentsInWorkflows/Program.cs
diff --git a/dotnet/samples/03-workflows/_StartHere/03_AgentWorkflowPatterns/03_AgentWorkflowPatterns.csproj b/dotnet/samples/03-workflows/_StartHere/03_AgentWorkflowPatterns/03_AgentWorkflowPatterns.csproj
new file mode 100644
index 0000000000..e926a8375a
--- /dev/null
+++ b/dotnet/samples/03-workflows/_StartHere/03_AgentWorkflowPatterns/03_AgentWorkflowPatterns.csproj
@@ -0,0 +1,22 @@
+
+
+
+ Exe
+ net10.0
+
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/04_AgentWorkflowPatterns/Program.cs b/dotnet/samples/03-workflows/_StartHere/03_AgentWorkflowPatterns/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/_Foundational/04_AgentWorkflowPatterns/Program.cs
rename to dotnet/samples/03-workflows/_StartHere/03_AgentWorkflowPatterns/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/05_MultiModelService/05_MultiModelService.csproj b/dotnet/samples/03-workflows/_StartHere/04_MultiModelService/04_MultiModelService.csproj
similarity index 68%
rename from dotnet/samples/GettingStarted/Workflows/_Foundational/05_MultiModelService/05_MultiModelService.csproj
rename to dotnet/samples/03-workflows/_StartHere/04_MultiModelService/04_MultiModelService.csproj
index bc5cc0d67d..ee2bd37bf2 100644
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/05_MultiModelService/05_MultiModelService.csproj
+++ b/dotnet/samples/03-workflows/_StartHere/04_MultiModelService/04_MultiModelService.csproj
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/05_MultiModelService/Program.cs b/dotnet/samples/03-workflows/_StartHere/04_MultiModelService/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/_Foundational/05_MultiModelService/Program.cs
rename to dotnet/samples/03-workflows/_StartHere/04_MultiModelService/Program.cs
diff --git a/dotnet/samples/03-workflows/_StartHere/05_SubWorkflows/05_SubWorkflows.csproj b/dotnet/samples/03-workflows/_StartHere/05_SubWorkflows/05_SubWorkflows.csproj
new file mode 100644
index 0000000000..072cc2cec3
--- /dev/null
+++ b/dotnet/samples/03-workflows/_StartHere/05_SubWorkflows/05_SubWorkflows.csproj
@@ -0,0 +1,16 @@
+
+
+
+ Exe
+ net10.0
+
+ enable
+ enable
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/06_SubWorkflows/Program.cs b/dotnet/samples/03-workflows/_StartHere/05_SubWorkflows/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/_Foundational/06_SubWorkflows/Program.cs
rename to dotnet/samples/03-workflows/_StartHere/05_SubWorkflows/Program.cs
diff --git a/dotnet/samples/03-workflows/_StartHere/06_MixedWorkflowAgentsAndExecutors/06_MixedWorkflowAgentsAndExecutors.csproj b/dotnet/samples/03-workflows/_StartHere/06_MixedWorkflowAgentsAndExecutors/06_MixedWorkflowAgentsAndExecutors.csproj
new file mode 100644
index 0000000000..e926a8375a
--- /dev/null
+++ b/dotnet/samples/03-workflows/_StartHere/06_MixedWorkflowAgentsAndExecutors/06_MixedWorkflowAgentsAndExecutors.csproj
@@ -0,0 +1,22 @@
+
+
+
+ Exe
+ net10.0
+
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/Program.cs b/dotnet/samples/03-workflows/_StartHere/06_MixedWorkflowAgentsAndExecutors/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/Program.cs
rename to dotnet/samples/03-workflows/_StartHere/06_MixedWorkflowAgentsAndExecutors/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/README.md b/dotnet/samples/03-workflows/_StartHere/06_MixedWorkflowAgentsAndExecutors/README.md
similarity index 99%
rename from dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/README.md
rename to dotnet/samples/03-workflows/_StartHere/06_MixedWorkflowAgentsAndExecutors/README.md
index 4ec203892b..5b93a83b6f 100644
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/README.md
+++ b/dotnet/samples/03-workflows/_StartHere/06_MixedWorkflowAgentsAndExecutors/README.md
@@ -146,8 +146,8 @@ I cannot process this request as it appears to contain unsafe content.
## Related Samples
+- **05_first_workflow** - Basic executor and edge concepts
- **03_AgentsInWorkflows** - Introduction to using agents in workflows
-- **01_ExecutorsAndEdges** - Basic executor and edge concepts
- **02_Streaming** - Understanding streaming events
- **Concurrent** - Parallel processing with fan-out/fan-in patterns
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/08_WriterCriticWorkflow/08_WriterCriticWorkflow.csproj b/dotnet/samples/03-workflows/_StartHere/07_WriterCriticWorkflow/07_WriterCriticWorkflow.csproj
similarity index 61%
rename from dotnet/samples/GettingStarted/Workflows/_Foundational/08_WriterCriticWorkflow/08_WriterCriticWorkflow.csproj
rename to dotnet/samples/03-workflows/_StartHere/07_WriterCriticWorkflow/07_WriterCriticWorkflow.csproj
index b9139c05ba..8486cebfb1 100644
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/08_WriterCriticWorkflow/08_WriterCriticWorkflow.csproj
+++ b/dotnet/samples/03-workflows/_StartHere/07_WriterCriticWorkflow/07_WriterCriticWorkflow.csproj
@@ -1,4 +1,4 @@
-
+
Exe
@@ -10,12 +10,12 @@
-
-
+
-
+
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/08_WriterCriticWorkflow/Program.cs b/dotnet/samples/03-workflows/_StartHere/07_WriterCriticWorkflow/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/_Foundational/08_WriterCriticWorkflow/Program.cs
rename to dotnet/samples/03-workflows/_StartHere/07_WriterCriticWorkflow/Program.cs
diff --git a/dotnet/samples/GettingStarted/A2A/A2AAgent_AsFunctionTools/A2AAgent_AsFunctionTools.csproj b/dotnet/samples/04-hosting/A2A/A2AAgent_AsFunctionTools/A2AAgent_AsFunctionTools.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/A2A/A2AAgent_AsFunctionTools/A2AAgent_AsFunctionTools.csproj
rename to dotnet/samples/04-hosting/A2A/A2AAgent_AsFunctionTools/A2AAgent_AsFunctionTools.csproj
diff --git a/dotnet/samples/GettingStarted/A2A/A2AAgent_AsFunctionTools/Program.cs b/dotnet/samples/04-hosting/A2A/A2AAgent_AsFunctionTools/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/A2A/A2AAgent_AsFunctionTools/Program.cs
rename to dotnet/samples/04-hosting/A2A/A2AAgent_AsFunctionTools/Program.cs
diff --git a/dotnet/samples/GettingStarted/A2A/A2AAgent_AsFunctionTools/README.md b/dotnet/samples/04-hosting/A2A/A2AAgent_AsFunctionTools/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/A2A/A2AAgent_AsFunctionTools/README.md
rename to dotnet/samples/04-hosting/A2A/A2AAgent_AsFunctionTools/README.md
diff --git a/dotnet/samples/GettingStarted/A2A/A2AAgent_PollingForTaskCompletion/A2AAgent_PollingForTaskCompletion.csproj b/dotnet/samples/04-hosting/A2A/A2AAgent_PollingForTaskCompletion/A2AAgent_PollingForTaskCompletion.csproj
similarity index 100%
rename from dotnet/samples/GettingStarted/A2A/A2AAgent_PollingForTaskCompletion/A2AAgent_PollingForTaskCompletion.csproj
rename to dotnet/samples/04-hosting/A2A/A2AAgent_PollingForTaskCompletion/A2AAgent_PollingForTaskCompletion.csproj
diff --git a/dotnet/samples/GettingStarted/A2A/A2AAgent_PollingForTaskCompletion/Program.cs b/dotnet/samples/04-hosting/A2A/A2AAgent_PollingForTaskCompletion/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/A2A/A2AAgent_PollingForTaskCompletion/Program.cs
rename to dotnet/samples/04-hosting/A2A/A2AAgent_PollingForTaskCompletion/Program.cs
diff --git a/dotnet/samples/GettingStarted/A2A/A2AAgent_PollingForTaskCompletion/README.md b/dotnet/samples/04-hosting/A2A/A2AAgent_PollingForTaskCompletion/README.md
similarity index 100%
rename from dotnet/samples/GettingStarted/A2A/A2AAgent_PollingForTaskCompletion/README.md
rename to dotnet/samples/04-hosting/A2A/A2AAgent_PollingForTaskCompletion/README.md
diff --git a/dotnet/samples/GettingStarted/A2A/README.md b/dotnet/samples/04-hosting/A2A/README.md
similarity index 95%
rename from dotnet/samples/GettingStarted/A2A/README.md
rename to dotnet/samples/04-hosting/A2A/README.md
index b513ffa929..55539a8322 100644
--- a/dotnet/samples/GettingStarted/A2A/README.md
+++ b/dotnet/samples/04-hosting/A2A/README.md
@@ -3,7 +3,7 @@
These samples demonstrate how to work with Agent-to-Agent (A2A) specific features in the Agent Framework.
For other samples that demonstrate how to use AIAgent instances,
-see the [Getting Started With Agents](../Agents/README.md) samples.
+see the [Getting Started With Agents](../../02-agents/Agents/README.md) samples.
## Prerequisites
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/.editorconfig b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/.editorconfig
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/.editorconfig
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/.editorconfig
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/02_AgentOrchestration_Chaining.csproj b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/01_AgentOrchestration_Chaining/01_AgentOrchestration_Chaining.csproj
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/02_AgentOrchestration_Chaining.csproj
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/01_AgentOrchestration_Chaining/01_AgentOrchestration_Chaining.csproj
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/FunctionTriggers.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/01_AgentOrchestration_Chaining/FunctionTriggers.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/FunctionTriggers.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/01_AgentOrchestration_Chaining/FunctionTriggers.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/Program.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/01_AgentOrchestration_Chaining/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/Program.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/01_AgentOrchestration_Chaining/Program.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/README.md b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/01_AgentOrchestration_Chaining/README.md
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/README.md
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/01_AgentOrchestration_Chaining/README.md
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/demo.http b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/01_AgentOrchestration_Chaining/demo.http
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/demo.http
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/01_AgentOrchestration_Chaining/demo.http
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/host.json b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/01_AgentOrchestration_Chaining/host.json
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/host.json
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/01_AgentOrchestration_Chaining/host.json
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/03_AgentOrchestration_Concurrency.csproj b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/02_AgentOrchestration_Concurrency/02_AgentOrchestration_Concurrency.csproj
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/03_AgentOrchestration_Concurrency.csproj
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/02_AgentOrchestration_Concurrency/02_AgentOrchestration_Concurrency.csproj
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/FunctionTriggers.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/02_AgentOrchestration_Concurrency/FunctionTriggers.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/FunctionTriggers.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/02_AgentOrchestration_Concurrency/FunctionTriggers.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/Program.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/02_AgentOrchestration_Concurrency/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/Program.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/02_AgentOrchestration_Concurrency/Program.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/README.md b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/02_AgentOrchestration_Concurrency/README.md
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/README.md
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/02_AgentOrchestration_Concurrency/README.md
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/demo.http b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/02_AgentOrchestration_Concurrency/demo.http
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/demo.http
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/02_AgentOrchestration_Concurrency/demo.http
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/host.json b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/02_AgentOrchestration_Concurrency/host.json
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/host.json
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/02_AgentOrchestration_Concurrency/host.json
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/04_AgentOrchestration_Conditionals.csproj b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/03_AgentOrchestration_Conditionals/03_AgentOrchestration_Conditionals.csproj
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/04_AgentOrchestration_Conditionals.csproj
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/03_AgentOrchestration_Conditionals/03_AgentOrchestration_Conditionals.csproj
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/FunctionTriggers.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/03_AgentOrchestration_Conditionals/FunctionTriggers.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/FunctionTriggers.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/03_AgentOrchestration_Conditionals/FunctionTriggers.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/Models.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/03_AgentOrchestration_Conditionals/Models.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/Models.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/03_AgentOrchestration_Conditionals/Models.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/Program.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/03_AgentOrchestration_Conditionals/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/Program.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/03_AgentOrchestration_Conditionals/Program.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/README.md b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/03_AgentOrchestration_Conditionals/README.md
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/README.md
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/03_AgentOrchestration_Conditionals/README.md
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/demo.http b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/03_AgentOrchestration_Conditionals/demo.http
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/demo.http
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/03_AgentOrchestration_Conditionals/demo.http
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/host.json b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/03_AgentOrchestration_Conditionals/host.json
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/host.json
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/03_AgentOrchestration_Conditionals/host.json
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/05_AgentOrchestration_HITL.csproj b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/04_AgentOrchestration_HITL/04_AgentOrchestration_HITL.csproj
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/05_AgentOrchestration_HITL.csproj
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/04_AgentOrchestration_HITL/04_AgentOrchestration_HITL.csproj
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/FunctionTriggers.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/04_AgentOrchestration_HITL/FunctionTriggers.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/FunctionTriggers.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/04_AgentOrchestration_HITL/FunctionTriggers.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/Models.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/04_AgentOrchestration_HITL/Models.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/Models.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/04_AgentOrchestration_HITL/Models.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/Program.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/04_AgentOrchestration_HITL/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/Program.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/04_AgentOrchestration_HITL/Program.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/README.md b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/04_AgentOrchestration_HITL/README.md
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/README.md
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/04_AgentOrchestration_HITL/README.md
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/demo.http b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/04_AgentOrchestration_HITL/demo.http
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/demo.http
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/04_AgentOrchestration_HITL/demo.http
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/host.json b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/04_AgentOrchestration_HITL/host.json
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/host.json
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/04_AgentOrchestration_HITL/host.json
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/06_LongRunningTools.csproj b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/05_LongRunningTools.csproj
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/06_LongRunningTools.csproj
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/05_LongRunningTools.csproj
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/FunctionTriggers.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/FunctionTriggers.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/FunctionTriggers.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/FunctionTriggers.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/Models.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/Models.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/Models.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/Models.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/Program.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/Program.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/Program.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/README.md b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/README.md
similarity index 97%
rename from dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/README.md
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/README.md
index 54ed85060b..517dc4d46f 100644
--- a/dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/README.md
+++ b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/README.md
@@ -1,10 +1,10 @@
# Long Running Tools Sample
-This sample demonstrates how to use the Durable Agent Framework (DAFx) to create agents with long running tools. This sample builds on the [05_AgentOrchestration_HITL](../05_AgentOrchestration_HITL) sample by adding a publisher agent that can start and manage content generation workflows. A key difference is that the publisher agent knows the IDs of the workflows it starts, so it can check the status of the workflows and approve or reject them without being explicitly given the context (instance IDs, etc).
+This sample demonstrates how to use the Durable Agent Framework (DAFx) to create agents with long running tools. This sample builds on the [04_AgentOrchestration_HITL](../04_AgentOrchestration_HITL) sample by adding a publisher agent that can start and manage content generation workflows. A key difference is that the publisher agent knows the IDs of the workflows it starts, so it can check the status of the workflows and approve or reject them without being explicitly given the context (instance IDs, etc).
## Key Concepts Demonstrated
-The same key concepts as the [05_AgentOrchestration_HITL](../05_AgentOrchestration_HITL) sample are demonstrated, but with the following additional concepts:
+The same key concepts as the [04_AgentOrchestration_HITL](../04_AgentOrchestration_HITL) sample are demonstrated, but with the following additional concepts:
- **Long running tools**: Using `DurableAgentContext.Current` to start orchestrations from tool calls
- **Multi-agent orchestration**: Agents can start and manage workflows that orchestrate other agents
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/Tools.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/Tools.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/Tools.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/Tools.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/demo.http b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/demo.http
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/demo.http
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/demo.http
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/host.json b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/host.json
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/host.json
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/05_LongRunningTools/host.json
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/07_AgentAsMcpTool/07_AgentAsMcpTool.csproj b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/06_AgentAsMcpTool/06_AgentAsMcpTool.csproj
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/07_AgentAsMcpTool/07_AgentAsMcpTool.csproj
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/06_AgentAsMcpTool/06_AgentAsMcpTool.csproj
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/07_AgentAsMcpTool/Program.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/06_AgentAsMcpTool/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/07_AgentAsMcpTool/Program.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/06_AgentAsMcpTool/Program.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/07_AgentAsMcpTool/README.md b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/06_AgentAsMcpTool/README.md
similarity index 97%
rename from dotnet/samples/Durable/Agents/AzureFunctions/07_AgentAsMcpTool/README.md
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/06_AgentAsMcpTool/README.md
index a8efad04de..d1656ba0cc 100644
--- a/dotnet/samples/Durable/Agents/AzureFunctions/07_AgentAsMcpTool/README.md
+++ b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/06_AgentAsMcpTool/README.md
@@ -49,7 +49,7 @@ Update your `local.settings.json` with your Azure OpenAI credentials:
1. **Start the Function App**:
```bash
- cd dotnet/samples/AzureFunctions/07_AgentAsMcpTool
+ cd dotnet/samples/04-hosting/DurableAgents/AzureFunctions/06_AgentAsMcpTool
func start
```
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/07_AgentAsMcpTool/host.json b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/06_AgentAsMcpTool/host.json
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/07_AgentAsMcpTool/host.json
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/06_AgentAsMcpTool/host.json
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/08_ReliableStreaming.csproj b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/07_ReliableStreaming/07_ReliableStreaming.csproj
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/08_ReliableStreaming.csproj
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/07_ReliableStreaming/07_ReliableStreaming.csproj
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/FunctionTriggers.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/07_ReliableStreaming/FunctionTriggers.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/FunctionTriggers.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/07_ReliableStreaming/FunctionTriggers.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/Program.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/07_ReliableStreaming/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/Program.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/07_ReliableStreaming/Program.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/README.md b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/07_ReliableStreaming/README.md
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/README.md
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/07_ReliableStreaming/README.md
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/RedisStreamResponseHandler.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/07_ReliableStreaming/RedisStreamResponseHandler.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/RedisStreamResponseHandler.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/07_ReliableStreaming/RedisStreamResponseHandler.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/Tools.cs b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/07_ReliableStreaming/Tools.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/Tools.cs
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/07_ReliableStreaming/Tools.cs
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/host.json b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/07_ReliableStreaming/host.json
similarity index 100%
rename from dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/host.json
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/07_ReliableStreaming/host.json
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/README.md b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/README.md
similarity index 88%
rename from dotnet/samples/Durable/Agents/AzureFunctions/README.md
rename to dotnet/samples/04-hosting/DurableAgents/AzureFunctions/README.md
index 2545712ea4..5ac0f6015b 100644
--- a/dotnet/samples/Durable/Agents/AzureFunctions/README.md
+++ b/dotnet/samples/04-hosting/DurableAgents/AzureFunctions/README.md
@@ -1,15 +1,18 @@
# Azure Functions Samples
+To get started with Azure Functions, begin with the introduction sample under [Get Started (`01-get-started`)](../../../01-get-started).
+
+- **[06_host_your_agent](../../../01-get-started/06_host_your_agent)**: A sample that demonstrates how to host a single conversational agent in an Azure Functions app and invoke it directly over HTTP.
+
This directory contains samples for Azure Functions.
-- **[01_SingleAgent](01_SingleAgent)**: A sample that demonstrates how to host a single conversational agent in an Azure Functions app and invoke it directly over HTTP.
-- **[02_AgentOrchestration_Chaining](02_AgentOrchestration_Chaining)**: A sample that demonstrates how to host a single conversational agent in an Azure Functions app and invoke it using a durable orchestration.
-- **[03_AgentOrchestration_Concurrency](03_AgentOrchestration_Concurrency)**: A sample that demonstrates how to host multiple agents in an Azure Functions app and run them concurrently using a durable orchestration.
-- **[04_AgentOrchestration_Conditionals](04_AgentOrchestration_Conditionals)**: A sample that demonstrates how to host multiple agents in an Azure Functions app and run them sequentially using a durable orchestration with conditionals.
-- **[05_AgentOrchestration_HITL](05_AgentOrchestration_HITL)**: A sample that demonstrates how to implement a human-in-the-loop workflow using durable orchestration, including external event handling for human approval.
-- **[06_LongRunningTools](06_LongRunningTools)**: A sample that demonstrates how agents can start and interact with durable orchestrations from tool calls to enable long-running tool scenarios.
-- **[07_AgentAsMcpTool](07_AgentAsMcpTool)**: A sample that demonstrates how to configure durable AI agents to be accessible as Model Context Protocol (MCP) tools.
-- **[08_ReliableStreaming](08_ReliableStreaming)**: A sample that demonstrates how to implement reliable streaming for durable agents using Redis Streams, enabling clients to disconnect and reconnect without losing messages.
+- **[01_AgentOrchestration_Chaining](01_AgentOrchestration_Chaining)**: A sample that demonstrates how to host a single conversational agent in an Azure Functions app and invoke it using a durable orchestration.
+- **[02_AgentOrchestration_Concurrency](02_AgentOrchestration_Concurrency)**: A sample that demonstrates how to host multiple agents in an Azure Functions app and run them concurrently using a durable orchestration.
+- **[03_AgentOrchestration_Conditionals](03_AgentOrchestration_Conditionals)**: A sample that demonstrates how to host multiple agents in an Azure Functions app and run them sequentially using a durable orchestration with conditionals.
+- **[04_AgentOrchestration_HITL](04_AgentOrchestration_HITL)**: A sample that demonstrates how to implement a human-in-the-loop workflow using durable orchestration, including external event handling for human approval.
+- **[05_LongRunningTools](05_LongRunningTools)**: A sample that demonstrates how agents can start and interact with durable orchestrations from tool calls to enable long-running tool scenarios.
+- **[06_AgentAsMcpTool](06_AgentAsMcpTool)**: A sample that demonstrates how to configure durable AI agents to be accessible as Model Context Protocol (MCP) tools.
+- **[07_ReliableStreaming](07_ReliableStreaming)**: A sample that demonstrates how to implement reliable streaming for durable agents using Redis Streams, enabling clients to disconnect and reconnect without losing messages.
## Running the Samples
@@ -135,7 +138,7 @@ These environment variables, when set, will override the values in the `local.se
Navigate to the sample directory and start the Azure Functions app:
```bash
-cd dotnet/samples/AzureFunctions/01_SingleAgent
+cd dotnet/samples/01-get-started/06_host_your_agent
func start
```
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/01_SingleAgent/01_SingleAgent.csproj b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/01_SingleAgent/01_SingleAgent.csproj
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/01_SingleAgent/01_SingleAgent.csproj
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/01_SingleAgent/01_SingleAgent.csproj
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/01_SingleAgent/Program.cs b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/01_SingleAgent/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/01_SingleAgent/Program.cs
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/01_SingleAgent/Program.cs
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/01_SingleAgent/README.md b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/01_SingleAgent/README.md
similarity index 96%
rename from dotnet/samples/Durable/Agents/ConsoleApps/01_SingleAgent/README.md
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/01_SingleAgent/README.md
index 7c921b0d87..927cd80e0a 100644
--- a/dotnet/samples/Durable/Agents/ConsoleApps/01_SingleAgent/README.md
+++ b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/01_SingleAgent/README.md
@@ -17,7 +17,7 @@ See the [README.md](../README.md) file in the parent directory for more informat
With the environment setup, you can run the sample:
```bash
-cd dotnet/samples/DurableAgents/ConsoleApps/01_SingleAgent
+cd dotnet/samples/04-hosting/DurableAgents/ConsoleApps/01_SingleAgent
dotnet run --framework net10.0
```
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/02_AgentOrchestration_Chaining/02_AgentOrchestration_Chaining.csproj b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/02_AgentOrchestration_Chaining/02_AgentOrchestration_Chaining.csproj
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/02_AgentOrchestration_Chaining/02_AgentOrchestration_Chaining.csproj
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/02_AgentOrchestration_Chaining/02_AgentOrchestration_Chaining.csproj
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/02_AgentOrchestration_Chaining/Models.cs b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/02_AgentOrchestration_Chaining/Models.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/02_AgentOrchestration_Chaining/Models.cs
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/02_AgentOrchestration_Chaining/Models.cs
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/02_AgentOrchestration_Chaining/Program.cs b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/02_AgentOrchestration_Chaining/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/02_AgentOrchestration_Chaining/Program.cs
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/02_AgentOrchestration_Chaining/Program.cs
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/02_AgentOrchestration_Chaining/README.md b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/02_AgentOrchestration_Chaining/README.md
similarity index 96%
rename from dotnet/samples/Durable/Agents/ConsoleApps/02_AgentOrchestration_Chaining/README.md
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/02_AgentOrchestration_Chaining/README.md
index 504f036dae..83a69b37a4 100644
--- a/dotnet/samples/Durable/Agents/ConsoleApps/02_AgentOrchestration_Chaining/README.md
+++ b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/02_AgentOrchestration_Chaining/README.md
@@ -18,7 +18,7 @@ See the [README.md](../README.md) file in the parent directory for more informat
With the environment setup, you can run the sample:
```bash
-cd dotnet/samples/DurableAgents/ConsoleApps/02_AgentOrchestration_Chaining
+cd dotnet/samples/04-hosting/DurableAgents/ConsoleApps/02_AgentOrchestration_Chaining
dotnet run --framework net10.0
```
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/03_AgentOrchestration_Concurrency/03_AgentOrchestration_Concurrency.csproj b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/03_AgentOrchestration_Concurrency/03_AgentOrchestration_Concurrency.csproj
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/03_AgentOrchestration_Concurrency/03_AgentOrchestration_Concurrency.csproj
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/03_AgentOrchestration_Concurrency/03_AgentOrchestration_Concurrency.csproj
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/03_AgentOrchestration_Concurrency/Models.cs b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/03_AgentOrchestration_Concurrency/Models.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/03_AgentOrchestration_Concurrency/Models.cs
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/03_AgentOrchestration_Concurrency/Models.cs
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/03_AgentOrchestration_Concurrency/Program.cs b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/03_AgentOrchestration_Concurrency/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/03_AgentOrchestration_Concurrency/Program.cs
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/03_AgentOrchestration_Concurrency/Program.cs
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/03_AgentOrchestration_Concurrency/README.md b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/03_AgentOrchestration_Concurrency/README.md
similarity index 96%
rename from dotnet/samples/Durable/Agents/ConsoleApps/03_AgentOrchestration_Concurrency/README.md
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/03_AgentOrchestration_Concurrency/README.md
index 2ac1a504c8..da75416bea 100644
--- a/dotnet/samples/Durable/Agents/ConsoleApps/03_AgentOrchestration_Concurrency/README.md
+++ b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/03_AgentOrchestration_Concurrency/README.md
@@ -18,7 +18,7 @@ See the [README.md](../README.md) file in the parent directory for more informat
With the environment setup, you can run the sample:
```bash
-cd dotnet/samples/DurableAgents/ConsoleApps/03_AgentOrchestration_Concurrency
+cd dotnet/samples/04-hosting/DurableAgents/ConsoleApps/03_AgentOrchestration_Concurrency
dotnet run --framework net10.0
```
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/04_AgentOrchestration_Conditionals/04_AgentOrchestration_Conditionals.csproj b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/04_AgentOrchestration_Conditionals/04_AgentOrchestration_Conditionals.csproj
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/04_AgentOrchestration_Conditionals/04_AgentOrchestration_Conditionals.csproj
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/04_AgentOrchestration_Conditionals/04_AgentOrchestration_Conditionals.csproj
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/04_AgentOrchestration_Conditionals/Models.cs b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/04_AgentOrchestration_Conditionals/Models.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/04_AgentOrchestration_Conditionals/Models.cs
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/04_AgentOrchestration_Conditionals/Models.cs
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/04_AgentOrchestration_Conditionals/Program.cs b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/04_AgentOrchestration_Conditionals/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/04_AgentOrchestration_Conditionals/Program.cs
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/04_AgentOrchestration_Conditionals/Program.cs
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/04_AgentOrchestration_Conditionals/README.md b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/04_AgentOrchestration_Conditionals/README.md
similarity index 97%
rename from dotnet/samples/Durable/Agents/ConsoleApps/04_AgentOrchestration_Conditionals/README.md
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/04_AgentOrchestration_Conditionals/README.md
index 646e5eda4e..c10b33145a 100644
--- a/dotnet/samples/Durable/Agents/ConsoleApps/04_AgentOrchestration_Conditionals/README.md
+++ b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/04_AgentOrchestration_Conditionals/README.md
@@ -18,7 +18,7 @@ See the [README.md](../README.md) file in the parent directory for more informat
With the environment setup, you can run the sample:
```bash
-cd dotnet/samples/DurableAgents/ConsoleApps/04_AgentOrchestration_Conditionals
+cd dotnet/samples/04-hosting/DurableAgents/ConsoleApps/04_AgentOrchestration_Conditionals
dotnet run --framework net10.0
```
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/05_AgentOrchestration_HITL/05_AgentOrchestration_HITL.csproj b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/05_AgentOrchestration_HITL/05_AgentOrchestration_HITL.csproj
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/05_AgentOrchestration_HITL/05_AgentOrchestration_HITL.csproj
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/05_AgentOrchestration_HITL/05_AgentOrchestration_HITL.csproj
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/05_AgentOrchestration_HITL/Models.cs b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/05_AgentOrchestration_HITL/Models.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/05_AgentOrchestration_HITL/Models.cs
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/05_AgentOrchestration_HITL/Models.cs
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/05_AgentOrchestration_HITL/Program.cs b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/05_AgentOrchestration_HITL/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/05_AgentOrchestration_HITL/Program.cs
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/05_AgentOrchestration_HITL/Program.cs
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/05_AgentOrchestration_HITL/README.md b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/05_AgentOrchestration_HITL/README.md
similarity index 96%
rename from dotnet/samples/Durable/Agents/ConsoleApps/05_AgentOrchestration_HITL/README.md
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/05_AgentOrchestration_HITL/README.md
index 1386dfbcb1..ec0fe9911e 100644
--- a/dotnet/samples/Durable/Agents/ConsoleApps/05_AgentOrchestration_HITL/README.md
+++ b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/05_AgentOrchestration_HITL/README.md
@@ -18,7 +18,7 @@ See the [README.md](../README.md) file in the parent directory for more informat
With the environment setup, you can run the sample:
```bash
-cd dotnet/samples/DurableAgents/ConsoleApps/05_AgentOrchestration_HITL
+cd dotnet/samples/04-hosting/DurableAgents/ConsoleApps/05_AgentOrchestration_HITL
dotnet run --framework net10.0
```
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/06_LongRunningTools/06_LongRunningTools.csproj b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/06_LongRunningTools/06_LongRunningTools.csproj
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/06_LongRunningTools/06_LongRunningTools.csproj
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/06_LongRunningTools/06_LongRunningTools.csproj
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/06_LongRunningTools/Models.cs b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/06_LongRunningTools/Models.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/06_LongRunningTools/Models.cs
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/06_LongRunningTools/Models.cs
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/06_LongRunningTools/Program.cs b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/06_LongRunningTools/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/06_LongRunningTools/Program.cs
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/06_LongRunningTools/Program.cs
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/06_LongRunningTools/README.md b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/06_LongRunningTools/README.md
similarity index 98%
rename from dotnet/samples/Durable/Agents/ConsoleApps/06_LongRunningTools/README.md
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/06_LongRunningTools/README.md
index b0dd69b129..1c87ab50ed 100644
--- a/dotnet/samples/Durable/Agents/ConsoleApps/06_LongRunningTools/README.md
+++ b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/06_LongRunningTools/README.md
@@ -19,7 +19,7 @@ See the [README.md](../README.md) file in the parent directory for more informat
With the environment setup, you can run the sample:
```bash
-cd dotnet/samples/DurableAgents/ConsoleApps/06_LongRunningTools
+cd dotnet/samples/04-hosting/DurableAgents/ConsoleApps/06_LongRunningTools
dotnet run --framework net10.0
```
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/07_ReliableStreaming/07_ReliableStreaming.csproj b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/07_ReliableStreaming/07_ReliableStreaming.csproj
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/07_ReliableStreaming/07_ReliableStreaming.csproj
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/07_ReliableStreaming/07_ReliableStreaming.csproj
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/07_ReliableStreaming/Program.cs b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/07_ReliableStreaming/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/07_ReliableStreaming/Program.cs
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/07_ReliableStreaming/Program.cs
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/07_ReliableStreaming/README.md b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/07_ReliableStreaming/README.md
similarity index 99%
rename from dotnet/samples/Durable/Agents/ConsoleApps/07_ReliableStreaming/README.md
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/07_ReliableStreaming/README.md
index c1956157e8..4b887978d0 100644
--- a/dotnet/samples/Durable/Agents/ConsoleApps/07_ReliableStreaming/README.md
+++ b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/07_ReliableStreaming/README.md
@@ -32,7 +32,7 @@ docker ps | grep redis
With the environment setup, you can run the sample:
```bash
-cd dotnet/samples/DurableAgents/ConsoleApps/07_ReliableStreaming
+cd dotnet/samples/04-hosting/DurableAgents/ConsoleApps/07_ReliableStreaming
dotnet run --framework net10.0
```
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/07_ReliableStreaming/RedisStreamResponseHandler.cs b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/07_ReliableStreaming/RedisStreamResponseHandler.cs
similarity index 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/07_ReliableStreaming/RedisStreamResponseHandler.cs
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/07_ReliableStreaming/RedisStreamResponseHandler.cs
diff --git a/dotnet/samples/Durable/Agents/ConsoleApps/README.md b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/README.md
similarity index 98%
rename from dotnet/samples/Durable/Agents/ConsoleApps/README.md
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/README.md
index 1bd2b0d224..bc3a09b3a1 100644
--- a/dotnet/samples/Durable/Agents/ConsoleApps/README.md
+++ b/dotnet/samples/04-hosting/DurableAgents/ConsoleApps/README.md
@@ -93,7 +93,7 @@ export AZURE_OPENAI_DEPLOYMENT="your-deployment-name"
Navigate to the sample directory and run the console app:
```bash
-cd dotnet/samples/DurableAgents/ConsoleApps/01_SingleAgent
+cd dotnet/samples/04-hosting/DurableAgents/ConsoleApps/01_SingleAgent
dotnet run --framework net10.0
```
diff --git a/dotnet/samples/Durable/Directory.Build.props b/dotnet/samples/04-hosting/DurableAgents/Directory.Build.props
similarity index 80%
rename from dotnet/samples/Durable/Directory.Build.props
rename to dotnet/samples/04-hosting/DurableAgents/Directory.Build.props
index 7c4cb7dea2..63c25dd5f0 100644
--- a/dotnet/samples/Durable/Directory.Build.props
+++ b/dotnet/samples/04-hosting/DurableAgents/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
diff --git a/dotnet/samples/A2AClientServer/A2AClient/A2AClient.csproj b/dotnet/samples/05-end-to-end/A2AClientServer/A2AClient/A2AClient.csproj
similarity index 60%
rename from dotnet/samples/A2AClientServer/A2AClient/A2AClient.csproj
rename to dotnet/samples/05-end-to-end/A2AClientServer/A2AClient/A2AClient.csproj
index 6b88c5c697..01a5a069bc 100644
--- a/dotnet/samples/A2AClientServer/A2AClient/A2AClient.csproj
+++ b/dotnet/samples/05-end-to-end/A2AClientServer/A2AClient/A2AClient.csproj
@@ -15,9 +15,9 @@
-
-
-
+
+
+
diff --git a/dotnet/samples/A2AClientServer/A2AClient/HostClientAgent.cs b/dotnet/samples/05-end-to-end/A2AClientServer/A2AClient/HostClientAgent.cs
similarity index 100%
rename from dotnet/samples/A2AClientServer/A2AClient/HostClientAgent.cs
rename to dotnet/samples/05-end-to-end/A2AClientServer/A2AClient/HostClientAgent.cs
diff --git a/dotnet/samples/A2AClientServer/A2AClient/Program.cs b/dotnet/samples/05-end-to-end/A2AClientServer/A2AClient/Program.cs
similarity index 100%
rename from dotnet/samples/A2AClientServer/A2AClient/Program.cs
rename to dotnet/samples/05-end-to-end/A2AClientServer/A2AClient/Program.cs
diff --git a/dotnet/samples/A2AClientServer/A2AClient/README.md b/dotnet/samples/05-end-to-end/A2AClientServer/A2AClient/README.md
similarity index 91%
rename from dotnet/samples/A2AClientServer/A2AClient/README.md
rename to dotnet/samples/05-end-to-end/A2AClientServer/A2AClient/README.md
index c542430b22..5a80e0220f 100644
--- a/dotnet/samples/A2AClientServer/A2AClient/README.md
+++ b/dotnet/samples/05-end-to-end/A2AClientServer/A2AClient/README.md
@@ -18,7 +18,7 @@ To run the sample, follow these steps:
The agent urls are provided as a ` ` delimited list of strings
```powershell
-cd dotnet/samples/A2AClientServer/A2AClient
+cd dotnet/samples/05-end-to-end/A2AClientServer/A2AClient
$env:OPENAI_MODEL="gpt-4o-mini"
$env:OPENAI_API_KEY=""
diff --git a/dotnet/samples/A2AClientServer/A2AServer/A2AServer.csproj b/dotnet/samples/05-end-to-end/A2AClientServer/A2AServer/A2AServer.csproj
similarity index 54%
rename from dotnet/samples/A2AClientServer/A2AServer/A2AServer.csproj
rename to dotnet/samples/05-end-to-end/A2AClientServer/A2AServer/A2AServer.csproj
index 0a3b170a0b..be5ff472c1 100644
--- a/dotnet/samples/A2AClientServer/A2AServer/A2AServer.csproj
+++ b/dotnet/samples/05-end-to-end/A2AClientServer/A2AServer/A2AServer.csproj
@@ -19,12 +19,12 @@
-
-
+
+
-
-
-
+
+
+
diff --git a/dotnet/samples/A2AClientServer/A2AServer/A2AServer.http b/dotnet/samples/05-end-to-end/A2AClientServer/A2AServer/A2AServer.http
similarity index 100%
rename from dotnet/samples/A2AClientServer/A2AServer/A2AServer.http
rename to dotnet/samples/05-end-to-end/A2AClientServer/A2AServer/A2AServer.http
diff --git a/dotnet/samples/A2AClientServer/A2AServer/HostAgentFactory.cs b/dotnet/samples/05-end-to-end/A2AClientServer/A2AServer/HostAgentFactory.cs
similarity index 100%
rename from dotnet/samples/A2AClientServer/A2AServer/HostAgentFactory.cs
rename to dotnet/samples/05-end-to-end/A2AClientServer/A2AServer/HostAgentFactory.cs
diff --git a/dotnet/samples/A2AClientServer/A2AServer/Models/InvoiceQuery.cs b/dotnet/samples/05-end-to-end/A2AClientServer/A2AServer/Models/InvoiceQuery.cs
similarity index 100%
rename from dotnet/samples/A2AClientServer/A2AServer/Models/InvoiceQuery.cs
rename to dotnet/samples/05-end-to-end/A2AClientServer/A2AServer/Models/InvoiceQuery.cs
diff --git a/dotnet/samples/A2AClientServer/A2AServer/Program.cs b/dotnet/samples/05-end-to-end/A2AClientServer/A2AServer/Program.cs
similarity index 100%
rename from dotnet/samples/A2AClientServer/A2AServer/Program.cs
rename to dotnet/samples/05-end-to-end/A2AClientServer/A2AServer/Program.cs
diff --git a/dotnet/samples/A2AClientServer/README.md b/dotnet/samples/05-end-to-end/A2AClientServer/README.md
similarity index 100%
rename from dotnet/samples/A2AClientServer/README.md
rename to dotnet/samples/05-end-to-end/A2AClientServer/README.md
diff --git a/dotnet/samples/A2AClientServer/a2a-inspector-agent-card.png b/dotnet/samples/05-end-to-end/A2AClientServer/a2a-inspector-agent-card.png
similarity index 100%
rename from dotnet/samples/A2AClientServer/a2a-inspector-agent-card.png
rename to dotnet/samples/05-end-to-end/A2AClientServer/a2a-inspector-agent-card.png
diff --git a/dotnet/samples/A2AClientServer/a2a-inspector-raw-json-response.png b/dotnet/samples/05-end-to-end/A2AClientServer/a2a-inspector-raw-json-response.png
similarity index 100%
rename from dotnet/samples/A2AClientServer/a2a-inspector-raw-json-response.png
rename to dotnet/samples/05-end-to-end/A2AClientServer/a2a-inspector-raw-json-response.png
diff --git a/dotnet/samples/A2AClientServer/a2a-inspector-send-message.png b/dotnet/samples/05-end-to-end/A2AClientServer/a2a-inspector-send-message.png
similarity index 100%
rename from dotnet/samples/A2AClientServer/a2a-inspector-send-message.png
rename to dotnet/samples/05-end-to-end/A2AClientServer/a2a-inspector-send-message.png
diff --git a/dotnet/samples/A2AClientServer/demo-architecture.png b/dotnet/samples/05-end-to-end/A2AClientServer/demo-architecture.png
similarity index 100%
rename from dotnet/samples/A2AClientServer/demo-architecture.png
rename to dotnet/samples/05-end-to-end/A2AClientServer/demo-architecture.png
diff --git a/dotnet/samples/A2AClientServer/rest-client-agent-card.png b/dotnet/samples/05-end-to-end/A2AClientServer/rest-client-agent-card.png
similarity index 100%
rename from dotnet/samples/A2AClientServer/rest-client-agent-card.png
rename to dotnet/samples/05-end-to-end/A2AClientServer/rest-client-agent-card.png
diff --git a/dotnet/samples/A2AClientServer/rest-client-send-message.png b/dotnet/samples/05-end-to-end/A2AClientServer/rest-client-send-message.png
similarity index 100%
rename from dotnet/samples/A2AClientServer/rest-client-send-message.png
rename to dotnet/samples/05-end-to-end/A2AClientServer/rest-client-send-message.png
diff --git a/dotnet/samples/AGUIClientServer/AGUIClient/AGUIClient.csproj b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIClient/AGUIClient.csproj
similarity index 70%
rename from dotnet/samples/AGUIClientServer/AGUIClient/AGUIClient.csproj
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIClient/AGUIClient.csproj
index 7d80fa7cda..8a45c09ce0 100644
--- a/dotnet/samples/AGUIClientServer/AGUIClient/AGUIClient.csproj
+++ b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIClient/AGUIClient.csproj
@@ -14,8 +14,8 @@
-
-
+
+
diff --git a/dotnet/samples/AGUIClientServer/AGUIClient/AGUIClientSerializerContext.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIClient/AGUIClientSerializerContext.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIClient/AGUIClientSerializerContext.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIClient/AGUIClientSerializerContext.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIClient/Program.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIClient/Program.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIClient/Program.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIClient/Program.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIClient/README.md b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIClient/README.md
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIClient/README.md
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIClient/README.md
diff --git a/dotnet/samples/AGUIClientServer/AGUIClient/SensorRequest.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIClient/SensorRequest.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIClient/SensorRequest.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIClient/SensorRequest.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIClient/SensorResponse.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIClient/SensorResponse.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIClient/SensorResponse.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIClient/SensorResponse.cs
diff --git a/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AGUIDojoServer.csproj b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AGUIDojoServer.csproj
new file mode 100644
index 0000000000..eb2dc3f77e
--- /dev/null
+++ b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AGUIDojoServer.csproj
@@ -0,0 +1,22 @@
+
+
+
+ Exe
+ net10.0
+ enable
+ enable
+ b9c3f1e1-2fb4-5g29-0e52-53e2b7g9gf21
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/AGUIDojoServerSerializerContext.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AGUIDojoServerSerializerContext.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/AGUIDojoServerSerializerContext.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AGUIDojoServerSerializerContext.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/AgenticPlanningTools.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AgenticUI/AgenticPlanningTools.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/AgenticPlanningTools.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AgenticUI/AgenticPlanningTools.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/AgenticUIAgent.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AgenticUI/AgenticUIAgent.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/AgenticUIAgent.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AgenticUI/AgenticUIAgent.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/JsonPatchOperation.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AgenticUI/JsonPatchOperation.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/JsonPatchOperation.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AgenticUI/JsonPatchOperation.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/Plan.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AgenticUI/Plan.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/Plan.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AgenticUI/Plan.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/Step.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AgenticUI/Step.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/Step.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AgenticUI/Step.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/StepStatus.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AgenticUI/StepStatus.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/AgenticUI/StepStatus.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AgenticUI/StepStatus.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/BackendToolRendering/WeatherInfo.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/BackendToolRendering/WeatherInfo.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/BackendToolRendering/WeatherInfo.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/BackendToolRendering/WeatherInfo.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/ChatClientAgentFactory.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/ChatClientAgentFactory.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/ChatClientAgentFactory.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/ChatClientAgentFactory.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/PredictiveStateUpdates/DocumentState.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/PredictiveStateUpdates/DocumentState.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/PredictiveStateUpdates/DocumentState.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/PredictiveStateUpdates/DocumentState.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/PredictiveStateUpdates/PredictiveStateUpdatesAgent.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/PredictiveStateUpdates/PredictiveStateUpdatesAgent.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/PredictiveStateUpdates/PredictiveStateUpdatesAgent.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/PredictiveStateUpdates/PredictiveStateUpdatesAgent.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/Program.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/Program.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/Program.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/Program.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/Properties/launchSettings.json b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/Properties/launchSettings.json
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/Properties/launchSettings.json
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/SharedState/Ingredient.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/SharedState/Ingredient.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/SharedState/Ingredient.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/SharedState/Ingredient.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/SharedState/Recipe.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/SharedState/Recipe.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/SharedState/Recipe.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/SharedState/Recipe.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/SharedState/RecipeResponse.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/SharedState/RecipeResponse.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/SharedState/RecipeResponse.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/SharedState/RecipeResponse.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/SharedState/SharedStateAgent.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/SharedState/SharedStateAgent.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/SharedState/SharedStateAgent.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/SharedState/SharedStateAgent.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Server/appsettings.Development.json b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/appsettings.Development.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Server/appsettings.Development.json
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/appsettings.Development.json
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/appsettings.json b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/appsettings.json
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/appsettings.json
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/appsettings.json
diff --git a/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/AGUIServer.csproj b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/AGUIServer.csproj
new file mode 100644
index 0000000000..c26e3eebad
--- /dev/null
+++ b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/AGUIServer.csproj
@@ -0,0 +1,22 @@
+
+
+
+ Exe
+ net10.0
+ enable
+ enable
+ a8b2e9f0-1ea3-4f18-9d41-42d1a6f8fe10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/AGUIClientServer/AGUIServer/AGUIServer.http b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/AGUIServer.http
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIServer/AGUIServer.http
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/AGUIServer.http
diff --git a/dotnet/samples/AGUIClientServer/AGUIServer/AGUIServerSerializerContext.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/AGUIServerSerializerContext.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIServer/AGUIServerSerializerContext.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/AGUIServerSerializerContext.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIServer/Program.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/Program.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIServer/Program.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/Program.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIServer/Properties/launchSettings.json b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIServer/Properties/launchSettings.json
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/Properties/launchSettings.json
diff --git a/dotnet/samples/AGUIClientServer/AGUIServer/ServerWeatherForecastRequest.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/ServerWeatherForecastRequest.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIServer/ServerWeatherForecastRequest.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/ServerWeatherForecastRequest.cs
diff --git a/dotnet/samples/AGUIClientServer/AGUIServer/ServerWeatherForecastResponse.cs b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/ServerWeatherForecastResponse.cs
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIServer/ServerWeatherForecastResponse.cs
rename to dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/ServerWeatherForecastResponse.cs
diff --git a/dotnet/samples/AGUIClientServer/README.md b/dotnet/samples/05-end-to-end/AGUIClientServer/README.md
similarity index 100%
rename from dotnet/samples/AGUIClientServer/README.md
rename to dotnet/samples/05-end-to-end/AGUIClientServer/README.md
diff --git a/dotnet/samples/AGUIWebChat/Client/AGUIWebChatClient.csproj b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/AGUIWebChatClient.csproj
similarity index 75%
rename from dotnet/samples/AGUIWebChat/Client/AGUIWebChatClient.csproj
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/AGUIWebChatClient.csproj
index b28e53df6e..fef0deb3ec 100644
--- a/dotnet/samples/AGUIWebChat/Client/AGUIWebChatClient.csproj
+++ b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/AGUIWebChatClient.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/App.razor b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/App.razor
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/App.razor
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/App.razor
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Layout/LoadingSpinner.razor b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Layout/LoadingSpinner.razor
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Layout/LoadingSpinner.razor
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Layout/LoadingSpinner.razor
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Layout/LoadingSpinner.razor.css b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Layout/LoadingSpinner.razor.css
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Layout/LoadingSpinner.razor.css
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Layout/LoadingSpinner.razor.css
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Layout/MainLayout.razor b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Layout/MainLayout.razor
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Layout/MainLayout.razor
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Layout/MainLayout.razor
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Layout/MainLayout.razor.css b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Layout/MainLayout.razor.css
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Layout/MainLayout.razor.css
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Layout/MainLayout.razor.css
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/Chat.razor b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/Chat.razor
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/Chat.razor
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/Chat.razor
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/Chat.razor.css b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/Chat.razor.css
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/Chat.razor.css
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/Chat.razor.css
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatCitation.razor b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatCitation.razor
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatCitation.razor
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatCitation.razor
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatCitation.razor.css b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatCitation.razor.css
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatCitation.razor.css
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatCitation.razor.css
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatHeader.razor b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatHeader.razor
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatHeader.razor
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatHeader.razor
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatHeader.razor.css b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatHeader.razor.css
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatHeader.razor.css
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatHeader.razor.css
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatInput.razor b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatInput.razor
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatInput.razor
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatInput.razor
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatInput.razor.css b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatInput.razor.css
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatInput.razor.css
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatInput.razor.css
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatInput.razor.js b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatInput.razor.js
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatInput.razor.js
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatInput.razor.js
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageItem.razor b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageItem.razor
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageItem.razor
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageItem.razor
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageItem.razor.css b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageItem.razor.css
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageItem.razor.css
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageItem.razor.css
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageList.razor b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageList.razor
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageList.razor
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageList.razor
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageList.razor.css b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageList.razor.css
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageList.razor.css
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageList.razor.css
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageList.razor.js b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageList.razor.js
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageList.razor.js
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatMessageList.razor.js
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatSuggestions.razor b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatSuggestions.razor
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatSuggestions.razor
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatSuggestions.razor
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatSuggestions.razor.css b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatSuggestions.razor.css
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Pages/Chat/ChatSuggestions.razor.css
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Pages/Chat/ChatSuggestions.razor.css
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/Routes.razor b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Routes.razor
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/Routes.razor
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/Routes.razor
diff --git a/dotnet/samples/AGUIWebChat/Client/Components/_Imports.razor b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/_Imports.razor
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Components/_Imports.razor
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Components/_Imports.razor
diff --git a/dotnet/samples/AGUIWebChat/Client/Program.cs b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Program.cs
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Program.cs
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Program.cs
diff --git a/dotnet/samples/AGUIWebChat/Client/Properties/launchSettings.json b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/Properties/launchSettings.json
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/Properties/launchSettings.json
diff --git a/dotnet/samples/AGUIWebChat/Client/wwwroot/app.css b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/wwwroot/app.css
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/wwwroot/app.css
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/wwwroot/app.css
diff --git a/dotnet/samples/AGUIWebChat/Client/wwwroot/favicon.png b/dotnet/samples/05-end-to-end/AGUIWebChat/Client/wwwroot/favicon.png
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Client/wwwroot/favicon.png
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Client/wwwroot/favicon.png
diff --git a/dotnet/samples/AGUIWebChat/README.md b/dotnet/samples/05-end-to-end/AGUIWebChat/README.md
similarity index 100%
rename from dotnet/samples/AGUIWebChat/README.md
rename to dotnet/samples/05-end-to-end/AGUIWebChat/README.md
diff --git a/dotnet/samples/05-end-to-end/AGUIWebChat/Server/AGUIWebChatServer.csproj b/dotnet/samples/05-end-to-end/AGUIWebChat/Server/AGUIWebChatServer.csproj
new file mode 100644
index 0000000000..e798d23506
--- /dev/null
+++ b/dotnet/samples/05-end-to-end/AGUIWebChat/Server/AGUIWebChatServer.csproj
@@ -0,0 +1,21 @@
+
+
+
+ Exe
+ net10.0
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/AGUIWebChat/Server/Program.cs b/dotnet/samples/05-end-to-end/AGUIWebChat/Server/Program.cs
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Server/Program.cs
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Server/Program.cs
diff --git a/dotnet/samples/AGUIWebChat/Server/Properties/launchSettings.json b/dotnet/samples/05-end-to-end/AGUIWebChat/Server/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/AGUIWebChat/Server/Properties/launchSettings.json
rename to dotnet/samples/05-end-to-end/AGUIWebChat/Server/Properties/launchSettings.json
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/ActorFrameworkWebApplicationExtensions.cs b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/ActorFrameworkWebApplicationExtensions.cs
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/ActorFrameworkWebApplicationExtensions.cs
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/ActorFrameworkWebApplicationExtensions.cs
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/AgentWebChat.AgentHost.csproj b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/AgentWebChat.AgentHost.csproj
similarity index 55%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/AgentWebChat.AgentHost.csproj
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/AgentWebChat.AgentHost.csproj
index f71becf5d3..4ed6d27cbd 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/AgentWebChat.AgentHost.csproj
+++ b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/AgentWebChat.AgentHost.csproj
@@ -8,13 +8,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Custom/CustomAITools.cs b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/Custom/CustomAITools.cs
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Custom/CustomAITools.cs
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/Custom/CustomAITools.cs
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Program.cs b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/Program.cs
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Program.cs
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/Program.cs
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Properties/launchSettings.json b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Properties/launchSettings.json
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/Properties/launchSettings.json
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Utilities/ChatClientConnectionInfo.cs b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/Utilities/ChatClientConnectionInfo.cs
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Utilities/ChatClientConnectionInfo.cs
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/Utilities/ChatClientConnectionInfo.cs
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Utilities/ChatClientExtensions.cs b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/Utilities/ChatClientExtensions.cs
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Utilities/ChatClientExtensions.cs
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/Utilities/ChatClientExtensions.cs
diff --git a/dotnet/samples/GettingStarted/AGUI/Step02_BackendTools/Server/appsettings.Development.json b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/appsettings.Development.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step02_BackendTools/Server/appsettings.Development.json
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/appsettings.Development.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Server/appsettings.json b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/appsettings.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step04_HumanInLoop/Server/appsettings.json
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/appsettings.json
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AppHost/AgentWebChat.AppHost.csproj b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AppHost/AgentWebChat.AppHost.csproj
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AppHost/AgentWebChat.AppHost.csproj
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AppHost/AgentWebChat.AppHost.csproj
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AppHost/ModelExtensions.cs b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AppHost/ModelExtensions.cs
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AppHost/ModelExtensions.cs
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AppHost/ModelExtensions.cs
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AppHost/Program.cs b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AppHost/Program.cs
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AppHost/Program.cs
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AppHost/Program.cs
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AppHost/Properties/launchSettings.json b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AppHost/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AppHost/Properties/launchSettings.json
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AppHost/Properties/launchSettings.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step03_FrontendTools/Server/appsettings.Development.json b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AppHost/appsettings.Development.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step03_FrontendTools/Server/appsettings.Development.json
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AppHost/appsettings.Development.json
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AppHost/appsettings.json b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AppHost/appsettings.json
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AppHost/appsettings.json
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AppHost/appsettings.json
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.ServiceDefaults/AgentWebChat.ServiceDefaults.csproj b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.ServiceDefaults/AgentWebChat.ServiceDefaults.csproj
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.ServiceDefaults/AgentWebChat.ServiceDefaults.csproj
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.ServiceDefaults/AgentWebChat.ServiceDefaults.csproj
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.ServiceDefaults/ServiceDefaultsExtensions.cs b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.ServiceDefaults/ServiceDefaultsExtensions.cs
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.ServiceDefaults/ServiceDefaultsExtensions.cs
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.ServiceDefaults/ServiceDefaultsExtensions.cs
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/A2AAgentClient.cs b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/A2AAgentClient.cs
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/A2AAgentClient.cs
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/A2AAgentClient.cs
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentDiscoveryClient.cs b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/AgentDiscoveryClient.cs
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentDiscoveryClient.cs
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/AgentDiscoveryClient.cs
diff --git a/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/AgentWebChat.Web.csproj b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/AgentWebChat.Web.csproj
new file mode 100644
index 0000000000..5335499168
--- /dev/null
+++ b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/AgentWebChat.Web.csproj
@@ -0,0 +1,18 @@
+
+
+
+ net10.0
+ enable
+ enable
+ $(NoWarn);CA1812
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/App.razor b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Components/App.razor
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/App.razor
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Components/App.razor
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/Layout/MainLayout.razor b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Components/Layout/MainLayout.razor
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/Layout/MainLayout.razor
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Components/Layout/MainLayout.razor
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/Layout/MainLayout.razor.css b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Components/Layout/MainLayout.razor.css
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/Layout/MainLayout.razor.css
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Components/Layout/MainLayout.razor.css
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/Pages/Error.razor b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Components/Pages/Error.razor
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/Pages/Error.razor
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Components/Pages/Error.razor
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/Pages/Home.razor b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Components/Pages/Home.razor
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/Pages/Home.razor
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Components/Pages/Home.razor
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/Routes.razor b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Components/Routes.razor
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/Routes.razor
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Components/Routes.razor
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/_Imports.razor b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Components/_Imports.razor
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/_Imports.razor
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Components/_Imports.razor
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/IAgentClient.cs b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/IAgentClient.cs
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/IAgentClient.cs
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/IAgentClient.cs
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/OpenAIChatCompletionsAgentClient.cs b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/OpenAIChatCompletionsAgentClient.cs
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/OpenAIChatCompletionsAgentClient.cs
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/OpenAIChatCompletionsAgentClient.cs
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/OpenAIResponsesAgentClient.cs b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/OpenAIResponsesAgentClient.cs
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/OpenAIResponsesAgentClient.cs
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/OpenAIResponsesAgentClient.cs
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/Program.cs b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Program.cs
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/Program.cs
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Program.cs
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/Properties/launchSettings.json b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/Properties/launchSettings.json
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/Properties/launchSettings.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/appsettings.Development.json b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/appsettings.Development.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/appsettings.Development.json
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/appsettings.Development.json
diff --git a/dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/appsettings.json b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/appsettings.json
similarity index 100%
rename from dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/appsettings.json
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/appsettings.json
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/wwwroot/app.css b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/wwwroot/app.css
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/wwwroot/app.css
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/wwwroot/app.css
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/wwwroot/favicon.png b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/wwwroot/favicon.png
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/wwwroot/favicon.png
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/wwwroot/favicon.png
diff --git a/dotnet/samples/Purview/AgentWithPurview/AgentWithPurview.csproj b/dotnet/samples/05-end-to-end/AgentWithPurview/AgentWithPurview.csproj
similarity index 100%
rename from dotnet/samples/Purview/AgentWithPurview/AgentWithPurview.csproj
rename to dotnet/samples/05-end-to-end/AgentWithPurview/AgentWithPurview.csproj
diff --git a/dotnet/samples/Purview/AgentWithPurview/Program.cs b/dotnet/samples/05-end-to-end/AgentWithPurview/Program.cs
similarity index 100%
rename from dotnet/samples/Purview/AgentWithPurview/Program.cs
rename to dotnet/samples/05-end-to-end/AgentWithPurview/Program.cs
diff --git a/dotnet/samples/HostedAgents/AgentWithHostedMCP/AgentWithHostedMCP.csproj b/dotnet/samples/05-end-to-end/HostedAgents/AgentWithHostedMCP/AgentWithHostedMCP.csproj
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentWithHostedMCP/AgentWithHostedMCP.csproj
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentWithHostedMCP/AgentWithHostedMCP.csproj
diff --git a/dotnet/samples/HostedAgents/AgentWithHostedMCP/Dockerfile b/dotnet/samples/05-end-to-end/HostedAgents/AgentWithHostedMCP/Dockerfile
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentWithHostedMCP/Dockerfile
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentWithHostedMCP/Dockerfile
diff --git a/dotnet/samples/HostedAgents/AgentWithHostedMCP/Program.cs b/dotnet/samples/05-end-to-end/HostedAgents/AgentWithHostedMCP/Program.cs
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentWithHostedMCP/Program.cs
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentWithHostedMCP/Program.cs
diff --git a/dotnet/samples/HostedAgents/AgentWithHostedMCP/README.md b/dotnet/samples/05-end-to-end/HostedAgents/AgentWithHostedMCP/README.md
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentWithHostedMCP/README.md
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentWithHostedMCP/README.md
diff --git a/dotnet/samples/HostedAgents/AgentWithHostedMCP/agent.yaml b/dotnet/samples/05-end-to-end/HostedAgents/AgentWithHostedMCP/agent.yaml
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentWithHostedMCP/agent.yaml
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentWithHostedMCP/agent.yaml
diff --git a/dotnet/samples/HostedAgents/AgentWithHostedMCP/run-requests.http b/dotnet/samples/05-end-to-end/HostedAgents/AgentWithHostedMCP/run-requests.http
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentWithHostedMCP/run-requests.http
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentWithHostedMCP/run-requests.http
diff --git a/dotnet/samples/HostedAgents/AgentWithTextSearchRag/AgentWithTextSearchRag.csproj b/dotnet/samples/05-end-to-end/HostedAgents/AgentWithTextSearchRag/AgentWithTextSearchRag.csproj
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentWithTextSearchRag/AgentWithTextSearchRag.csproj
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentWithTextSearchRag/AgentWithTextSearchRag.csproj
diff --git a/dotnet/samples/HostedAgents/AgentWithTextSearchRag/Dockerfile b/dotnet/samples/05-end-to-end/HostedAgents/AgentWithTextSearchRag/Dockerfile
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentWithTextSearchRag/Dockerfile
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentWithTextSearchRag/Dockerfile
diff --git a/dotnet/samples/HostedAgents/AgentWithTextSearchRag/Program.cs b/dotnet/samples/05-end-to-end/HostedAgents/AgentWithTextSearchRag/Program.cs
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentWithTextSearchRag/Program.cs
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentWithTextSearchRag/Program.cs
diff --git a/dotnet/samples/HostedAgents/AgentWithTextSearchRag/README.md b/dotnet/samples/05-end-to-end/HostedAgents/AgentWithTextSearchRag/README.md
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentWithTextSearchRag/README.md
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentWithTextSearchRag/README.md
diff --git a/dotnet/samples/HostedAgents/AgentWithTextSearchRag/agent.yaml b/dotnet/samples/05-end-to-end/HostedAgents/AgentWithTextSearchRag/agent.yaml
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentWithTextSearchRag/agent.yaml
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentWithTextSearchRag/agent.yaml
diff --git a/dotnet/samples/HostedAgents/AgentWithTextSearchRag/run-requests.http b/dotnet/samples/05-end-to-end/HostedAgents/AgentWithTextSearchRag/run-requests.http
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentWithTextSearchRag/run-requests.http
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentWithTextSearchRag/run-requests.http
diff --git a/dotnet/samples/HostedAgents/AgentsInWorkflows/AgentsInWorkflows.csproj b/dotnet/samples/05-end-to-end/HostedAgents/AgentsInWorkflows/AgentsInWorkflows.csproj
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentsInWorkflows/AgentsInWorkflows.csproj
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentsInWorkflows/AgentsInWorkflows.csproj
diff --git a/dotnet/samples/HostedAgents/AgentsInWorkflows/Dockerfile b/dotnet/samples/05-end-to-end/HostedAgents/AgentsInWorkflows/Dockerfile
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentsInWorkflows/Dockerfile
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentsInWorkflows/Dockerfile
diff --git a/dotnet/samples/HostedAgents/AgentsInWorkflows/Program.cs b/dotnet/samples/05-end-to-end/HostedAgents/AgentsInWorkflows/Program.cs
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentsInWorkflows/Program.cs
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentsInWorkflows/Program.cs
diff --git a/dotnet/samples/HostedAgents/AgentsInWorkflows/README.md b/dotnet/samples/05-end-to-end/HostedAgents/AgentsInWorkflows/README.md
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentsInWorkflows/README.md
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentsInWorkflows/README.md
diff --git a/dotnet/samples/HostedAgents/AgentsInWorkflows/agent.yaml b/dotnet/samples/05-end-to-end/HostedAgents/AgentsInWorkflows/agent.yaml
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentsInWorkflows/agent.yaml
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentsInWorkflows/agent.yaml
diff --git a/dotnet/samples/HostedAgents/AgentsInWorkflows/run-requests.http b/dotnet/samples/05-end-to-end/HostedAgents/AgentsInWorkflows/run-requests.http
similarity index 100%
rename from dotnet/samples/HostedAgents/AgentsInWorkflows/run-requests.http
rename to dotnet/samples/05-end-to-end/HostedAgents/AgentsInWorkflows/run-requests.http
diff --git a/dotnet/samples/M365Agent/AFAgentApplication.cs b/dotnet/samples/05-end-to-end/M365Agent/AFAgentApplication.cs
similarity index 100%
rename from dotnet/samples/M365Agent/AFAgentApplication.cs
rename to dotnet/samples/05-end-to-end/M365Agent/AFAgentApplication.cs
diff --git a/dotnet/samples/M365Agent/Agents/AdaptiveCardAIContent.cs b/dotnet/samples/05-end-to-end/M365Agent/Agents/AdaptiveCardAIContent.cs
similarity index 100%
rename from dotnet/samples/M365Agent/Agents/AdaptiveCardAIContent.cs
rename to dotnet/samples/05-end-to-end/M365Agent/Agents/AdaptiveCardAIContent.cs
diff --git a/dotnet/samples/M365Agent/Agents/WeatherForecastAgent.cs b/dotnet/samples/05-end-to-end/M365Agent/Agents/WeatherForecastAgent.cs
similarity index 100%
rename from dotnet/samples/M365Agent/Agents/WeatherForecastAgent.cs
rename to dotnet/samples/05-end-to-end/M365Agent/Agents/WeatherForecastAgent.cs
diff --git a/dotnet/samples/M365Agent/Agents/WeatherForecastAgentResponse.cs b/dotnet/samples/05-end-to-end/M365Agent/Agents/WeatherForecastAgentResponse.cs
similarity index 100%
rename from dotnet/samples/M365Agent/Agents/WeatherForecastAgentResponse.cs
rename to dotnet/samples/05-end-to-end/M365Agent/Agents/WeatherForecastAgentResponse.cs
diff --git a/dotnet/samples/M365Agent/Agents/WeatherForecastAgentResponseContentType.cs b/dotnet/samples/05-end-to-end/M365Agent/Agents/WeatherForecastAgentResponseContentType.cs
similarity index 100%
rename from dotnet/samples/M365Agent/Agents/WeatherForecastAgentResponseContentType.cs
rename to dotnet/samples/05-end-to-end/M365Agent/Agents/WeatherForecastAgentResponseContentType.cs
diff --git a/dotnet/samples/M365Agent/Auth/AspNetExtensions.cs b/dotnet/samples/05-end-to-end/M365Agent/Auth/AspNetExtensions.cs
similarity index 100%
rename from dotnet/samples/M365Agent/Auth/AspNetExtensions.cs
rename to dotnet/samples/05-end-to-end/M365Agent/Auth/AspNetExtensions.cs
diff --git a/dotnet/samples/M365Agent/Auth/TokenValidationOptions.cs b/dotnet/samples/05-end-to-end/M365Agent/Auth/TokenValidationOptions.cs
similarity index 100%
rename from dotnet/samples/M365Agent/Auth/TokenValidationOptions.cs
rename to dotnet/samples/05-end-to-end/M365Agent/Auth/TokenValidationOptions.cs
diff --git a/dotnet/samples/M365Agent/JsonUtilities.cs b/dotnet/samples/05-end-to-end/M365Agent/JsonUtilities.cs
similarity index 100%
rename from dotnet/samples/M365Agent/JsonUtilities.cs
rename to dotnet/samples/05-end-to-end/M365Agent/JsonUtilities.cs
diff --git a/dotnet/samples/M365Agent/M365Agent.csproj b/dotnet/samples/05-end-to-end/M365Agent/M365Agent.csproj
similarity index 88%
rename from dotnet/samples/M365Agent/M365Agent.csproj
rename to dotnet/samples/05-end-to-end/M365Agent/M365Agent.csproj
index f40d404204..72352b7f01 100644
--- a/dotnet/samples/M365Agent/M365Agent.csproj
+++ b/dotnet/samples/05-end-to-end/M365Agent/M365Agent.csproj
@@ -23,7 +23,7 @@
-
+
\ No newline at end of file
diff --git a/dotnet/samples/M365Agent/Program.cs b/dotnet/samples/05-end-to-end/M365Agent/Program.cs
similarity index 100%
rename from dotnet/samples/M365Agent/Program.cs
rename to dotnet/samples/05-end-to-end/M365Agent/Program.cs
diff --git a/dotnet/samples/M365Agent/Properties/launchSettings.json b/dotnet/samples/05-end-to-end/M365Agent/Properties/launchSettings.json
similarity index 100%
rename from dotnet/samples/M365Agent/Properties/launchSettings.json
rename to dotnet/samples/05-end-to-end/M365Agent/Properties/launchSettings.json
diff --git a/dotnet/samples/M365Agent/README.md b/dotnet/samples/05-end-to-end/M365Agent/README.md
similarity index 100%
rename from dotnet/samples/M365Agent/README.md
rename to dotnet/samples/05-end-to-end/M365Agent/README.md
diff --git a/dotnet/samples/M365Agent/appManifest/color.png b/dotnet/samples/05-end-to-end/M365Agent/appManifest/color.png
similarity index 100%
rename from dotnet/samples/M365Agent/appManifest/color.png
rename to dotnet/samples/05-end-to-end/M365Agent/appManifest/color.png
diff --git a/dotnet/samples/M365Agent/appManifest/manifest.json b/dotnet/samples/05-end-to-end/M365Agent/appManifest/manifest.json
similarity index 100%
rename from dotnet/samples/M365Agent/appManifest/manifest.json
rename to dotnet/samples/05-end-to-end/M365Agent/appManifest/manifest.json
diff --git a/dotnet/samples/M365Agent/appManifest/outline.png b/dotnet/samples/05-end-to-end/M365Agent/appManifest/outline.png
similarity index 100%
rename from dotnet/samples/M365Agent/appManifest/outline.png
rename to dotnet/samples/05-end-to-end/M365Agent/appManifest/outline.png
diff --git a/dotnet/samples/M365Agent/appsettings.json.template b/dotnet/samples/05-end-to-end/M365Agent/appsettings.json.template
similarity index 100%
rename from dotnet/samples/M365Agent/appsettings.json.template
rename to dotnet/samples/05-end-to-end/M365Agent/appsettings.json.template
diff --git a/dotnet/samples/AGUIClientServer/AGUIDojoServer/AGUIDojoServer.csproj b/dotnet/samples/AGUIClientServer/AGUIDojoServer/AGUIDojoServer.csproj
deleted file mode 100644
index cea8efff76..0000000000
--- a/dotnet/samples/AGUIClientServer/AGUIDojoServer/AGUIDojoServer.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Exe
- net10.0
- enable
- enable
- b9c3f1e1-2fb4-5g29-0e52-53e2b7g9gf21
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dotnet/samples/AGUIClientServer/AGUIServer/AGUIServer.csproj b/dotnet/samples/AGUIClientServer/AGUIServer/AGUIServer.csproj
deleted file mode 100644
index ccfe22923a..0000000000
--- a/dotnet/samples/AGUIClientServer/AGUIServer/AGUIServer.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Exe
- net10.0
- enable
- enable
- a8b2e9f0-1ea3-4f18-9d41-42d1a6f8fe10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dotnet/samples/AGUIWebChat/Server/AGUIWebChatServer.csproj b/dotnet/samples/AGUIWebChat/Server/AGUIWebChatServer.csproj
deleted file mode 100644
index c45adfd4a8..0000000000
--- a/dotnet/samples/AGUIWebChat/Server/AGUIWebChatServer.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- Exe
- net10.0
- enable
- enable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentWebChat.Web.csproj b/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentWebChat.Web.csproj
deleted file mode 100644
index fd26f56191..0000000000
--- a/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentWebChat.Web.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- net10.0
- enable
- enable
- $(NoWarn);CA1812
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/local.settings.json b/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/local.settings.json
deleted file mode 100644
index 54dfbb5664..0000000000
--- a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/local.settings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "IsEncrypted": false,
- "Values": {
- "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
- "AzureWebJobsStorage": "UseDevelopmentStorage=true",
- "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
- "AZURE_OPENAI_ENDPOINT": "",
- "AZURE_OPENAI_DEPLOYMENT": ""
- }
-}
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/local.settings.json b/dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/local.settings.json
deleted file mode 100644
index 54dfbb5664..0000000000
--- a/dotnet/samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/local.settings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "IsEncrypted": false,
- "Values": {
- "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
- "AzureWebJobsStorage": "UseDevelopmentStorage=true",
- "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
- "AZURE_OPENAI_ENDPOINT": "",
- "AZURE_OPENAI_DEPLOYMENT": ""
- }
-}
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/local.settings.json b/dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/local.settings.json
deleted file mode 100644
index 54dfbb5664..0000000000
--- a/dotnet/samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/local.settings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "IsEncrypted": false,
- "Values": {
- "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
- "AzureWebJobsStorage": "UseDevelopmentStorage=true",
- "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
- "AZURE_OPENAI_ENDPOINT": "",
- "AZURE_OPENAI_DEPLOYMENT": ""
- }
-}
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/local.settings.json b/dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/local.settings.json
deleted file mode 100644
index 54dfbb5664..0000000000
--- a/dotnet/samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/local.settings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "IsEncrypted": false,
- "Values": {
- "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
- "AzureWebJobsStorage": "UseDevelopmentStorage=true",
- "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
- "AZURE_OPENAI_ENDPOINT": "",
- "AZURE_OPENAI_DEPLOYMENT": ""
- }
-}
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/local.settings.json b/dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/local.settings.json
deleted file mode 100644
index 54dfbb5664..0000000000
--- a/dotnet/samples/Durable/Agents/AzureFunctions/05_AgentOrchestration_HITL/local.settings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "IsEncrypted": false,
- "Values": {
- "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
- "AzureWebJobsStorage": "UseDevelopmentStorage=true",
- "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
- "AZURE_OPENAI_ENDPOINT": "",
- "AZURE_OPENAI_DEPLOYMENT": ""
- }
-}
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/local.settings.json b/dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/local.settings.json
deleted file mode 100644
index 54dfbb5664..0000000000
--- a/dotnet/samples/Durable/Agents/AzureFunctions/06_LongRunningTools/local.settings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "IsEncrypted": false,
- "Values": {
- "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
- "AzureWebJobsStorage": "UseDevelopmentStorage=true",
- "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
- "AZURE_OPENAI_ENDPOINT": "",
- "AZURE_OPENAI_DEPLOYMENT": ""
- }
-}
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/07_AgentAsMcpTool/local.settings.json b/dotnet/samples/Durable/Agents/AzureFunctions/07_AgentAsMcpTool/local.settings.json
deleted file mode 100644
index 54dfbb5664..0000000000
--- a/dotnet/samples/Durable/Agents/AzureFunctions/07_AgentAsMcpTool/local.settings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "IsEncrypted": false,
- "Values": {
- "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
- "AzureWebJobsStorage": "UseDevelopmentStorage=true",
- "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
- "AZURE_OPENAI_ENDPOINT": "",
- "AZURE_OPENAI_DEPLOYMENT": ""
- }
-}
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/local.settings.json b/dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/local.settings.json
deleted file mode 100644
index 5dfdb17999..0000000000
--- a/dotnet/samples/Durable/Agents/AzureFunctions/08_ReliableStreaming/local.settings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "IsEncrypted": false,
- "Values": {
- "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
- "AzureWebJobsStorage": "UseDevelopmentStorage=true",
- "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
- "AZURE_OPENAI_ENDPOINT": "",
- "AZURE_OPENAI_DEPLOYMENT": "",
- "REDIS_CONNECTION_STRING": "localhost:6379",
- "REDIS_STREAM_TTL_MINUTES": "10"
- }
-}
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/FoundryAgent/FoundryAgent.csproj b/dotnet/samples/GettingStarted/Workflows/Agents/FoundryAgent/FoundryAgent.csproj
deleted file mode 100644
index f75c7fd28b..0000000000
--- a/dotnet/samples/GettingStarted/Workflows/Agents/FoundryAgent/FoundryAgent.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Exe
- net10.0
-
- enable
- enable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/GroupChatToolApproval/GroupChatToolApproval.csproj b/dotnet/samples/GettingStarted/Workflows/Agents/GroupChatToolApproval/GroupChatToolApproval.csproj
deleted file mode 100644
index d0c0656ade..0000000000
--- a/dotnet/samples/GettingStarted/Workflows/Agents/GroupChatToolApproval/GroupChatToolApproval.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Exe
- net10.0
-
- enable
- enable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/WorkflowAsAnAgent.csproj b/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/WorkflowAsAnAgent.csproj
deleted file mode 100644
index d0c0656ade..0000000000
--- a/dotnet/samples/GettingStarted/Workflows/Agents/WorkflowAsAnAgent/WorkflowAsAnAgent.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Exe
- net10.0
-
- enable
- enable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dotnet/samples/GettingStarted/Workflows/Concurrent/Concurrent/Concurrent.csproj b/dotnet/samples/GettingStarted/Workflows/Concurrent/Concurrent/Concurrent.csproj
deleted file mode 100644
index e756a0bf1d..0000000000
--- a/dotnet/samples/GettingStarted/Workflows/Concurrent/Concurrent/Concurrent.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Exe
- net10.0
-
- enable
- enable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dotnet/samples/GettingStarted/Workflows/Concurrent/MapReduce/MapReduce.csproj b/dotnet/samples/GettingStarted/Workflows/Concurrent/MapReduce/MapReduce.csproj
deleted file mode 100644
index fd311b7be3..0000000000
--- a/dotnet/samples/GettingStarted/Workflows/Concurrent/MapReduce/MapReduce.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- Exe
- net10.0
-
- enable
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dotnet/samples/GettingStarted/Workflows/Directory.Build.props b/dotnet/samples/GettingStarted/Workflows/Directory.Build.props
deleted file mode 100644
index 8ad5839332..0000000000
--- a/dotnet/samples/GettingStarted/Workflows/Directory.Build.props
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/01_ExecutorsAndEdges.csproj b/dotnet/samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/01_ExecutorsAndEdges.csproj
deleted file mode 100644
index 2f41070759..0000000000
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/01_ExecutorsAndEdges.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- Exe
- net10.0
-
- enable
- enable
-
-
-
-
-
-
-
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/02_Streaming/02_Streaming.csproj b/dotnet/samples/GettingStarted/Workflows/_Foundational/02_Streaming/02_Streaming.csproj
deleted file mode 100644
index 2f41070759..0000000000
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/02_Streaming/02_Streaming.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- Exe
- net10.0
-
- enable
- enable
-
-
-
-
-
-
-
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/03_AgentsInWorkflows/03_AgentsInWorkflows.csproj b/dotnet/samples/GettingStarted/Workflows/_Foundational/03_AgentsInWorkflows/03_AgentsInWorkflows.csproj
deleted file mode 100644
index d0c0656ade..0000000000
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/03_AgentsInWorkflows/03_AgentsInWorkflows.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Exe
- net10.0
-
- enable
- enable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/04_AgentWorkflowPatterns/04_AgentWorkflowPatterns.csproj b/dotnet/samples/GettingStarted/Workflows/_Foundational/04_AgentWorkflowPatterns/04_AgentWorkflowPatterns.csproj
deleted file mode 100644
index d0c0656ade..0000000000
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/04_AgentWorkflowPatterns/04_AgentWorkflowPatterns.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Exe
- net10.0
-
- enable
- enable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/06_SubWorkflows/06_SubWorkflows.csproj b/dotnet/samples/GettingStarted/Workflows/_Foundational/06_SubWorkflows/06_SubWorkflows.csproj
deleted file mode 100644
index 6c33744eee..0000000000
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/06_SubWorkflows/06_SubWorkflows.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- Exe
- net10.0
-
- enable
- enable
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/07_MixedWorkflowAgentsAndExecutors.csproj b/dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/07_MixedWorkflowAgentsAndExecutors.csproj
deleted file mode 100644
index d0c0656ade..0000000000
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/07_MixedWorkflowAgentsAndExecutors.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Exe
- net10.0
-
- enable
- enable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dotnet/samples/README.md b/dotnet/samples/README.md
index 9dfe07e2b3..5170f33d2b 100644
--- a/dotnet/samples/README.md
+++ b/dotnet/samples/README.md
@@ -13,14 +13,14 @@ were local agents. These are supported using various `AIAgent` subclasses.
The samples are subdivided into the following categories:
-- [Getting Started - Agents](./GettingStarted/Agents/README.md): Basic steps to get started with the agent framework.
+- [Getting Started - Agents](./02-agents/Agents/README.md): Basic steps to get started with the agent framework.
These samples demonstrate the fundamental concepts and functionalities of the agent framework when using the
`AIAgent` and can be used with any underlying service that provides an `AIAgent` implementation.
-- [Getting Started - Agent Providers](./GettingStarted/AgentProviders/README.md): Shows how to create an AIAgent instance for a selection of providers.
-- [Getting Started - Agent Telemetry](./GettingStarted/AgentOpenTelemetry/README.md): Demo which showcases the integration of OpenTelemetry with the Microsoft Agent Framework using Azure OpenAI and .NET Aspire Dashboard for telemetry visualization.
+- [Getting Started - Agent Providers](./02-agents/AgentProviders/README.md): Shows how to create an AIAgent instance for a selection of providers.
+- [Getting Started - Agent Telemetry](./02-agents/AgentOpenTelemetry/README.md): Demo which showcases the integration of OpenTelemetry with the Microsoft Agent Framework using Azure OpenAI and .NET Aspire Dashboard for telemetry visualization.
- [Semantic Kernel to Agent Framework Migration](https://github.com/microsoft/semantic-kernel/tree/main/dotnet/samples/AgentFrameworkMigration): For instructions and samples describing how to migrate from Semantic Kernel to Microsoft Agent Framework
-- [Durable Agents - Azure Functions](./Durable/Agents/AzureFunctions/README.md): Samples for using the Microsoft Agent Framework with Azure Functions via the durable task extension.
-- [Durable Agents - Console Apps](./Durable/Agents/ConsoleApps/README.md): Samples demonstrating durable agents in console applications.
+- [Durable Agents - Azure Functions](./04-hosting/DurableAgents/AzureFunctions/README.md): Samples for using the Microsoft Agent Framework with Azure Functions via the durable task extension.
+- [Durable Agents - Console Apps](./04-hosting/DurableAgents/ConsoleApps/README.md): Samples demonstrating durable agents in console applications.
## Prerequisites
diff --git a/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/README.md b/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/README.md
index 4202b89b82..4408f0febd 100644
--- a/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/README.md
+++ b/dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/README.md
@@ -8,11 +8,9 @@ We've provided a set of [Sample Workflows](../../../workflow-samples/) within th
Please refer to the [README](../../../workflow-samples/README.md) for setup instructions to run the sample workflows in your environment.
-As part of our [Getting Started with Declarative Workflows](../../samples/GettingStarted/Workflows/Declarative/README.md),
+As part of our [Getting Started with Declarative Workflows](../../samples/03-workflows/Declarative/README.md),
we've provided a console application that is able to execute any declarative workflow.
-Please refer to the [README](../../samples/GettingStarted/Workflows/Declarative/README.md) for configuration instructions.
-
## Actions
### ⚙️ Foundry Actions
diff --git a/python/packages/ag-ui/agent_framework_ag_ui_examples/README.md b/python/packages/ag-ui/agent_framework_ag_ui_examples/README.md
index e11a05d863..cfc4042026 100644
--- a/python/packages/ag-ui/agent_framework_ag_ui_examples/README.md
+++ b/python/packages/ag-ui/agent_framework_ag_ui_examples/README.md
@@ -327,10 +327,6 @@ wrapped_agent = AgentFrameworkAgent(
orchestrators=[MyCustomOrchestrator(), DefaultOrchestrator()],
)
-## Documentation
-
-For detailed documentation, see [DESIGN.md](DESIGN.md).
-
## License
MIT
diff --git a/python/packages/core/README.md b/python/packages/core/README.md
index 1c2433cbc1..ff194ad859 100644
--- a/python/packages/core/README.md
+++ b/python/packages/core/README.md
@@ -220,7 +220,7 @@ if __name__ == "__main__":
- [Getting Started with Agents](../../samples/02-agents): Basic agent creation and tool usage
- [Chat Client Examples](../../samples/02-agents/chat_client): Direct chat client usage patterns
- [Azure AI Integration](https://github.com/microsoft/agent-framework/tree/main/python/packages/azure-ai): Azure AI integration
-- [.NET Workflows Samples](../../../dotnet/samples/GettingStarted/Workflows): Advanced multi-agent patterns (.NET)
+- [Workflows Samples](../../samples/03-workflows): Advanced multi-agent patterns
## Agent Framework Documentation
diff --git a/python/samples/04-hosting/a2a/README.md b/python/samples/04-hosting/a2a/README.md
index dd09aaaa1a..2ede8b8a3d 100644
--- a/python/samples/04-hosting/a2a/README.md
+++ b/python/samples/04-hosting/a2a/README.md
@@ -25,7 +25,7 @@ Make sure to set the following environment variables before running the example:
For quick testing and demonstration, you can use the pre-built .NET A2A servers from this repository:
**Quick Testing Reference**: Use the .NET A2A Client Server sample at:
-`..\agent-framework\dotnet\samples\A2AClientServer`
+`..\agent-framework\dotnet\samples\05-end-to-end\A2AClientServer`
### Run Python A2A Sample
```powershell
diff --git a/workflow-samples/README.md b/workflow-samples/README.md
index a7bed697e5..07cbb859e2 100644
--- a/workflow-samples/README.md
+++ b/workflow-samples/README.md
@@ -10,8 +10,8 @@ Workflow workflow = DeclarativeWorkflowBuilder.Build("Marketing.yaml", options);
```
These example workflows may be executed by the workflow
-[Samples](../dotnet/samples/GettingStarted/Workflows/Declarative)
+[Samples](../dotnet/samples/03-workflows/Declarative)
that are present in this repository.
-> See the [README.md](../dotnet/samples/GettingStarted/Workflows/Declarative/README.md)
+> See the [README.md](../dotnet/samples/03-workflows/Declarative/README.md)
associated with the samples for configuration details.