diff --git a/docs/spring-session-docs.gradle b/docs/spring-session-docs.gradle
index 1bef5673..e0753f19 100644
--- a/docs/spring-session-docs.gradle
+++ b/docs/spring-session-docs.gradle
@@ -2,7 +2,7 @@ apply plugin: 'io.spring.convention.docs'
 apply plugin: 'io.spring.convention.spring-test'
 
 dependencies {
-	testCompile project(':spring-session')
+	testCompile project(':spring-session-core')
 	testCompile project(':spring-session-data-redis')
 	testCompile "org.springframework:spring-jdbc"
 	testCompile "org.springframework:spring-messaging"
diff --git a/samples/javaconfig/hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/samples/javaconfig/hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
index 05d80158..69bb2fbf 100644
--- a/samples/javaconfig/hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
+++ b/samples/javaconfig/hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'io.spring.convention.spring-sample-war'
 
 dependencies {
-	compile project(':spring-session')
+	compile project(':spring-session-core')
 	compile "org.springframework:spring-web"
 	compile "org.springframework.security:spring-security-config"
 	compile "org.springframework.security:spring-security-web"
diff --git a/samples/misc/hazelcast/spring-session-sample-misc-hazelcast.gradle b/samples/misc/hazelcast/spring-session-sample-misc-hazelcast.gradle
index 137a5e1f..07f2c1f5 100644
--- a/samples/misc/hazelcast/spring-session-sample-misc-hazelcast.gradle
+++ b/samples/misc/hazelcast/spring-session-sample-misc-hazelcast.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'io.spring.convention.spring-sample-war'
 
 dependencies {
-	compile project(':spring-session')
+	compile project(':spring-session-core')
 	compile "org.webjars:bootstrap"
 	compile "org.webjars:webjars-taglib"
 	compile "com.hazelcast:hazelcast-client"
diff --git a/spring-session/spring-session.gradle b/spring-session-core/spring-session-core.gradle
similarity index 100%
rename from spring-session/spring-session.gradle
rename to spring-session-core/spring-session-core.gradle
diff --git a/spring-session/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java b/spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java
similarity index 100%
rename from spring-session/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java
rename to spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java
diff --git a/spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java b/spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java
similarity index 100%
rename from spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java
rename to spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java
diff --git a/spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java b/spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java
similarity index 100%
rename from spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java
rename to spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java
diff --git a/spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastServerRepositoryITests.java b/spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/HazelcastServerRepositoryITests.java
similarity index 100%
rename from spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastServerRepositoryITests.java
rename to spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/HazelcastServerRepositoryITests.java
diff --git a/spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java b/spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java
similarity index 100%
rename from spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java
rename to spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java
diff --git a/spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationXmlTests.java b/spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationXmlTests.java
similarity index 100%
rename from spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationXmlTests.java
rename to spring-session-core/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationXmlTests.java
diff --git a/spring-session/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcOperationsSessionRepositoryITests.java b/spring-session-core/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcOperationsSessionRepositoryITests.java
similarity index 100%
rename from spring-session/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcOperationsSessionRepositoryITests.java
rename to spring-session-core/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcOperationsSessionRepositoryITests.java
diff --git a/spring-session/src/integration-test/java/org/springframework/session/jdbc/DerbyJdbcOperationsSessionRepositoryITests.java b/spring-session-core/src/integration-test/java/org/springframework/session/jdbc/DerbyJdbcOperationsSessionRepositoryITests.java
similarity index 100%
rename from spring-session/src/integration-test/java/org/springframework/session/jdbc/DerbyJdbcOperationsSessionRepositoryITests.java
rename to spring-session-core/src/integration-test/java/org/springframework/session/jdbc/DerbyJdbcOperationsSessionRepositoryITests.java
diff --git a/spring-session/src/integration-test/java/org/springframework/session/jdbc/H2JdbcOperationsSessionRepositoryITests.java b/spring-session-core/src/integration-test/java/org/springframework/session/jdbc/H2JdbcOperationsSessionRepositoryITests.java
similarity index 100%
rename from spring-session/src/integration-test/java/org/springframework/session/jdbc/H2JdbcOperationsSessionRepositoryITests.java
rename to spring-session-core/src/integration-test/java/org/springframework/session/jdbc/H2JdbcOperationsSessionRepositoryITests.java
diff --git a/spring-session/src/integration-test/java/org/springframework/session/jdbc/HsqldbJdbcOperationsSessionRepositoryITests.java b/spring-session-core/src/integration-test/java/org/springframework/session/jdbc/HsqldbJdbcOperationsSessionRepositoryITests.java
similarity index 100%
rename from spring-session/src/integration-test/java/org/springframework/session/jdbc/HsqldbJdbcOperationsSessionRepositoryITests.java
rename to spring-session-core/src/integration-test/java/org/springframework/session/jdbc/HsqldbJdbcOperationsSessionRepositoryITests.java
diff --git a/spring-session/src/main/java/org/springframework/session/FindByIndexNameSessionRepository.java b/spring-session-core/src/main/java/org/springframework/session/FindByIndexNameSessionRepository.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/FindByIndexNameSessionRepository.java
rename to spring-session-core/src/main/java/org/springframework/session/FindByIndexNameSessionRepository.java
diff --git a/spring-session/src/main/java/org/springframework/session/MapSession.java b/spring-session-core/src/main/java/org/springframework/session/MapSession.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/MapSession.java
rename to spring-session-core/src/main/java/org/springframework/session/MapSession.java
diff --git a/spring-session/src/main/java/org/springframework/session/MapSessionRepository.java b/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/MapSessionRepository.java
rename to spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java
diff --git a/spring-session/src/main/java/org/springframework/session/Session.java b/spring-session-core/src/main/java/org/springframework/session/Session.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/Session.java
rename to spring-session-core/src/main/java/org/springframework/session/Session.java
diff --git a/spring-session/src/main/java/org/springframework/session/SessionRepository.java b/spring-session-core/src/main/java/org/springframework/session/SessionRepository.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/SessionRepository.java
rename to spring-session-core/src/main/java/org/springframework/session/SessionRepository.java
diff --git a/spring-session/src/main/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSession.java b/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSession.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSession.java
rename to spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSession.java
diff --git a/spring-session/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java b/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java
rename to spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java
diff --git a/spring-session/src/main/java/org/springframework/session/events/AbstractSessionEvent.java b/spring-session-core/src/main/java/org/springframework/session/events/AbstractSessionEvent.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/events/AbstractSessionEvent.java
rename to spring-session-core/src/main/java/org/springframework/session/events/AbstractSessionEvent.java
diff --git a/spring-session/src/main/java/org/springframework/session/events/SessionCreatedEvent.java b/spring-session-core/src/main/java/org/springframework/session/events/SessionCreatedEvent.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/events/SessionCreatedEvent.java
rename to spring-session-core/src/main/java/org/springframework/session/events/SessionCreatedEvent.java
diff --git a/spring-session/src/main/java/org/springframework/session/events/SessionDeletedEvent.java b/spring-session-core/src/main/java/org/springframework/session/events/SessionDeletedEvent.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/events/SessionDeletedEvent.java
rename to spring-session-core/src/main/java/org/springframework/session/events/SessionDeletedEvent.java
diff --git a/spring-session/src/main/java/org/springframework/session/events/SessionDestroyedEvent.java b/spring-session-core/src/main/java/org/springframework/session/events/SessionDestroyedEvent.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/events/SessionDestroyedEvent.java
rename to spring-session-core/src/main/java/org/springframework/session/events/SessionDestroyedEvent.java
diff --git a/spring-session/src/main/java/org/springframework/session/events/SessionExpiredEvent.java b/spring-session-core/src/main/java/org/springframework/session/events/SessionExpiredEvent.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/events/SessionExpiredEvent.java
rename to spring-session-core/src/main/java/org/springframework/session/events/SessionExpiredEvent.java
diff --git a/spring-session/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java b/spring-session-core/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java
rename to spring-session-core/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java
diff --git a/spring-session/src/main/java/org/springframework/session/jdbc/config/annotation/web/http/EnableJdbcHttpSession.java b/spring-session-core/src/main/java/org/springframework/session/jdbc/config/annotation/web/http/EnableJdbcHttpSession.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/jdbc/config/annotation/web/http/EnableJdbcHttpSession.java
rename to spring-session-core/src/main/java/org/springframework/session/jdbc/config/annotation/web/http/EnableJdbcHttpSession.java
diff --git a/spring-session/src/main/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfiguration.java b/spring-session-core/src/main/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfiguration.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfiguration.java
rename to spring-session-core/src/main/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfiguration.java
diff --git a/spring-session/src/main/java/org/springframework/session/security/SpringSessionBackedSessionInformation.java b/spring-session-core/src/main/java/org/springframework/session/security/SpringSessionBackedSessionInformation.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/security/SpringSessionBackedSessionInformation.java
rename to spring-session-core/src/main/java/org/springframework/session/security/SpringSessionBackedSessionInformation.java
diff --git a/spring-session/src/main/java/org/springframework/session/security/SpringSessionBackedSessionRegistry.java b/spring-session-core/src/main/java/org/springframework/session/security/SpringSessionBackedSessionRegistry.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/security/SpringSessionBackedSessionRegistry.java
rename to spring-session-core/src/main/java/org/springframework/session/security/SpringSessionBackedSessionRegistry.java
diff --git a/spring-session/src/main/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServices.java b/spring-session-core/src/main/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServices.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServices.java
rename to spring-session-core/src/main/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServices.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/context/AbstractHttpSessionApplicationInitializer.java b/spring-session-core/src/main/java/org/springframework/session/web/context/AbstractHttpSessionApplicationInitializer.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/context/AbstractHttpSessionApplicationInitializer.java
rename to spring-session-core/src/main/java/org/springframework/session/web/context/AbstractHttpSessionApplicationInitializer.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/CookieHttpSessionStrategy.java b/spring-session-core/src/main/java/org/springframework/session/web/http/CookieHttpSessionStrategy.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/http/CookieHttpSessionStrategy.java
rename to spring-session-core/src/main/java/org/springframework/session/web/http/CookieHttpSessionStrategy.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/CookieSerializer.java b/spring-session-core/src/main/java/org/springframework/session/web/http/CookieSerializer.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/http/CookieSerializer.java
rename to spring-session-core/src/main/java/org/springframework/session/web/http/CookieSerializer.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java b/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java
rename to spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/HeaderHttpSessionStrategy.java b/spring-session-core/src/main/java/org/springframework/session/web/http/HeaderHttpSessionStrategy.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/http/HeaderHttpSessionStrategy.java
rename to spring-session-core/src/main/java/org/springframework/session/web/http/HeaderHttpSessionStrategy.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java b/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java
rename to spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/HttpSessionManager.java b/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionManager.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/http/HttpSessionManager.java
rename to spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionManager.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/HttpSessionStrategy.java b/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionStrategy.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/http/HttpSessionStrategy.java
rename to spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionStrategy.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/MultiHttpSessionStrategy.java b/spring-session-core/src/main/java/org/springframework/session/web/http/MultiHttpSessionStrategy.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/http/MultiHttpSessionStrategy.java
rename to spring-session-core/src/main/java/org/springframework/session/web/http/MultiHttpSessionStrategy.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java b/spring-session-core/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java
rename to spring-session-core/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/OncePerRequestFilter.java b/spring-session-core/src/main/java/org/springframework/session/web/http/OncePerRequestFilter.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/http/OncePerRequestFilter.java
rename to spring-session-core/src/main/java/org/springframework/session/web/http/OncePerRequestFilter.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/RequestResponsePostProcessor.java b/spring-session-core/src/main/java/org/springframework/session/web/http/RequestResponsePostProcessor.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/http/RequestResponsePostProcessor.java
rename to spring-session-core/src/main/java/org/springframework/session/web/http/RequestResponsePostProcessor.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java
rename to spring-session-core/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java
rename to spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/socket/config/annotation/AbstractSessionWebSocketMessageBrokerConfigurer.java b/spring-session-core/src/main/java/org/springframework/session/web/socket/config/annotation/AbstractSessionWebSocketMessageBrokerConfigurer.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/socket/config/annotation/AbstractSessionWebSocketMessageBrokerConfigurer.java
rename to spring-session-core/src/main/java/org/springframework/session/web/socket/config/annotation/AbstractSessionWebSocketMessageBrokerConfigurer.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/socket/events/SessionConnectEvent.java b/spring-session-core/src/main/java/org/springframework/session/web/socket/events/SessionConnectEvent.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/socket/events/SessionConnectEvent.java
rename to spring-session-core/src/main/java/org/springframework/session/web/socket/events/SessionConnectEvent.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactory.java b/spring-session-core/src/main/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactory.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactory.java
rename to spring-session-core/src/main/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactory.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java b/spring-session-core/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java
rename to spring-session-core/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java
diff --git a/spring-session/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java b/spring-session-core/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java
similarity index 100%
rename from spring-session/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java
rename to spring-session-core/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-db2.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-db2.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-db2.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-db2.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-derby.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-derby.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-derby.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-derby.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-db2.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-db2.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-db2.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-db2.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-derby.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-derby.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-derby.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-derby.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-h2.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-h2.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-h2.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-h2.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-hsqldb.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-hsqldb.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-hsqldb.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-hsqldb.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-mysql.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-mysql.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-mysql.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-mysql.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-oracle.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-oracle.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-oracle.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-oracle.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-postgresql.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-postgresql.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-postgresql.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-postgresql.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-sqlite.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-sqlite.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-sqlite.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-sqlite.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-sqlserver.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-sqlserver.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-sqlserver.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-sqlserver.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-sybase.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-sybase.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-drop-sybase.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-drop-sybase.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-h2.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-h2.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-h2.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-h2.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql
diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql b/spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql
similarity index 100%
rename from spring-session/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql
rename to spring-session-core/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql
diff --git a/spring-session/src/test/java/org/springframework/session/MapSessionRepositoryTests.java b/spring-session-core/src/test/java/org/springframework/session/MapSessionRepositoryTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/MapSessionRepositoryTests.java
rename to spring-session-core/src/test/java/org/springframework/session/MapSessionRepositoryTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/MapSessionTests.java b/spring-session-core/src/test/java/org/springframework/session/MapSessionTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/MapSessionTests.java
rename to spring-session-core/src/test/java/org/springframework/session/MapSessionTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java b/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java
rename to spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomMultiHttpSessionStrategyTests.java b/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomMultiHttpSessionStrategyTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomMultiHttpSessionStrategyTests.java
rename to spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomMultiHttpSessionStrategyTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfigurationTests.java b/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfigurationTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfigurationTests.java
rename to spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfigurationTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/jdbc/JdbcOperationsSessionRepositoryTests.java b/spring-session-core/src/test/java/org/springframework/session/jdbc/JdbcOperationsSessionRepositoryTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/jdbc/JdbcOperationsSessionRepositoryTests.java
rename to spring-session-core/src/test/java/org/springframework/session/jdbc/JdbcOperationsSessionRepositoryTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfigurationCustomCronTests.java b/spring-session-core/src/test/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfigurationCustomCronTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfigurationCustomCronTests.java
rename to spring-session-core/src/test/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfigurationCustomCronTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfigurationTests.java b/spring-session-core/src/test/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfigurationTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfigurationTests.java
rename to spring-session-core/src/test/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfigurationTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java b/spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java
rename to spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java
diff --git a/spring-session/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java b/spring-session-core/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java
rename to spring-session-core/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/web/http/CookieHttpSessionStrategyTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/CookieHttpSessionStrategyTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/web/http/CookieHttpSessionStrategyTests.java
rename to spring-session-core/src/test/java/org/springframework/session/web/http/CookieHttpSessionStrategyTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java
rename to spring-session-core/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/web/http/HeaderSessionStrategyTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/HeaderSessionStrategyTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/web/http/HeaderSessionStrategyTests.java
rename to spring-session-core/src/test/java/org/springframework/session/web/http/HeaderSessionStrategyTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java
rename to spring-session-core/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java
rename to spring-session-core/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java
rename to spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java
rename to spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactoryTests.java b/spring-session-core/src/test/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactoryTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactoryTests.java
rename to spring-session-core/src/test/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactoryTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/web/socket/handler/WebSocketRegistryListenerTests.java b/spring-session-core/src/test/java/org/springframework/session/web/socket/handler/WebSocketRegistryListenerTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/web/socket/handler/WebSocketRegistryListenerTests.java
rename to spring-session-core/src/test/java/org/springframework/session/web/socket/handler/WebSocketRegistryListenerTests.java
diff --git a/spring-session/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java b/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java
similarity index 100%
rename from spring-session/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java
rename to spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java
diff --git a/spring-session-data-redis/spring-session-data-redis.gradle b/spring-session-data-redis/spring-session-data-redis.gradle
index d02deea6..b74f19f4 100644
--- a/spring-session-data-redis/spring-session-data-redis.gradle
+++ b/spring-session-data-redis/spring-session-data-redis.gradle
@@ -3,7 +3,7 @@ apply plugin: 'io.spring.convention.spring-pom'
 description = "Aggregator for Spring Session and Spring Data Redis"
 
 dependencies {
-	compile project(':spring-session')
+	compile project(':spring-session-core')
 	compile ("org.springframework.data:spring-data-redis") {
 		exclude group: "org.slf4j", module: 'slf4j-api'
 		exclude group: "org.slf4j", module: 'jcl-over-slf4j'
diff --git a/spring-session-hazelcast/spring-session-hazelcast.gradle b/spring-session-hazelcast/spring-session-hazelcast.gradle
index bb863e03..6b30fb0a 100644
--- a/spring-session-hazelcast/spring-session-hazelcast.gradle
+++ b/spring-session-hazelcast/spring-session-hazelcast.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'io.spring.convention.spring-pom'
 
 dependencies {
-	compile project(':spring-session')
+	compile project(':spring-session-core')
 	compile "com.hazelcast:hazelcast"
 }
\ No newline at end of file
diff --git a/spring-session-jdbc/spring-session-jdbc.gradle b/spring-session-jdbc/spring-session-jdbc.gradle
index 58a930b5..d08e1859 100644
--- a/spring-session-jdbc/spring-session-jdbc.gradle
+++ b/spring-session-jdbc/spring-session-jdbc.gradle
@@ -3,6 +3,6 @@ apply plugin: 'io.spring.convention.spring-pom'
 description = "Aggregator for Spring Session and Spring JDBC"
 
 dependencies {
-	compile project(':spring-session')
+	compile project(':spring-session-core')
 	compile "org.springframework:spring-jdbc"
 }