microsoft · crickman · Feb 19, 2026 · Feb 19, 2026
diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
@@ -7,6 +7,17 @@
   <Folder Name="/Samples/">
     <File Path="samples/README.md" />
   </Folder>
+  <Folder Name="/Samples/01-get-started/">
+    <Project Path="samples/01-get-started/01_hello_agent/01_hello_agent.csproj" />
+    <Project Path="samples/01-get-started/02_add_tools/02_add_tools.csproj" />
+    <Project Path="samples/01-get-started/03_multi_turn/03_multi_turn.csproj" />
+    <Project Path="samples/01-get-started/04_memory/04_memory.csproj" />
+    <Project Path="samples/01-get-started/05_first_workflow/05_first_workflow.csproj" />
+    <Project Path="samples/01-get-started/06_host_your_agent/06_host_your_agent.csproj" />
+  </Folder>
+  <Folder Name="/Samples/02-agents/"/>
+  <Folder Name="/Samples/03-workflows/"/>
+  <Folder Name="/Samples/04-hosting/"/>
   <Folder Name="/Samples/05-end-to-end/">
     <Project Path="samples/05-end-to-end/AgentWithPurview/AgentWithPurview.csproj" />
     <Project Path="samples/05-end-to-end/M365Agent/M365Agent.csproj" />
@@ -37,7 +48,6 @@
   <Folder Name="/Samples/Durable/Agents/AzureFunctions/">
     <File Path="samples/Durable/Agents/AzureFunctions/.editorconfig" />
     <File Path="samples/Durable/Agents/AzureFunctions/README.md" />
-    <Project Path="samples/Durable/Agents/AzureFunctions/01_SingleAgent/01_SingleAgent.csproj" />
     <Project Path="samples/Durable/Agents/AzureFunctions/02_AgentOrchestration_Chaining/02_AgentOrchestration_Chaining.csproj" />
     <Project Path="samples/Durable/Agents/AzureFunctions/03_AgentOrchestration_Concurrency/03_AgentOrchestration_Concurrency.csproj" />
     <Project Path="samples/Durable/Agents/AzureFunctions/04_AgentOrchestration_Conditionals/04_AgentOrchestration_Conditionals.csproj" />
@@ -84,9 +94,6 @@
   </Folder>
   <Folder Name="/Samples/GettingStarted/Agents/">
     <File Path="samples/GettingStarted/Agents/README.md" />
-    <Project Path="samples/GettingStarted/Agents/Agent_Step01_Running/Agent_Step01_Running.csproj" />
-    <Project Path="samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj" />
-    <Project Path="samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj" />
     <Project Path="samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj" />
     <Project Path="samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj" />
     <Project Path="samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj" />
@@ -146,7 +153,6 @@
     <File Path="samples/GettingStarted/AgentWithMemory/README.md" />
     <Project Path="samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/AgentWithMemory_Step01_ChatHistoryMemory.csproj" />
     <Project Path="samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step02_MemoryUsingMem0/AgentWithMemory_Step02_MemoryUsingMem0.csproj" />
-    <Project Path="samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/AgentWithMemory_Step03_CustomMemory.csproj" />
   </Folder>
   <Folder Name="/Samples/GettingStarted/AgentWithOpenAI/">
     <File Path="samples/GettingStarted/AgentWithOpenAI/README.md" />
@@ -261,7 +267,6 @@
     <Project Path="samples/GettingStarted/Workflows/Visualization/Visualization.csproj" />
   </Folder>
   <Folder Name="/Samples/GettingStarted/Workflows/_Foundational/">
-    <Project Path="samples/GettingStarted/Workflows/_Foundational/01_ExecutorsAndEdges/01_ExecutorsAndEdges.csproj" />
     <Project Path="samples/GettingStarted/Workflows/_Foundational/02_Streaming/02_Streaming.csproj" />
     <Project Path="samples/GettingStarted/Workflows/_Foundational/03_AgentsInWorkflows/03_AgentsInWorkflows.csproj" />
     <Project Path="samples/GettingStarted/Workflows/_Foundational/04_AgentWorkflowPatterns/04_AgentWorkflowPatterns.csproj" />

diff --git a/...Agent_Step02_MultiturnConversation.csproj → ...rted/01_hello_agent/01_hello_agent.csproj b/...Agent_Step02_MultiturnConversation.csproj → ...rted/01_hello_agent/01_hello_agent.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...ed/Agents/Agent_Step01_Running/Program.cs → .../01-get-started/01_hello_agent/Program.cs b/...ed/Agents/Agent_Step01_Running/Program.cs → .../01-get-started/01_hello_agent/Program.cs
diff --git a/...ls/Agent_Step03_UsingFunctionTools.csproj → ...-started/02_add_tools/02_add_tools.csproj b/...ls/Agent_Step03_UsingFunctionTools.csproj → ...-started/02_add_tools/02_add_tools.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...gent_Step03_UsingFunctionTools/Program.cs → ...es/01-get-started/02_add_tools/Program.cs b/...gent_Step03_UsingFunctionTools/Program.cs → ...es/01-get-started/02_add_tools/Program.cs
diff --git a/...gentWithMemory_Step03_CustomMemory.csproj → ...tarted/03_multi_turn/03_multi_turn.csproj b/...gentWithMemory_Step03_CustomMemory.csproj → ...tarted/03_multi_turn/03_multi_turn.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...t_Step02_MultiturnConversation/Program.cs → ...s/01-get-started/03_multi_turn/Program.cs b/...t_Step02_MultiturnConversation/Program.cs → ...s/01-get-started/03_multi_turn/Program.cs
diff --git a/...tep01_Running/Agent_Step01_Running.csproj → ...01-get-started/04_memory/04_memory.csproj b/...tep01_Running/Agent_Step01_Running.csproj → ...01-get-started/04_memory/04_memory.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...WithMemory_Step03_CustomMemory/Program.cs → ...mples/01-get-started/04_memory/Program.cs b/...WithMemory_Step03_CustomMemory/Program.cs → ...mples/01-get-started/04_memory/Program.cs
diff --git a/...utorsAndEdges/01_ExecutorsAndEdges.csproj → ...5_first_workflow/05_first_workflow.csproj b/...utorsAndEdges/01_ExecutorsAndEdges.csproj → ...5_first_workflow/05_first_workflow.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Workflows\Microsoft.Agents.AI.Workflows.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Workflows\Microsoft.Agents.AI.Workflows.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...ndational/01_ExecutorsAndEdges/Program.cs → ...-get-started/05_first_workflow/Program.cs b/...ndational/01_ExecutorsAndEdges/Program.cs → ...-get-started/05_first_workflow/Program.cs
diff --git a/...ions/01_SingleAgent/01_SingleAgent.csproj → ...host_your_agent/06_host_your_agent.csproj b/...ions/01_SingleAgent/01_SingleAgent.csproj → ...host_your_agent/06_host_your_agent.csproj
@@ -36,7 +36,7 @@
   </ItemGroup>
   -->
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Hosting.AzureFunctions\Microsoft.Agents.AI.Hosting.AzureFunctions.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Hosting.AzureFunctions\Microsoft.Agents.AI.Hosting.AzureFunctions.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
   </ItemGroup>
 </Project>
diff --git a/.../AzureFunctions/01_SingleAgent/Program.cs → ...get-started/06_host_your_agent/Program.cs b/.../AzureFunctions/01_SingleAgent/Program.cs → ...get-started/06_host_your_agent/Program.cs
diff --git a/...s/AzureFunctions/01_SingleAgent/README.md → ...-get-started/06_host_your_agent/README.md b/...s/AzureFunctions/01_SingleAgent/README.md → ...-get-started/06_host_your_agent/README.md
diff --git a/...s/AzureFunctions/01_SingleAgent/demo.http → ...-get-started/06_host_your_agent/demo.http b/...s/AzureFunctions/01_SingleAgent/demo.http → ...-get-started/06_host_your_agent/demo.http
diff --git a/...s/AzureFunctions/01_SingleAgent/host.json → ...-get-started/06_host_your_agent/host.json b/...s/AzureFunctions/01_SingleAgent/host.json → ...-get-started/06_host_your_agent/host.json
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/local.settings.json b/dotnet/samples/Durable/Agents/AzureFunctions/01_SingleAgent/local.settings.json
diff --git a/dotnet/samples/Durable/Agents/AzureFunctions/README.md b/dotnet/samples/Durable/Agents/AzureFunctions/README.md
@@ -2,7 +2,6 @@
 
 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.
@@ -135,7 +134,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/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
@@ -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
@@ -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/...ingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/README.md b/...ingStarted/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