diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
index b3a1fd81f3..81736e1b9f 100644
--- a/dotnet/agent-framework-dotnet.slnx
+++ b/dotnet/agent-framework-dotnet.slnx
@@ -7,54 +7,73 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
@@ -75,9 +94,6 @@
-
-
-
@@ -137,7 +153,6 @@
-
@@ -147,10 +162,6 @@
-
-
-
-
@@ -160,6 +171,8 @@
+
+
@@ -176,10 +189,8 @@
-
-
-
+
@@ -214,10 +225,10 @@
+
-
@@ -256,7 +267,6 @@
-
@@ -265,14 +275,6 @@
-
-
-
-
-
-
-
-
diff --git a/dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj b/dotnet/samples/01-get-started/01_hello_agent/01_hello_agent.csproj
similarity index 80%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.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_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.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_Step01_Running/Agent_Step01_Running.csproj b/dotnet/samples/01-get-started/02_add_tools/02_add_tools.csproj
similarity index 80%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step01_Running/Agent_Step01_Running.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_Step01_Running/Agent_Step01_Running.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_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj b/dotnet/samples/01-get-started/03_multi_turn/03_multi_turn.csproj
similarity index 80%
rename from dotnet/samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.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_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.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/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/AgentWithMemory_Step03_CustomMemory.csproj b/dotnet/samples/01-get-started/04_memory/04_memory.csproj
similarity index 80%
rename from dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/AgentWithMemory_Step03_CustomMemory.csproj
rename to dotnet/samples/01-get-started/04_memory/04_memory.csproj
index 0f9de7c359..b32de63906 100644
--- a/dotnet/samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/AgentWithMemory_Step03_CustomMemory.csproj
+++ b/dotnet/samples/01-get-started/04_memory/04_memory.csproj
@@ -15,7 +15,7 @@
-
+
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/_Foundational/01_ExecutorsAndEdges/01_ExecutorsAndEdges.csproj b/dotnet/samples/01-get-started/05_first_workflow/05_first_workflow.csproj
similarity index 69%
rename from dotnet/samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/01_ExecutorsAndEdges.csproj
rename to dotnet/samples/01-get-started/05_first_workflow/05_first_workflow.csproj
index 2f41070759..8430479a72 100644
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/01_ExecutorsAndEdges.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/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..82cb765203 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](../../GettingStarted/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..896ac12095 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 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/01_SingleAgent/README.md
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/01_SingleAgent/README.md
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/06_LongRunningTools/README.md
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/06_LongRunningTools/README.md
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 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/07_ReliableStreaming/README.md
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/07_ReliableStreaming/README.md
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 100%
rename from dotnet/samples/Durable/Agents/ConsoleApps/README.md
rename to dotnet/samples/04-hosting/DurableAgents/ConsoleApps/README.md
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/AGUIClientServer/AGUIDojoServer/appsettings.Development.json b/dotnet/samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/appsettings.Development.json
similarity index 100%
rename from dotnet/samples/AGUIClientServer/AGUIDojoServer/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/AgentWebChat/AgentWebChat.AgentHost/appsettings.Development.json b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/appsettings.Development.json
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/appsettings.Development.json
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/appsettings.Development.json
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/appsettings.json b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/appsettings.json
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/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/AgentWebChat/AgentWebChat.AppHost/appsettings.Development.json b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AppHost/appsettings.Development.json
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.AppHost/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/AgentWebChat/AgentWebChat.Web/appsettings.Development.json b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/appsettings.Development.json
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/appsettings.Development.json
rename to dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/appsettings.Development.json
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/appsettings.json b/dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.Web/appsettings.json
similarity index 100%
rename from dotnet/samples/AgentWebChat/AgentWebChat.Web/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/AgentWithMemory/README.md b/dotnet/samples/GettingStarted/AgentWithMemory/README.md
index 903fcf1b78..670ef564d3 100644
--- a/dotnet/samples/GettingStarted/AgentWithMemory/README.md
+++ b/dotnet/samples/GettingStarted/AgentWithMemory/README.md
@@ -6,4 +6,4 @@ 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.|
diff --git a/dotnet/samples/GettingStarted/Agents/README.md b/dotnet/samples/GettingStarted/Agents/README.md
index 64af82a23e..e9079210d6 100644
--- a/dotnet/samples/GettingStarted/Agents/README.md
+++ b/dotnet/samples/GettingStarted/Agents/README.md
@@ -26,9 +26,6 @@ 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|
diff --git a/dotnet/samples/GettingStarted/Workflows/README.md b/dotnet/samples/GettingStarted/Workflows/README.md
index f7704d0e42..36a88fff5d 100644
--- a/dotnet/samples/GettingStarted/Workflows/README.md
+++ b/dotnet/samples/GettingStarted/Workflows/README.md
@@ -12,7 +12,6 @@ Please begin with the [Foundational](./_Foundational) samples in order. These th
| 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 |
diff --git a/dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/README.md b/dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/README.md
index 4ec203892b..5b93a83b6f 100644
--- a/dotnet/samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/README.md
+++ b/dotnet/samples/GettingStarted/Workflows/_Foundational/07_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/README.md b/dotnet/samples/README.md
index 9dfe07e2b3..e9971ce976 100644
--- a/dotnet/samples/README.md
+++ b/dotnet/samples/README.md
@@ -19,8 +19,8 @@ The samples are subdivided into the following categories:
- [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.
- [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/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