diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
index 5bfd03775e..81a2da4a49 100644
--- a/dotnet/agent-framework-dotnet.slnx
+++ b/dotnet/agent-framework-dotnet.slnx
@@ -80,9 +80,10 @@
     <Project Path="samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/03_MultiSelection.csproj" />
   </Folder>
   <Folder Name="/Samples/GettingStarted/Workflows/Declarative/">
-    <Project Path="samples/GettingStarted/Workflows/Declarative/DeclarativeWorkflow.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/DeclarativeCode/DeclarativeCode.csproj" />
-    <Project Path="samples/GettingStarted/Workflows/DeclarativeEject/DeclarativeEject.csproj" />
+    <File Path="samples/GettingStarted/Workflows/Declarative/README.md" />
+    <Project Path="samples/GettingStarted/Workflows/Declarative/ExecuteCode/ExecuteCode.csproj" />
+    <Project Path="samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj" />
+    <Project Path="samples/GettingStarted/Workflows/Declarative/GenerateCode/GenerateCode.csproj" />
   </Folder>
   <Folder Name="/Samples/GettingStarted/Workflows/Declarative/Examples/">
     <File Path="../workflow-samples/DeepResearch.yaml" />
diff --git a/dotnet/samples/GettingStarted/Workflows/DeclarativeCode/DeclarativeCode.csproj b/dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/ExecuteCode.csproj
similarity index 89%
rename from dotnet/samples/GettingStarted/Workflows/DeclarativeCode/DeclarativeCode.csproj
rename to dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/ExecuteCode.csproj
index 91bb0f69d1..72afa29cda 100644
--- a/dotnet/samples/GettingStarted/Workflows/DeclarativeCode/DeclarativeCode.csproj
+++ b/dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/ExecuteCode.csproj
@@ -26,7 +26,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Workflows.Declarative\Microsoft.Agents.AI.Workflows.Declarative.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Workflows.Declarative\Microsoft.Agents.AI.Workflows.Declarative.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/dotnet/samples/GettingStarted/Workflows/DeclarativeCode/Generated.cs b/dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/Generated.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/DeclarativeCode/Generated.cs
rename to dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/Generated.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/DeclarativeCode/Program.cs b/dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/DeclarativeCode/Program.cs
rename to dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/DeclarativeWorkflow.csproj b/dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj
similarity index 88%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/DeclarativeWorkflow.csproj
rename to dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj
index 70c048f255..b885a71c3c 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/DeclarativeWorkflow.csproj
+++ b/dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Workflows.Declarative\Microsoft.Agents.AI.Workflows.Declarative.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Workflows.Declarative\Microsoft.Agents.AI.Workflows.Declarative.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/Program.cs b/dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/Declarative/Program.cs
rename to dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/DeclarativeEject/DeclarativeEject.csproj b/dotnet/samples/GettingStarted/Workflows/Declarative/GenerateCode/GenerateCode.csproj
similarity index 89%
rename from dotnet/samples/GettingStarted/Workflows/DeclarativeEject/DeclarativeEject.csproj
rename to dotnet/samples/GettingStarted/Workflows/Declarative/GenerateCode/GenerateCode.csproj
index 91bb0f69d1..72afa29cda 100644
--- a/dotnet/samples/GettingStarted/Workflows/DeclarativeEject/DeclarativeEject.csproj
+++ b/dotnet/samples/GettingStarted/Workflows/Declarative/GenerateCode/GenerateCode.csproj
@@ -26,7 +26,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Workflows.Declarative\Microsoft.Agents.AI.Workflows.Declarative.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Workflows.Declarative\Microsoft.Agents.AI.Workflows.Declarative.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/dotnet/samples/GettingStarted/Workflows/DeclarativeEject/Program.cs b/dotnet/samples/GettingStarted/Workflows/Declarative/GenerateCode/Program.cs
similarity index 100%
rename from dotnet/samples/GettingStarted/Workflows/DeclarativeEject/Program.cs
rename to dotnet/samples/GettingStarted/Workflows/Declarative/GenerateCode/Program.cs
diff --git a/dotnet/samples/GettingStarted/Workflows/Declarative/README.md b/dotnet/samples/GettingStarted/Workflows/Declarative/README.md
index 48c6f91cbb..03023ea847 100644
--- a/dotnet/samples/GettingStarted/Workflows/Declarative/README.md
+++ b/dotnet/samples/GettingStarted/Workflows/Declarative/README.md
@@ -27,7 +27,7 @@ To set your secrets with .NET Secret Manager:
 1. From the root of the repository, navigate the console to the project folder:
 
     ```
-    cd dotnet/samples/GettingStarted/Workflows/Declarative/DeclarativeWorkflow
+    cd dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow
     ```
 
 2. Examine existing secret definitions:
diff --git a/workflow-samples/README.md b/workflow-samples/README.md
index 3bea36472d..c5937760c2 100644
--- a/workflow-samples/README.md
+++ b/workflow-samples/README.md
@@ -1,7 +1,7 @@
 # Declarative Workflows
 
 This folder contains sample workflow definitions than be ran using the
-[Declarative Workflow](../dotnet/samples/GettingStarted/Workflows/Declarative) demo.
+[Declarative Workflow](../dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow) demo.
 
 Each workflow is defined in a single YAML file and contains 
 comments with additional information specific to that workflow.