diff --git a/dotnet/samples/GettingStartedWithAgents/Step12_Azure.cs b/dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step01_AzureAIAgent.cs
similarity index 98%
rename from dotnet/samples/GettingStartedWithAgents/Step12_Azure.cs
rename to dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step01_AzureAIAgent.cs
index b144a066b7c5..8256c45c3344 100644
--- a/dotnet/samples/GettingStartedWithAgents/Step12_Azure.cs
+++ b/dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step01_AzureAIAgent.cs
@@ -14,7 +14,7 @@ namespace GettingStarted;
 /// This example demonstrates similarity between using <see cref="AzureAIAgent"/>
 /// and <see cref="ChatCompletionAgent"/> (see: Step 2).
 /// </summary>
-public class Step12_Azure(ITestOutputHelper output) : BaseAgentsTest(output)
+public class Step01_AzureAIAgent(ITestOutputHelper output) : BaseAgentsTest(output)
 {
     private const string HostName = "Host";
     private const string HostInstructions = "Answer questions about the menu.";
diff --git a/dotnet/samples/GettingStartedWithAgents/Step13_Azure_Chat.cs b/dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step02_AzureAIAgent_Chat.cs
similarity index 98%
rename from dotnet/samples/GettingStartedWithAgents/Step13_Azure_Chat.cs
rename to dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step02_AzureAIAgent_Chat.cs
index fcc2598d1e68..1452e03e1329 100644
--- a/dotnet/samples/GettingStartedWithAgents/Step13_Azure_Chat.cs
+++ b/dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step02_AzureAIAgent_Chat.cs
@@ -14,7 +14,7 @@ namespace GettingStarted;
 /// that inform how chat proceeds with regards to: Agent selection, chat continuation, and maximum
 /// number of agent interactions.
 /// </summary>
-public class Step13_Azure_Chat(ITestOutputHelper output) : BaseAgentsTest(output)
+public class Step02_AzureAIAgent_Chat(ITestOutputHelper output) : BaseAgentsTest(output)
 {
     private const string ReviewerName = "ArtDirector";
     private const string ReviewerInstructions =
diff --git a/dotnet/samples/GettingStartedWithAgents/Step14_AzureTool_CodeInterpreter.cs b/dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step03_AzureAIAgent_CodeInterpreter.cs
similarity index 95%
rename from dotnet/samples/GettingStartedWithAgents/Step14_AzureTool_CodeInterpreter.cs
rename to dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step03_AzureAIAgent_CodeInterpreter.cs
index 5d02b21e4315..1c63d920d81d 100644
--- a/dotnet/samples/GettingStartedWithAgents/Step14_AzureTool_CodeInterpreter.cs
+++ b/dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step03_AzureAIAgent_CodeInterpreter.cs
@@ -10,7 +10,7 @@ namespace GettingStarted;
 /// <summary>
 /// Demonstrate using code-interpreter on <see cref="AzureAIAgent"/> .
 /// </summary>
-public class Step14_AzureTool_CodeInterpreter(ITestOutputHelper output) : BaseAgentsTest(output)
+public class Step03_AzureAIAgent_CodeInterpreter(ITestOutputHelper output) : BaseAgentsTest(output)
 {
     [Fact]
     public async Task UseCodeInterpreterToolWithAgentAsync()
diff --git a/dotnet/samples/GettingStartedWithAgents/Step15_AzureTool_FileSearch.cs b/dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step04_AzureAIAgent_FileSearch.cs
similarity index 96%
rename from dotnet/samples/GettingStartedWithAgents/Step15_AzureTool_FileSearch.cs
rename to dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step04_AzureAIAgent_FileSearch.cs
index 122f5a4255be..fdf407529f26 100644
--- a/dotnet/samples/GettingStartedWithAgents/Step15_AzureTool_FileSearch.cs
+++ b/dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step04_AzureAIAgent_FileSearch.cs
@@ -11,7 +11,7 @@ namespace GettingStarted;
 /// <summary>
 /// Demonstrate using code-interpreter on <see cref="AzureAIAgent"/> .
 /// </summary>
-public class Step15_AzureTool_FileSearch(ITestOutputHelper output) : BaseAgentsTest(output)
+public class Step04_AzureAIAgent_FileSearch(ITestOutputHelper output) : BaseAgentsTest(output)
 {
     [Fact]
     public async Task UseFileSearchToolWithAgentAsync()
diff --git a/dotnet/samples/GettingStartedWithAgents/Step16_Azure_OpenAPI.cs b/dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step05_AzureAIAgent_OpenAPI.cs
similarity index 96%
rename from dotnet/samples/GettingStartedWithAgents/Step16_Azure_OpenAPI.cs
rename to dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step05_AzureAIAgent_OpenAPI.cs
index 511d90512826..6b336cec23e0 100644
--- a/dotnet/samples/GettingStartedWithAgents/Step16_Azure_OpenAPI.cs
+++ b/dotnet/samples/GettingStartedWithAgents/AzureAIAgent/Step05_AzureAIAgent_OpenAPI.cs
@@ -17,7 +17,7 @@ namespace GettingStarted;
 /// Note: Open API invocation does not involve kernel function calling or kernel filters.
 /// Azure Function invocation is managed entirely by the Azure AI Agent service.
 /// </remarks>
-public class Step16_Azure_OpenAPI(ITestOutputHelper output) : BaseAgentsTest(output)
+public class Step05_AzureAIAgent_OpenAPI(ITestOutputHelper output) : BaseAgentsTest(output)
 {
     [Fact]
     public async Task UseOpenAPIToolWithAgentAsync()
diff --git a/dotnet/samples/GettingStartedWithAgents/Step08_Assistant.cs b/dotnet/samples/GettingStartedWithAgents/OpenAIAssistant/Step01_Assistant.cs
similarity index 98%
rename from dotnet/samples/GettingStartedWithAgents/Step08_Assistant.cs
rename to dotnet/samples/GettingStartedWithAgents/OpenAIAssistant/Step01_Assistant.cs
index 1e952810e51e..3e95508ebac4 100644
--- a/dotnet/samples/GettingStartedWithAgents/Step08_Assistant.cs
+++ b/dotnet/samples/GettingStartedWithAgents/OpenAIAssistant/Step01_Assistant.cs
@@ -12,7 +12,7 @@ namespace GettingStarted;
 /// This example demonstrates similarity between using <see cref="OpenAIAssistantAgent"/>
 /// and <see cref="ChatCompletionAgent"/> (see: Step 2).
 /// </summary>
-public class Step08_Assistant(ITestOutputHelper output) : BaseAgentsTest(output)
+public class Step01_Assistant(ITestOutputHelper output) : BaseAgentsTest(output)
 {
     private const string HostName = "Host";
     private const string HostInstructions = "Answer questions about the menu.";
diff --git a/dotnet/samples/GettingStartedWithAgents/Step09_Assistant_Vision.cs b/dotnet/samples/GettingStartedWithAgents/OpenAIAssistant/Step02_Assistant_Vision.cs
similarity index 97%
rename from dotnet/samples/GettingStartedWithAgents/Step09_Assistant_Vision.cs
rename to dotnet/samples/GettingStartedWithAgents/OpenAIAssistant/Step02_Assistant_Vision.cs
index cd4de46f2b88..ed57ae55fd94 100644
--- a/dotnet/samples/GettingStartedWithAgents/Step09_Assistant_Vision.cs
+++ b/dotnet/samples/GettingStartedWithAgents/OpenAIAssistant/Step02_Assistant_Vision.cs
@@ -9,7 +9,7 @@ namespace GettingStarted;
 /// <summary>
 /// Demonstrate providing image input to <see cref="OpenAIAssistantAgent"/> .
 /// </summary>
-public class Step09_Assistant_Vision(ITestOutputHelper output) : BaseAgentsTest(output)
+public class Step02_Assistant_Vision(ITestOutputHelper output) : BaseAgentsTest(output)
 {
     /// <summary>
     /// Azure currently only supports message of type=text.
diff --git a/dotnet/samples/GettingStartedWithAgents/Step10_AssistantTool_CodeInterpreter.cs b/dotnet/samples/GettingStartedWithAgents/OpenAIAssistant/Step03_AssistantTool_CodeInterpreter.cs
similarity index 96%
rename from dotnet/samples/GettingStartedWithAgents/Step10_AssistantTool_CodeInterpreter.cs
rename to dotnet/samples/GettingStartedWithAgents/OpenAIAssistant/Step03_AssistantTool_CodeInterpreter.cs
index 203009ffb561..5fb88ef1d829 100644
--- a/dotnet/samples/GettingStartedWithAgents/Step10_AssistantTool_CodeInterpreter.cs
+++ b/dotnet/samples/GettingStartedWithAgents/OpenAIAssistant/Step03_AssistantTool_CodeInterpreter.cs
@@ -8,7 +8,7 @@ namespace GettingStarted;
 /// <summary>
 /// Demonstrate using code-interpreter on <see cref="OpenAIAssistantAgent"/> .
 /// </summary>
-public class Step10_AssistantTool_CodeInterpreter(ITestOutputHelper output) : BaseAgentsTest(output)
+public class Step03_AssistantTool_CodeInterpreter(ITestOutputHelper output) : BaseAgentsTest(output)
 {
     [Fact]
     public async Task UseCodeInterpreterToolWithAssistantAgentAsync()
diff --git a/dotnet/samples/GettingStartedWithAgents/Step11_AssistantTool_FileSearch.cs b/dotnet/samples/GettingStartedWithAgents/OpenAIAssistant/Step04_AssistantTool_FileSearch.cs
similarity index 98%
rename from dotnet/samples/GettingStartedWithAgents/Step11_AssistantTool_FileSearch.cs
rename to dotnet/samples/GettingStartedWithAgents/OpenAIAssistant/Step04_AssistantTool_FileSearch.cs
index 77f4e5dbdff1..e410032b2581 100644
--- a/dotnet/samples/GettingStartedWithAgents/Step11_AssistantTool_FileSearch.cs
+++ b/dotnet/samples/GettingStartedWithAgents/OpenAIAssistant/Step04_AssistantTool_FileSearch.cs
@@ -12,7 +12,7 @@ namespace GettingStarted;
 /// <summary>
 /// Demonstrate using code-interpreter on <see cref="OpenAIAssistantAgent"/> .
 /// </summary>
-public class Step11_AssistantTool_FileSearch(ITestOutputHelper output) : BaseAgentsTest(output)
+public class Step04_AssistantTool_FileSearch(ITestOutputHelper output) : BaseAgentsTest(output)
 {
     [Fact]
     public async Task UseFileSearchToolWithAssistantAgentAsync()