diff --git a/mcp-bom/pom.xml b/mcp-bom/pom.xml
index b7ea52639..daa539011 100644
--- a/mcp-bom/pom.xml
+++ b/mcp-bom/pom.xml
@@ -27,6 +27,13 @@
     <dependencyManagement>
         <dependencies>
             <!-- Core MCP -->
+            <dependency>
+                <groupId>io.modelcontextprotocol.sdk</groupId>
+                <artifactId>mcp-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <!-- MCP -->
             <dependency>
                 <groupId>io.modelcontextprotocol.sdk</groupId>
                 <artifactId>mcp</artifactId>
diff --git a/mcp-core/pom.xml b/mcp-core/pom.xml
new file mode 100644
index 000000000..52d5bf58a
--- /dev/null
+++ b/mcp-core/pom.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>io.modelcontextprotocol.sdk</groupId>
+		<artifactId>mcp-parent</artifactId>
+		<version>0.13.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>mcp-core</artifactId>
+	<packaging>jar</packaging>
+	<name>Java MCP SDK Core</name>
+	<description>Core classes of the Java SDK implementation of the Model Context Protocol, enabling seamless integration with language models and AI tools</description>
+	<url>https://github.com/modelcontextprotocol/java-sdk</url>
+
+	<scm>
+		<url>https://github.com/modelcontextprotocol/java-sdk</url>
+		<connection>git://github.com/modelcontextprotocol/java-sdk.git</connection>
+		<developerConnection>git@github.com/modelcontextprotocol/java-sdk.git</developerConnection>
+	</scm>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-maven-plugin</artifactId>
+				<version>${bnd-maven-plugin.version}</version>
+				<executions>
+					<execution>
+						<id>bnd-process</id>
+						<goals>
+							<goal>bnd-process</goal>
+						</goals>
+						<configuration>
+							<bnd><![CDATA[
+								Bundle-Name:            Bundle ${project.groupId} : ${project.artifactId}
+								version:                ${versionmask;===;${version_cleanup;${project.version}}}
+								Bundle-SymbolicName:    ${project.groupId}.${project.artifactId}
+								Bundle-Version:         ${version}
+								Automatic-Module-Name:  ${project.groupId}.${project.artifactId}
+								Import-Package:         jakarta.*;resolution:=optional, \
+								                        *;
+								Export-Package:         io.modelcontextprotocol.*;version="${version}";-noimport:=true
+								-noimportjava:          true;
+								-nouses:                true;
+								-removeheaders:         Private-Package
+								]]>
+							</bnd>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+        <dependency>
+            <groupId>io.modelcontextprotocol.sdk</groupId>
+            <artifactId>mcp-json</artifactId>
+            <version>0.13.0-SNAPSHOT</version>
+        </dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j-api.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-core</artifactId>
+		</dependency>
+
+
+		<!-- Used by the HttpServletSseServerTransport -->
+		<dependency>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<version>${jakarta.servlet.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Test dependencies -->
+        <dependency>
+            <groupId>io.modelcontextprotocol.sdk</groupId>
+            <artifactId>mcp-json-jackson2</artifactId>
+            <version>0.13.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>${springframework.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+
+		<dependency>
+			<groupId>io.projectreactor.netty</groupId>
+			<artifactId>reactor-netty-http</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- The Spring Context is required due to the reactor-netty connector being dependent on
+		the Spring Lifecycle, as discussed here:
+		https://github.com/spring-projects/spring-framework/issues/31180 -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${springframework.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${springframework.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${assert4j.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-params</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>${mockito.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Mockito cannot mock this class: class java.net.http.HttpClient. the bytebuddy helps. -->
+		<dependency>
+			<groupId>net.bytebuddy</groupId>
+			<artifactId>byte-buddy</artifactId>
+			<version>${byte-buddy.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>${testcontainers.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
+			<version>${awaitility.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>net.javacrumbs.json-unit</groupId>
+			<artifactId>json-unit-assertj</artifactId>
+			<version>${json-unit-assertj.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Tomcat dependencies for testing -->
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-core</artifactId>
+			<version>${tomcat.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-websocket</artifactId>
+			<version>${tomcat.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>toxiproxy</artifactId>
+			<version>${toxiproxy.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+        <!-- Test-only JSON library for the Gson-based McpJsonMapper example -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.10.1</version>
+            <scope>test</scope>
+        </dependency>
+	</dependencies>
+
+
+</project>
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/LifecycleInitializer.java b/mcp-core/src/main/java/io/modelcontextprotocol/client/LifecycleInitializer.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/client/LifecycleInitializer.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/client/LifecycleInitializer.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java b/mcp-core/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/McpClient.java b/mcp-core/src/main/java/io/modelcontextprotocol/client/McpClient.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/client/McpClient.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/client/McpClient.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/McpClientFeatures.java b/mcp-core/src/main/java/io/modelcontextprotocol/client/McpClientFeatures.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/client/McpClientFeatures.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/client/McpClientFeatures.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/McpSyncClient.java b/mcp-core/src/main/java/io/modelcontextprotocol/client/McpSyncClient.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/client/McpSyncClient.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/client/McpSyncClient.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java b/mcp-core/src/main/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransport.java b/mcp-core/src/main/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransport.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransport.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransport.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/transport/ResponseSubscribers.java b/mcp-core/src/main/java/io/modelcontextprotocol/client/transport/ResponseSubscribers.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/client/transport/ResponseSubscribers.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/client/transport/ResponseSubscribers.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/transport/ServerParameters.java b/mcp-core/src/main/java/io/modelcontextprotocol/client/transport/ServerParameters.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/client/transport/ServerParameters.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/client/transport/ServerParameters.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java b/mcp-core/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpAsyncHttpClientRequestCustomizer.java b/mcp-core/src/main/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpAsyncHttpClientRequestCustomizer.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpAsyncHttpClientRequestCustomizer.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpAsyncHttpClientRequestCustomizer.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpSyncHttpClientRequestCustomizer.java b/mcp-core/src/main/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpSyncHttpClientRequestCustomizer.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpSyncHttpClientRequestCustomizer.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpSyncHttpClientRequestCustomizer.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/transport/customizer/McpAsyncHttpClientRequestCustomizer.java b/mcp-core/src/main/java/io/modelcontextprotocol/client/transport/customizer/McpAsyncHttpClientRequestCustomizer.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/client/transport/customizer/McpAsyncHttpClientRequestCustomizer.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/client/transport/customizer/McpAsyncHttpClientRequestCustomizer.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/transport/customizer/McpSyncHttpClientRequestCustomizer.java b/mcp-core/src/main/java/io/modelcontextprotocol/client/transport/customizer/McpSyncHttpClientRequestCustomizer.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/client/transport/customizer/McpSyncHttpClientRequestCustomizer.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/client/transport/customizer/McpSyncHttpClientRequestCustomizer.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/common/DefaultMcpTransportContext.java b/mcp-core/src/main/java/io/modelcontextprotocol/common/DefaultMcpTransportContext.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/common/DefaultMcpTransportContext.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/common/DefaultMcpTransportContext.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/common/McpTransportContext.java b/mcp-core/src/main/java/io/modelcontextprotocol/common/McpTransportContext.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/common/McpTransportContext.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/common/McpTransportContext.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/DefaultMcpStatelessServerHandler.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/DefaultMcpStatelessServerHandler.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/DefaultMcpStatelessServerHandler.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/DefaultMcpStatelessServerHandler.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpAsyncServerExchange.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpAsyncServerExchange.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpAsyncServerExchange.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpAsyncServerExchange.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpInitRequestHandler.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpInitRequestHandler.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpInitRequestHandler.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpInitRequestHandler.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpNotificationHandler.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpNotificationHandler.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpNotificationHandler.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpNotificationHandler.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpRequestHandler.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpRequestHandler.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpRequestHandler.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpRequestHandler.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpServer.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpServer.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpServer.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpServer.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpServerFeatures.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpServerFeatures.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpServerFeatures.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpServerFeatures.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpStatelessAsyncServer.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessAsyncServer.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpStatelessAsyncServer.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessAsyncServer.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpStatelessNotificationHandler.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessNotificationHandler.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpStatelessNotificationHandler.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessNotificationHandler.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpStatelessRequestHandler.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessRequestHandler.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpStatelessRequestHandler.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessRequestHandler.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpStatelessServerFeatures.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessServerFeatures.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpStatelessServerFeatures.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessServerFeatures.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpStatelessServerHandler.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessServerHandler.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpStatelessServerHandler.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessServerHandler.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpStatelessSyncServer.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessSyncServer.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpStatelessSyncServer.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessSyncServer.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpSyncServer.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpSyncServer.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpSyncServer.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpSyncServer.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpSyncServerExchange.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpSyncServerExchange.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpSyncServerExchange.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpSyncServerExchange.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpTransportContextExtractor.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/McpTransportContextExtractor.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/McpTransportContextExtractor.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/McpTransportContextExtractor.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/transport/HttpServletSseServerTransportProvider.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/transport/HttpServletSseServerTransportProvider.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/transport/HttpServletSseServerTransportProvider.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/transport/HttpServletSseServerTransportProvider.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/transport/HttpServletStatelessServerTransport.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/transport/HttpServletStatelessServerTransport.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/transport/HttpServletStatelessServerTransport.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/transport/HttpServletStatelessServerTransport.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/transport/HttpServletStreamableServerTransportProvider.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/transport/HttpServletStreamableServerTransportProvider.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/transport/HttpServletStreamableServerTransportProvider.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/transport/HttpServletStreamableServerTransportProvider.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/transport/StdioServerTransportProvider.java b/mcp-core/src/main/java/io/modelcontextprotocol/server/transport/StdioServerTransportProvider.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/server/transport/StdioServerTransportProvider.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/server/transport/StdioServerTransportProvider.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/DefaultMcpStreamableServerSessionFactory.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/DefaultMcpStreamableServerSessionFactory.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/DefaultMcpStreamableServerSessionFactory.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/DefaultMcpStreamableServerSessionFactory.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/DefaultMcpTransportSession.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/DefaultMcpTransportSession.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/DefaultMcpTransportSession.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/DefaultMcpTransportSession.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/DefaultMcpTransportStream.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/DefaultMcpTransportStream.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/DefaultMcpTransportStream.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/DefaultMcpTransportStream.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/HttpHeaders.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/HttpHeaders.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/HttpHeaders.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/HttpHeaders.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/JsonSchemaValidator.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/JsonSchemaValidator.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/JsonSchemaValidator.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/JsonSchemaValidator.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpClientSession.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpClientSession.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpClientSession.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpClientSession.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpClientTransport.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpClientTransport.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpClientTransport.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpClientTransport.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpError.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpError.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpError.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpError.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpLoggableSession.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpLoggableSession.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpLoggableSession.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpLoggableSession.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpSchema.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpSchema.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpSchema.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpSchema.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpServerSession.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpServerSession.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpServerSession.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpServerSession.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpServerTransport.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpServerTransport.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpServerTransport.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpServerTransport.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpServerTransportProvider.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpServerTransportProvider.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpServerTransportProvider.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpServerTransportProvider.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpServerTransportProviderBase.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpServerTransportProviderBase.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpServerTransportProviderBase.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpServerTransportProviderBase.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpSession.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpSession.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpSession.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpSession.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpStatelessServerTransport.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpStatelessServerTransport.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpStatelessServerTransport.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpStatelessServerTransport.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpStreamableServerSession.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpStreamableServerSession.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpStreamableServerSession.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpStreamableServerSession.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpStreamableServerTransport.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpStreamableServerTransport.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpStreamableServerTransport.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpStreamableServerTransport.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpStreamableServerTransportProvider.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpStreamableServerTransportProvider.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpStreamableServerTransportProvider.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpStreamableServerTransportProvider.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpTransport.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpTransport.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpTransport.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpTransport.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpTransportException.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpTransportException.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpTransportException.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpTransportException.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpTransportSession.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpTransportSession.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpTransportSession.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpTransportSession.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpTransportSessionNotFoundException.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpTransportSessionNotFoundException.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpTransportSessionNotFoundException.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpTransportSessionNotFoundException.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpTransportStream.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/McpTransportStream.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/McpTransportStream.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/McpTransportStream.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/MissingMcpTransportSession.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/MissingMcpTransportSession.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/MissingMcpTransportSession.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/MissingMcpTransportSession.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/ProtocolVersions.java b/mcp-core/src/main/java/io/modelcontextprotocol/spec/ProtocolVersions.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/spec/ProtocolVersions.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/spec/ProtocolVersions.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/util/Assert.java b/mcp-core/src/main/java/io/modelcontextprotocol/util/Assert.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/util/Assert.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/util/Assert.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/util/DeafaultMcpUriTemplateManagerFactory.java b/mcp-core/src/main/java/io/modelcontextprotocol/util/DeafaultMcpUriTemplateManagerFactory.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/util/DeafaultMcpUriTemplateManagerFactory.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/util/DeafaultMcpUriTemplateManagerFactory.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/util/DefaultMcpUriTemplateManager.java b/mcp-core/src/main/java/io/modelcontextprotocol/util/DefaultMcpUriTemplateManager.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/util/DefaultMcpUriTemplateManager.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/util/DefaultMcpUriTemplateManager.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/util/KeepAliveScheduler.java b/mcp-core/src/main/java/io/modelcontextprotocol/util/KeepAliveScheduler.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/util/KeepAliveScheduler.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/util/KeepAliveScheduler.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/util/McpUriTemplateManager.java b/mcp-core/src/main/java/io/modelcontextprotocol/util/McpUriTemplateManager.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/util/McpUriTemplateManager.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/util/McpUriTemplateManager.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/util/McpUriTemplateManagerFactory.java b/mcp-core/src/main/java/io/modelcontextprotocol/util/McpUriTemplateManagerFactory.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/util/McpUriTemplateManagerFactory.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/util/McpUriTemplateManagerFactory.java
diff --git a/mcp/src/main/java/io/modelcontextprotocol/util/Utils.java b/mcp-core/src/main/java/io/modelcontextprotocol/util/Utils.java
similarity index 100%
rename from mcp/src/main/java/io/modelcontextprotocol/util/Utils.java
rename to mcp-core/src/main/java/io/modelcontextprotocol/util/Utils.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/McpUriTemplateManagerTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/McpUriTemplateManagerTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/McpUriTemplateManagerTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/McpUriTemplateManagerTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/MockMcpClientTransport.java b/mcp-core/src/test/java/io/modelcontextprotocol/MockMcpClientTransport.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/MockMcpClientTransport.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/MockMcpClientTransport.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/MockMcpServerTransport.java b/mcp-core/src/test/java/io/modelcontextprotocol/MockMcpServerTransport.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/MockMcpServerTransport.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/MockMcpServerTransport.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/MockMcpServerTransportProvider.java b/mcp-core/src/test/java/io/modelcontextprotocol/MockMcpServerTransportProvider.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/MockMcpServerTransportProvider.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/MockMcpServerTransportProvider.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientResiliencyTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientResiliencyTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientResiliencyTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientResiliencyTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpSyncClientTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/AbstractMcpSyncClientTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpSyncClientTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/AbstractMcpSyncClientTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/HttpClientStreamableHttpAsyncClientResiliencyTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/HttpClientStreamableHttpAsyncClientResiliencyTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/HttpClientStreamableHttpAsyncClientResiliencyTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/HttpClientStreamableHttpAsyncClientResiliencyTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/HttpClientStreamableHttpAsyncClientTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/HttpClientStreamableHttpAsyncClientTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/HttpClientStreamableHttpAsyncClientTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/HttpClientStreamableHttpAsyncClientTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/HttpClientStreamableHttpSyncClientTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/HttpClientStreamableHttpSyncClientTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/HttpClientStreamableHttpSyncClientTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/HttpClientStreamableHttpSyncClientTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/HttpSseMcpAsyncClientLostConnectionTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/HttpSseMcpAsyncClientLostConnectionTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/HttpSseMcpAsyncClientLostConnectionTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/HttpSseMcpAsyncClientLostConnectionTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/HttpSseMcpAsyncClientTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/HttpSseMcpAsyncClientTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/HttpSseMcpAsyncClientTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/HttpSseMcpAsyncClientTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/HttpSseMcpSyncClientTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/HttpSseMcpSyncClientTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/HttpSseMcpSyncClientTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/HttpSseMcpSyncClientTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/LifecycleInitializerTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/LifecycleInitializerTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/LifecycleInitializerTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/LifecycleInitializerTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/McpAsyncClientTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/McpAsyncClientTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/McpAsyncClientTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/McpAsyncClientTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/McpClientProtocolVersionTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/McpClientProtocolVersionTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/McpClientProtocolVersionTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/McpClientProtocolVersionTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/ServerParameterUtils.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/ServerParameterUtils.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/ServerParameterUtils.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/ServerParameterUtils.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/StdioMcpAsyncClientTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/StdioMcpAsyncClientTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/StdioMcpAsyncClientTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/StdioMcpAsyncClientTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/StdioMcpSyncClientTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/StdioMcpSyncClientTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/StdioMcpSyncClientTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/StdioMcpSyncClientTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransportTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransportTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransportTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransportTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportEmptyJsonResponseTest.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportEmptyJsonResponseTest.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportEmptyJsonResponseTest.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportEmptyJsonResponseTest.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportErrorHandlingTest.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportErrorHandlingTest.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportErrorHandlingTest.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportErrorHandlingTest.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportTest.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportTest.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportTest.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportTest.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpAsyncHttpClientRequestCustomizerTest.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpAsyncHttpClientRequestCustomizerTest.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpAsyncHttpClientRequestCustomizerTest.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpAsyncHttpClientRequestCustomizerTest.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpSyncHttpClientRequestCustomizerTest.java b/mcp-core/src/test/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpSyncHttpClientRequestCustomizerTest.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpSyncHttpClientRequestCustomizerTest.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/client/transport/customizer/DelegatingMcpSyncHttpClientRequestCustomizerTest.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/common/AsyncServerMcpTransportContextIntegrationTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/common/AsyncServerMcpTransportContextIntegrationTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/common/AsyncServerMcpTransportContextIntegrationTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/common/AsyncServerMcpTransportContextIntegrationTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/common/SyncServerMcpTransportContextIntegrationTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/common/SyncServerMcpTransportContextIntegrationTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/common/SyncServerMcpTransportContextIntegrationTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/common/SyncServerMcpTransportContextIntegrationTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/AbstractMcpClientServerIntegrationTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/AbstractMcpClientServerIntegrationTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/AbstractMcpClientServerIntegrationTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/AbstractMcpClientServerIntegrationTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/AbstractMcpSyncServerTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/AbstractMcpSyncServerTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/AbstractMcpSyncServerTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/AbstractMcpSyncServerTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/AsyncToolSpecificationBuilderTest.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/AsyncToolSpecificationBuilderTest.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/AsyncToolSpecificationBuilderTest.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/AsyncToolSpecificationBuilderTest.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/HttpServletSseIntegrationTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/HttpServletSseIntegrationTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/HttpServletSseIntegrationTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/HttpServletSseIntegrationTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/HttpServletStatelessIntegrationTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/HttpServletStatelessIntegrationTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/HttpServletStatelessIntegrationTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/HttpServletStatelessIntegrationTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/HttpServletStreamableAsyncServerTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/HttpServletStreamableAsyncServerTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/HttpServletStreamableAsyncServerTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/HttpServletStreamableAsyncServerTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/HttpServletStreamableIntegrationTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/HttpServletStreamableIntegrationTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/HttpServletStreamableIntegrationTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/HttpServletStreamableIntegrationTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/HttpServletStreamableSyncServerTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/HttpServletStreamableSyncServerTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/HttpServletStreamableSyncServerTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/HttpServletStreamableSyncServerTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/McpAsyncServerExchangeTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/McpAsyncServerExchangeTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/McpAsyncServerExchangeTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/McpAsyncServerExchangeTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/McpCompletionTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/McpCompletionTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/McpCompletionTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/McpCompletionTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/McpServerProtocolVersionTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/McpServerProtocolVersionTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/McpServerProtocolVersionTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/McpServerProtocolVersionTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/McpSyncServerExchangeTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/McpSyncServerExchangeTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/McpSyncServerExchangeTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/McpSyncServerExchangeTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/ResourceTemplateListingTest.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/ResourceTemplateListingTest.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/ResourceTemplateListingTest.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/ResourceTemplateListingTest.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/ServletSseMcpAsyncServerTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/ServletSseMcpAsyncServerTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/ServletSseMcpAsyncServerTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/ServletSseMcpAsyncServerTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/ServletSseMcpSyncServerTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/ServletSseMcpSyncServerTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/ServletSseMcpSyncServerTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/ServletSseMcpSyncServerTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/StdioMcpAsyncServerTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/StdioMcpAsyncServerTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/StdioMcpAsyncServerTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/StdioMcpAsyncServerTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/StdioMcpSyncServerTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/StdioMcpSyncServerTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/StdioMcpSyncServerTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/StdioMcpSyncServerTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/SyncToolSpecificationBuilderTest.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/SyncToolSpecificationBuilderTest.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/SyncToolSpecificationBuilderTest.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/SyncToolSpecificationBuilderTest.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/transport/HttpServletSseServerCustomContextPathTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/transport/HttpServletSseServerCustomContextPathTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/transport/HttpServletSseServerCustomContextPathTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/transport/HttpServletSseServerCustomContextPathTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/transport/McpTestServletFilter.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/transport/McpTestServletFilter.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/transport/McpTestServletFilter.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/transport/McpTestServletFilter.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/transport/StdioServerTransportProviderTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/transport/StdioServerTransportProviderTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/transport/StdioServerTransportProviderTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/transport/StdioServerTransportProviderTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/server/transport/TomcatTestUtil.java b/mcp-core/src/test/java/io/modelcontextprotocol/server/transport/TomcatTestUtil.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/server/transport/TomcatTestUtil.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/server/transport/TomcatTestUtil.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/spec/ArgumentException.java b/mcp-core/src/test/java/io/modelcontextprotocol/spec/ArgumentException.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/spec/ArgumentException.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/spec/ArgumentException.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/spec/DefaultJsonSchemaValidatorTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/spec/DefaultJsonSchemaValidatorTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/spec/DefaultJsonSchemaValidatorTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/spec/DefaultJsonSchemaValidatorTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/spec/JSONRPCRequestMcpValidationTest.java b/mcp-core/src/test/java/io/modelcontextprotocol/spec/JSONRPCRequestMcpValidationTest.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/spec/JSONRPCRequestMcpValidationTest.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/spec/JSONRPCRequestMcpValidationTest.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/spec/McpClientSessionTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/spec/McpClientSessionTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/spec/McpClientSessionTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/spec/McpClientSessionTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/spec/McpSchemaTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/spec/McpSchemaTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/spec/McpSchemaTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/spec/McpSchemaTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/spec/PromptReferenceEqualsTest.java b/mcp-core/src/test/java/io/modelcontextprotocol/spec/PromptReferenceEqualsTest.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/spec/PromptReferenceEqualsTest.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/spec/PromptReferenceEqualsTest.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/spec/json/gson/GsonMcpJsonMapper.java b/mcp-core/src/test/java/io/modelcontextprotocol/spec/json/gson/GsonMcpJsonMapper.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/spec/json/gson/GsonMcpJsonMapper.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/spec/json/gson/GsonMcpJsonMapper.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/spec/json/gson/GsonMcpJsonMapperTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/spec/json/gson/GsonMcpJsonMapperTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/spec/json/gson/GsonMcpJsonMapperTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/spec/json/gson/GsonMcpJsonMapperTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/util/AssertTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/util/AssertTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/util/AssertTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/util/AssertTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/util/KeepAliveSchedulerTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/util/KeepAliveSchedulerTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/util/KeepAliveSchedulerTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/util/KeepAliveSchedulerTests.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/util/McpJsonMapperUtils.java b/mcp-core/src/test/java/io/modelcontextprotocol/util/McpJsonMapperUtils.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/util/McpJsonMapperUtils.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/util/McpJsonMapperUtils.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/util/ToolsUtils.java b/mcp-core/src/test/java/io/modelcontextprotocol/util/ToolsUtils.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/util/ToolsUtils.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/util/ToolsUtils.java
diff --git a/mcp/src/test/java/io/modelcontextprotocol/util/UtilsTests.java b/mcp-core/src/test/java/io/modelcontextprotocol/util/UtilsTests.java
similarity index 100%
rename from mcp/src/test/java/io/modelcontextprotocol/util/UtilsTests.java
rename to mcp-core/src/test/java/io/modelcontextprotocol/util/UtilsTests.java
diff --git a/mcp/src/test/resources/logback.xml b/mcp-core/src/test/resources/logback.xml
similarity index 100%
rename from mcp/src/test/resources/logback.xml
rename to mcp-core/src/test/resources/logback.xml
diff --git a/mcp/pom.xml b/mcp/pom.xml
index 6ba402a4d..438c7535c 100644
--- a/mcp/pom.xml
+++ b/mcp/pom.xml
@@ -70,158 +70,10 @@
             <artifactId>mcp-json-jackson2</artifactId>
             <version>0.13.0-SNAPSHOT</version>
         </dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j-api.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-core</artifactId>
-		</dependency>
-
-
-		<!-- Used by the HttpServletSseServerTransport -->
-		<dependency>
-			<groupId>jakarta.servlet</groupId>
-			<artifactId>jakarta.servlet-api</artifactId>
-			<version>${jakarta.servlet.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<!-- Test dependencies -->
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${springframework.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-
-		<dependency>
-			<groupId>io.projectreactor.netty</groupId>
-			<artifactId>reactor-netty-http</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- The Spring Context is required due to the reactor-netty connector being dependent on
-		the Spring Lifecycle, as discussed here:
-		https://github.com/spring-projects/spring-framework/issues/31180 -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${springframework.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${springframework.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-			<version>${assert4j.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-params</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>${mockito.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- Mockito cannot mock this class: class java.net.http.HttpClient. the bytebuddy helps. -->
-		<dependency>
-			<groupId>net.bytebuddy</groupId>
-			<artifactId>byte-buddy</artifactId>
-			<version>${byte-buddy.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>junit-jupiter</artifactId>
-			<version>${testcontainers.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.awaitility</groupId>
-			<artifactId>awaitility</artifactId>
-			<version>${awaitility.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>net.javacrumbs.json-unit</groupId>
-			<artifactId>json-unit-assertj</artifactId>
-			<version>${json-unit-assertj.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- Tomcat dependencies for testing -->
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-core</artifactId>
-			<version>${tomcat.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-websocket</artifactId>
-			<version>${tomcat.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>toxiproxy</artifactId>
-			<version>${toxiproxy.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-        <!-- Test-only JSON library for the Gson-based McpJsonMapper example -->
         <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.10.1</version>
-            <scope>test</scope>
+            <groupId>io.modelcontextprotocol.sdk</groupId>
+            <artifactId>mcp-core</artifactId>
+            <version>0.13.0-SNAPSHOT</version>
         </dependency>
 	</dependencies>
 
diff --git a/pom.xml b/pom.xml
index f60a9aca1..388fc6d9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,7 @@
 	<modules>
 		<module>mcp-bom</module>
 		<module>mcp</module>
+        <module>mcp-core</module>
         <module>mcp-json-jackson2</module>
         <module>mcp-json</module>
 		<module>mcp-spring/mcp-spring-webflux</module>