diff --git a/src/All.slnx b/src/All.slnx
index 6f04f44758c..98f7335d69e 100644
--- a/src/All.slnx
+++ b/src/All.slnx
@@ -217,7 +217,9 @@
   </Folder>
   <Folder Name="/HotChocolate/ModelContextProtocol/" />
   <Folder Name="/HotChocolate/ModelContextProtocol/src/">
+    <Project Path="HotChocolate/ModelContextProtocol/src/HotChocolate.Fusion.ModelContextProtocol/HotChocolate.Fusion.ModelContextProtocol.csproj" />
     <Project Path="HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/HotChocolate.ModelContextProtocol.csproj" />
+    <Project Path="HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/HotChocolate.ModelContextProtocol.Core.csproj" />
   </Folder>
   <Folder Name="/HotChocolate/ModelContextProtocol/test/">
     <Project Path="HotChocolate/ModelContextProtocol/test/HotChocolate.ModelContextProtocol.Tests/HotChocolate.ModelContextProtocol.Tests.csproj" />
@@ -349,4 +351,4 @@
   <Folder Name="/StrawberryShake/Tooling/test/">
     <Project Path="StrawberryShake/Tooling/test/Configuration.Tests/StrawberryShake.Tools.Configuration.Tests.csproj" />
   </Folder>
-</Solution>
\ No newline at end of file
+</Solution>
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.Fusion.ModelContextProtocol/HotChocolate.Fusion.ModelContextProtocol.csproj b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.Fusion.ModelContextProtocol/HotChocolate.Fusion.ModelContextProtocol.csproj
new file mode 100644
index 00000000000..3056d55151b
--- /dev/null
+++ b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.Fusion.ModelContextProtocol/HotChocolate.Fusion.ModelContextProtocol.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>HotChocolate.ModelContextProtocol.Fusion</AssemblyName>
+    <RootNamespace>HotChocolate.ModelContextProtocol</RootNamespace>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolAnnotationsDirective.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Directives/McpToolAnnotationsDirective.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolAnnotationsDirective.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Directives/McpToolAnnotationsDirective.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolDirective.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Directives/McpToolDirective.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolDirective.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Directives/McpToolDirective.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolDirectiveParser.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Directives/McpToolDirectiveParser.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolDirectiveParser.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Directives/McpToolDirectiveParser.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/EndpointRouteBuilderExtensions.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/EndpointRouteBuilderExtensions.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/EndpointRouteBuilderExtensions.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/EndpointRouteBuilderExtensions.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/FieldNodeExtensions.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/FieldNodeExtensions.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/FieldNodeExtensions.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/FieldNodeExtensions.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/HasDirectivesExtensions.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/HasDirectivesExtensions.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/HasDirectivesExtensions.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/HasDirectivesExtensions.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/InputFieldExtensions.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/InputValueDefinitionExtensions.cs
similarity index 82%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/InputFieldExtensions.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/InputValueDefinitionExtensions.cs
index 9f094e871c7..68b618974cd 100644
--- a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/InputFieldExtensions.cs
+++ b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/InputValueDefinitionExtensions.cs
@@ -3,9 +3,9 @@
 
 namespace HotChocolate.ModelContextProtocol.Extensions;
 
-internal static class InputFieldExtensions
+internal static class InputValueDefinitionExtensions
 {
-    public static JsonSchema ToJsonSchema(this InputField inputField)
+    public static JsonSchema ToJsonSchema(this IInputValueDefinition inputField)
     {
         var type = inputField.Type;
         var schemaBuilder = type.ToJsonSchemaBuilder(isOneOf: inputField.DeclaringType.IsOneOf);
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/JsonSchemaExtensions.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/JsonSchemaExtensions.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/JsonSchemaExtensions.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/JsonSchemaExtensions.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/OperationDefinitionNodeExtensions.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/OperationDefinitionNodeExtensions.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/OperationDefinitionNodeExtensions.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/OperationDefinitionNodeExtensions.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/OutputFieldDefinitionExtensions.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/OutputFieldDefinitionExtensions.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/OutputFieldDefinitionExtensions.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/OutputFieldDefinitionExtensions.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/TypeExtensions.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/TypeExtensions.cs
similarity index 96%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/TypeExtensions.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/TypeExtensions.cs
index 93526c0acec..7bdd1cefaa8 100644
--- a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/TypeExtensions.cs
+++ b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/TypeExtensions.cs
@@ -49,7 +49,7 @@ public static JsonSchemaBuilder ToJsonSchemaBuilder(this IType type, bool isOneO
 
         switch (type.NullableType())
         {
-            case EnumType enumType:
+            case IEnumTypeDefinition enumType:
                 // Enum values.
                 List<JsonValue?> enumValues = [];
 
@@ -66,7 +66,7 @@ public static JsonSchemaBuilder ToJsonSchemaBuilder(this IType type, bool isOneO
                 schemaBuilder.Enum(enumValues);
                 break;
 
-            case InputObjectType inputObjectType:
+            case IInputObjectTypeDefinition inputObjectType:
                 // Object properties.
                 var objectProperties = new Dictionary<string, JsonSchema>();
                 var requiredObjectProperties = new List<string>();
@@ -123,11 +123,12 @@ private static SchemaValueType GetJsonSchemaValueType(this IType type)
     {
         return type switch
         {
-            EnumType => SchemaValueType.String,
-            InputObjectType or InterfaceType or ObjectType or UnionType => SchemaValueType.Object,
+            IEnumTypeDefinition => SchemaValueType.String,
+            IInputObjectTypeDefinition or IInterfaceTypeDefinition or IObjectTypeDefinition or IUnionTypeDefinition
+                => SchemaValueType.Object,
             ListType => SchemaValueType.Array,
             NonNullType => GetJsonSchemaValueType(type.NullableType()),
-            ScalarType => type switch
+            IScalarTypeDefinition => type switch
             {
                 AnyType or JsonType =>
                     SchemaValueType.Object
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/TypeNodeExtensions.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/TypeNodeExtensions.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/TypeNodeExtensions.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/TypeNodeExtensions.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/ValueNodeExtensions.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/ValueNodeExtensions.cs
similarity index 97%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/ValueNodeExtensions.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/ValueNodeExtensions.cs
index 85630fd01f8..a032a667f2b 100644
--- a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/ValueNodeExtensions.cs
+++ b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/ValueNodeExtensions.cs
@@ -63,7 +63,7 @@ private static JsonObject ToJsonNode(this ObjectValueNode valueNode, IType objec
 
         foreach (var field in valueNode.Fields)
         {
-            var graphQLFieldType = objectType is InputObjectType inputObjectType
+            var graphQLFieldType = objectType is IInputObjectTypeDefinition inputObjectType
                 ? inputObjectType.Fields[field.Name.Value].Type
                 : new AnyType(); // Types like JsonType or AnyType have no schema.
 
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Handlers/CallToolHandler.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Handlers/CallToolHandler.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Handlers/CallToolHandler.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Handlers/CallToolHandler.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Handlers/ListToolsHandler.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Handlers/ListToolsHandler.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Handlers/ListToolsHandler.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Handlers/ListToolsHandler.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/HotChocolate.ModelContextProtocol.Core.csproj b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/HotChocolate.ModelContextProtocol.Core.csproj
new file mode 100644
index 00000000000..f9d1a404d49
--- /dev/null
+++ b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/HotChocolate.ModelContextProtocol.Core.csproj
@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>HotChocolate.ModelContextProtocol.Core</AssemblyName>
+    <RootNamespace>HotChocolate.ModelContextProtocol</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="HotChocolate.ModelContextProtocol" />
+    <InternalsVisibleTo Include="HotChocolate.ModelContextProtocol.Tests" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CaseConverter" />
+    <PackageReference Include="ChilliCream.ModelContextProtocol.AspNetCore" />
+    <PackageReference Include="JsonSchema.Net" />
+    <PackageReference Include="System.Reactive" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Core\src\Execution.Abstractions\HotChocolate.Execution.Abstractions.csproj" />
+    <ProjectReference Include="..\..\..\Core\src\Types.Abstractions\HotChocolate.Types.Abstractions.csproj" />
+    <ProjectReference Include="..\..\..\Language\src\Language\HotChocolate.Language.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\ModelContextProtocolResources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>ModelContextProtocolResources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\ModelContextProtocolResources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>ModelContextProtocolResources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/JsonSchemaJsonSerializerContext.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/JsonSchemaJsonSerializerContext.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/JsonSchemaJsonSerializerContext.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/JsonSchemaJsonSerializerContext.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/OperationTool.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/OperationTool.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/OperationTool.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/OperationTool.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/OperationToolFactory.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/OperationToolFactory.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/OperationToolFactory.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/OperationToolFactory.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Properties/ModelContextProtocolResources.Designer.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Properties/ModelContextProtocolResources.Designer.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Properties/ModelContextProtocolResources.Designer.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Properties/ModelContextProtocolResources.Designer.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Properties/ModelContextProtocolResources.resx b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Properties/ModelContextProtocolResources.resx
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Properties/ModelContextProtocolResources.resx
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Properties/ModelContextProtocolResources.resx
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Proxies/McpExecutorSession.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Proxies/McpExecutorSession.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Proxies/McpExecutorSession.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Proxies/McpExecutorSession.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Proxies/McpRequestExecutorProxy.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Proxies/McpRequestExecutorProxy.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Proxies/McpRequestExecutorProxy.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Proxies/McpRequestExecutorProxy.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Proxies/SseHandlerProxy.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Proxies/SseHandlerProxy.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Proxies/SseHandlerProxy.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Proxies/SseHandlerProxy.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Proxies/StreamableHttpHandlerProxy.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Proxies/StreamableHttpHandlerProxy.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Proxies/StreamableHttpHandlerProxy.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Proxies/StreamableHttpHandlerProxy.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Storage/IOperationToolStorage.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Storage/IOperationToolStorage.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Storage/IOperationToolStorage.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Storage/IOperationToolStorage.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Storage/OperationToolDefinition.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Storage/OperationToolDefinition.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Storage/OperationToolDefinition.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Storage/OperationToolDefinition.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Storage/OperationToolStorageEventArgs.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Storage/OperationToolStorageEventArgs.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Storage/OperationToolStorageEventArgs.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Storage/OperationToolStorageEventArgs.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Storage/OperationToolStorageEventType.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Storage/OperationToolStorageEventType.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Storage/OperationToolStorageEventType.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Storage/OperationToolStorageEventType.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/ToolRegistry.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/ToolRegistry.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/ToolRegistry.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/ToolRegistry.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/ToolStorageObserver.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/ToolStorageObserver.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/ToolStorageObserver.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/ToolStorageObserver.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/WellKnownArgumentNames.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/WellKnownArgumentNames.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/WellKnownArgumentNames.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/WellKnownArgumentNames.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/WellKnownDirectiveNames.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/WellKnownDirectiveNames.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/WellKnownDirectiveNames.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/WellKnownDirectiveNames.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/WellKnownFieldNames.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/WellKnownFieldNames.cs
similarity index 100%
rename from src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/WellKnownFieldNames.cs
rename to src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/WellKnownFieldNames.cs
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolAnnotationsAttribute.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolAnnotationsAttribute.cs
index baa7e0d9279..37c71de6464 100644
--- a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolAnnotationsAttribute.cs
+++ b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolAnnotationsAttribute.cs
@@ -1,9 +1,8 @@
 using System.Reflection;
-using HotChocolate.ModelContextProtocol.Directives;
 using HotChocolate.Types;
 using HotChocolate.Types.Descriptors;
 
-namespace HotChocolate.ModelContextProtocol.Attributes;
+namespace HotChocolate.ModelContextProtocol.Directives;
 
 /// <summary>
 /// Additional properties describing a Tool to clients.
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolAnnotationsDirectiveType.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolAnnotationsDirectiveType.cs
index a2b0de2a1e3..3e5727f41f1 100644
--- a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolAnnotationsDirectiveType.cs
+++ b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolAnnotationsDirectiveType.cs
@@ -1,7 +1,6 @@
-using HotChocolate.ModelContextProtocol.Directives;
 using HotChocolate.Types;
 
-namespace HotChocolate.ModelContextProtocol.Types;
+namespace HotChocolate.ModelContextProtocol.Directives;
 
 /// <summary>
 /// Additional properties describing a Tool to clients.
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/RequestExecutorBuilderExtensions.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/RequestExecutorBuilderExtensions.cs
index 201dfda65ae..e95636aa46c 100644
--- a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/RequestExecutorBuilderExtensions.cs
+++ b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/RequestExecutorBuilderExtensions.cs
@@ -1,9 +1,9 @@
 using HotChocolate.Execution;
 using HotChocolate.Execution.Configuration;
+using HotChocolate.ModelContextProtocol.Directives;
 using HotChocolate.ModelContextProtocol.Handlers;
 using HotChocolate.ModelContextProtocol.Proxies;
 using HotChocolate.ModelContextProtocol.Storage;
-using HotChocolate.ModelContextProtocol.Types;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/SchemaBuilderExtensions.cs b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/SchemaBuilderExtensions.cs
index 302d98054a5..54b83f8825f 100644
--- a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/SchemaBuilderExtensions.cs
+++ b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/SchemaBuilderExtensions.cs
@@ -1,13 +1,13 @@
-using HotChocolate.ModelContextProtocol.Types;
-
-namespace HotChocolate.ModelContextProtocol.Extensions;
-
-public static class SchemaBuilderExtensions
-{
-    public static ISchemaBuilder AddMcp(this ISchemaBuilder builder)
-    {
-        builder.AddDirectiveType<McpToolAnnotationsDirectiveType>();
-
-        return builder;
-    }
-}
+using HotChocolate.ModelContextProtocol.Directives;
+
+namespace HotChocolate.ModelContextProtocol.Extensions;
+
+public static class SchemaBuilderExtensions
+{
+    public static ISchemaBuilder AddMcp(this ISchemaBuilder builder)
+    {
+        builder.AddDirectiveType<McpToolAnnotationsDirectiveType>();
+
+        return builder;
+    }
+}
diff --git a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/HotChocolate.ModelContextProtocol.csproj b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/HotChocolate.ModelContextProtocol.csproj
index 8b63f3b3f66..58c44a3b041 100644
--- a/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/HotChocolate.ModelContextProtocol.csproj
+++ b/src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/HotChocolate.ModelContextProtocol.csproj
@@ -5,35 +5,10 @@
     <RootNamespace>HotChocolate.ModelContextProtocol</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <InternalsVisibleTo Include="HotChocolate.ModelContextProtocol.Tests" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CaseConverter" />
-    <PackageReference Include="ChilliCream.ModelContextProtocol.AspNetCore" />
-    <PackageReference Include="JsonSchema.Net" />
-    <PackageReference Include="System.Reactive" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\..\Core\src\Execution\HotChocolate.Execution.csproj" />
-    <ProjectReference Include="..\..\..\Language\src\Language\HotChocolate.Language.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\ModelContextProtocolResources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>ModelContextProtocolResources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\ModelContextProtocolResources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ModelContextProtocolResources.resx</DependentUpon>
-    </Compile>
+    <ProjectReference Include="..\..\..\Core\src\Types\HotChocolate.Types.csproj" />
+    <ProjectReference Include="..\HotChocolate.ModelContextProtocol.Core\HotChocolate.ModelContextProtocol.Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/HotChocolate/ModelContextProtocol/test/HotChocolate.ModelContextProtocol.Tests/TestSchema.cs b/src/HotChocolate/ModelContextProtocol/test/HotChocolate.ModelContextProtocol.Tests/TestSchema.cs
index a069aaa31bd..904011c88ee 100644
--- a/src/HotChocolate/ModelContextProtocol/test/HotChocolate.ModelContextProtocol.Tests/TestSchema.cs
+++ b/src/HotChocolate/ModelContextProtocol/test/HotChocolate.ModelContextProtocol.Tests/TestSchema.cs
@@ -4,7 +4,7 @@
 using System.Text.Json;
 using HotChocolate.Authorization;
 using HotChocolate.Language;
-using HotChocolate.ModelContextProtocol.Attributes;
+using HotChocolate.ModelContextProtocol.Directives;
 using HotChocolate.Types;
 
 namespace HotChocolate.ModelContextProtocol;