diff --git a/build.gradle b/build.gradle
index a8045a12..7805f698 100644
--- a/build.gradle
+++ b/build.gradle
@@ -124,7 +124,7 @@ subprojects { subproject ->
 
 }
 
-project('spring-amqp-core') {
+project('spring-amqp') {
 	description = 'Spring AMQP Core'
 	dependencies {
 
@@ -182,7 +182,7 @@ project('spring-rabbit') {
 	description = 'Spring RabbitMQ Support'
 	dependencies {
 
-		compile project(":spring-amqp-core")
+		compile project(":spring-amqp")
 		testCompile project(":spring-erlang")
 
 		compile "com.rabbitmq:amqp-client:$rabbitmqVersion"
diff --git a/settings.gradle b/settings.gradle
index 7913609d..f31f626f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
-rootProject.name = 'spring-amqp'
+rootProject.name = 'spring-amqp-dist'
 
-include 'spring-amqp-core'
+include 'spring-amqp'
 include 'spring-erlang'
 include 'spring-rabbit'
 
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/AmqpConnectException.java b/spring-amqp/src/main/java/org/springframework/amqp/AmqpConnectException.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/AmqpConnectException.java
rename to spring-amqp/src/main/java/org/springframework/amqp/AmqpConnectException.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/AmqpException.java b/spring-amqp/src/main/java/org/springframework/amqp/AmqpException.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/AmqpException.java
rename to spring-amqp/src/main/java/org/springframework/amqp/AmqpException.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/AmqpIOException.java b/spring-amqp/src/main/java/org/springframework/amqp/AmqpIOException.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/AmqpIOException.java
rename to spring-amqp/src/main/java/org/springframework/amqp/AmqpIOException.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/AmqpIllegalStateException.java b/spring-amqp/src/main/java/org/springframework/amqp/AmqpIllegalStateException.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/AmqpIllegalStateException.java
rename to spring-amqp/src/main/java/org/springframework/amqp/AmqpIllegalStateException.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/AmqpRejectAndDontRequeueException.java b/spring-amqp/src/main/java/org/springframework/amqp/AmqpRejectAndDontRequeueException.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/AmqpRejectAndDontRequeueException.java
rename to spring-amqp/src/main/java/org/springframework/amqp/AmqpRejectAndDontRequeueException.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/AmqpUnsupportedEncodingException.java b/spring-amqp/src/main/java/org/springframework/amqp/AmqpUnsupportedEncodingException.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/AmqpUnsupportedEncodingException.java
rename to spring-amqp/src/main/java/org/springframework/amqp/AmqpUnsupportedEncodingException.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/ImmediateAcknowledgeAmqpException.java b/spring-amqp/src/main/java/org/springframework/amqp/ImmediateAcknowledgeAmqpException.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/ImmediateAcknowledgeAmqpException.java
rename to spring-amqp/src/main/java/org/springframework/amqp/ImmediateAcknowledgeAmqpException.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/UncategorizedAmqpException.java b/spring-amqp/src/main/java/org/springframework/amqp/UncategorizedAmqpException.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/UncategorizedAmqpException.java
rename to spring-amqp/src/main/java/org/springframework/amqp/UncategorizedAmqpException.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/AbstractExchange.java b/spring-amqp/src/main/java/org/springframework/amqp/core/AbstractExchange.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/AbstractExchange.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/AbstractExchange.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/AcknowledgeMode.java b/spring-amqp/src/main/java/org/springframework/amqp/core/AcknowledgeMode.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/AcknowledgeMode.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/AcknowledgeMode.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/Address.java b/spring-amqp/src/main/java/org/springframework/amqp/core/Address.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/Address.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/Address.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/AmqpAdmin.java b/spring-amqp/src/main/java/org/springframework/amqp/core/AmqpAdmin.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/AmqpAdmin.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/AmqpAdmin.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/AmqpTemplate.java b/spring-amqp/src/main/java/org/springframework/amqp/core/AmqpTemplate.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/AmqpTemplate.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/AmqpTemplate.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/AnonymousQueue.java b/spring-amqp/src/main/java/org/springframework/amqp/core/AnonymousQueue.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/AnonymousQueue.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/AnonymousQueue.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/Binding.java b/spring-amqp/src/main/java/org/springframework/amqp/core/Binding.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/Binding.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/Binding.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/BindingBuilder.java b/spring-amqp/src/main/java/org/springframework/amqp/core/BindingBuilder.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/BindingBuilder.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/BindingBuilder.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/CustomExchange.java b/spring-amqp/src/main/java/org/springframework/amqp/core/CustomExchange.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/CustomExchange.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/CustomExchange.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/DirectExchange.java b/spring-amqp/src/main/java/org/springframework/amqp/core/DirectExchange.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/DirectExchange.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/DirectExchange.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/Exchange.java b/spring-amqp/src/main/java/org/springframework/amqp/core/Exchange.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/Exchange.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/Exchange.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/ExchangeTypes.java b/spring-amqp/src/main/java/org/springframework/amqp/core/ExchangeTypes.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/ExchangeTypes.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/ExchangeTypes.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/FanoutExchange.java b/spring-amqp/src/main/java/org/springframework/amqp/core/FanoutExchange.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/FanoutExchange.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/FanoutExchange.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/FederatedExchange.java b/spring-amqp/src/main/java/org/springframework/amqp/core/FederatedExchange.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/FederatedExchange.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/FederatedExchange.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/HeadersExchange.java b/spring-amqp/src/main/java/org/springframework/amqp/core/HeadersExchange.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/HeadersExchange.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/HeadersExchange.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/Message.java b/spring-amqp/src/main/java/org/springframework/amqp/core/Message.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/Message.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/Message.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageDeliveryMode.java b/spring-amqp/src/main/java/org/springframework/amqp/core/MessageDeliveryMode.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageDeliveryMode.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/MessageDeliveryMode.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageListener.java b/spring-amqp/src/main/java/org/springframework/amqp/core/MessageListener.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageListener.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/MessageListener.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessagePostProcessor.java b/spring-amqp/src/main/java/org/springframework/amqp/core/MessagePostProcessor.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/MessagePostProcessor.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/MessagePostProcessor.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageProperties.java b/spring-amqp/src/main/java/org/springframework/amqp/core/MessageProperties.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageProperties.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/MessageProperties.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/Queue.java b/spring-amqp/src/main/java/org/springframework/amqp/core/Queue.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/Queue.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/Queue.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/TopicExchange.java b/spring-amqp/src/main/java/org/springframework/amqp/core/TopicExchange.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/TopicExchange.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/TopicExchange.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/UniquelyNamedQueue.java b/spring-amqp/src/main/java/org/springframework/amqp/core/UniquelyNamedQueue.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/core/UniquelyNamedQueue.java
rename to spring-amqp/src/main/java/org/springframework/amqp/core/UniquelyNamedQueue.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/AbstractMessageConverter.java b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractMessageConverter.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/AbstractMessageConverter.java
rename to spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractMessageConverter.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/ClassMapper.java b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/ClassMapper.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/ClassMapper.java
rename to spring-amqp/src/main/java/org/springframework/amqp/support/converter/ClassMapper.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/DefaultClassMapper.java b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/DefaultClassMapper.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/DefaultClassMapper.java
rename to spring-amqp/src/main/java/org/springframework/amqp/support/converter/DefaultClassMapper.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/DefaultJavaTypeMapper.java b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/DefaultJavaTypeMapper.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/DefaultJavaTypeMapper.java
rename to spring-amqp/src/main/java/org/springframework/amqp/support/converter/DefaultJavaTypeMapper.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/JavaTypeMapper.java b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/JavaTypeMapper.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/JavaTypeMapper.java
rename to spring-amqp/src/main/java/org/springframework/amqp/support/converter/JavaTypeMapper.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/JsonMessageConverter.java b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/JsonMessageConverter.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/JsonMessageConverter.java
rename to spring-amqp/src/main/java/org/springframework/amqp/support/converter/JsonMessageConverter.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/MarshallingMessageConverter.java b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/MarshallingMessageConverter.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/MarshallingMessageConverter.java
rename to spring-amqp/src/main/java/org/springframework/amqp/support/converter/MarshallingMessageConverter.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/MessageConversionException.java b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/MessageConversionException.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/MessageConversionException.java
rename to spring-amqp/src/main/java/org/springframework/amqp/support/converter/MessageConversionException.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/MessageConverter.java b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/MessageConverter.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/MessageConverter.java
rename to spring-amqp/src/main/java/org/springframework/amqp/support/converter/MessageConverter.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/SerializerMessageConverter.java b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/SerializerMessageConverter.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/SerializerMessageConverter.java
rename to spring-amqp/src/main/java/org/springframework/amqp/support/converter/SerializerMessageConverter.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/SimpleMessageConverter.java b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/SimpleMessageConverter.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/support/converter/SimpleMessageConverter.java
rename to spring-amqp/src/main/java/org/springframework/amqp/support/converter/SimpleMessageConverter.java
diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/utils/SerializationUtils.java b/spring-amqp/src/main/java/org/springframework/amqp/utils/SerializationUtils.java
similarity index 100%
rename from spring-amqp-core/src/main/java/org/springframework/amqp/utils/SerializationUtils.java
rename to spring-amqp/src/main/java/org/springframework/amqp/utils/SerializationUtils.java
diff --git a/spring-amqp-core/src/test/java/org/springframework/amqp/core/AddressTests.java b/spring-amqp/src/test/java/org/springframework/amqp/core/AddressTests.java
similarity index 100%
rename from spring-amqp-core/src/test/java/org/springframework/amqp/core/AddressTests.java
rename to spring-amqp/src/test/java/org/springframework/amqp/core/AddressTests.java
diff --git a/spring-amqp-core/src/test/java/org/springframework/amqp/core/BindingBuilderTests.java b/spring-amqp/src/test/java/org/springframework/amqp/core/BindingBuilderTests.java
similarity index 100%
rename from spring-amqp-core/src/test/java/org/springframework/amqp/core/BindingBuilderTests.java
rename to spring-amqp/src/test/java/org/springframework/amqp/core/BindingBuilderTests.java
diff --git a/spring-amqp-core/src/test/java/org/springframework/amqp/core/MessagePropertiesTests.java b/spring-amqp/src/test/java/org/springframework/amqp/core/MessagePropertiesTests.java
similarity index 100%
rename from spring-amqp-core/src/test/java/org/springframework/amqp/core/MessagePropertiesTests.java
rename to spring-amqp/src/test/java/org/springframework/amqp/core/MessagePropertiesTests.java
diff --git a/spring-amqp-core/src/test/java/org/springframework/amqp/core/MessageTests.java b/spring-amqp/src/test/java/org/springframework/amqp/core/MessageTests.java
similarity index 100%
rename from spring-amqp-core/src/test/java/org/springframework/amqp/core/MessageTests.java
rename to spring-amqp/src/test/java/org/springframework/amqp/core/MessageTests.java
diff --git a/spring-amqp-core/src/test/java/org/springframework/amqp/support/converter/DefaultClassMapperTest.java b/spring-amqp/src/test/java/org/springframework/amqp/support/converter/DefaultClassMapperTest.java
similarity index 100%
rename from spring-amqp-core/src/test/java/org/springframework/amqp/support/converter/DefaultClassMapperTest.java
rename to spring-amqp/src/test/java/org/springframework/amqp/support/converter/DefaultClassMapperTest.java
diff --git a/spring-amqp-core/src/test/java/org/springframework/amqp/support/converter/DefaultJavaTypeMapperTest.java b/spring-amqp/src/test/java/org/springframework/amqp/support/converter/DefaultJavaTypeMapperTest.java
similarity index 100%
rename from spring-amqp-core/src/test/java/org/springframework/amqp/support/converter/DefaultJavaTypeMapperTest.java
rename to spring-amqp/src/test/java/org/springframework/amqp/support/converter/DefaultJavaTypeMapperTest.java
diff --git a/spring-amqp-core/src/test/java/org/springframework/amqp/support/converter/JsonMessageConverterTests.java b/spring-amqp/src/test/java/org/springframework/amqp/support/converter/JsonMessageConverterTests.java
similarity index 100%
rename from spring-amqp-core/src/test/java/org/springframework/amqp/support/converter/JsonMessageConverterTests.java
rename to spring-amqp/src/test/java/org/springframework/amqp/support/converter/JsonMessageConverterTests.java
diff --git a/spring-amqp-core/src/test/java/org/springframework/amqp/support/converter/MarshallingMessageConverterTests.java b/spring-amqp/src/test/java/org/springframework/amqp/support/converter/MarshallingMessageConverterTests.java
similarity index 100%
rename from spring-amqp-core/src/test/java/org/springframework/amqp/support/converter/MarshallingMessageConverterTests.java
rename to spring-amqp/src/test/java/org/springframework/amqp/support/converter/MarshallingMessageConverterTests.java
diff --git a/spring-amqp-core/src/test/java/org/springframework/amqp/support/converter/SerializerMessageConverterTests.java b/spring-amqp/src/test/java/org/springframework/amqp/support/converter/SerializerMessageConverterTests.java
similarity index 100%
rename from spring-amqp-core/src/test/java/org/springframework/amqp/support/converter/SerializerMessageConverterTests.java
rename to spring-amqp/src/test/java/org/springframework/amqp/support/converter/SerializerMessageConverterTests.java
diff --git a/spring-amqp-core/src/test/java/org/springframework/amqp/support/converter/SimpleMessageConverterTests.java b/spring-amqp/src/test/java/org/springframework/amqp/support/converter/SimpleMessageConverterTests.java
similarity index 100%
rename from spring-amqp-core/src/test/java/org/springframework/amqp/support/converter/SimpleMessageConverterTests.java
rename to spring-amqp/src/test/java/org/springframework/amqp/support/converter/SimpleMessageConverterTests.java
diff --git a/spring-amqp-core/src/test/java/org/springframework/amqp/support/converter/SimpleTrade.java b/spring-amqp/src/test/java/org/springframework/amqp/support/converter/SimpleTrade.java
similarity index 100%
rename from spring-amqp-core/src/test/java/org/springframework/amqp/support/converter/SimpleTrade.java
rename to spring-amqp/src/test/java/org/springframework/amqp/support/converter/SimpleTrade.java
diff --git a/spring-amqp-core/src/test/resources/log4j.properties b/spring-amqp/src/test/resources/log4j.properties
similarity index 100%
rename from spring-amqp-core/src/test/resources/log4j.properties
rename to spring-amqp/src/test/resources/log4j.properties