diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
index cfddeb0fd3..98a1ac8ed4 100644
--- a/dotnet/agent-framework-dotnet.slnx
+++ b/dotnet/agent-framework-dotnet.slnx
@@ -272,9 +272,9 @@
-
-
-
+
+
+
@@ -300,8 +300,8 @@
-
-
+
+
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/ActorFrameworkWebApplicationExtensions.cs b/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/ActorFrameworkWebApplicationExtensions.cs
index 7dfdaf5263..5e997c4f58 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/ActorFrameworkWebApplicationExtensions.cs
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/ActorFrameworkWebApplicationExtensions.cs
@@ -2,7 +2,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Text.Json.Serialization;
-using Microsoft.Extensions.AI.Agents.Hosting;
+using Microsoft.Agents.AI.Hosting;
namespace AgentWebChat.AgentHost;
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/AgentWebChat.AgentHost.csproj b/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/AgentWebChat.AgentHost.csproj
index 8b162dede3..458fd258aa 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/AgentWebChat.AgentHost.csproj
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/AgentWebChat.AgentHost.csproj
@@ -10,11 +10,11 @@
-
+
-
+
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/HttpActorProcessor.cs b/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/HttpActorProcessor.cs
index 4f2f360ac5..ba9a610589 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/HttpActorProcessor.cs
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/HttpActorProcessor.cs
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Text.Json;
+using Microsoft.Agents.AI.Hosting;
using Microsoft.AspNetCore.Http.Features;
-using Microsoft.Extensions.AI.Agents.Hosting;
using Microsoft.Extensions.AI.Agents.Runtime;
namespace AgentWebChat.AgentHost;
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Program.cs b/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Program.cs
index b4d31b5cc8..d5001c7e5d 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Program.cs
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.AgentHost/Program.cs
@@ -4,11 +4,11 @@ using System.Text.Json;
using AgentWebChat.AgentHost;
using AgentWebChat.AgentHost.Utilities;
using Microsoft.Agents.AI;
+using Microsoft.Agents.AI.Hosting;
+using Microsoft.Agents.AI.Hosting.A2A.AspNetCore;
using Microsoft.Agents.Orchestration;
using Microsoft.Azure.Cosmos;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents.Hosting;
-using Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore;
using Microsoft.Extensions.AI.Agents.Runtime.Storage.CosmosDB;
var builder = WebApplication.CreateBuilder(args);
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/A2AActorClient.cs b/dotnet/samples/AgentWebChat/AgentWebChat.Web/A2AActorClient.cs
index 956036d10e..52696a6acf 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.Web/A2AActorClient.cs
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.Web/A2AActorClient.cs
@@ -5,9 +5,9 @@ using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;
using System.Text.Json;
using A2A;
+using Microsoft.Agents.AI.Hosting;
+using Microsoft.Agents.AI.Hosting.A2A.Converters;
using Microsoft.Extensions.AI;
-using Microsoft.Extensions.AI.Agents.Hosting;
-using Microsoft.Extensions.AI.Agents.Hosting.A2A.Converters;
using Microsoft.Extensions.AI.Agents.Runtime;
namespace AgentWebChat.Web;
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentDiscoveryClient.cs b/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentDiscoveryClient.cs
index df0894d8f0..08f4d07213 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentDiscoveryClient.cs
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentDiscoveryClient.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
using System.Text.Json;
-using Microsoft.Extensions.AI.Agents.Hosting;
+using Microsoft.Agents.AI.Hosting;
namespace AgentWebChat.Web;
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentWebChat.Web.csproj b/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentWebChat.Web.csproj
index ea5ed2bea2..a7ac9dc2a5 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentWebChat.Web.csproj
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.Web/AgentWebChat.Web.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/Pages/Home.razor b/dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/Pages/Home.razor
index cc3a2576b3..223aae0e19 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/Pages/Home.razor
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.Web/Components/Pages/Home.razor
@@ -10,7 +10,7 @@
@using System.Text.Json
@using Microsoft.Extensions.AI
@using Microsoft.Extensions.AI.Agents
-@using Microsoft.Extensions.AI.Agents.Hosting
+@using Microsoft.Agents.AI.Hosting
@using Microsoft.Extensions.AI.Agents.Runtime
@using A2A
diff --git a/dotnet/samples/AgentWebChat/AgentWebChat.Web/HttpActorClient.cs b/dotnet/samples/AgentWebChat/AgentWebChat.Web/HttpActorClient.cs
index 8a11070742..094530dcc6 100644
--- a/dotnet/samples/AgentWebChat/AgentWebChat.Web/HttpActorClient.cs
+++ b/dotnet/samples/AgentWebChat/AgentWebChat.Web/HttpActorClient.cs
@@ -5,7 +5,7 @@ using System.Net.ServerSentEvents;
using System.Runtime.CompilerServices;
using System.Text.Json;
using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI.Agents.Hosting;
+using Microsoft.Agents.AI.Hosting;
using Microsoft.Extensions.AI.Agents.Runtime;
namespace AgentWebChat.Web;
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore/Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore.csproj b/dotnet/src/Microsoft.Agents.AI.Hosting.A2A.AspNetCore/Microsoft.Agents.AI.Hosting.A2A.AspNetCore.csproj
similarity index 76%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore/Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore.csproj
rename to dotnet/src/Microsoft.Agents.AI.Hosting.A2A.AspNetCore/Microsoft.Agents.AI.Hosting.A2A.AspNetCore.csproj
index 3dfe651782..f246184ed6 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore/Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore.csproj
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting.A2A.AspNetCore/Microsoft.Agents.AI.Hosting.A2A.AspNetCore.csproj
@@ -4,7 +4,7 @@
$(ProjectsCoreTargetFrameworks)
$(ProjectsCoreTargetFrameworks)
$(NoWarn);IDE1006;IDE0130;NU1504
- Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore
+ Microsoft.Agents.AI.Hosting.A2A.AspNetCore
alpha
@@ -16,7 +16,7 @@
-
+
\ No newline at end of file
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore/WebApplicationExtensions.cs b/dotnet/src/Microsoft.Agents.AI.Hosting.A2A.AspNetCore/WebApplicationExtensions.cs
similarity index 97%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore/WebApplicationExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting.A2A.AspNetCore/WebApplicationExtensions.cs
index b4b445aedd..93e5dfba9b 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore/WebApplicationExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting.A2A.AspNetCore/WebApplicationExtensions.cs
@@ -2,13 +2,12 @@
using A2A;
using A2A.AspNetCore;
-using Microsoft.Agents.AI;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Microsoft.Extensions.AI.Agents.Hosting.A2A.AspNetCore;
+namespace Microsoft.Agents.AI.Hosting.A2A.AspNetCore;
///
/// Provides extension methods for configuring A2A (Agent-to-Agent) communication in a host application builder.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/AIAgentExtensions.cs b/dotnet/src/Microsoft.Agents.AI.Hosting.A2A/AIAgentExtensions.cs
similarity index 95%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/AIAgentExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting.A2A/AIAgentExtensions.cs
index 1a1ef66d46..c2064cd480 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/AIAgentExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting.A2A/AIAgentExtensions.cs
@@ -3,12 +3,11 @@
using System;
using System.Threading.Tasks;
using A2A;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI.Agents.Hosting.A2A.Internal;
+using Microsoft.Agents.AI.Hosting.A2A.Internal;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Extensions.Logging;
-namespace Microsoft.Extensions.AI.Agents.Hosting.A2A;
+namespace Microsoft.Agents.AI.Hosting.A2A;
///
/// Provides extension methods for attaching A2A (Agent-to-Agent) messaging capabilities to an .
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Converters/ActorEntitiesConverter.cs b/dotnet/src/Microsoft.Agents.AI.Hosting.A2A/Converters/ActorEntitiesConverter.cs
similarity index 95%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Converters/ActorEntitiesConverter.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting.A2A/Converters/ActorEntitiesConverter.cs
index f705c10fe3..297d5f809e 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Converters/ActorEntitiesConverter.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting.A2A/Converters/ActorEntitiesConverter.cs
@@ -3,10 +3,10 @@
using System;
using System.Text.Json;
using A2A;
-using Microsoft.Agents.AI;
+using Microsoft.Extensions.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
-namespace Microsoft.Extensions.AI.Agents.Hosting.A2A.Converters;
+namespace Microsoft.Agents.AI.Hosting.A2A.Converters;
internal static class ActorEntitiesConverter
{
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Converters/MessageConverter.cs b/dotnet/src/Microsoft.Agents.AI.Hosting.A2A/Converters/MessageConverter.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Converters/MessageConverter.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting.A2A/Converters/MessageConverter.cs
index 56af225f19..57b59d3abb 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Converters/MessageConverter.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting.A2A/Converters/MessageConverter.cs
@@ -4,8 +4,9 @@ using System;
using System.Collections.Generic;
using System.Text.Json;
using A2A;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.Hosting.A2A.Converters;
+namespace Microsoft.Agents.AI.Hosting.A2A.Converters;
internal static class MessageConverter
{
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Internal/A2AAgentWrapper.cs b/dotnet/src/Microsoft.Agents.AI.Hosting.A2A/Internal/A2AAgentWrapper.cs
similarity index 94%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Internal/A2AAgentWrapper.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting.A2A/Internal/A2AAgentWrapper.cs
index e398216dbf..94855a4ce0 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Internal/A2AAgentWrapper.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting.A2A/Internal/A2AAgentWrapper.cs
@@ -5,12 +5,11 @@ using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using A2A;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI.Agents.Hosting.A2A.Converters;
+using Microsoft.Agents.AI.Hosting.A2A.Converters;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Extensions.Logging;
-namespace Microsoft.Extensions.AI.Agents.Hosting.A2A.Internal;
+namespace Microsoft.Agents.AI.Hosting.A2A.Internal;
///
/// A2A agent that wraps an existing AIAgent and provides A2A-specific thread wrapping.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Microsoft.Extensions.AI.Agents.Hosting.A2A.csproj b/dotnet/src/Microsoft.Agents.AI.Hosting.A2A/Microsoft.Agents.AI.Hosting.A2A.csproj
similarity index 79%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Microsoft.Extensions.AI.Agents.Hosting.A2A.csproj
rename to dotnet/src/Microsoft.Agents.AI.Hosting.A2A/Microsoft.Agents.AI.Hosting.A2A.csproj
index ab6a8161a6..b69e2edbdc 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting.A2A/Microsoft.Extensions.AI.Agents.Hosting.A2A.csproj
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting.A2A/Microsoft.Agents.AI.Hosting.A2A.csproj
@@ -4,7 +4,7 @@
$(ProjectsCoreTargetFrameworks)
$(ProjectsCoreTargetFrameworks)
$(NoWarn);IDE1006;IDE0130;NU1504
- Microsoft.Extensions.AI.Agents.Hosting.A2A
+ Microsoft.Agents.AI.Hosting.A2A
alpha
@@ -17,7 +17,7 @@
-
+
@@ -27,7 +27,7 @@
-
+
\ No newline at end of file
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentActor.cs b/dotnet/src/Microsoft.Agents.AI.Hosting/AgentActor.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentActor.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting/AgentActor.cs
index 800cfae894..96a4a6cf00 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentActor.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting/AgentActor.cs
@@ -6,11 +6,11 @@ using System.Diagnostics;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
-using Microsoft.Agents.AI;
+using Microsoft.Extensions.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Extensions.Logging;
-namespace Microsoft.Extensions.AI.Agents.Hosting;
+namespace Microsoft.Agents.AI.Hosting;
internal sealed class AgentActor(
AIAgent agent,
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentActorConstants.cs b/dotnet/src/Microsoft.Agents.AI.Hosting/AgentActorConstants.cs
similarity index 74%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentActorConstants.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting/AgentActorConstants.cs
index de10aa345a..ac1b2d99c9 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentActorConstants.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting/AgentActorConstants.cs
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft. All rights reserved.
-namespace Microsoft.Extensions.AI.Agents.Hosting;
+namespace Microsoft.Agents.AI.Hosting;
internal static class AgentActorConstants
{
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentCatalog.cs b/dotnet/src/Microsoft.Agents.AI.Hosting/AgentCatalog.cs
similarity index 95%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentCatalog.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting/AgentCatalog.cs
index 4b1b57bb15..dc883d1416 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentCatalog.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting/AgentCatalog.cs
@@ -2,9 +2,8 @@
using System.Collections.Generic;
using System.Threading;
-using Microsoft.Agents.AI;
-namespace Microsoft.Extensions.AI.Agents.Hosting;
+namespace Microsoft.Agents.AI.Hosting;
///
/// Provides a catalog of registered AI agents within the hosting environment.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentHostingJsonUtilities.cs b/dotnet/src/Microsoft.Agents.AI.Hosting/AgentHostingJsonUtilities.cs
similarity index 97%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentHostingJsonUtilities.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting/AgentHostingJsonUtilities.cs
index e55d0bd68c..4f45c9f212 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentHostingJsonUtilities.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting/AgentHostingJsonUtilities.cs
@@ -3,10 +3,9 @@
using System.Diagnostics.CodeAnalysis;
using System.Text.Json;
using System.Text.Json.Serialization;
-using Microsoft.Agents.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
-namespace Microsoft.Extensions.AI.Agents.Hosting;
+namespace Microsoft.Agents.AI.Hosting;
/// Provides a collection of utility methods for working with JSON data in the context of agent hosting.
public static partial class AgentHostingJsonUtilities
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentProxy.cs b/dotnet/src/Microsoft.Agents.AI.Hosting/AgentProxy.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentProxy.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting/AgentProxy.cs
index 86d1f61e91..57bd260184 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentProxy.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting/AgentProxy.cs
@@ -7,11 +7,11 @@ using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
-using Microsoft.Agents.AI;
+using Microsoft.Extensions.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents.Hosting;
+namespace Microsoft.Agents.AI.Hosting;
///
/// Represents a proxy for an AI agent that communicates with the agent runtime via an actor client.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentProxyThread.cs b/dotnet/src/Microsoft.Agents.AI.Hosting/AgentProxyThread.cs
similarity index 97%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentProxyThread.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting/AgentProxyThread.cs
index ab53d99d58..b3bbc162df 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentProxyThread.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting/AgentProxyThread.cs
@@ -3,10 +3,9 @@
using System;
using System.Text.Json;
using System.Text.RegularExpressions;
-using Microsoft.Agents.AI;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents.Hosting;
+namespace Microsoft.Agents.AI.Hosting;
///
/// Represents an agent thread for a .
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentRunRequest.cs b/dotnet/src/Microsoft.Agents.AI.Hosting/AgentRunRequest.cs
similarity index 87%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentRunRequest.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting/AgentRunRequest.cs
index 4ee50e85a0..fe1b3a1651 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/AgentRunRequest.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting/AgentRunRequest.cs
@@ -2,8 +2,9 @@
using System.Collections.Generic;
using System.Text.Json.Serialization;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.Hosting;
+namespace Microsoft.Agents.AI.Hosting;
///
/// Represents a request to run an agent with a collection of chat messages.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/HostApplicationBuilderAgentExtensions.cs b/dotnet/src/Microsoft.Agents.AI.Hosting/HostApplicationBuilderAgentExtensions.cs
similarity index 99%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/HostApplicationBuilderAgentExtensions.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting/HostApplicationBuilderAgentExtensions.cs
index 391b6504fd..bd30482292 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/HostApplicationBuilderAgentExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting/HostApplicationBuilderAgentExtensions.cs
@@ -2,7 +2,6 @@
using System;
using System.Linq;
-using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Extensions.DependencyInjection;
@@ -10,7 +9,7 @@ using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Shared.Diagnostics;
-namespace Microsoft.Extensions.AI.Agents.Hosting;
+namespace Microsoft.Agents.AI.Hosting;
///
/// Provides extension methods for configuring AI agents in a host application builder.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/LocalAgentCatalog.cs b/dotnet/src/Microsoft.Agents.AI.Hosting/LocalAgentCatalog.cs
similarity index 93%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/LocalAgentCatalog.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting/LocalAgentCatalog.cs
index ae5fd86ba7..8d36c16e7c 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/LocalAgentCatalog.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting/LocalAgentCatalog.cs
@@ -5,10 +5,9 @@ using System.Collections.Generic;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
-using Microsoft.Agents.AI;
using Microsoft.Extensions.DependencyInjection;
-namespace Microsoft.Extensions.AI.Agents.Hosting;
+namespace Microsoft.Agents.AI.Hosting;
// Implementation of an AgentCatalog which enumerates agents registered in the local service provider.
internal sealed class LocalAgentCatalog : AgentCatalog
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/LocalAgentRegistry.cs b/dotnet/src/Microsoft.Agents.AI.Hosting/LocalAgentRegistry.cs
similarity index 78%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/LocalAgentRegistry.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting/LocalAgentRegistry.cs
index a15e6d5e3c..712634a2ba 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/LocalAgentRegistry.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting/LocalAgentRegistry.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
-namespace Microsoft.Extensions.AI.Agents.Hosting;
+namespace Microsoft.Agents.AI.Hosting;
internal sealed class LocalAgentRegistry
{
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/Log.cs b/dotnet/src/Microsoft.Agents.AI.Hosting/Log.cs
similarity index 98%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/Log.cs
rename to dotnet/src/Microsoft.Agents.AI.Hosting/Log.cs
index ab07708cf9..98f66328e6 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/Log.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting/Log.cs
@@ -3,7 +3,7 @@
using System;
using Microsoft.Extensions.Logging;
-namespace Microsoft.Extensions.AI.Agents.Hosting;
+namespace Microsoft.Agents.AI.Hosting;
///
/// High-performance logging messages using LoggerMessage source generator.
diff --git a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/Microsoft.Extensions.AI.Agents.Hosting.csproj b/dotnet/src/Microsoft.Agents.AI.Hosting/Microsoft.Agents.AI.Hosting.csproj
similarity index 95%
rename from dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/Microsoft.Extensions.AI.Agents.Hosting.csproj
rename to dotnet/src/Microsoft.Agents.AI.Hosting/Microsoft.Agents.AI.Hosting.csproj
index be779b5a9d..12ae9bc64c 100644
--- a/dotnet/src/Microsoft.Extensions.AI.Agents.Hosting/Microsoft.Extensions.AI.Agents.Hosting.csproj
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting/Microsoft.Agents.AI.Hosting.csproj
@@ -39,6 +39,6 @@
-
+
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.A2A.Tests/Converters/MessageConverterTests.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.A2A.Tests/Converters/MessageConverterTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.A2A.Tests/Converters/MessageConverterTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Hosting.A2A.Tests/Converters/MessageConverterTests.cs
index c14e3d823c..3b8072149d 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.A2A.Tests/Converters/MessageConverterTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.A2A.Tests/Converters/MessageConverterTests.cs
@@ -5,9 +5,10 @@ using System.Collections.Generic;
using System.Linq;
using System.Text.Json;
using A2A;
-using Microsoft.Extensions.AI.Agents.Hosting.A2A.Converters;
+using Microsoft.Agents.AI.Hosting.A2A.Converters;
+using Microsoft.Extensions.AI;
-namespace Microsoft.Extensions.AI.Agents.Hosting.A2A.Tests.Converters;
+namespace Microsoft.Agents.AI.Hosting.A2A.Tests.Converters;
public class MessageConverterTests
{
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.A2A.Tests/Microsoft.Extensions.AI.Agents.Hosting.A2A.Tests.csproj b/dotnet/tests/Microsoft.Agents.AI.Hosting.A2A.Tests/Microsoft.Agents.AI.Hosting.A2A.Tests.csproj
similarity index 77%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.A2A.Tests/Microsoft.Extensions.AI.Agents.Hosting.A2A.Tests.csproj
rename to dotnet/tests/Microsoft.Agents.AI.Hosting.A2A.Tests/Microsoft.Agents.AI.Hosting.A2A.Tests.csproj
index ddc94e3b54..d3e3e0fc72 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.A2A.Tests/Microsoft.Extensions.AI.Agents.Hosting.A2A.Tests.csproj
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.A2A.Tests/Microsoft.Agents.AI.Hosting.A2A.Tests.csproj
@@ -11,7 +11,7 @@
-
+
\ No newline at end of file
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentActorTests.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/AgentActorTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentActorTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/AgentActorTests.cs
index 84ce8564d9..0551ef2d8a 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentActorTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/AgentActorTests.cs
@@ -5,13 +5,13 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
-using Microsoft.Agents.AI;
+using Microsoft.Extensions.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Moq;
-namespace Microsoft.Extensions.AI.Agents.Hosting.UnitTests;
+namespace Microsoft.Agents.AI.Hosting.UnitTests;
///
/// Unit tests for .
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentProxyTests.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/AgentProxyTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentProxyTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/AgentProxyTests.cs
index ea4ee97b4a..698d284843 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentProxyTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/AgentProxyTests.cs
@@ -6,11 +6,11 @@ using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
-using Microsoft.Agents.AI;
+using Microsoft.Extensions.AI;
using Microsoft.Extensions.AI.Agents.Runtime;
using Moq;
-namespace Microsoft.Extensions.AI.Agents.Hosting.UnitTests;
+namespace Microsoft.Agents.AI.Hosting.UnitTests;
///
/// Tests for the constructor.
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentProxyThreadTests.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/AgentProxyThreadTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentProxyThreadTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/AgentProxyThreadTests.cs
index b32ec6fe47..239400ac52 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/AgentProxyThreadTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/AgentProxyThreadTests.cs
@@ -4,9 +4,8 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Microsoft.Agents.AI;
-namespace Microsoft.Extensions.AI.Agents.Hosting.UnitTests;
+namespace Microsoft.Agents.AI.Hosting.UnitTests;
public class AgentProxyThreadTests
{
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/HostApplicationBuilderAgentExtensionsTests.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/HostApplicationBuilderAgentExtensionsTests.cs
similarity index 99%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/HostApplicationBuilderAgentExtensionsTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/HostApplicationBuilderAgentExtensionsTests.cs
index d74cce5e67..677f8a0492 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/HostApplicationBuilderAgentExtensionsTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/HostApplicationBuilderAgentExtensionsTests.cs
@@ -2,12 +2,11 @@
using System;
using System.Linq;
-using Microsoft.Agents.AI;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Moq;
-namespace Microsoft.Extensions.AI.Agents.Hosting.UnitTests;
+namespace Microsoft.Agents.AI.Hosting.UnitTests;
public class HostApplicationBuilderAgentExtensionsTests
{
diff --git a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests.csproj b/dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/Microsoft.Agents.AI.Hosting.UnitTests.csproj
similarity index 58%
rename from dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests.csproj
rename to dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/Microsoft.Agents.AI.Hosting.UnitTests.csproj
index 3608d73854..72c0e962ce 100644
--- a/dotnet/tests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests/Microsoft.Extensions.AI.Agents.Hosting.UnitTests.csproj
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.UnitTests/Microsoft.Agents.AI.Hosting.UnitTests.csproj
@@ -5,7 +5,7 @@
-
+
\ No newline at end of file