microsoft · crickman · Feb 19, 2026 · Feb 19, 2026 · Feb 19, 2026 · Feb 19, 2026
diff --git 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/02-agents/Workflow/**
     - python/packages/main/agent_framework/_workflow/**
     - python/samples/getting_started/workflow/**
 

diff --git a/README.md b/README.md
@@ -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_Step14_Middleware/)
 
 ### 💬 **We want your feedback!**
 
@@ -165,8 +165,8 @@ 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
+- [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/dotnet/README.md b/dotnet/README.md
@@ -22,8 +22,8 @@ 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
+- [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
diff --git a/dotnet/samples/GettingStarted/AGUI/README.md → dotnet/samples/02-agents/AGUI/README.md b/dotnet/samples/GettingStarted/AGUI/README.md → dotnet/samples/02-agents/AGUI/README.md
diff --git a/...tep01_GettingStarted/Client/Client.csproj → ...tep01_GettingStarted/Client/Client.csproj b/...tep01_GettingStarted/Client/Client.csproj → ...tep01_GettingStarted/Client/Client.csproj
diff --git a/...I/Step01_GettingStarted/Client/Program.cs → ...I/Step01_GettingStarted/Client/Program.cs b/...I/Step01_GettingStarted/Client/Program.cs → ...I/Step01_GettingStarted/Client/Program.cs
diff --git a/...I/Step01_GettingStarted/Server/Program.cs → ...I/Step01_GettingStarted/Server/Program.cs b/...I/Step01_GettingStarted/Server/Program.cs → ...I/Step01_GettingStarted/Server/Program.cs
diff --git a/...ted/Server/Properties/launchSettings.json → ...ted/Server/Properties/launchSettings.json b/...ted/Server/Properties/launchSettings.json → ...ted/Server/Properties/launchSettings.json
diff --git a/...tep01_GettingStarted/Server/Server.csproj → ...tep01_GettingStarted/Server/Server.csproj b/...tep01_GettingStarted/Server/Server.csproj → ...tep01_GettingStarted/Server/Server.csproj
diff --git a/...arted/Server/appsettings.Development.json → ...arted/Server/appsettings.Development.json b/...arted/Server/appsettings.Development.json → ...arted/Server/appsettings.Development.json
diff --git a/...01_GettingStarted/Server/appsettings.json → ...01_GettingStarted/Server/appsettings.json b/...01_GettingStarted/Server/appsettings.json → ...01_GettingStarted/Server/appsettings.json
diff --git a/.../Step02_BackendTools/Client/Client.csproj → .../Step02_BackendTools/Client/Client.csproj b/.../Step02_BackendTools/Client/Client.csproj → .../Step02_BackendTools/Client/Client.csproj
diff --git a/...GUI/Step02_BackendTools/Client/Program.cs → ...GUI/Step02_BackendTools/Client/Program.cs b/...GUI/Step02_BackendTools/Client/Program.cs → ...GUI/Step02_BackendTools/Client/Program.cs
diff --git a/...GUI/Step02_BackendTools/Server/Program.cs → ...GUI/Step02_BackendTools/Server/Program.cs b/...GUI/Step02_BackendTools/Server/Program.cs → ...GUI/Step02_BackendTools/Server/Program.cs
diff --git a/...ols/Server/Properties/launchSettings.json → ...ols/Server/Properties/launchSettings.json b/...ols/Server/Properties/launchSettings.json → ...ols/Server/Properties/launchSettings.json
diff --git a/.../Step02_BackendTools/Server/Server.csproj → .../Step02_BackendTools/Server/Server.csproj b/.../Step02_BackendTools/Server/Server.csproj → .../Step02_BackendTools/Server/Server.csproj
diff --git a/...Tools/Server/appsettings.Development.json → ...Tools/Server/appsettings.Development.json b/...Tools/Server/appsettings.Development.json → ...Tools/Server/appsettings.Development.json
diff --git a/...ep02_BackendTools/Server/appsettings.json → ...ep02_BackendTools/Server/appsettings.json b/...ep02_BackendTools/Server/appsettings.json → ...ep02_BackendTools/Server/appsettings.json
diff --git a/...Step03_FrontendTools/Client/Client.csproj → ...Step03_FrontendTools/Client/Client.csproj b/...Step03_FrontendTools/Client/Client.csproj → ...Step03_FrontendTools/Client/Client.csproj
diff --git a/...UI/Step03_FrontendTools/Client/Program.cs → ...UI/Step03_FrontendTools/Client/Program.cs b/...UI/Step03_FrontendTools/Client/Program.cs → ...UI/Step03_FrontendTools/Client/Program.cs
diff --git a/...UI/Step03_FrontendTools/Server/Program.cs → ...UI/Step03_FrontendTools/Server/Program.cs b/...UI/Step03_FrontendTools/Server/Program.cs → ...UI/Step03_FrontendTools/Server/Program.cs
diff --git a/...ols/Server/Properties/launchSettings.json → ...ols/Server/Properties/launchSettings.json b/...ols/Server/Properties/launchSettings.json → ...ols/Server/Properties/launchSettings.json
diff --git a/...Step03_FrontendTools/Server/Server.csproj → ...Step03_FrontendTools/Server/Server.csproj b/...Step03_FrontendTools/Server/Server.csproj → ...Step03_FrontendTools/Server/Server.csproj
diff --git a/...Tools/Server/appsettings.Development.json → ...Tools/Server/appsettings.Development.json b/...Tools/Server/appsettings.Development.json → ...Tools/Server/appsettings.Development.json
diff --git a/...p03_FrontendTools/Server/appsettings.json → ...p03_FrontendTools/Server/appsettings.json b/...p03_FrontendTools/Server/appsettings.json → ...p03_FrontendTools/Server/appsettings.json
diff --git a/...I/Step04_HumanInLoop/Client/Client.csproj → ...I/Step04_HumanInLoop/Client/Client.csproj b/...I/Step04_HumanInLoop/Client/Client.csproj → ...I/Step04_HumanInLoop/Client/Client.csproj
diff --git a/...AGUI/Step04_HumanInLoop/Client/Program.cs → ...AGUI/Step04_HumanInLoop/Client/Program.cs b/...AGUI/Step04_HumanInLoop/Client/Program.cs → ...AGUI/Step04_HumanInLoop/Client/Program.cs
diff --git a/...ient/ServerFunctionApprovalClientAgent.cs → ...ient/ServerFunctionApprovalClientAgent.cs b/...ient/ServerFunctionApprovalClientAgent.cs → ...ient/ServerFunctionApprovalClientAgent.cs
diff --git a/...AGUI/Step04_HumanInLoop/Server/Program.cs → ...AGUI/Step04_HumanInLoop/Server/Program.cs b/...AGUI/Step04_HumanInLoop/Server/Program.cs → ...AGUI/Step04_HumanInLoop/Server/Program.cs
diff --git a/...oop/Server/Properties/launchSettings.json → ...oop/Server/Properties/launchSettings.json b/...oop/Server/Properties/launchSettings.json → ...oop/Server/Properties/launchSettings.json
diff --git a/...I/Step04_HumanInLoop/Server/Server.csproj → ...I/Step04_HumanInLoop/Server/Server.csproj b/...I/Step04_HumanInLoop/Server/Server.csproj → ...I/Step04_HumanInLoop/Server/Server.csproj
diff --git a/...rver/ServerFunctionApprovalServerAgent.cs → ...rver/ServerFunctionApprovalServerAgent.cs b/...rver/ServerFunctionApprovalServerAgent.cs → ...rver/ServerFunctionApprovalServerAgent.cs
diff --git a/...nLoop/Server/appsettings.Development.json → ...nLoop/Server/appsettings.Development.json b/...nLoop/Server/appsettings.Development.json → ...nLoop/Server/appsettings.Development.json
diff --git a/...tep04_HumanInLoop/Server/appsettings.json → ...tep04_HumanInLoop/Server/appsettings.json b/...tep04_HumanInLoop/Server/appsettings.json → ...tep04_HumanInLoop/Server/appsettings.json
diff --git a/...ep05_StateManagement/Client/Client.csproj → ...ep05_StateManagement/Client/Client.csproj b/...ep05_StateManagement/Client/Client.csproj → ...ep05_StateManagement/Client/Client.csproj
diff --git a/.../Step05_StateManagement/Client/Program.cs → .../Step05_StateManagement/Client/Program.cs b/.../Step05_StateManagement/Client/Program.cs → .../Step05_StateManagement/Client/Program.cs
diff --git a/...5_StateManagement/Client/StatefulAgent.cs → ...5_StateManagement/Client/StatefulAgent.cs b/...5_StateManagement/Client/StatefulAgent.cs → ...5_StateManagement/Client/StatefulAgent.cs
diff --git a/.../Step05_StateManagement/Server/Program.cs → .../Step05_StateManagement/Server/Program.cs b/.../Step05_StateManagement/Server/Program.cs → .../Step05_StateManagement/Server/Program.cs
diff --git a/...ent/Server/Properties/launchSettings.json → ...ent/Server/Properties/launchSettings.json b/...ent/Server/Properties/launchSettings.json → ...ent/Server/Properties/launchSettings.json
diff --git a/...05_StateManagement/Server/RecipeModels.cs → ...05_StateManagement/Server/RecipeModels.cs b/...05_StateManagement/Server/RecipeModels.cs → ...05_StateManagement/Server/RecipeModels.cs
diff --git a/...ep05_StateManagement/Server/Server.csproj → ...ep05_StateManagement/Server/Server.csproj b/...ep05_StateManagement/Server/Server.csproj → ...ep05_StateManagement/Server/Server.csproj
diff --git a/...tateManagement/Server/SharedStateAgent.cs → ...tateManagement/Server/SharedStateAgent.cs b/...tateManagement/Server/SharedStateAgent.cs → ...tateManagement/Server/SharedStateAgent.cs
diff --git a/...ement/Server/appsettings.Development.json → ...ement/Server/appsettings.Development.json b/...ement/Server/appsettings.Development.json → ...ement/Server/appsettings.Development.json
diff --git a/...5_StateManagement/Server/appsettings.json → ...5_StateManagement/Server/appsettings.json b/...5_StateManagement/Server/appsettings.json → ...5_StateManagement/Server/appsettings.json
diff --git a/...ntOpenTelemetry/AgentOpenTelemetry.csproj → ...ntOpenTelemetry/AgentOpenTelemetry.csproj b/...ntOpenTelemetry/AgentOpenTelemetry.csproj → ...ntOpenTelemetry/AgentOpenTelemetry.csproj
diff --git a/...tingStarted/AgentOpenTelemetry/Program.cs → ...s/02-agents/AgentOpenTelemetry/Program.cs b/...tingStarted/AgentOpenTelemetry/Program.cs → ...s/02-agents/AgentOpenTelemetry/Program.cs
diff --git a/...ttingStarted/AgentOpenTelemetry/README.md → ...es/02-agents/AgentOpenTelemetry/README.md b/...ttingStarted/AgentOpenTelemetry/README.md → ...es/02-agents/AgentOpenTelemetry/README.md
diff --git a/...Started/AgentOpenTelemetry/start-demo.ps1 → ...-agents/AgentOpenTelemetry/start-demo.ps1 b/...Started/AgentOpenTelemetry/start-demo.ps1 → ...-agents/AgentOpenTelemetry/start-demo.ps1
diff --git a/...ders/Agent_With_A2A/Agent_With_A2A.csproj → ...ders/Agent_With_A2A/Agent_With_A2A.csproj b/...ders/Agent_With_A2A/Agent_With_A2A.csproj → ...ders/Agent_With_A2A/Agent_With_A2A.csproj
diff --git a/.../AgentProviders/Agent_With_A2A/Program.cs → .../AgentProviders/Agent_With_A2A/Program.cs b/.../AgentProviders/Agent_With_A2A/Program.cs → .../AgentProviders/Agent_With_A2A/Program.cs
diff --git a/...d/AgentProviders/Agent_With_A2A/README.md → ...s/AgentProviders/Agent_With_A2A/README.md b/...d/AgentProviders/Agent_With_A2A/README.md → ...s/AgentProviders/Agent_With_A2A/README.md
diff --git a/...ith_Anthropic/Agent_With_Anthropic.csproj → ...ith_Anthropic/Agent_With_Anthropic.csproj b/...ith_Anthropic/Agent_With_Anthropic.csproj → ...ith_Anthropic/Agent_With_Anthropic.csproj
diff --git a/...Providers/Agent_With_Anthropic/Program.cs → ...Providers/Agent_With_Anthropic/Program.cs b/...Providers/Agent_With_Anthropic/Program.cs → ...Providers/Agent_With_Anthropic/Program.cs
diff --git a/...tProviders/Agent_With_Anthropic/README.md → ...tProviders/Agent_With_Anthropic/README.md b/...tProviders/Agent_With_Anthropic/README.md → ...tProviders/Agent_With_Anthropic/README.md
diff --git a/...Agent_With_AzureAIAgentsPersistent.csproj → ...Agent_With_AzureAIAgentsPersistent.csproj b/...Agent_With_AzureAIAgentsPersistent.csproj → ...Agent_With_AzureAIAgentsPersistent.csproj
diff --git a/...t_With_AzureAIAgentsPersistent/Program.cs → ...t_With_AzureAIAgentsPersistent/Program.cs b/...t_With_AzureAIAgentsPersistent/Program.cs → ...t_With_AzureAIAgentsPersistent/Program.cs
diff --git a/...nt_With_AzureAIAgentsPersistent/README.md → ...nt_With_AzureAIAgentsPersistent/README.md b/...nt_With_AzureAIAgentsPersistent/README.md → ...nt_With_AzureAIAgentsPersistent/README.md
diff --git a/...IProject/Agent_With_AzureAIProject.csproj → ...IProject/Agent_With_AzureAIProject.csproj b/...IProject/Agent_With_AzureAIProject.csproj → ...IProject/Agent_With_AzureAIProject.csproj
diff --git a/...ders/Agent_With_AzureAIProject/Program.cs → ...ders/Agent_With_AzureAIProject/Program.cs b/...ders/Agent_With_AzureAIProject/Program.cs → ...ders/Agent_With_AzureAIProject/Program.cs
diff --git a/...iders/Agent_With_AzureAIProject/README.md → ...iders/Agent_With_AzureAIProject/README.md b/...iders/Agent_With_AzureAIProject/README.md → ...iders/Agent_With_AzureAIProject/README.md
diff --git a/...Model/Agent_With_AzureFoundryModel.csproj → ...Model/Agent_With_AzureFoundryModel.csproj b/...Model/Agent_With_AzureFoundryModel.csproj → ...Model/Agent_With_AzureFoundryModel.csproj
diff --git a/...s/Agent_With_AzureFoundryModel/Program.cs → ...s/Agent_With_AzureFoundryModel/Program.cs b/...s/Agent_With_AzureFoundryModel/Program.cs → ...s/Agent_With_AzureFoundryModel/Program.cs
diff --git a/...rs/Agent_With_AzureFoundryModel/README.md → ...rs/Agent_With_AzureFoundryModel/README.md b/...rs/Agent_With_AzureFoundryModel/README.md → ...rs/Agent_With_AzureFoundryModel/README.md
diff --git a/...ent_With_AzureOpenAIChatCompletion.csproj → ...ent_With_AzureOpenAIChatCompletion.csproj b/...ent_With_AzureOpenAIChatCompletion.csproj → ...ent_With_AzureOpenAIChatCompletion.csproj
diff --git a/...With_AzureOpenAIChatCompletion/Program.cs → ...With_AzureOpenAIChatCompletion/Program.cs b/...With_AzureOpenAIChatCompletion/Program.cs → ...With_AzureOpenAIChatCompletion/Program.cs
diff --git a/..._With_AzureOpenAIChatCompletion/README.md → ..._With_AzureOpenAIChatCompletion/README.md b/..._With_AzureOpenAIChatCompletion/README.md → ..._With_AzureOpenAIChatCompletion/README.md
diff --git a/...es/Agent_With_AzureOpenAIResponses.csproj → ...es/Agent_With_AzureOpenAIResponses.csproj b/...es/Agent_With_AzureOpenAIResponses.csproj → ...es/Agent_With_AzureOpenAIResponses.csproj
diff --git a/...gent_With_AzureOpenAIResponses/Program.cs → ...gent_With_AzureOpenAIResponses/Program.cs b/...gent_With_AzureOpenAIResponses/Program.cs → ...gent_With_AzureOpenAIResponses/Program.cs
diff --git a/...Agent_With_AzureOpenAIResponses/README.md → ...Agent_With_AzureOpenAIResponses/README.md b/...Agent_With_AzureOpenAIResponses/README.md → ...Agent_With_AzureOpenAIResponses/README.md
diff --git a/...on/Agent_With_CustomImplementation.csproj → ...on/Agent_With_CustomImplementation.csproj b/...on/Agent_With_CustomImplementation.csproj → ...on/Agent_With_CustomImplementation.csproj
diff --git a/...gent_With_CustomImplementation/Program.cs → ...gent_With_CustomImplementation/Program.cs b/...gent_With_CustomImplementation/Program.cs → ...gent_With_CustomImplementation/Program.cs
diff --git a/...Agent_With_CustomImplementation/README.md → ...Agent_With_CustomImplementation/README.md b/...Agent_With_CustomImplementation/README.md → ...Agent_With_CustomImplementation/README.md
diff --git a/...ubCopilot/Agent_With_GitHubCopilot.csproj → ...ubCopilot/Agent_With_GitHubCopilot.csproj b/...ubCopilot/Agent_With_GitHubCopilot.csproj → ...ubCopilot/Agent_With_GitHubCopilot.csproj
diff --git a/...iders/Agent_With_GitHubCopilot/Program.cs → ...iders/Agent_With_GitHubCopilot/Program.cs b/...iders/Agent_With_GitHubCopilot/Program.cs → ...iders/Agent_With_GitHubCopilot/Program.cs
diff --git a/...viders/Agent_With_GitHubCopilot/README.md → ...viders/Agent_With_GitHubCopilot/README.md b/...viders/Agent_With_GitHubCopilot/README.md → ...viders/Agent_With_GitHubCopilot/README.md
diff --git a/...ogleGemini/Agent_With_GoogleGemini.csproj → ...ogleGemini/Agent_With_GoogleGemini.csproj b/...ogleGemini/Agent_With_GoogleGemini.csproj → ...ogleGemini/Agent_With_GoogleGemini.csproj
diff --git a/...viders/Agent_With_GoogleGemini/Program.cs → ...viders/Agent_With_GoogleGemini/Program.cs b/...viders/Agent_With_GoogleGemini/Program.cs → ...viders/Agent_With_GoogleGemini/Program.cs
diff --git a/...oviders/Agent_With_GoogleGemini/README.md → ...oviders/Agent_With_GoogleGemini/README.md b/...oviders/Agent_With_GoogleGemini/README.md → ...oviders/Agent_With_GoogleGemini/README.md
diff --git a/...rs/Agent_With_ONNX/Agent_With_ONNX.csproj → ...rs/Agent_With_ONNX/Agent_With_ONNX.csproj b/...rs/Agent_With_ONNX/Agent_With_ONNX.csproj → ...rs/Agent_With_ONNX/Agent_With_ONNX.csproj
diff --git a/...AgentProviders/Agent_With_ONNX/Program.cs → ...AgentProviders/Agent_With_ONNX/Program.cs b/...AgentProviders/Agent_With_ONNX/Program.cs → ...AgentProviders/Agent_With_ONNX/Program.cs
diff --git a/.../AgentProviders/Agent_With_ONNX/README.md → .../AgentProviders/Agent_With_ONNX/README.md b/.../AgentProviders/Agent_With_ONNX/README.md → .../AgentProviders/Agent_With_ONNX/README.md
diff --git a/...gent_With_Ollama/Agent_With_Ollama.csproj → ...gent_With_Ollama/Agent_With_Ollama.csproj b/...gent_With_Ollama/Agent_With_Ollama.csproj → ...gent_With_Ollama/Agent_With_Ollama.csproj
diff --git a/...entProviders/Agent_With_Ollama/Program.cs → ...entProviders/Agent_With_Ollama/Program.cs b/...entProviders/Agent_With_Ollama/Program.cs → ...entProviders/Agent_With_Ollama/Program.cs
diff --git a/...gentProviders/Agent_With_Ollama/README.md → ...gentProviders/Agent_With_Ollama/README.md b/...gentProviders/Agent_With_Ollama/README.md → ...gentProviders/Agent_With_Ollama/README.md
diff --git a/...stants/Agent_With_OpenAIAssistants.csproj → ...stants/Agent_With_OpenAIAssistants.csproj b/...stants/Agent_With_OpenAIAssistants.csproj → ...stants/Agent_With_OpenAIAssistants.csproj
diff --git a/...rs/Agent_With_OpenAIAssistants/Program.cs → ...rs/Agent_With_OpenAIAssistants/Program.cs b/...rs/Agent_With_OpenAIAssistants/Program.cs → ...rs/Agent_With_OpenAIAssistants/Program.cs
diff --git a/...ers/Agent_With_OpenAIAssistants/README.md → ...ers/Agent_With_OpenAIAssistants/README.md b/...ers/Agent_With_OpenAIAssistants/README.md → ...ers/Agent_With_OpenAIAssistants/README.md
diff --git a/...on/Agent_With_OpenAIChatCompletion.csproj → ...on/Agent_With_OpenAIChatCompletion.csproj b/...on/Agent_With_OpenAIChatCompletion.csproj → ...on/Agent_With_OpenAIChatCompletion.csproj
diff --git a/...gent_With_OpenAIChatCompletion/Program.cs → ...gent_With_OpenAIChatCompletion/Program.cs b/...gent_With_OpenAIChatCompletion/Program.cs → ...gent_With_OpenAIChatCompletion/Program.cs
diff --git a/...Agent_With_OpenAIChatCompletion/README.md → ...Agent_With_OpenAIChatCompletion/README.md b/...Agent_With_OpenAIChatCompletion/README.md → ...Agent_With_OpenAIChatCompletion/README.md
diff --git a/...sponses/Agent_With_OpenAIResponses.csproj → ...sponses/Agent_With_OpenAIResponses.csproj b/...sponses/Agent_With_OpenAIResponses.csproj → ...sponses/Agent_With_OpenAIResponses.csproj
diff --git a/...ers/Agent_With_OpenAIResponses/Program.cs → ...ers/Agent_With_OpenAIResponses/Program.cs b/...ers/Agent_With_OpenAIResponses/Program.cs → ...ers/Agent_With_OpenAIResponses/Program.cs
diff --git a/...ders/Agent_With_OpenAIResponses/README.md → ...ders/Agent_With_OpenAIResponses/README.md b/...ders/Agent_With_OpenAIResponses/README.md → ...ders/Agent_With_OpenAIResponses/README.md
diff --git a/...s/GettingStarted/AgentProviders/README.md → ...amples/02-agents/AgentProviders/README.md b/...s/GettingStarted/AgentProviders/README.md → ...amples/02-agents/AgentProviders/README.md
diff --git a/...ing/Agent_Anthropic_Step01_Running.csproj → ...ing/Agent_Anthropic_Step01_Running.csproj b/...ing/Agent_Anthropic_Step01_Running.csproj → ...ing/Agent_Anthropic_Step01_Running.csproj
diff --git a/...Agent_Anthropic_Step01_Running/Program.cs → ...Agent_Anthropic_Step01_Running/Program.cs b/...Agent_Anthropic_Step01_Running/Program.cs → ...Agent_Anthropic_Step01_Running/Program.cs
diff --git a/.../Agent_Anthropic_Step01_Running/README.md → .../Agent_Anthropic_Step01_Running/README.md b/.../Agent_Anthropic_Step01_Running/README.md → .../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/...g/Agent_Anthropic_Step02_Reasoning.csproj → ...g/Agent_Anthropic_Step02_Reasoning.csproj b/...g/Agent_Anthropic_Step02_Reasoning.csproj → ...g/Agent_Anthropic_Step02_Reasoning.csproj
diff --git a/...ent_Anthropic_Step02_Reasoning/Program.cs → ...ent_Anthropic_Step02_Reasoning/Program.cs b/...ent_Anthropic_Step02_Reasoning/Program.cs → ...ent_Anthropic_Step02_Reasoning/Program.cs
diff --git a/...gent_Anthropic_Step02_Reasoning/README.md → ...gent_Anthropic_Step02_Reasoning/README.md b/...gent_Anthropic_Step02_Reasoning/README.md → ...gent_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/...nthropic_Step03_UsingFunctionTools.csproj → ...nthropic_Step03_UsingFunctionTools.csproj b/...nthropic_Step03_UsingFunctionTools.csproj → ...nthropic_Step03_UsingFunctionTools.csproj
diff --git a/...opic_Step03_UsingFunctionTools/Program.cs → ...opic_Step03_UsingFunctionTools/Program.cs b/...opic_Step03_UsingFunctionTools/Program.cs → ...opic_Step03_UsingFunctionTools/Program.cs
diff --git a/...ropic_Step03_UsingFunctionTools/README.md → ...ropic_Step03_UsingFunctionTools/README.md b/...ropic_Step03_UsingFunctionTools/README.md → ...ropic_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/...Agent_Anthropic_Step04_UsingSkills.csproj → ...Agent_Anthropic_Step04_UsingSkills.csproj b/...Agent_Anthropic_Step04_UsingSkills.csproj → ...Agent_Anthropic_Step04_UsingSkills.csproj
diff --git a/...t_Anthropic_Step04_UsingSkills/Program.cs → ...t_Anthropic_Step04_UsingSkills/Program.cs b/...t_Anthropic_Step04_UsingSkills/Program.cs → ...t_Anthropic_Step04_UsingSkills/Program.cs
diff --git a/...nt_Anthropic_Step04_UsingSkills/README.md → ...nt_Anthropic_Step04_UsingSkills/README.md b/...nt_Anthropic_Step04_UsingSkills/README.md → ...nt_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/...ttingStarted/AgentWithAnthropic/README.md → ...es/02-agents/AgentWithAnthropic/README.md b/...ttingStarted/AgentWithAnthropic/README.md → ...es/02-agents/AgentWithAnthropic/README.md
diff --git a/...ithMemory_Step01_ChatHistoryMemory.csproj → ...ithMemory_Step01_ChatHistoryMemory.csproj b/...ithMemory_Step01_ChatHistoryMemory.csproj → ...ithMemory_Step01_ChatHistoryMemory.csproj
diff --git a/...emory_Step01_ChatHistoryMemory/Program.cs → ...emory_Step01_ChatHistoryMemory/Program.cs b/...emory_Step01_ChatHistoryMemory/Program.cs → ...emory_Step01_ChatHistoryMemory/Program.cs
diff --git a/...tWithMemory_Step02_MemoryUsingMem0.csproj → ...tWithMemory_Step02_MemoryUsingMem0.csproj b/...tWithMemory_Step02_MemoryUsingMem0.csproj → ...tWithMemory_Step02_MemoryUsingMem0.csproj
diff --git a/...hMemory_Step02_MemoryUsingMem0/Program.cs → ...hMemory_Step02_MemoryUsingMem0/Program.cs b/...hMemory_Step02_MemoryUsingMem0/Program.cs → ...hMemory_Step02_MemoryUsingMem0/Program.cs
diff --git a/.../GettingStarted/AgentWithMemory/README.md → ...mples/02-agents/AgentWithMemory/README.md b/.../GettingStarted/AgentWithMemory/README.md → ...mples/02-agents/AgentWithMemory/README.md
diff --git a/...unning/Agent_OpenAI_Step01_Running.csproj → ...unning/Agent_OpenAI_Step01_Running.csproj b/...unning/Agent_OpenAI_Step01_Running.csproj → ...unning/Agent_OpenAI_Step01_Running.csproj
diff --git a/...AI/Agent_OpenAI_Step01_Running/Program.cs → ...AI/Agent_OpenAI_Step01_Running/Program.cs b/...AI/Agent_OpenAI_Step01_Running/Program.cs → ...AI/Agent_OpenAI_Step01_Running/Program.cs
diff --git a/...ning/Agent_OpenAI_Step02_Reasoning.csproj → ...ning/Agent_OpenAI_Step02_Reasoning.csproj b/...ning/Agent_OpenAI_Step02_Reasoning.csproj → ...ning/Agent_OpenAI_Step02_Reasoning.csproj
diff --git a/.../Agent_OpenAI_Step02_Reasoning/Program.cs → .../Agent_OpenAI_Step02_Reasoning/Program.cs b/.../Agent_OpenAI_Step02_Reasoning/Program.cs → .../Agent_OpenAI_Step02_Reasoning/Program.cs
diff --git a/...OpenAI_Step03_CreateFromChatClient.csproj → ...OpenAI_Step03_CreateFromChatClient.csproj b/...OpenAI_Step03_CreateFromChatClient.csproj → ...OpenAI_Step03_CreateFromChatClient.csproj
diff --git a/...teFromChatClient/OpenAIChatClientAgent.cs → ...teFromChatClient/OpenAIChatClientAgent.cs b/...teFromChatClient/OpenAIChatClientAgent.cs → ...teFromChatClient/OpenAIChatClientAgent.cs
diff --git a/...AI_Step03_CreateFromChatClient/Program.cs → ...AI_Step03_CreateFromChatClient/Program.cs b/...AI_Step03_CreateFromChatClient/Program.cs → ...AI_Step03_CreateFromChatClient/Program.cs
diff --git a/...nAI_Step03_CreateFromChatClient/README.md → ...nAI_Step03_CreateFromChatClient/README.md b/...nAI_Step03_CreateFromChatClient/README.md → ...nAI_Step03_CreateFromChatClient/README.md
diff --git a/...p04_CreateFromOpenAIResponseClient.csproj → ...p04_CreateFromOpenAIResponseClient.csproj b/...p04_CreateFromOpenAIResponseClient.csproj → ...p04_CreateFromOpenAIResponseClient.csproj
diff --git a/...sponseClient/OpenAIResponseClientAgent.cs → ...sponseClient/OpenAIResponseClientAgent.cs b/...sponseClient/OpenAIResponseClientAgent.cs → ...sponseClient/OpenAIResponseClientAgent.cs
diff --git a/...CreateFromOpenAIResponseClient/Program.cs → ...CreateFromOpenAIResponseClient/Program.cs b/...CreateFromOpenAIResponseClient/Program.cs → ...CreateFromOpenAIResponseClient/Program.cs
diff --git a/..._CreateFromOpenAIResponseClient/README.md → ..._CreateFromOpenAIResponseClient/README.md b/..._CreateFromOpenAIResponseClient/README.md → ..._CreateFromOpenAIResponseClient/README.md
diff --git a/...n/Agent_OpenAI_Step05_Conversation.csproj → ...n/Agent_OpenAI_Step05_Conversation.csproj b/...n/Agent_OpenAI_Step05_Conversation.csproj → ...n/Agent_OpenAI_Step05_Conversation.csproj
diff --git a/...ent_OpenAI_Step05_Conversation/Program.cs → ...ent_OpenAI_Step05_Conversation/Program.cs b/...ent_OpenAI_Step05_Conversation/Program.cs → ...ent_OpenAI_Step05_Conversation/Program.cs
diff --git a/...gent_OpenAI_Step05_Conversation/README.md → ...gent_OpenAI_Step05_Conversation/README.md b/...gent_OpenAI_Step05_Conversation/README.md → ...gent_OpenAI_Step05_Conversation/README.md
diff --git a/.../GettingStarted/AgentWithOpenAI/README.md → ...mples/02-agents/AgentWithOpenAI/README.md b/.../GettingStarted/AgentWithOpenAI/README.md → ...mples/02-agents/AgentWithOpenAI/README.md
diff --git a/...G/AgentWithRAG_Step01_BasicTextRAG.csproj → ...G/AgentWithRAG_Step01_BasicTextRAG.csproj b/...G/AgentWithRAG_Step01_BasicTextRAG.csproj → ...G/AgentWithRAG_Step01_BasicTextRAG.csproj
diff --git a/...entWithRAG_Step01_BasicTextRAG/Program.cs → ...entWithRAG_Step01_BasicTextRAG/Program.cs b/...entWithRAG_Step01_BasicTextRAG/Program.cs → ...entWithRAG_Step01_BasicTextRAG/Program.cs
diff --git a/...RAG/TextSearchStore/TextSearchDocument.cs → ...RAG/TextSearchStore/TextSearchDocument.cs b/...RAG/TextSearchStore/TextSearchDocument.cs → ...RAG/TextSearchStore/TextSearchDocument.cs
diff --git a/...extRAG/TextSearchStore/TextSearchStore.cs → ...extRAG/TextSearchStore/TextSearchStore.cs b/...extRAG/TextSearchStore/TextSearchStore.cs → ...extRAG/TextSearchStore/TextSearchStore.cs
diff --git a/...TextSearchStore/TextSearchStoreOptions.cs → ...TextSearchStore/TextSearchStoreOptions.cs b/...TextSearchStore/TextSearchStoreOptions.cs → ...TextSearchStore/TextSearchStoreOptions.cs
diff --git a/...archStore/TextSearchStoreUpsertOptions.cs → ...archStore/TextSearchStoreUpsertOptions.cs b/...archStore/TextSearchStoreUpsertOptions.cs → ...archStore/TextSearchStoreUpsertOptions.cs
diff --git a/...ithRAG_Step02_CustomVectorStoreRAG.csproj → ...ithRAG_Step02_CustomVectorStoreRAG.csproj b/...ithRAG_Step02_CustomVectorStoreRAG.csproj → ...ithRAG_Step02_CustomVectorStoreRAG.csproj
diff --git a/...AG_Step02_CustomVectorStoreRAG/Program.cs → ...AG_Step02_CustomVectorStoreRAG/Program.cs b/...AG_Step02_CustomVectorStoreRAG/Program.cs → ...AG_Step02_CustomVectorStoreRAG/Program.cs
diff --git a/...RAG_Step02_CustomVectorStoreRAG/README.md → ...RAG_Step02_CustomVectorStoreRAG/README.md b/...RAG_Step02_CustomVectorStoreRAG/README.md → ...RAG_Step02_CustomVectorStoreRAG/README.md
diff --git a/...WithRAG_Step03_CustomRAGDataSource.csproj → ...WithRAG_Step03_CustomRAGDataSource.csproj b/...WithRAG_Step03_CustomRAGDataSource.csproj → ...WithRAG_Step03_CustomRAGDataSource.csproj
diff --git a/...RAG_Step03_CustomRAGDataSource/Program.cs → ...RAG_Step03_CustomRAGDataSource/Program.cs b/...RAG_Step03_CustomRAGDataSource/Program.cs → ...RAG_Step03_CustomRAGDataSource/Program.cs
diff --git a/...ntWithRAG_Step04_FoundryServiceRAG.csproj → ...ntWithRAG_Step04_FoundryServiceRAG.csproj b/...ntWithRAG_Step04_FoundryServiceRAG.csproj → ...ntWithRAG_Step04_FoundryServiceRAG.csproj
diff --git a/...thRAG_Step04_FoundryServiceRAG/Program.cs → ...thRAG_Step04_FoundryServiceRAG/Program.cs b/...thRAG_Step04_FoundryServiceRAG/Program.cs → ...thRAG_Step04_FoundryServiceRAG/Program.cs
diff --git a/...iceRAG/contoso-outdoors-knowledge-base.md → ...iceRAG/contoso-outdoors-knowledge-base.md b/...iceRAG/contoso-outdoors-knowledge-base.md → ...iceRAG/contoso-outdoors-knowledge-base.md
diff --git a/...les/GettingStarted/AgentWithRAG/README.md → .../samples/02-agents/AgentWithRAG/README.md b/...les/GettingStarted/AgentWithRAG/README.md → .../samples/02-agents/AgentWithRAG/README.md
diff --git a/...04_UsingFunctionToolsWithApprovals.csproj → ...04_UsingFunctionToolsWithApprovals.csproj b/...04_UsingFunctionToolsWithApprovals.csproj → ...04_UsingFunctionToolsWithApprovals.csproj
diff --git a/...singFunctionToolsWithApprovals/Program.cs → ...singFunctionToolsWithApprovals/Program.cs b/...singFunctionToolsWithApprovals/Program.cs → ...singFunctionToolsWithApprovals/Program.cs
diff --git a/...ucturedOutput/AIAgentBuilderExtensions.cs → ...ucturedOutput/AIAgentBuilderExtensions.cs b/...ucturedOutput/AIAgentBuilderExtensions.cs → ...ucturedOutput/AIAgentBuilderExtensions.cs
diff --git a/...tput/Agent_Step05_StructuredOutput.csproj → ...tput/Agent_Step05_StructuredOutput.csproj b/...tput/Agent_Step05_StructuredOutput.csproj → ...tput/Agent_Step05_StructuredOutput.csproj
diff --git a/.../Agent_Step05_StructuredOutput/Program.cs → .../Agent_Step05_StructuredOutput/Program.cs b/.../Agent_Step05_StructuredOutput/Program.cs → .../Agent_Step05_StructuredOutput/Program.cs
diff --git a/...s/Agent_Step05_StructuredOutput/README.md → ...s/Agent_Step05_StructuredOutput/README.md b/...s/Agent_Step05_StructuredOutput/README.md → ...s/Agent_Step05_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_Step05_StructuredOutput
 dotnet run
 ```
 

diff --git a/...StructuredOutput/StructuredOutputAgent.cs → ...StructuredOutput/StructuredOutputAgent.cs b/...StructuredOutput/StructuredOutputAgent.cs → ...StructuredOutput/StructuredOutputAgent.cs
diff --git a/...redOutput/StructuredOutputAgentOptions.cs → ...redOutput/StructuredOutputAgentOptions.cs b/...redOutput/StructuredOutputAgentOptions.cs → ...redOutput/StructuredOutputAgentOptions.cs
diff --git a/...edOutput/StructuredOutputAgentResponse.cs → ...edOutput/StructuredOutputAgentResponse.cs b/...edOutput/StructuredOutputAgentResponse.cs → ...edOutput/StructuredOutputAgentResponse.cs
diff --git a/...gent_Step06_PersistedConversations.csproj → ...gent_Step06_PersistedConversations.csproj b/...gent_Step06_PersistedConversations.csproj → ...gent_Step06_PersistedConversations.csproj
diff --git a/..._Step06_PersistedConversations/Program.cs → ..._Step06_PersistedConversations/Program.cs b/..._Step06_PersistedConversations/Program.cs → ..._Step06_PersistedConversations/Program.cs
diff --git a/..._Step07_3rdPartyChatHistoryStorage.csproj → ..._Step07_3rdPartyChatHistoryStorage.csproj b/..._Step07_3rdPartyChatHistoryStorage.csproj → ..._Step07_3rdPartyChatHistoryStorage.csproj
diff --git a/...p07_3rdPartyChatHistoryStorage/Program.cs → ...p07_3rdPartyChatHistoryStorage/Program.cs b/...p07_3rdPartyChatHistoryStorage/Program.cs → ...p07_3rdPartyChatHistoryStorage/Program.cs
diff --git a/...ability/Agent_Step08_Observability.csproj → ...ability/Agent_Step08_Observability.csproj b/...ability/Agent_Step08_Observability.csproj → ...ability/Agent_Step08_Observability.csproj
diff --git a/...nts/Agent_Step08_Observability/Program.cs → ...nts/Agent_Step08_Observability/Program.cs b/...nts/Agent_Step08_Observability/Program.cs → ...nts/Agent_Step08_Observability/Program.cs
diff --git a/...n/Agent_Step09_DependencyInjection.csproj → ...n/Agent_Step09_DependencyInjection.csproj b/...n/Agent_Step09_DependencyInjection.csproj → ...n/Agent_Step09_DependencyInjection.csproj
diff --git a/...ent_Step09_DependencyInjection/Program.cs → ...ent_Step09_DependencyInjection/Program.cs b/...ent_Step09_DependencyInjection/Program.cs → ...ent_Step09_DependencyInjection/Program.cs
diff --git a/...0_AsMcpTool/Agent_Step10_AsMcpTool.csproj → ...0_AsMcpTool/Agent_Step10_AsMcpTool.csproj b/...0_AsMcpTool/Agent_Step10_AsMcpTool.csproj → ...0_AsMcpTool/Agent_Step10_AsMcpTool.csproj
diff --git a/.../Agents/Agent_Step10_AsMcpTool/Program.cs → .../Agents/Agent_Step10_AsMcpTool/Program.cs b/.../Agents/Agent_Step10_AsMcpTool/Program.cs → .../Agents/Agent_Step10_AsMcpTool/Program.cs
diff --git a/...d/Agents/Agent_Step10_AsMcpTool/README.md → ...s/Agents/Agent_Step10_AsMcpTool/README.md b/...d/Agents/Agent_Step10_AsMcpTool/README.md → ...s/Agents/Agent_Step10_AsMcpTool/README.md
diff --git a/...ingImages/Agent_Step11_UsingImages.csproj → ...ingImages/Agent_Step11_UsingImages.csproj b/...ingImages/Agent_Step11_UsingImages.csproj → ...ingImages/Agent_Step11_UsingImages.csproj
diff --git a/...gents/Agent_Step11_UsingImages/Program.cs → ...gents/Agent_Step11_UsingImages/Program.cs b/...gents/Agent_Step11_UsingImages/Program.cs → ...gents/Agent_Step11_UsingImages/Program.cs
diff --git a/...Agents/Agent_Step11_UsingImages/README.md → ...Agents/Agent_Step11_UsingImages/README.md b/...Agents/Agent_Step11_UsingImages/README.md → ...Agents/Agent_Step11_UsingImages/README.md
diff --git a/...onTool/Agent_Step12_AsFunctionTool.csproj → ...onTool/Agent_Step12_AsFunctionTool.csproj b/...onTool/Agent_Step12_AsFunctionTool.csproj → ...onTool/Agent_Step12_AsFunctionTool.csproj
diff --git a/...ts/Agent_Step12_AsFunctionTool/Program.cs → ...ts/Agent_Step12_AsFunctionTool/Program.cs b/...ts/Agent_Step12_AsFunctionTool/Program.cs → ...ts/Agent_Step12_AsFunctionTool/Program.cs
diff --git a/...ndResponsesWithToolsAndPersistence.csproj → ...ndResponsesWithToolsAndPersistence.csproj b/...ndResponsesWithToolsAndPersistence.csproj → ...ndResponsesWithToolsAndPersistence.csproj
diff --git a/...sponsesWithToolsAndPersistence/Program.cs → ...sponsesWithToolsAndPersistence/Program.cs b/...sponsesWithToolsAndPersistence/Program.cs → ...sponsesWithToolsAndPersistence/Program.cs
diff --git a/...esponsesWithToolsAndPersistence/README.md → ...esponsesWithToolsAndPersistence/README.md b/...esponsesWithToolsAndPersistence/README.md → ...esponsesWithToolsAndPersistence/README.md
diff --git a/...Middleware/Agent_Step14_Middleware.csproj → ...Middleware/Agent_Step14_Middleware.csproj b/...Middleware/Agent_Step14_Middleware.csproj → ...Middleware/Agent_Step14_Middleware.csproj
diff --git a/...Agents/Agent_Step14_Middleware/Program.cs → ...Agents/Agent_Step14_Middleware/Program.cs b/...Agents/Agent_Step14_Middleware/Program.cs → ...Agents/Agent_Step14_Middleware/Program.cs
diff --git a/.../Agents/Agent_Step14_Middleware/README.md → .../Agents/Agent_Step14_Middleware/README.md b/.../Agents/Agent_Step14_Middleware/README.md → .../Agents/Agent_Step14_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_Step14_Middleware
 dotnet run
 ```
 
diff --git a/...tep15_Plugins/Agent_Step15_Plugins.csproj → ...tep15_Plugins/Agent_Step15_Plugins.csproj b/...tep15_Plugins/Agent_Step15_Plugins.csproj → ...tep15_Plugins/Agent_Step15_Plugins.csproj
diff --git a/...ed/Agents/Agent_Step15_Plugins/Program.cs → ...ts/Agents/Agent_Step15_Plugins/Program.cs b/...ed/Agents/Agent_Step15_Plugins/Program.cs → ...ts/Agents/Agent_Step15_Plugins/Program.cs
diff --git a/...duction/Agent_Step16_ChatReduction.csproj → ...duction/Agent_Step16_ChatReduction.csproj b/...duction/Agent_Step16_ChatReduction.csproj → ...duction/Agent_Step16_ChatReduction.csproj
diff --git a/...nts/Agent_Step16_ChatReduction/Program.cs → ...nts/Agent_Step16_ChatReduction/Program.cs b/...nts/Agent_Step16_ChatReduction/Program.cs → ...nts/Agent_Step16_ChatReduction/Program.cs
diff --git a/...s/Agent_Step17_BackgroundResponses.csproj → ...s/Agent_Step17_BackgroundResponses.csproj b/...s/Agent_Step17_BackgroundResponses.csproj → ...s/Agent_Step17_BackgroundResponses.csproj
diff --git a/...ent_Step17_BackgroundResponses/Program.cs → ...ent_Step17_BackgroundResponses/Program.cs b/...ent_Step17_BackgroundResponses/Program.cs → ...ent_Step17_BackgroundResponses/Program.cs
diff --git a/...gent_Step17_BackgroundResponses/README.md → ...gent_Step17_BackgroundResponses/README.md b/...gent_Step17_BackgroundResponses/README.md → ...gent_Step17_BackgroundResponses/README.md
diff --git a/...Research/Agent_Step18_DeepResearch.csproj → ...Research/Agent_Step18_DeepResearch.csproj b/...Research/Agent_Step18_DeepResearch.csproj → ...Research/Agent_Step18_DeepResearch.csproj
diff --git a/...ents/Agent_Step18_DeepResearch/Program.cs → ...ents/Agent_Step18_DeepResearch/Program.cs b/...ents/Agent_Step18_DeepResearch/Program.cs → ...ents/Agent_Step18_DeepResearch/Program.cs
diff --git a/...gents/Agent_Step18_DeepResearch/README.md → ...gents/Agent_Step18_DeepResearch/README.md b/...gents/Agent_Step18_DeepResearch/README.md → ...gents/Agent_Step18_DeepResearch/README.md
diff --git a/...clarative/Agent_Step19_Declarative.csproj → ...clarative/Agent_Step19_Declarative.csproj b/...clarative/Agent_Step19_Declarative.csproj → ...clarative/Agent_Step19_Declarative.csproj
diff --git a/...gents/Agent_Step19_Declarative/Program.cs → ...gents/Agent_Step19_Declarative/Program.cs b/...gents/Agent_Step19_Declarative/Program.cs → ...gents/Agent_Step19_Declarative/Program.cs
diff --git a/...t/Agent_Step20_AdditionalAIContext.csproj → ...t/Agent_Step20_AdditionalAIContext.csproj b/...t/Agent_Step20_AdditionalAIContext.csproj → ...t/Agent_Step20_AdditionalAIContext.csproj
diff --git a/...ent_Step20_AdditionalAIContext/Program.cs → ...ent_Step20_AdditionalAIContext/Program.cs b/...ent_Step20_AdditionalAIContext/Program.cs → ...ent_Step20_AdditionalAIContext/Program.cs
diff --git a/...t/samples/GettingStarted/Agents/README.md → dotnet/samples/02-agents/Agents/README.md b/...t/samples/GettingStarted/Agents/README.md → dotnet/samples/02-agents/Agents/README.md
diff --git a/...Client/DeclarativeChatClientAgents.csproj → ...Client/DeclarativeChatClientAgents.csproj b/...Client/DeclarativeChatClientAgents.csproj → ...Client/DeclarativeChatClientAgents.csproj
diff --git a/...d/DeclarativeAgents/ChatClient/Program.cs → ...s/DeclarativeAgents/ChatClient/Program.cs b/...d/DeclarativeAgents/ChatClient/Program.cs → ...s/DeclarativeAgents/ChatClient/Program.cs
diff --git a/...ChatClient/Properties/launchSettings.json → ...ChatClient/Properties/launchSettings.json b/...ChatClient/Properties/launchSettings.json → ...ChatClient/Properties/launchSettings.json
diff --git a/...BasicUsage/DevUI_Step01_BasicUsage.csproj → ...BasicUsage/DevUI_Step01_BasicUsage.csproj b/...BasicUsage/DevUI_Step01_BasicUsage.csproj → ...BasicUsage/DevUI_Step01_BasicUsage.csproj
diff --git a/.../DevUI/DevUI_Step01_BasicUsage/Program.cs → .../DevUI/DevUI_Step01_BasicUsage/Program.cs b/.../DevUI/DevUI_Step01_BasicUsage/Program.cs → .../DevUI/DevUI_Step01_BasicUsage/Program.cs
diff --git a/...BasicUsage/Properties/launchSettings.json → ...BasicUsage/Properties/launchSettings.json b/...BasicUsage/Properties/launchSettings.json → ...BasicUsage/Properties/launchSettings.json
diff --git a/...d/DevUI/DevUI_Step01_BasicUsage/README.md → ...s/DevUI/DevUI_Step01_BasicUsage/README.md b/...d/DevUI/DevUI_Step01_BasicUsage/README.md → ...s/DevUI/DevUI_Step01_BasicUsage/README.md
diff --git a/...et/samples/GettingStarted/DevUI/README.md → dotnet/samples/02-agents/DevUI/README.md b/...et/samples/GettingStarted/DevUI/README.md → dotnet/samples/02-agents/DevUI/README.md
diff --git a/...ents_Evaluations_Step01_RedTeaming.csproj → ...ents_Evaluations_Step01_RedTeaming.csproj b/...ents_Evaluations_Step01_RedTeaming.csproj → ...ents_Evaluations_Step01_RedTeaming.csproj
diff --git a/..._Evaluations_Step01_RedTeaming/Program.cs → ..._Evaluations_Step01_RedTeaming/Program.cs b/..._Evaluations_Step01_RedTeaming/Program.cs → ..._Evaluations_Step01_RedTeaming/Program.cs
diff --git a/...s_Evaluations_Step01_RedTeaming/README.md → ...s_Evaluations_Step01_RedTeaming/README.md b/...s_Evaluations_Step01_RedTeaming/README.md → ...s_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/..._Evaluations_Step02_SelfReflection.csproj → ..._Evaluations_Step02_SelfReflection.csproj b/..._Evaluations_Step02_SelfReflection.csproj → ..._Evaluations_Step02_SelfReflection.csproj
diff --git a/...luations_Step02_SelfReflection/Program.cs → ...luations_Step02_SelfReflection/Program.cs b/...luations_Step02_SelfReflection/Program.cs → ...luations_Step02_SelfReflection/Program.cs
diff --git a/...aluations_Step02_SelfReflection/README.md → ...aluations_Step02_SelfReflection/README.md b/...aluations_Step02_SelfReflection/README.md → ...aluations_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/...sics/FoundryAgents_Step01.1_Basics.csproj → ...sics/FoundryAgents_Step01.1_Basics.csproj b/...sics/FoundryAgents_Step01.1_Basics.csproj → ...sics/FoundryAgents_Step01.1_Basics.csproj
diff --git a/.../FoundryAgents_Step01.1_Basics/Program.cs → .../FoundryAgents_Step01.1_Basics/Program.cs b/.../FoundryAgents_Step01.1_Basics/Program.cs → .../FoundryAgents_Step01.1_Basics/Program.cs
diff --git a/...s/FoundryAgents_Step01.1_Basics/README.md → ...s/FoundryAgents_Step01.1_Basics/README.md b/...s/FoundryAgents_Step01.1_Basics/README.md → ...s/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/...ing/FoundryAgents_Step01.2_Running.csproj → ...ing/FoundryAgents_Step01.2_Running.csproj b/...ing/FoundryAgents_Step01.2_Running.csproj → ...ing/FoundryAgents_Step01.2_Running.csproj
diff --git a/...FoundryAgents_Step01.2_Running/Program.cs → ...FoundryAgents_Step01.2_Running/Program.cs b/...FoundryAgents_Step01.2_Running/Program.cs → ...FoundryAgents_Step01.2_Running/Program.cs
diff --git a/.../FoundryAgents_Step01.2_Running/README.md → .../FoundryAgents_Step01.2_Running/README.md b/.../FoundryAgents_Step01.2_Running/README.md → .../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/...gents_Step02_MultiturnConversation.csproj → ...gents_Step02_MultiturnConversation.csproj b/...gents_Step02_MultiturnConversation.csproj → ...gents_Step02_MultiturnConversation.csproj
diff --git a/...s_Step02_MultiturnConversation/Program.cs → ...s_Step02_MultiturnConversation/Program.cs b/...s_Step02_MultiturnConversation/Program.cs → ...s_Step02_MultiturnConversation/Program.cs
diff --git a/...ts_Step02_MultiturnConversation/README.md → ...ts_Step02_MultiturnConversation/README.md b/...ts_Step02_MultiturnConversation/README.md → ...ts_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/...ryAgents_Step03_UsingFunctionTools.csproj → ...ryAgents_Step03_UsingFunctionTools.csproj b/...ryAgents_Step03_UsingFunctionTools.csproj → ...ryAgents_Step03_UsingFunctionTools.csproj
diff --git a/...ents_Step03_UsingFunctionTools/Program.cs → ...ents_Step03_UsingFunctionTools/Program.cs b/...ents_Step03_UsingFunctionTools/Program.cs → ...ents_Step03_UsingFunctionTools/Program.cs
diff --git a/...gents_Step03_UsingFunctionTools/README.md → ...gents_Step03_UsingFunctionTools/README.md b/...gents_Step03_UsingFunctionTools/README.md → ...gents_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/...04_UsingFunctionToolsWithApprovals.csproj → ...04_UsingFunctionToolsWithApprovals.csproj b/...04_UsingFunctionToolsWithApprovals.csproj → ...04_UsingFunctionToolsWithApprovals.csproj
diff --git a/...singFunctionToolsWithApprovals/Program.cs → ...singFunctionToolsWithApprovals/Program.cs b/...singFunctionToolsWithApprovals/Program.cs → ...singFunctionToolsWithApprovals/Program.cs
diff --git a/...UsingFunctionToolsWithApprovals/README.md → ...UsingFunctionToolsWithApprovals/README.md b/...UsingFunctionToolsWithApprovals/README.md → ...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/...ndryAgents_Step05_StructuredOutput.csproj → ...ndryAgents_Step05_StructuredOutput.csproj b/...ndryAgents_Step05_StructuredOutput.csproj → ...ndryAgents_Step05_StructuredOutput.csproj
diff --git a/...Agents_Step05_StructuredOutput/Program.cs → ...Agents_Step05_StructuredOutput/Program.cs b/...Agents_Step05_StructuredOutput/Program.cs → ...Agents_Step05_StructuredOutput/Program.cs
diff --git a/...yAgents_Step05_StructuredOutput/README.md → ...yAgents_Step05_StructuredOutput/README.md b/...yAgents_Step05_StructuredOutput/README.md → ...yAgents_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/...ents_Step06_PersistedConversations.csproj → ...ents_Step06_PersistedConversations.csproj b/...ents_Step06_PersistedConversations.csproj → ...ents_Step06_PersistedConversations.csproj
diff --git a/..._Step06_PersistedConversations/Program.cs → ..._Step06_PersistedConversations/Program.cs b/..._Step06_PersistedConversations/Program.cs → ..._Step06_PersistedConversations/Program.cs
diff --git a/...s_Step06_PersistedConversations/README.md → ...s_Step06_PersistedConversations/README.md b/...s_Step06_PersistedConversations/README.md → ...s_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/...FoundryAgents_Step07_Observability.csproj → ...FoundryAgents_Step07_Observability.csproj b/...FoundryAgents_Step07_Observability.csproj → ...FoundryAgents_Step07_Observability.csproj
diff --git a/...dryAgents_Step07_Observability/Program.cs → ...dryAgents_Step07_Observability/Program.cs b/...dryAgents_Step07_Observability/Program.cs → ...dryAgents_Step07_Observability/Program.cs
diff --git a/...ndryAgents_Step07_Observability/README.md → ...ndryAgents_Step07_Observability/README.md b/...ndryAgents_Step07_Observability/README.md → ...ndryAgents_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/...yAgents_Step08_DependencyInjection.csproj → ...yAgents_Step08_DependencyInjection.csproj b/...yAgents_Step08_DependencyInjection.csproj → ...yAgents_Step08_DependencyInjection.csproj
diff --git a/...nts_Step08_DependencyInjection/Program.cs → ...nts_Step08_DependencyInjection/Program.cs b/...nts_Step08_DependencyInjection/Program.cs → ...nts_Step08_DependencyInjection/Program.cs
diff --git a/...ents_Step08_DependencyInjection/README.md → ...ents_Step08_DependencyInjection/README.md b/...ents_Step08_DependencyInjection/README.md → ...ents_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/...gents_Step09_UsingMcpClientAsTools.csproj → ...gents_Step09_UsingMcpClientAsTools.csproj b/...gents_Step09_UsingMcpClientAsTools.csproj → ...gents_Step09_UsingMcpClientAsTools.csproj
diff --git a/...s_Step09_UsingMcpClientAsTools/Program.cs → ...s_Step09_UsingMcpClientAsTools/Program.cs b/...s_Step09_UsingMcpClientAsTools/Program.cs → ...s_Step09_UsingMcpClientAsTools/Program.cs
diff --git a/...ts_Step09_UsingMcpClientAsTools/README.md → ...ts_Step09_UsingMcpClientAsTools/README.md b/...ts_Step09_UsingMcpClientAsTools/README.md → ...ts_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/...nts_Step10_UsingImages/Assets/walkway.jpg → ...nts_Step10_UsingImages/Assets/walkway.jpg b/...nts_Step10_UsingImages/Assets/walkway.jpg → ...nts_Step10_UsingImages/Assets/walkway.jpg
diff --git a/...s/FoundryAgents_Step10_UsingImages.csproj → ...s/FoundryAgents_Step10_UsingImages.csproj b/...s/FoundryAgents_Step10_UsingImages.csproj → ...s/FoundryAgents_Step10_UsingImages.csproj
diff --git a/...undryAgents_Step10_UsingImages/Program.cs → ...undryAgents_Step10_UsingImages/Program.cs b/...undryAgents_Step10_UsingImages/Program.cs → ...undryAgents_Step10_UsingImages/Program.cs
diff --git a/...oundryAgents_Step10_UsingImages/README.md → ...oundryAgents_Step10_UsingImages/README.md b/...oundryAgents_Step10_UsingImages/README.md → ...oundryAgents_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/...oundryAgents_Step11_AsFunctionTool.csproj → ...oundryAgents_Step11_AsFunctionTool.csproj b/...oundryAgents_Step11_AsFunctionTool.csproj → ...oundryAgents_Step11_AsFunctionTool.csproj
diff --git a/...ryAgents_Step11_AsFunctionTool/Program.cs → ...ryAgents_Step11_AsFunctionTool/Program.cs b/...ryAgents_Step11_AsFunctionTool/Program.cs → ...ryAgents_Step11_AsFunctionTool/Program.cs
diff --git a/...dryAgents_Step11_AsFunctionTool/README.md → ...dryAgents_Step11_AsFunctionTool/README.md b/...dryAgents_Step11_AsFunctionTool/README.md → ...dryAgents_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/...re/FoundryAgents_Step12_Middleware.csproj → ...re/FoundryAgents_Step12_Middleware.csproj b/...re/FoundryAgents_Step12_Middleware.csproj → ...re/FoundryAgents_Step12_Middleware.csproj
diff --git a/...oundryAgents_Step12_Middleware/Program.cs → ...oundryAgents_Step12_Middleware/Program.cs b/...oundryAgents_Step12_Middleware/Program.cs → ...oundryAgents_Step12_Middleware/Program.cs
diff --git a/...FoundryAgents_Step12_Middleware/README.md → ...FoundryAgents_Step12_Middleware/README.md b/...FoundryAgents_Step12_Middleware/README.md → ...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/...ugins/FoundryAgents_Step13_Plugins.csproj → ...ugins/FoundryAgents_Step13_Plugins.csproj b/...ugins/FoundryAgents_Step13_Plugins.csproj → ...ugins/FoundryAgents_Step13_Plugins.csproj
diff --git a/...s/FoundryAgents_Step13_Plugins/Program.cs → ...s/FoundryAgents_Step13_Plugins/Program.cs b/...s/FoundryAgents_Step13_Plugins/Program.cs → ...s/FoundryAgents_Step13_Plugins/Program.cs
diff --git a/...ts/FoundryAgents_Step13_Plugins/README.md → ...ts/FoundryAgents_Step13_Plugins/README.md b/...ts/FoundryAgents_Step13_Plugins/README.md → ...ts/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/...undryAgents_Step14_CodeInterpreter.csproj → ...undryAgents_Step14_CodeInterpreter.csproj b/...undryAgents_Step14_CodeInterpreter.csproj → ...undryAgents_Step14_CodeInterpreter.csproj
diff --git a/...yAgents_Step14_CodeInterpreter/Program.cs → ...yAgents_Step14_CodeInterpreter/Program.cs b/...yAgents_Step14_CodeInterpreter/Program.cs → ...yAgents_Step14_CodeInterpreter/Program.cs
diff --git a/...ryAgents_Step14_CodeInterpreter/README.md → ...ryAgents_Step14_CodeInterpreter/README.md b/...ryAgents_Step14_CodeInterpreter/README.md → ...ryAgents_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/...ComputerUse/Assets/cua_browser_search.png → ...ComputerUse/Assets/cua_browser_search.png b/...ComputerUse/Assets/cua_browser_search.png → ...ComputerUse/Assets/cua_browser_search.png
diff --git a/...ComputerUse/Assets/cua_search_results.png → ...ComputerUse/Assets/cua_search_results.png b/...ComputerUse/Assets/cua_search_results.png → ...ComputerUse/Assets/cua_search_results.png
diff --git a/...5_ComputerUse/Assets/cua_search_typed.png → ...5_ComputerUse/Assets/cua_search_typed.png b/...5_ComputerUse/Assets/cua_search_typed.png → ...5_ComputerUse/Assets/cua_search_typed.png
diff --git a/...nts_Step15_ComputerUse/ComputerUseUtil.cs → ...nts_Step15_ComputerUse/ComputerUseUtil.cs b/...nts_Step15_ComputerUse/ComputerUseUtil.cs → ...nts_Step15_ComputerUse/ComputerUseUtil.cs
diff --git a/...e/FoundryAgents_Step15_ComputerUse.csproj → ...e/FoundryAgents_Step15_ComputerUse.csproj b/...e/FoundryAgents_Step15_ComputerUse.csproj → ...e/FoundryAgents_Step15_ComputerUse.csproj
diff --git a/...undryAgents_Step15_ComputerUse/Program.cs → ...undryAgents_Step15_ComputerUse/Program.cs b/...undryAgents_Step15_ComputerUse/Program.cs → ...undryAgents_Step15_ComputerUse/Program.cs
diff --git a/...oundryAgents_Step15_ComputerUse/README.md → ...oundryAgents_Step15_ComputerUse/README.md b/...oundryAgents_Step15_ComputerUse/README.md → ...oundryAgents_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/...ch/FoundryAgents_Step18_FileSearch.csproj → ...ch/FoundryAgents_Step18_FileSearch.csproj b/...ch/FoundryAgents_Step18_FileSearch.csproj → ...ch/FoundryAgents_Step18_FileSearch.csproj
diff --git a/...oundryAgents_Step18_FileSearch/Program.cs → ...oundryAgents_Step18_FileSearch/Program.cs b/...oundryAgents_Step18_FileSearch/Program.cs → ...oundryAgents_Step18_FileSearch/Program.cs
diff --git a/...FoundryAgents_Step18_FileSearch/README.md → ...FoundryAgents_Step18_FileSearch/README.md b/...FoundryAgents_Step18_FileSearch/README.md → ...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/.../FoundryAgents_Step19_OpenAPITools.csproj → .../FoundryAgents_Step19_OpenAPITools.csproj b/.../FoundryAgents_Step19_OpenAPITools.csproj → .../FoundryAgents_Step19_OpenAPITools.csproj
diff --git a/...ndryAgents_Step19_OpenAPITools/Program.cs → ...ndryAgents_Step19_OpenAPITools/Program.cs b/...ndryAgents_Step19_OpenAPITools/Program.cs → ...ndryAgents_Step19_OpenAPITools/Program.cs
diff --git a/...undryAgents_Step19_OpenAPITools/README.md → ...undryAgents_Step19_OpenAPITools/README.md b/...undryAgents_Step19_OpenAPITools/README.md → ...undryAgents_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/...lMCP/FoundryAgents_Step27_LocalMCP.csproj → ...lMCP/FoundryAgents_Step27_LocalMCP.csproj b/...lMCP/FoundryAgents_Step27_LocalMCP.csproj → ...lMCP/FoundryAgents_Step27_LocalMCP.csproj
diff --git a/.../FoundryAgents_Step27_LocalMCP/Program.cs → .../FoundryAgents_Step27_LocalMCP/Program.cs b/.../FoundryAgents_Step27_LocalMCP/Program.cs → .../FoundryAgents_Step27_LocalMCP/Program.cs
diff --git a/...s/FoundryAgents_Step27_LocalMCP/README.md → ...s/FoundryAgents_Step27_LocalMCP/README.md b/...s/FoundryAgents_Step27_LocalMCP/README.md → ...s/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/...es/GettingStarted/FoundryAgents/README.md → ...samples/02-agents/FoundryAgents/README.md b/...es/GettingStarted/FoundryAgents/README.md → ...samples/02-agents/FoundryAgents/README.md
diff --git a/.../Agent_MCP_Server/Agent_MCP_Server.csproj → .../Agent_MCP_Server/Agent_MCP_Server.csproj b/.../Agent_MCP_Server/Agent_MCP_Server.csproj → .../Agent_MCP_Server/Agent_MCP_Server.csproj
diff --git a/...ntextProtocol/Agent_MCP_Server/Program.cs → ...ntextProtocol/Agent_MCP_Server/Program.cs b/...ntextProtocol/Agent_MCP_Server/Program.cs → ...ntextProtocol/Agent_MCP_Server/Program.cs
diff --git a/...ontextProtocol/Agent_MCP_Server/README.md → ...ontextProtocol/Agent_MCP_Server/README.md b/...ontextProtocol/Agent_MCP_Server/README.md → ...ontextProtocol/Agent_MCP_Server/README.md
diff --git a/..._Server_Auth/Agent_MCP_Server_Auth.csproj → ..._Server_Auth/Agent_MCP_Server_Auth.csproj b/..._Server_Auth/Agent_MCP_Server_Auth.csproj → ..._Server_Auth/Agent_MCP_Server_Auth.csproj
diff --git a/...Protocol/Agent_MCP_Server_Auth/Program.cs → ...Protocol/Agent_MCP_Server_Auth/Program.cs b/...Protocol/Agent_MCP_Server_Auth/Program.cs → ...Protocol/Agent_MCP_Server_Auth/Program.cs
diff --git a/...tProtocol/Agent_MCP_Server_Auth/README.md → ...tProtocol/Agent_MCP_Server_Auth/README.md b/...tProtocol/Agent_MCP_Server_Auth/README.md → ...tProtocol/Agent_MCP_Server_Auth/README.md
diff --git a/...Hosted_MCP/FoundryAgent_Hosted_MCP.csproj → ...Hosted_MCP/FoundryAgent_Hosted_MCP.csproj b/...Hosted_MCP/FoundryAgent_Hosted_MCP.csproj → ...Hosted_MCP/FoundryAgent_Hosted_MCP.csproj
diff --git a/...otocol/FoundryAgent_Hosted_MCP/Program.cs → ...otocol/FoundryAgent_Hosted_MCP/Program.cs b/...otocol/FoundryAgent_Hosted_MCP/Program.cs → ...otocol/FoundryAgent_Hosted_MCP/Program.cs
diff --git a/...rotocol/FoundryAgent_Hosted_MCP/README.md → ...rotocol/FoundryAgent_Hosted_MCP/README.md b/...rotocol/FoundryAgent_Hosted_MCP/README.md → ...rotocol/FoundryAgent_Hosted_MCP/README.md
diff --git a/...ingStarted/ModelContextProtocol/README.md → .../02-agents/ModelContextProtocol/README.md b/...ingStarted/ModelContextProtocol/README.md → .../02-agents/ModelContextProtocol/README.md
diff --git a/...tocol/ResponseAgent_Hosted_MCP/Program.cs → ...tocol/ResponseAgent_Hosted_MCP/Program.cs b/...tocol/ResponseAgent_Hosted_MCP/Program.cs → ...tocol/ResponseAgent_Hosted_MCP/Program.cs
diff --git a/...otocol/ResponseAgent_Hosted_MCP/README.md → ...otocol/ResponseAgent_Hosted_MCP/README.md b/...otocol/ResponseAgent_Hosted_MCP/README.md → ...otocol/ResponseAgent_Hosted_MCP/README.md
diff --git a/...osted_MCP/ResponseAgent_Hosted_MCP.csproj → ...osted_MCP/ResponseAgent_Hosted_MCP.csproj b/...osted_MCP/ResponseAgent_Hosted_MCP.csproj → ...osted_MCP/ResponseAgent_Hosted_MCP.csproj
diff --git a/dotnet/samples/GettingStarted/README.md → dotnet/samples/02-agents/README.md b/dotnet/samples/GettingStarted/README.md → dotnet/samples/02-agents/README.md
diff --git a/dotnet/samples/04-hosting/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](../../GettingStarted/Agents/README.md) samples.
+see the [Getting Started With Agents](../../02-agents/Agents/README.md) samples.
 
 ## Prerequisites
 

diff --git a/dotnet/samples/README.md b/dotnet/samples/README.md
@@ -13,11 +13,11 @@ 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](./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.