diff --git a/build-spring-integration/build.xml b/build-spring-integration/build.xml
index b6a8e2f39a..6425632405 100644
--- a/build-spring-integration/build.xml
+++ b/build-spring-integration/build.xml
@@ -2,11 +2,11 @@
 <project name="build-spring-integration" default="precommit">
 
 	<path id="bundles">
-		<pathelement location="../spring-integration-core"/>
-		<pathelement location="../spring-integration-adapters"/>
-		<pathelement location="../spring-integration-samples"/>
-		<pathelement location="../spring-integration-test"/>
-		<pathelement location="../spring-integration-ws"/>
+		<pathelement location="../org.springframework.integration"/>
+		<pathelement location="../org.springframework.integration.adapter"/>
+		<pathelement location="../org.springframework.integration.samples"/>
+		<pathelement location="../org.springframework.integration.test"/>
+		<pathelement location="../org.springframework.integration.ws"/>
 	</path>
 
 	<property file="${basedir}/../build.properties"/>
diff --git a/spring-integration-adapters/.classpath b/org.springframework.integration.adapter/.classpath
similarity index 98%
rename from spring-integration-adapters/.classpath
rename to org.springframework.integration.adapter/.classpath
index 9e143863fb..e5ee7c2629 100644
--- a/spring-integration-adapters/.classpath
+++ b/org.springframework.integration.adapter/.classpath
@@ -21,6 +21,6 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.4.A/org.springframework.test-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.4.A/org.springframework.test-sources-2.5.4.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/2.5.4.A/org.springframework.transaction-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/2.5.4.A/org.springframework.transaction-sources-2.5.4.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/2.5.4.A/org.springframework.web-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/2.5.4.A/org.springframework.web-2.5.4.A.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/spring-integration-core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-integration-test/.project b/org.springframework.integration.adapter/.project
similarity index 86%
rename from spring-integration-test/.project
rename to org.springframework.integration.adapter/.project
index 21306ee5a0..3ed79abd23 100644
--- a/spring-integration-test/.project
+++ b/org.springframework.integration.adapter/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>spring-integration-test</name>
+	<name>org.springframework.integration.adapter</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/spring-integration-core/build.xml b/org.springframework.integration.adapter/build.xml
similarity index 59%
rename from spring-integration-core/build.xml
rename to org.springframework.integration.adapter/build.xml
index e86b23afd1..4f925d61d7 100644
--- a/spring-integration-core/build.xml
+++ b/org.springframework.integration.adapter/build.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="spring-integration-core">
+<project name="org.springframework.integration.adapter">
 
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-integration/package-bundle.xml"/>
-	<import file="../spring-build/standard/default.xml"/>
+	<import file="${basedir}/../spring-build/standard/default.xml"/>
 
 </project>
diff --git a/spring-integration-adapters/ivy.xml b/org.springframework.integration.adapter/ivy.xml
similarity index 94%
rename from spring-integration-adapters/ivy.xml
rename to org.springframework.integration.adapter/ivy.xml
index c6158c09d7..e85d5ba649 100644
--- a/spring-integration-adapters/ivy.xml
+++ b/org.springframework.integration.adapter/ivy.xml
@@ -27,7 +27,7 @@
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.net" rev="1.4.1" conf="compile->runtime"/>
 		<dependency org="org.apache.oro" name="com.springsource.org.apache.oro" rev="2.0.8" conf="compile->runtime"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime"/>
-		<dependency org="org.springframework.integration" name="spring-integration-core" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.context" rev="2.5.4.A" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.4.A" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.4.A" conf="compile->runtime"/>
diff --git a/spring-integration-adapters/src/main/java/META-INF/spring-integration.parsers b/org.springframework.integration.adapter/src/main/java/META-INF/spring-integration.parsers
similarity index 100%
rename from spring-integration-adapters/src/main/java/META-INF/spring-integration.parsers
rename to org.springframework.integration.adapter/src/main/java/META-INF/spring-integration.parsers
diff --git a/spring-integration-adapters/src/main/java/META-INF/spring.schemas b/org.springframework.integration.adapter/src/main/java/META-INF/spring.schemas
similarity index 100%
rename from spring-integration-adapters/src/main/java/META-INF/spring.schemas
rename to org.springframework.integration.adapter/src/main/java/META-INF/spring.schemas
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/AbstractRemotingTargetAdapter.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingTargetAdapter.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/AbstractRemotingTargetAdapter.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingTargetAdapter.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/MessageHandlingSourceAdapter.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHandlingSourceAdapter.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/MessageHandlingSourceAdapter.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHandlingSourceAdapter.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/MessageHeaderMapper.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHeaderMapper.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/MessageHeaderMapper.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHeaderMapper.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/MessageMappingException.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageMappingException.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/MessageMappingException.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageMappingException.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/AbstractRequestReplySourceAdapterParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRequestReplySourceAdapterParser.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/AbstractRequestReplySourceAdapterParser.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRequestReplySourceAdapterParser.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-1.0.xsd b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-1.0.xsd
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-1.0.xsd
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-1.0.xsd
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSource.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSource.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSource.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSource.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventTarget.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/ApplicationEventTarget.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventTarget.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/ApplicationEventTarget.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/MessagingEvent.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/MessagingEvent.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/MessagingEvent.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/MessagingEvent.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/MessagingEventMapper.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/MessagingEventMapper.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/MessagingEventMapper.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/MessagingEventMapper.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/AbstractFileMapper.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/AbstractFileMapper.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/AbstractFileMapper.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/AbstractFileMapper.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/ByteArrayFileMapper.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/ByteArrayFileMapper.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/ByteArrayFileMapper.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/ByteArrayFileMapper.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/DefaultFileNameGenerator.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/DefaultFileNameGenerator.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/DefaultFileNameGenerator.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/DefaultFileNameGenerator.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/FileNameGenerator.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileNameGenerator.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/FileNameGenerator.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileNameGenerator.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/FileSource.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileSource.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/FileSource.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileSource.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/FileTarget.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileTarget.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/FileTarget.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileTarget.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/TextFileMapper.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/TextFileMapper.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/TextFileMapper.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/TextFileMapper.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileSourceParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/config/FileSourceParser.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileSourceParser.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/config/FileSourceParser.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileTargetParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/config/FileTargetParser.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/file/config/FileTargetParser.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/config/FileTargetParser.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/ftp/DirectoryContentManager.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/ftp/DirectoryContentManager.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/ftp/DirectoryContentManager.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/ftp/DirectoryContentManager.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/ftp/FileInfo.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/ftp/FileInfo.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/ftp/FileInfo.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/ftp/FileInfo.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/ftp/FtpSource.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/ftp/FtpSource.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/ftp/FtpSource.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/ftp/FtpSource.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/ftp/config/FtpSourceParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/ftp/config/FtpSourceParser.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/ftp/config/FtpSourceParser.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/ftp/config/FtpSourceParser.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerSourceAdapter.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerSourceAdapter.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerSourceAdapter.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerSourceAdapter.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerTargetAdapter.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerTargetAdapter.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerTargetAdapter.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerTargetAdapter.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerSourceAdapterParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerSourceAdapterParser.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerSourceAdapterParser.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerSourceAdapterParser.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerTargetAdapterParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerTargetAdapterParser.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerTargetAdapterParser.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerTargetAdapterParser.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/AbstractJmsTemplateBasedAdapter.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/AbstractJmsTemplateBasedAdapter.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/AbstractJmsTemplateBasedAdapter.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/AbstractJmsTemplateBasedAdapter.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapper.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapper.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapper.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapper.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/HeaderMappingMessageConverter.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/HeaderMappingMessageConverter.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/HeaderMappingMessageConverter.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/HeaderMappingMessageConverter.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/JmsAttributeKeys.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsAttributeKeys.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/JmsAttributeKeys.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsAttributeKeys.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/JmsGateway.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsGateway.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/JmsGateway.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsGateway.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/JmsSource.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsSource.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/JmsSource.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsSource.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/JmsTarget.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsTarget.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/JmsTarget.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsTarget.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/config/JmsAdapterParserUtils.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsAdapterParserUtils.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/config/JmsAdapterParserUtils.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsAdapterParserUtils.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/config/JmsGatewayParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsGatewayParser.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/config/JmsGatewayParser.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsGatewayParser.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/config/JmsSourceParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsSourceParser.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/config/JmsSourceParser.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsSourceParser.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/config/JmsTargetParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsTargetParser.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/jms/config/JmsTargetParser.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsTargetParser.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/AbstractMailHeaderGenerator.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/AbstractMailHeaderGenerator.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/AbstractMailHeaderGenerator.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/AbstractMailHeaderGenerator.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/ByteArrayMailMessageMapper.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/ByteArrayMailMessageMapper.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/ByteArrayMailMessageMapper.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/ByteArrayMailMessageMapper.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/DefaultMailHeaderGenerator.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/DefaultMailHeaderGenerator.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/DefaultMailHeaderGenerator.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/DefaultMailHeaderGenerator.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/MailAttributeKeys.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailAttributeKeys.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/MailAttributeKeys.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailAttributeKeys.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/MailHeaderGenerator.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailHeaderGenerator.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/MailHeaderGenerator.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailHeaderGenerator.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/MailTarget.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailTarget.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/MailTarget.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailTarget.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/StaticMailHeaderGenerator.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/StaticMailHeaderGenerator.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/StaticMailHeaderGenerator.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/StaticMailHeaderGenerator.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/TextMailMessageMapper.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/TextMailMessageMapper.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/TextMailMessageMapper.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/TextMailMessageMapper.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/config/MailTargetParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/config/MailTargetParser.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/config/MailTargetParser.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/config/MailTargetParser.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/rmi/RmiSourceAdapter.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/rmi/RmiSourceAdapter.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/rmi/RmiSourceAdapter.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/rmi/RmiSourceAdapter.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/rmi/RmiTargetAdapter.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/rmi/RmiTargetAdapter.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/rmi/RmiTargetAdapter.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/rmi/RmiTargetAdapter.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/rmi/config/RmiSourceAdapterParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/rmi/config/RmiSourceAdapterParser.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/rmi/config/RmiSourceAdapterParser.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/rmi/config/RmiSourceAdapterParser.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/rmi/config/RmiTargetAdapterParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/rmi/config/RmiTargetAdapterParser.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/rmi/config/RmiTargetAdapterParser.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/rmi/config/RmiTargetAdapterParser.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/ByteStreamSource.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/ByteStreamSource.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/ByteStreamSource.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/ByteStreamSource.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/ByteStreamTarget.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/ByteStreamTarget.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/ByteStreamTarget.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/ByteStreamTarget.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamSource.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamSource.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamSource.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamSource.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTarget.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTarget.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTarget.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTarget.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/config/ConsoleSourceParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/config/ConsoleSourceParser.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/config/ConsoleSourceParser.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/config/ConsoleSourceParser.java
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/config/ConsoleTargetParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/config/ConsoleTargetParser.java
similarity index 100%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/stream/config/ConsoleTargetParser.java
rename to org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/config/ConsoleTargetParser.java
diff --git a/spring-integration-adapters/src/main/resources/META-INF/MANIFEST.MF b/org.springframework.integration.adapter/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from spring-integration-adapters/src/main/resources/META-INF/MANIFEST.MF
rename to org.springframework.integration.adapter/src/main/resources/META-INF/MANIFEST.MF
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventSourceTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/event/ApplicationEventSourceTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventSourceTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/event/ApplicationEventSourceTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventTargetTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/event/ApplicationEventTargetTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventTargetTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/event/ApplicationEventTargetTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/applicationEventSourceTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/event/applicationEventSourceTests.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/applicationEventSourceTests.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/event/applicationEventSourceTests.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/DefaultFileNameGeneratorTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/file/DefaultFileNameGeneratorTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/DefaultFileNameGeneratorTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/file/DefaultFileNameGeneratorTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileSourceParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/file/config/FileSourceParserTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileSourceParserTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/file/config/FileSourceParserTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileTargetParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/file/config/FileTargetParserTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/FileTargetParserTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/file/config/FileTargetParserTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileSourceParserTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/file/config/fileSourceParserTests.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileSourceParserTests.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/file/config/fileSourceParserTests.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileTargetParserTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/file/config/fileTargetParserTests.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileTargetParserTests.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/file/config/fileTargetParserTests.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/ftp/DirectoryContentManagerTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/ftp/DirectoryContentManagerTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/ftp/DirectoryContentManagerTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/ftp/DirectoryContentManagerTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/ftp/config/FtpSourceParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/ftp/config/FtpSourceParserTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/ftp/config/FtpSourceParserTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/ftp/config/FtpSourceParserTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/ftp/config/ftpSourceParserTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/ftp/config/ftpSourceParserTests.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/ftp/config/ftpSourceParserTests.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/ftp/config/ftpSourceParserTests.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerSourceAdapterTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerSourceAdapterTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerSourceAdapterTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerSourceAdapterTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerSourceAdapterParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerSourceAdapterParserTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerSourceAdapterParserTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerSourceAdapterParserTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerTargetAdapterParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerTargetAdapterParserTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerTargetAdapterParserTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerTargetAdapterParserTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/httpinvoker/config/httpInvokerSourceAdapterParserTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/httpInvokerSourceAdapterParserTests.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/httpinvoker/config/httpInvokerSourceAdapterParserTests.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/httpInvokerSourceAdapterParserTests.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/httpinvoker/config/httpInvokerTargetAdapterParserTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/httpInvokerTargetAdapterParserTests.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/httpinvoker/config/httpInvokerTargetAdapterParserTests.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/httpInvokerTargetAdapterParserTests.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapperTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapperTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapperTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapperTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/StubConnection.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubConnection.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/StubConnection.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubConnection.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/StubConsumer.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubConsumer.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/StubConsumer.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubConsumer.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/StubDestination.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubDestination.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/StubDestination.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubDestination.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/StubSession.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubSession.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/StubSession.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubSession.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/StubTextMessage.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubTextMessage.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/StubTextMessage.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubTextMessage.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/JmsGatewayParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsGatewayParserTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/JmsGatewayParserTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsGatewayParserTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/JmsSourceParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsSourceParserTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/JmsSourceParserTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsSourceParserTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/JmsTargetParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsTargetParserTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/JmsTargetParserTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsTargetParserTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageConverter.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageConverter.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageConverter.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageConverter.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageHeaderMapper.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageHeaderMapper.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageHeaderMapper.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageHeaderMapper.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryOnly.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryOnly.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryOnly.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryOnly.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithDefaultConnectionFactory.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithEmptyConnectionFactory.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithEmptyConnectionFactory.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithEmptyConnectionFactory.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithEmptyConnectionFactory.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithMessageConverter.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithMessageConverter.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithMessageConverter.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithMessageConverter.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewaysWithExpectReplyAttributes.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewaysWithExpectReplyAttributes.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewaysWithExpectReplyAttributes.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewaysWithExpectReplyAttributes.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceEndpoint.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceEndpoint.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceEndpoint.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceEndpoint.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestination.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestination.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestination.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestination.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestinationName.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestinationName.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestinationName.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestinationName.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryOnly.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryOnly.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryOnly.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryOnly.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationAndDefaultConnectionFactory.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationAndDefaultConnectionFactory.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationAndDefaultConnectionFactory.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationAndDefaultConnectionFactory.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameAndDefaultConnectionFactory.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameAndDefaultConnectionFactory.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameAndDefaultConnectionFactory.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameAndDefaultConnectionFactory.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameOnly.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameOnly.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameOnly.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameOnly.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationOnly.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationOnly.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationOnly.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationOnly.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithHeaderMapper.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithHeaderMapper.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithHeaderMapper.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithHeaderMapper.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithJmsTemplate.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithJmsTemplate.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithJmsTemplate.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithJmsTemplate.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestination.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestination.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestination.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestination.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestinationName.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestinationName.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestinationName.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestinationName.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetWithDefaultConnectionFactory.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithDefaultConnectionFactory.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetWithDefaultConnectionFactory.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithDefaultConnectionFactory.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetWithEmptyConnectionFactory.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithEmptyConnectionFactory.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetWithEmptyConnectionFactory.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithEmptyConnectionFactory.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetWithHeaderMapper.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithHeaderMapper.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetWithHeaderMapper.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithHeaderMapper.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/MailTargetContextTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetContextTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/MailTargetContextTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetContextTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/MailTargetTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/MailTargetTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/MailTestsHelper.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTestsHelper.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/MailTestsHelper.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTestsHelper.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/StubJavaMailSender.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/StubJavaMailSender.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/StubJavaMailSender.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/StubJavaMailSender.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/config/MailTargetParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/MailTargetParserTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/config/MailTargetParserTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/MailTargetParserTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/config/mailTargetParserTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/mailTargetParserTests.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/config/mailTargetParserTests.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/mailTargetParserTests.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/mailTarget.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/mailTarget.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/mailTarget.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/mailTarget.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/rmi/RmiTargetAdapterTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/RmiTargetAdapterTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/rmi/RmiTargetAdapterTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/RmiTargetAdapterTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/rmi/config/RmiSourceAdapterParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiSourceAdapterParserTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/rmi/config/RmiSourceAdapterParserTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiSourceAdapterParserTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/rmi/config/RmiTargetAdapterParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiTargetAdapterParserTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/rmi/config/RmiTargetAdapterParserTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiTargetAdapterParserTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/rmi/config/StubRemoteInvocationExecutor.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/StubRemoteInvocationExecutor.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/rmi/config/StubRemoteInvocationExecutor.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/StubRemoteInvocationExecutor.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/rmi/config/rmiSourceAdapterParserTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/rmiSourceAdapterParserTests.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/rmi/config/rmiSourceAdapterParserTests.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/rmiSourceAdapterParserTests.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/rmi/config/rmiTargetAdapterParserTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/rmiTargetAdapterParserTests.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/rmi/config/rmiTargetAdapterParserTests.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/rmiTargetAdapterParserTests.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/ByteStreamSourceTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/ByteStreamSourceTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/ByteStreamSourceTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/ByteStreamSourceTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/ByteStreamTargetTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/ByteStreamTargetTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/ByteStreamTargetTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/ByteStreamTargetTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamSourceTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamSourceTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamSourceTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamSourceTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamTargetTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamTargetTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamTargetTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamTargetTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/config/ConsoleSourceParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/config/ConsoleSourceParserTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/config/ConsoleSourceParserTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/config/ConsoleSourceParserTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/config/ConsoleTargetParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/config/ConsoleTargetParserTests.java
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/config/ConsoleTargetParserTests.java
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/config/ConsoleTargetParserTests.java
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/config/consoleSourceParserTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/config/consoleSourceParserTests.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/config/consoleSourceParserTests.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/config/consoleSourceParserTests.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/config/consoleTargetParserTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/config/consoleTargetParserTests.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/config/consoleTargetParserTests.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/config/consoleTargetParserTests.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/config/invalidConsoleSourceParserTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/config/invalidConsoleSourceParserTests.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/config/invalidConsoleSourceParserTests.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/config/invalidConsoleSourceParserTests.xml
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/config/invalidConsoleTargetParserTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/config/invalidConsoleTargetParserTests.xml
similarity index 100%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/stream/config/invalidConsoleTargetParserTests.xml
rename to org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/stream/config/invalidConsoleTargetParserTests.xml
diff --git a/spring-integration-samples/.classpath b/org.springframework.integration.samples/.classpath
similarity index 94%
rename from spring-integration-samples/.classpath
rename to org.springframework.integration.samples/.classpath
index 856c15de89..dcef16a978 100644
--- a/spring-integration-samples/.classpath
+++ b/org.springframework.integration.samples/.classpath
@@ -14,7 +14,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.jms/2.5.4.A/org.springframework.jms-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.jms/2.5.4.A/org.springframework.jms-sources-2.5.4.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/2.5.4.A/org.springframework.transaction-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/2.5.4.A/org.springframework.transaction-sources-2.5.4.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-1.1.0.jar" sourcepath="/IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-sources-1.1.0.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/spring-integration-core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/spring-integration-adapters"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.integration.samples/.project b/org.springframework.integration.samples/.project
new file mode 100644
index 0000000000..1af8211517
--- /dev/null
+++ b/org.springframework.integration.samples/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.springframework.integration.samples</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/spring-integration-samples/build.xml b/org.springframework.integration.samples/build.xml
similarity index 76%
rename from spring-integration-samples/build.xml
rename to org.springframework.integration.samples/build.xml
index ffaa9f3651..7da7024918 100644
--- a/spring-integration-samples/build.xml
+++ b/org.springframework.integration.samples/build.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="spring-integration-samples">
+<project name="org.springframework.integration.samples">
 
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-integration/package-bundle.xml"/>
-	<import file="../spring-build/standard/default.xml"/>
+	<import file="${basedir}/../spring-build/standard/default.xml"/>
 
 	<target name="package" depends="package-bundle.package">
 		<mkdir dir="${package.output.dir}/samples"/>
diff --git a/spring-integration-samples/ivy.xml b/org.springframework.integration.samples/ivy.xml
similarity index 91%
rename from spring-integration-samples/ivy.xml
rename to org.springframework.integration.samples/ivy.xml
index c99f205d35..476a1541da 100644
--- a/spring-integration-samples/ivy.xml
+++ b/org.springframework.integration.samples/ivy.xml
@@ -22,7 +22,7 @@
 	<dependencies>
 		<dependency org="javax.jms" name="com.springsource.javax.jms" rev="1.1.0" conf="provided->runtime"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime"/>
-		<dependency org="org.springframework.integration" name="spring-integration-core" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.context" rev="2.5.4.A" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.4.A" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.jms" rev="2.5.4.A" conf="compile->runtime"/>
diff --git a/spring-integration-samples/scripts/cafeDemo.bat b/org.springframework.integration.samples/scripts/cafeDemo.bat
similarity index 100%
rename from spring-integration-samples/scripts/cafeDemo.bat
rename to org.springframework.integration.samples/scripts/cafeDemo.bat
diff --git a/spring-integration-samples/scripts/cafeDemo.sh b/org.springframework.integration.samples/scripts/cafeDemo.sh
similarity index 100%
rename from spring-integration-samples/scripts/cafeDemo.sh
rename to org.springframework.integration.samples/scripts/cafeDemo.sh
diff --git a/spring-integration-samples/scripts/cafeDemo.xml b/org.springframework.integration.samples/scripts/cafeDemo.xml
similarity index 100%
rename from spring-integration-samples/scripts/cafeDemo.xml
rename to org.springframework.integration.samples/scripts/cafeDemo.xml
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/Barista.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Barista.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/Barista.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Barista.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/Cafe.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/CafeDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/CafeDemo.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/CafeDemo.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/CafeDemo.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/Drink.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Drink.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/Drink.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Drink.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/DrinkOrder.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/DrinkOrder.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/DrinkOrder.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/DrinkOrder.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/DrinkRouter.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/DrinkRouter.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/DrinkRouter.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/DrinkRouter.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/OrderSplitter.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/OrderSplitter.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/OrderSplitter.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/OrderSplitter.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/cafeDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/cafeDemo.xml
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/cafeDemo.xml
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/cafeDemo.xml
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/filecopy/Exclaimer.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/Exclaimer.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/filecopy/Exclaimer.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/Exclaimer.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemo.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemo.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemo.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo.xml
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo.xml
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo.xml
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/oddeven/Counter.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/Counter.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/oddeven/Counter.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/Counter.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/oddeven/NumberLogger.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/NumberLogger.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/oddeven/NumberLogger.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/NumberLogger.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/oddeven/OddEvenDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/OddEvenDemo.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/oddeven/OddEvenDemo.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/OddEvenDemo.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/oddeven/oddEvenDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/oddEvenDemo.xml
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/oddeven/oddEvenDemo.xml
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/oddEvenDemo.xml
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/quote/Quote.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/Quote.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/quote/Quote.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/Quote.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/quote/QuotePublisher.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/QuotePublisher.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/quote/QuotePublisher.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/QuotePublisher.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/quote/QuoteSubscriber.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/QuoteSubscriber.java
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/quote/QuoteSubscriber.java
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/QuoteSubscriber.java
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
similarity index 100%
rename from spring-integration-samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
rename to org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
diff --git a/spring-integration-samples/src/main/resources/META-INF/MANIFEST.MF b/org.springframework.integration.samples/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from spring-integration-samples/src/main/resources/META-INF/MANIFEST.MF
rename to org.springframework.integration.samples/src/main/resources/META-INF/MANIFEST.MF
diff --git a/spring-integration-test/.classpath b/org.springframework.integration.test/.classpath
similarity index 93%
rename from spring-integration-test/.classpath
rename to org.springframework.integration.test/.classpath
index f2c2e4dae1..6f6f9553af 100644
--- a/spring-integration-test/.classpath
+++ b/org.springframework.integration.test/.classpath
@@ -12,7 +12,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/2.5.4.A/org.springframework.context.support-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/2.5.4.A/org.springframework.context.support-sources-2.5.4.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.4.A/org.springframework.core-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.4.A/org.springframework.core-sources-2.5.4.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.4.A/org.springframework.test-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.4.A/org.springframework.test-sources-2.5.4.A.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/spring-integration-core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/spring-integration-adapters"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-integration-samples/.project b/org.springframework.integration.test/.project
similarity index 87%
rename from spring-integration-samples/.project
rename to org.springframework.integration.test/.project
index f7934500f1..683fc6d7b9 100644
--- a/spring-integration-samples/.project
+++ b/org.springframework.integration.test/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>spring-integration-samples</name>
+	<name>org.springframework.integration.test</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/spring-integration-adapters/build.xml b/org.springframework.integration.test/build.xml
similarity index 59%
rename from spring-integration-adapters/build.xml
rename to org.springframework.integration.test/build.xml
index a7eb5669f5..d4b00fd40e 100644
--- a/spring-integration-adapters/build.xml
+++ b/org.springframework.integration.test/build.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="spring-integration-adapters">
+<project name="org.springframework.integration.test">
 
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-integration/package-bundle.xml"/>
-	<import file="../spring-build/standard/default.xml"/>
+	<import file="${basedir}/../spring-build/standard/default.xml"/>
 
 </project>
diff --git a/spring-integration-test/ivy.xml b/org.springframework.integration.test/ivy.xml
similarity index 77%
rename from spring-integration-test/ivy.xml
rename to org.springframework.integration.test/ivy.xml
index 7b907e3862..9119483598 100644
--- a/spring-integration-test/ivy.xml
+++ b/org.springframework.integration.test/ivy.xml
@@ -21,8 +21,8 @@
 
 	<dependencies>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime"/>
-		<dependency org="org.springframework.integration" name="spring-integration-core" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework.integration" name="spring-integration-adapters" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.4.A" conf="compile->runtime"/>
 	</dependencies>
 
diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/TestMessage.java b/org.springframework.integration.test/src/main/java/org/springframework/integration/test/TestMessage.java
similarity index 100%
rename from spring-integration-test/src/main/java/org/springframework/integration/test/TestMessage.java
rename to org.springframework.integration.test/src/main/java/org/springframework/integration/test/TestMessage.java
diff --git a/spring-integration-test/src/main/resources/META-INF/MANIFEST.MF b/org.springframework.integration.test/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from spring-integration-test/src/main/resources/META-INF/MANIFEST.MF
rename to org.springframework.integration.test/src/main/resources/META-INF/MANIFEST.MF
diff --git a/spring-integration-ws/.classpath b/org.springframework.integration.ws/.classpath
similarity index 94%
rename from spring-integration-ws/.classpath
rename to org.springframework.integration.ws/.classpath
index 0cecd1c636..90c13fa9b4 100644
--- a/spring-integration-ws/.classpath
+++ b/org.springframework.integration.ws/.classpath
@@ -14,7 +14,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.ws/1.5.1.A/org.springframework.ws-1.5.1.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.ws/1.5.1.A/org.springframework.ws-sources-1.5.1.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.1.A/org.springframework.oxm-1.5.1.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.1.A/org.springframework.oxm-sources-1.5.1.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.1.A/org.springframework.xml-1.5.1.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.1.A/org.springframework.xml-sources-1.5.1.A.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/spring-integration-adapters"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/spring-integration-core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-integration-adapters/.project b/org.springframework.integration.ws/.project
similarity index 87%
rename from spring-integration-adapters/.project
rename to org.springframework.integration.ws/.project
index 2f329970d9..2d0d137ec1 100644
--- a/spring-integration-adapters/.project
+++ b/org.springframework.integration.ws/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>spring-integration-adapters</name>
+	<name>org.springframework.integration.ws</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/spring-integration-ws/build.xml b/org.springframework.integration.ws/build.xml
similarity index 60%
rename from spring-integration-ws/build.xml
rename to org.springframework.integration.ws/build.xml
index da407f23a5..111096f782 100644
--- a/spring-integration-ws/build.xml
+++ b/org.springframework.integration.ws/build.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="spring-integration-ws">
+<project name="org.springframework.integration.ws">
 
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-integration/package-bundle.xml"/>
-	<import file="../spring-build/standard/default.xml"/>
+	<import file="${basedir}/../spring-build/standard/default.xml"/>
 
 </project>
diff --git a/spring-integration-ws/ivy.xml b/org.springframework.integration.ws/ivy.xml
similarity index 90%
rename from spring-integration-ws/ivy.xml
rename to org.springframework.integration.ws/ivy.xml
index 023cb4e1ab..6a6b59f7eb 100644
--- a/spring-integration-ws/ivy.xml
+++ b/org.springframework.integration.ws/ivy.xml
@@ -24,7 +24,7 @@
 		<dependency org="javax.xml.soap" name="com.springsource.javax.xml.soap" rev="1.3.0" conf="provided->runtime"/>
 		<dependency org="javax.xml.stream" name="com.springsource.javax.xml.stream" rev="1.0.1" conf="provided->runtime"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime"/>
-		<dependency org="org.springframework.integration" name="spring-integration-adapters" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework.ws" name="org.springframework.oxm" rev="1.5.1.A" conf="compile->runtime"/>
 		<dependency org="org.springframework.ws" name="org.springframework.ws" rev="1.5.1.A" conf="compile->runtime"/>
 	</dependencies>
diff --git a/spring-integration-ws/src/main/java/META-INF/spring-integration.parsers b/org.springframework.integration.ws/src/main/java/META-INF/spring-integration.parsers
similarity index 100%
rename from spring-integration-ws/src/main/java/META-INF/spring-integration.parsers
rename to org.springframework.integration.ws/src/main/java/META-INF/spring-integration.parsers
diff --git a/spring-integration-ws/src/main/java/META-INF/spring.schemas b/org.springframework.integration.ws/src/main/java/META-INF/spring.schemas
similarity index 100%
rename from spring-integration-ws/src/main/java/META-INF/spring.schemas
rename to org.springframework.integration.ws/src/main/java/META-INF/spring.schemas
diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/adapter/AbstractWebServiceTargetAdapter.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/adapter/AbstractWebServiceTargetAdapter.java
similarity index 100%
rename from spring-integration-ws/src/main/java/org/springframework/integration/ws/adapter/AbstractWebServiceTargetAdapter.java
rename to org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/adapter/AbstractWebServiceTargetAdapter.java
diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/adapter/MarshallingWebServiceTargetAdapter.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/adapter/MarshallingWebServiceTargetAdapter.java
similarity index 100%
rename from spring-integration-ws/src/main/java/org/springframework/integration/ws/adapter/MarshallingWebServiceTargetAdapter.java
rename to org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/adapter/MarshallingWebServiceTargetAdapter.java
diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/adapter/SimpleWebServiceTargetAdapter.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/adapter/SimpleWebServiceTargetAdapter.java
similarity index 100%
rename from spring-integration-ws/src/main/java/org/springframework/integration/ws/adapter/SimpleWebServiceTargetAdapter.java
rename to org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/adapter/SimpleWebServiceTargetAdapter.java
diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WebServiceTargetAdapterParser.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WebServiceTargetAdapterParser.java
similarity index 100%
rename from spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WebServiceTargetAdapterParser.java
rename to org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WebServiceTargetAdapterParser.java
diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd
similarity index 100%
rename from spring-integration-ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd
rename to org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd
diff --git a/spring-integration-ws/src/main/resources/META-INF/MANIFEST.MF b/org.springframework.integration.ws/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from spring-integration-ws/src/main/resources/META-INF/MANIFEST.MF
rename to org.springframework.integration.ws/src/main/resources/META-INF/MANIFEST.MF
diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubMarshaller.java b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubMarshaller.java
similarity index 100%
rename from spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubMarshaller.java
rename to org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubMarshaller.java
diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubMarshallerAndUnmarshaller.java b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubMarshallerAndUnmarshaller.java
similarity index 100%
rename from spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubMarshallerAndUnmarshaller.java
rename to org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubMarshallerAndUnmarshaller.java
diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubSourceExtractor.java b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubSourceExtractor.java
similarity index 100%
rename from spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubSourceExtractor.java
rename to org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubSourceExtractor.java
diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubUnmarshaller.java b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubUnmarshaller.java
similarity index 100%
rename from spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubUnmarshaller.java
rename to org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubUnmarshaller.java
diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceTargetAdapterParserTests.java b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/WebServiceTargetAdapterParserTests.java
similarity index 100%
rename from spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceTargetAdapterParserTests.java
rename to org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/WebServiceTargetAdapterParserTests.java
diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceTargetAdapterParserTests.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceTargetAdapterParserTests.xml
similarity index 100%
rename from spring-integration-ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceTargetAdapterParserTests.xml
rename to org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceTargetAdapterParserTests.xml
diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceTargetAdapterParserTests.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceTargetAdapterParserTests.xml
similarity index 100%
rename from spring-integration-ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceTargetAdapterParserTests.xml
rename to org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceTargetAdapterParserTests.xml
diff --git a/spring-integration-core/.classpath b/org.springframework.integration/.classpath
similarity index 100%
rename from spring-integration-core/.classpath
rename to org.springframework.integration/.classpath
diff --git a/spring-integration-core/.project b/org.springframework.integration/.project
similarity index 88%
rename from spring-integration-core/.project
rename to org.springframework.integration/.project
index 7d7a9e8356..23b4186d56 100644
--- a/spring-integration-core/.project
+++ b/org.springframework.integration/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>spring-integration-core</name>
+	<name>org.springframework.integration</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/spring-integration-test/build.xml b/org.springframework.integration/build.xml
similarity index 60%
rename from spring-integration-test/build.xml
rename to org.springframework.integration/build.xml
index 7ce733519e..a471c562c5 100644
--- a/spring-integration-test/build.xml
+++ b/org.springframework.integration/build.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="spring-integration-test">
+<project name="org.springframework.integration">
 
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-integration/package-bundle.xml"/>
-	<import file="../spring-build/standard/default.xml"/>
+	<import file="${basedir}/../spring-build/standard/default.xml"/>
 
 </project>
diff --git a/spring-integration-core/ivy.xml b/org.springframework.integration/ivy.xml
similarity index 100%
rename from spring-integration-core/ivy.xml
rename to org.springframework.integration/ivy.xml
diff --git a/spring-integration-core/src/main/java/META-INF/spring.handlers b/org.springframework.integration/src/main/java/META-INF/spring.handlers
similarity index 100%
rename from spring-integration-core/src/main/java/META-INF/spring.handlers
rename to org.springframework.integration/src/main/java/META-INF/spring.handlers
diff --git a/spring-integration-core/src/main/java/META-INF/spring.schemas b/org.springframework.integration/src/main/java/META-INF/spring.schemas
similarity index 100%
rename from spring-integration-core/src/main/java/META-INF/spring.schemas
rename to org.springframework.integration/src/main/java/META-INF/spring.schemas
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/ConfigurationException.java b/org.springframework.integration/src/main/java/org/springframework/integration/ConfigurationException.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/ConfigurationException.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/ConfigurationException.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Aggregator.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Aggregator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/annotation/Aggregator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/annotation/Aggregator.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/CompletionStrategy.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/CompletionStrategy.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/annotation/CompletionStrategy.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/annotation/CompletionStrategy.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Concurrency.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Concurrency.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/annotation/Concurrency.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/annotation/Concurrency.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/DefaultOutput.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/DefaultOutput.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/annotation/DefaultOutput.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/annotation/DefaultOutput.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Handler.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Handler.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/annotation/Handler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/annotation/Handler.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/MessageEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/MessageEndpoint.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/annotation/MessageEndpoint.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/annotation/MessageEndpoint.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Polled.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Polled.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/annotation/Polled.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/annotation/Polled.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Publisher.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Publisher.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/annotation/Publisher.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/annotation/Publisher.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Router.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/annotation/Router.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitter.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Splitter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/annotation/Splitter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Subscriber.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Subscriber.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/annotation/Subscriber.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/annotation/Subscriber.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/AnnotationAwareMessagePublishingInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/aop/AnnotationAwareMessagePublishingInterceptor.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/aop/AnnotationAwareMessagePublishingInterceptor.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/aop/AnnotationAwareMessagePublishingInterceptor.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java b/org.springframework.integration/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBusAware.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusAware.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBusAware.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusAware.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBusAwareBeanPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusAwareBeanPostProcessor.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBusAwareBeanPostProcessor.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBusAwareBeanPostProcessor.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/bus/SubscriptionManager.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/SubscriptionManager.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/bus/SubscriptionManager.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/bus/SubscriptionManager.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelPublisher.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelPublisher.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelPublisher.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelPublisher.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelPurger.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelPurger.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelPurger.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelPurger.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelRegistry.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelRegistry.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelRegistry.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelRegistry.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelRegistryAware.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelRegistryAware.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelRegistryAware.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelRegistryAware.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultChannelRegistry.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/DefaultChannelRegistry.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultChannelRegistry.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/DefaultChannelRegistry.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/DirectChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/DirectChannel.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/DirectChannel.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/DirectChannel.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/DispatcherPolicy.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/DispatcherPolicy.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/DispatcherPolicy.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/DispatcherPolicy.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannel.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannel.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannel.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/PriorityChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PriorityChannel.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/PriorityChannel.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/PriorityChannel.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/QueueChannel.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/QueueChannel.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/RendezvousChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/RendezvousChannel.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/RendezvousChannel.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/RendezvousChannel.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/RequestReplyTemplate.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/RequestReplyTemplate.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/RequestReplyTemplate.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/RequestReplyTemplate.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/ThreadLocalChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ThreadLocalChannel.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/ThreadLocalChannel.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/ThreadLocalChannel.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/config/AbstractChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/AbstractChannelParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/config/AbstractChannelParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/config/AbstractChannelParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/config/DefaultChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/DefaultChannelParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/config/DefaultChannelParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/config/DefaultChannelParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/config/DirectChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/DirectChannelParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/config/DirectChannelParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/config/DirectChannelParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/config/PriorityChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/PriorityChannelParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/config/PriorityChannelParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/config/PriorityChannelParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/config/QueueChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/QueueChannelParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/config/QueueChannelParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/config/QueueChannelParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/config/RendezvousChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/RendezvousChannelParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/config/RendezvousChannelParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/config/RendezvousChannelParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/config/ThreadLocalChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/ThreadLocalChannelParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/config/ThreadLocalChannelParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/config/ThreadLocalChannelParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/factory/AbstractChannelFactory.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/AbstractChannelFactory.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/factory/AbstractChannelFactory.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/AbstractChannelFactory.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/factory/ChannelFactory.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/ChannelFactory.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/factory/ChannelFactory.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/ChannelFactory.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/factory/DefaultChannelFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/DefaultChannelFactoryBean.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/factory/DefaultChannelFactoryBean.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/DefaultChannelFactoryBean.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/factory/DirectChannelFactory.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/DirectChannelFactory.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/factory/DirectChannelFactory.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/DirectChannelFactory.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/factory/PriorityChannelFactory.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/PriorityChannelFactory.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/factory/PriorityChannelFactory.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/PriorityChannelFactory.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/factory/QueueChannelFactory.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/QueueChannelFactory.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/factory/QueueChannelFactory.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/QueueChannelFactory.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/factory/RendezvousChannelFactory.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/RendezvousChannelFactory.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/factory/RendezvousChannelFactory.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/RendezvousChannelFactory.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/factory/ThreadLocalChannelFactory.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/ThreadLocalChannelFactory.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/factory/ThreadLocalChannelFactory.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/ThreadLocalChannelFactory.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractTargetEndpointParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractTargetEndpointParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/AbstractTargetEndpointParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractTargetEndpointParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/AggregatorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/AggregatorParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/AggregatorParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/AggregatorParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/AnnotationDrivenParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/AnnotationDrivenParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/AnnotationDrivenParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/AnnotationDrivenParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/HandlerEndpointParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/HandlerEndpointParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/HandlerEndpointParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/HandlerEndpointParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/HandlerParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/HandlerParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/HandlerParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/HandlerParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/MessageBusParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/MessageBusParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/MessageBusParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/MessageBusParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/MethodInvokingAdapterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingAdapterParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/MethodInvokingAdapterParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingAdapterParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/PublisherAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/PublisherAnnotationPostProcessor.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/PublisherAnnotationPostProcessor.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/PublisherAnnotationPostProcessor.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/SourceEndpointParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/SourceEndpointParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/SourceEndpointParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/SourceEndpointParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/SubscriberAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/SubscriberAnnotationPostProcessor.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/SubscriberAnnotationPostProcessor.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/SubscriberAnnotationPostProcessor.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/TargetEndpointParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/TargetEndpointParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/TargetEndpointParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/TargetEndpointParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/DefaultPollingDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DefaultPollingDispatcher.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/dispatcher/DefaultPollingDispatcher.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DefaultPollingDispatcher.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/PollingDispatcherTask.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcherTask.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/dispatcher/PollingDispatcherTask.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcherTask.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/SimpleDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/SimpleDispatcher.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/dispatcher/SimpleDispatcher.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/SimpleDispatcher.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ConcurrencyPolicy.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ConcurrencyPolicy.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/ConcurrencyPolicy.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ConcurrencyPolicy.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ConcurrentTarget.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ConcurrentTarget.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/ConcurrentTarget.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ConcurrentTarget.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/DefaultEndpointRegistry.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/DefaultEndpointRegistry.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/DefaultEndpointRegistry.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/endpoint/DefaultEndpointRegistry.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/EndpointPolicy.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/EndpointPolicy.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/EndpointPolicy.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/endpoint/EndpointPolicy.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/EndpointRegistry.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/EndpointRegistry.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/EndpointRegistry.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/endpoint/EndpointRegistry.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/HandlerEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/HandlerEndpoint.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/HandlerEndpoint.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/endpoint/HandlerEndpoint.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourceEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/SourceEndpoint.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourceEndpoint.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/endpoint/SourceEndpoint.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandlerAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractMessageHandlerAdapter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandlerAdapter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractMessageHandlerAdapter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/DefaultMessageHandlerAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/DefaultMessageHandlerAdapter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/DefaultMessageHandlerAdapter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/DefaultMessageHandlerAdapter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/InterceptingMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/InterceptingMessageHandler.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/InterceptingMessageHandler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/InterceptingMessageHandler.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageHandler.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageHandler.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerNotRunningException.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageHandlerNotRunningException.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerNotRunningException.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageHandlerNotRunningException.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerRejectedExecutionException.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageHandlerRejectedExecutionException.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerRejectedExecutionException.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageHandlerRejectedExecutionException.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingTarget.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingTarget.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingTarget.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingTarget.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ReplyHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyHandler.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/ReplyHandler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyHandler.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ReplyMessageCorrelator.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyMessageCorrelator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/ReplyMessageCorrelator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyMessageCorrelator.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/AnnotationMethodMessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/annotation/AnnotationMethodMessageMapper.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/AnnotationMethodMessageMapper.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/annotation/AnnotationMethodMessageMapper.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/HeaderAttribute.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/annotation/HeaderAttribute.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/HeaderAttribute.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/annotation/HeaderAttribute.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/HeaderProperty.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/annotation/HeaderProperty.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/annotation/HeaderProperty.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/annotation/HeaderProperty.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/config/AbstractMessageHandlerCreator.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/config/AbstractMessageHandlerCreator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/config/AbstractMessageHandlerCreator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/config/AbstractMessageHandlerCreator.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/config/DefaultMessageHandlerCreator.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/config/DefaultMessageHandlerCreator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/config/DefaultMessageHandlerCreator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/config/DefaultMessageHandlerCreator.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/config/MessageHandlerCreator.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/config/MessageHandlerCreator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/config/MessageHandlerCreator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/config/MessageHandlerCreator.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/BlockingSource.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingSource.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/BlockingSource.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingSource.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/BlockingTarget.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingTarget.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/BlockingTarget.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingTarget.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/DefaultMessageCreator.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/DefaultMessageCreator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/DefaultMessageCreator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/DefaultMessageCreator.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/DefaultMessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/DefaultMessageMapper.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/DefaultMessageMapper.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/DefaultMessageMapper.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/ErrorMessage.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/ErrorMessage.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/ErrorMessage.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/ErrorMessage.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/GenericMessage.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/GenericMessage.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/GenericMessage.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/GenericMessage.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/Message.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/Message.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/Message.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/Message.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageCreator.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageCreator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessageCreator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MessageCreator.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageDeliveryAware.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryAware.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessageDeliveryAware.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryAware.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageDeliveryException.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryException.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessageDeliveryException.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryException.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageHandlingException.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHandlingException.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessageHandlingException.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHandlingException.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageHeader.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHeader.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessageHeader.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHeader.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMapper.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessageMapper.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMapper.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessagePriority.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessagePriority.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessagePriority.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MessagePriority.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageStore.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageStore.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessageStore.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MessageStore.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessagingException.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessagingException.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessagingException.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MessagingException.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MethodInvokingSource.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/MethodInvokingSource.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/Poller.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/Poller.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/Poller.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/Poller.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/RetrievalBlockingMessageStore.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/RetrievalBlockingMessageStore.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/RetrievalBlockingMessageStore.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/RetrievalBlockingMessageStore.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/SimpleMessageStore.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/SimpleMessageStore.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/SimpleMessageStore.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/SimpleMessageStore.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/Source.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/Source.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/Source.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/Source.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/StringMessage.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/StringMessage.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/StringMessage.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/StringMessage.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/Subscribable.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/Subscribable.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/Subscribable.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/Subscribable.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/Target.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/Target.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/Target.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/Target.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/selector/MessageSelector.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/selector/MessageSelector.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/selector/MessageSelector.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/selector/MessageSelector.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/selector/PayloadTypeSelector.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/selector/PayloadTypeSelector.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/selector/PayloadTypeSelector.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/selector/PayloadTypeSelector.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/selector/UnexpiredMessageSelector.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/selector/UnexpiredMessageSelector.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/selector/UnexpiredMessageSelector.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/selector/UnexpiredMessageSelector.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractRoutingMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractRoutingMessageHandler.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/AbstractRoutingMessageHandler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractRoutingMessageHandler.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AggregationBarrier.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AggregationBarrier.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/AggregationBarrier.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/AggregationBarrier.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/Aggregator.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/Aggregator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/Aggregator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/Aggregator.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AggregatorAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AggregatorAdapter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/AggregatorAdapter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/AggregatorAdapter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/ChannelNameResolver.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/ChannelNameResolver.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/ChannelNameResolver.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/ChannelNameResolver.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/ChannelResolver.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/ChannelResolver.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/ChannelResolver.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/ChannelResolver.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/CompletionStrategy.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/CompletionStrategy.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/CompletionStrategy.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/CompletionStrategy.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/CompletionStrategyAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/CompletionStrategyAdapter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/CompletionStrategyAdapter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/CompletionStrategyAdapter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/MessageBarrier.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/MessageBarrier.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/MessageBarrier.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/MessageBarrier.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/MessageListMethodAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/MessageListMethodAdapter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/MessageListMethodAdapter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/MessageListMethodAdapter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/MessageSequenceComparator.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/MessageSequenceComparator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/MessageSequenceComparator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/MessageSequenceComparator.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/MultiChannelNameResolver.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/MultiChannelNameResolver.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/MultiChannelNameResolver.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/MultiChannelNameResolver.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/MultiChannelResolver.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/MultiChannelResolver.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/MultiChannelResolver.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/MultiChannelResolver.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/MultiChannelRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/MultiChannelRouter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/MultiChannelRouter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/MultiChannelRouter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListRouter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListRouter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/RootCauseErrorMessageRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/RootCauseErrorMessageRouter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/RootCauseErrorMessageRouter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/RootCauseErrorMessageRouter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/SequenceSizeCompletionStrategy.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/SequenceSizeCompletionStrategy.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/SequenceSizeCompletionStrategy.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/SequenceSizeCompletionStrategy.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/SingleChannelRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/SingleChannelRouter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/SingleChannelRouter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/SingleChannelRouter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/SplitterMessageHandlerAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/SplitterMessageHandlerAdapter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/SplitterMessageHandlerAdapter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/SplitterMessageHandlerAdapter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/config/AggregatorMessageHandlerCreator.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/config/AggregatorMessageHandlerCreator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/config/AggregatorMessageHandlerCreator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/config/AggregatorMessageHandlerCreator.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/config/RouterMessageHandlerCreator.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/config/RouterMessageHandlerCreator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/config/RouterMessageHandlerCreator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/config/RouterMessageHandlerCreator.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/config/RouterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/config/RouterParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/config/RouterParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/config/RouterParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/config/SplitterMessageHandlerCreator.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/config/SplitterMessageHandlerCreator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/config/SplitterMessageHandlerCreator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/config/SplitterMessageHandlerCreator.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/config/SplitterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/config/SplitterParser.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/router/config/SplitterParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/router/config/SplitterParser.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/AbstractMessagingTaskScheduler.java b/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/AbstractMessagingTaskScheduler.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/scheduling/AbstractMessagingTaskScheduler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/scheduling/AbstractMessagingTaskScheduler.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/MessagePublishingErrorHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/MessagePublishingErrorHandler.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/scheduling/MessagePublishingErrorHandler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/scheduling/MessagePublishingErrorHandler.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/MessagingTask.java b/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/MessagingTask.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/scheduling/MessagingTask.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/scheduling/MessagingTask.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/MessagingTaskScheduler.java b/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/MessagingTaskScheduler.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/scheduling/MessagingTaskScheduler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/scheduling/MessagingTaskScheduler.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollingSchedule.java b/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/PollingSchedule.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollingSchedule.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/scheduling/PollingSchedule.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/Schedule.java b/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/Schedule.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/scheduling/Schedule.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/scheduling/Schedule.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/SimpleMessagingTaskScheduler.java b/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/SimpleMessagingTaskScheduler.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/scheduling/SimpleMessagingTaskScheduler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/scheduling/SimpleMessagingTaskScheduler.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/Subscription.java b/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/Subscription.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/scheduling/Subscription.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/scheduling/Subscription.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageFilter.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageFilter.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageFilter.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageFilter.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/BoundedHashMap.java b/org.springframework.integration/src/main/java/org/springframework/integration/util/BoundedHashMap.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/util/BoundedHashMap.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/util/BoundedHashMap.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/DefaultMethodInvoker.java b/org.springframework.integration/src/main/java/org/springframework/integration/util/DefaultMethodInvoker.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/util/DefaultMethodInvoker.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/util/DefaultMethodInvoker.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/ErrorHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/util/ErrorHandler.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/util/ErrorHandler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/util/ErrorHandler.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/IdGenerator.java b/org.springframework.integration/src/main/java/org/springframework/integration/util/IdGenerator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/util/IdGenerator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/util/IdGenerator.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/MethodInvoker.java b/org.springframework.integration/src/main/java/org/springframework/integration/util/MethodInvoker.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/util/MethodInvoker.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/util/MethodInvoker.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/MethodValidator.java b/org.springframework.integration/src/main/java/org/springframework/integration/util/MethodValidator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/util/MethodValidator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/util/MethodValidator.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/NameResolvingMethodInvoker.java b/org.springframework.integration/src/main/java/org/springframework/integration/util/NameResolvingMethodInvoker.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/util/NameResolvingMethodInvoker.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/util/NameResolvingMethodInvoker.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/RandomUuidGenerator.java b/org.springframework.integration/src/main/java/org/springframework/integration/util/RandomUuidGenerator.java
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/util/RandomUuidGenerator.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/util/RandomUuidGenerator.java
diff --git a/spring-integration-core/src/main/resources/META-INF/MANIFEST.MF b/org.springframework.integration/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from spring-integration-core/src/main/resources/META-INF/MANIFEST.MF
rename to org.springframework.integration/src/main/resources/META-INF/MANIFEST.MF
diff --git a/spring-integration-core/src/test/java/log4j.properties b/org.springframework.integration/src/test/java/log4j.properties
similarity index 100%
rename from spring-integration-core/src/test/java/log4j.properties
rename to org.springframework.integration/src/test/java/log4j.properties
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/MessageHeaderTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/MessageHeaderTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/MessageHeaderTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/MessageHeaderTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/ITestBean.java b/org.springframework.integration/src/test/java/org/springframework/integration/aop/ITestBean.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/aop/ITestBean.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/aop/ITestBean.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationPostProcessorTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationPostProcessorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationPostProcessorTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java b/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/publisherAnnotationPostProcessorTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/aop/publisherAnnotationPostProcessorTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/aop/publisherAnnotationPostProcessorTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/aop/publisherAnnotationPostProcessorTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/SubscriptionManagerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/SubscriptionManagerTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/bus/SubscriptionManagerTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/bus/SubscriptionManagerTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/TestMessageBusAwareImpl.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/TestMessageBusAwareImpl.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/bus/TestMessageBusAwareImpl.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/bus/TestMessageBusAwareImpl.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/messageBusTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/bus/messageBusTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/multipleMessageBusBeans.xml b/org.springframework.integration/src/test/java/org/springframework/integration/bus/multipleMessageBusBeans.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/bus/multipleMessageBusBeans.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/bus/multipleMessageBusBeans.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/DefaultChannelRegistryTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/DefaultChannelRegistryTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/DefaultChannelRegistryTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/DefaultChannelRegistryTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/MessagePayloadTestComparator.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessagePayloadTestComparator.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/MessagePayloadTestComparator.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/MessagePayloadTestComparator.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/QueueChannelTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/QueueChannelTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/RequestReplyTemplateTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/RequestReplyTemplateTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/RequestReplyTemplateTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/RequestReplyTemplateTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/ThreadLocalChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/ThreadLocalChannelTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/ThreadLocalChannelTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/ThreadLocalChannelTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/DirectChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/DirectChannelParserTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/config/DirectChannelParserTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/config/DirectChannelParserTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/TestSourceBean.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestSourceBean.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/config/TestSourceBean.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestSourceBean.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelInterceptorParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelInterceptorParserTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelInterceptorParserTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelInterceptorParserTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelParserTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelParserTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelParserTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelWithoutId.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelWithoutId.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelWithoutId.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelWithoutId.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/directChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/directChannelParserTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/config/directChannelParserTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/config/directChannelParserTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/threadLocalChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/threadLocalChannelParserTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/config/threadLocalChannelParserTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/config/threadLocalChannelParserTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/Adder.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/Adder.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/Adder.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/Adder.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorAnnotationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorAnnotationTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorAnnotationTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorAnnotationTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/CompletionStrategyAnnotationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/CompletionStrategyAnnotationTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/CompletionStrategyAnnotationTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/CompletionStrategyAnnotationTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ExceptionThrowingTestHandler.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/ExceptionThrowingTestHandler.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/ExceptionThrowingTestHandler.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/ExceptionThrowingTestHandler.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/HandlerParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/HandlerParserTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/HandlerParserTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/HandlerParserTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/MaxValueCompletionStrategy.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/MaxValueCompletionStrategy.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/MaxValueCompletionStrategy.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/MaxValueCompletionStrategy.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/SubscriberAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/SubscriberAnnotationPostProcessorTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/SubscriberAnnotationPostProcessorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/SubscriberAnnotationPostProcessorTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestAggregator.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestAggregator.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/TestAggregator.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/TestAggregator.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithCompletionStrategy.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithCompletionStrategy.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithCompletionStrategy.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithCompletionStrategy.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithCompletionStrategyOnly.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithCompletionStrategyOnly.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithCompletionStrategyOnly.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithCompletionStrategyOnly.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithCustomizedAggregator.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithCustomizedAggregator.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithCustomizedAggregator.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithCustomizedAggregator.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithDefaultAggregator.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithDefaultAggregator.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithDefaultAggregator.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/TestAnnotatedEndpointWithDefaultAggregator.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestBean.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestBean.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/TestBean.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/TestBean.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestCompletionStrategy.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestCompletionStrategy.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/TestCompletionStrategy.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/TestCompletionStrategy.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestConcatenatingHandler.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestConcatenatingHandler.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/TestConcatenatingHandler.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/TestConcatenatingHandler.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestErrorHandler.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestErrorHandler.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/TestErrorHandler.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/TestErrorHandler.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestHandler.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestHandler.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/TestHandler.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/TestHandler.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestReplyHandler.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestReplyHandler.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/TestReplyHandler.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/TestReplyHandler.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/completionStrategyMethodWithMissingReference.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/completionStrategyMethodWithMissingReference.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/completionStrategyMethodWithMissingReference.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/completionStrategyMethodWithMissingReference.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/duplicateCompletionStrategy.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/duplicateCompletionStrategy.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/duplicateCompletionStrategy.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/duplicateCompletionStrategy.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointConcurrencyTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointConcurrencyTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/endpointConcurrencyTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/endpointConcurrencyTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithHandlerChainElement.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithHandlerChainElement.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithHandlerChainElement.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithHandlerChainElement.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithReplyHandler.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithReplyHandler.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithReplyHandler.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithReplyHandler.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithSelectors.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelectors.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithSelectors.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelectors.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/handlerAdapterParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterParserTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/handlerAdapterParserTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterParserTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/handlerChainParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerChainParserTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/handlerChainParserTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/handlerChainParserTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithAsyncEventMulticaster.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAsyncEventMulticaster.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithAsyncEventMulticaster.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAsyncEventMulticaster.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithAutoCreateChannels.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAutoCreateChannels.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithAutoCreateChannels.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAutoCreateChannels.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithChannelFactory.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithChannelFactory.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithChannelFactory.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithChannelFactory.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaultConcurrencyTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaultConcurrencyTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaultConcurrencyTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaultConcurrencyTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithErrorChannelReference.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithErrorChannelReference.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithErrorChannelReference.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithErrorChannelReference.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithMessageBusAware.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithMessageBusAware.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithMessageBusAware.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithMessageBusAware.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/testAnnotatedAggregator.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/testAnnotatedAggregator.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/testAnnotatedAggregator.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/testAnnotatedAggregator.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/testInvalidCompletionStrategyAnnotation.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/testInvalidCompletionStrategyAnnotation.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/config/testInvalidCompletionStrategyAnnotation.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/testInvalidCompletionStrategyAnnotation.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DefaultPollingDispatcherTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DefaultPollingDispatcherTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DefaultPollingDispatcherTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DefaultPollingDispatcherTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/HandlerEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/HandlerEndpointTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/HandlerEndpointTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/HandlerEndpointTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/SourceEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/SourceEndpointTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/SourceEndpointTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/SourceEndpointTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/TestBean.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/TestBean.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/TestBean.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/TestBean.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/ITestEndpoint.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/ITestEndpoint.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/ITestEndpoint.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/ITestEndpoint.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/InboundChannelAdapterTestBean.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/InboundChannelAdapterTestBean.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/InboundChannelAdapterTestBean.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/InboundChannelAdapterTestBean.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessorTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessorTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageParameterAnnotatedEndpoint.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/MessageParameterAnnotatedEndpoint.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageParameterAnnotatedEndpoint.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/MessageParameterAnnotatedEndpoint.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/OutboundChannelAdapterTestBean.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/OutboundChannelAdapterTestBean.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/OutboundChannelAdapterTestBean.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/OutboundChannelAdapterTestBean.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/SimpleAnnotatedEndpoint.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/SimpleAnnotatedEndpoint.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/SimpleAnnotatedEndpoint.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/SimpleAnnotatedEndpoint.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/TypeConvertingTestEndpoint.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/TypeConvertingTestEndpoint.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/TypeConvertingTestEndpoint.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/TypeConvertingTestEndpoint.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/messageParameterAnnotatedEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/messageParameterAnnotatedEndpointTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/messageParameterAnnotatedEndpointTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/messageParameterAnnotatedEndpointTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointWithAutoCreateChannelTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointWithAutoCreateChannelTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointWithAutoCreateChannelTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointWithAutoCreateChannelTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/typeConvertingEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/typeConvertingEndpointTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/typeConvertingEndpointTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/typeConvertingEndpointTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestHandler.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestHandler.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/gateway/TestHandler.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestHandler.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestService.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestService.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/gateway/TestService.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestService.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/CorrelationIdTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/CorrelationIdTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/handler/CorrelationIdTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/CorrelationIdTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/DefaultMessageHandlerAdapterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/DefaultMessageHandlerAdapterTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/handler/DefaultMessageHandlerAdapterTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/DefaultMessageHandlerAdapterTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingAdapterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingAdapterTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingAdapterTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingAdapterTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingTargetTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingTargetTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingTargetTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingTargetTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/ReplyMessageCorrelatorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/ReplyMessageCorrelatorTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/handler/ReplyMessageCorrelatorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/ReplyMessageCorrelatorTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/TestHandlers.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestHandlers.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/handler/TestHandlers.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/TestHandlers.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/TestSink.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestSink.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/handler/TestSink.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/TestSink.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/TestSource.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestSource.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/handler/TestSource.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/TestSource.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/adapterTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/handler/adapterTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/handler/adapterTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/adapterTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/adapterTestsWithNamespace.xml b/org.springframework.integration/src/test/java/org/springframework/integration/handler/adapterTestsWithNamespace.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/handler/adapterTestsWithNamespace.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/adapterTestsWithNamespace.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/annotation/AnnotationMethodMessageMapperTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/annotation/AnnotationMethodMessageMapperTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/handler/annotation/AnnotationMethodMessageMapperTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/annotation/AnnotationMethodMessageMapperTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/config/DefaultMessageHandlerCreatorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/config/DefaultMessageHandlerCreatorTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/handler/config/DefaultMessageHandlerCreatorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/config/DefaultMessageHandlerCreatorTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/DefaultMessageCreatorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/DefaultMessageCreatorTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/message/DefaultMessageCreatorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/message/DefaultMessageCreatorTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/DefaultMessageMapperTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/DefaultMessageMapperTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/message/DefaultMessageMapperTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/message/DefaultMessageMapperTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/GenericMessageTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/GenericMessageTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/message/GenericMessageTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/message/GenericMessageTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/RetrievalBlockingMessageStoreTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/RetrievalBlockingMessageStoreTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/message/RetrievalBlockingMessageStoreTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/message/RetrievalBlockingMessageStoreTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/SimpleMessageStoreTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/SimpleMessageStoreTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/message/SimpleMessageStoreTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/message/SimpleMessageStoreTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/AggregationBarrierTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/AggregationBarrierTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/AggregationBarrierTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/AggregationBarrierTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/AggregatorAdapterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/AggregatorAdapterTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/AggregatorAdapterTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/AggregatorAdapterTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/CompletionStrategyAdapterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/CompletionStrategyAdapterTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/CompletionStrategyAdapterTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/CompletionStrategyAdapterTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/MessageSequenceComparatorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/MessageSequenceComparatorTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/MessageSequenceComparatorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/MessageSequenceComparatorTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/RootCauseErrorMessageRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/RootCauseErrorMessageRouterTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/RootCauseErrorMessageRouterTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/RootCauseErrorMessageRouterTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/RouterMessageHandlerAdapterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterMessageHandlerAdapterTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/RouterMessageHandlerAdapterTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/RouterMessageHandlerAdapterTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/SequenceSizeCompletionStrategyTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/SequenceSizeCompletionStrategyTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/SequenceSizeCompletionStrategyTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/SequenceSizeCompletionStrategyTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/SplitterMessageHandlerAdapterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/SplitterMessageHandlerAdapterTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/SplitterMessageHandlerAdapterTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/SplitterMessageHandlerAdapterTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/RouterParserTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/config/RouterParserTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/TestRouter.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/TestRouter.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/config/TestRouter.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/config/TestRouter.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/TestSplitter.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/TestSplitter.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/config/TestSplitter.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/config/TestSplitter.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/routerParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/config/routerParserTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MessageFilterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/MessageFilterTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/transformer/MessageFilterTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/transformer/MessageFilterTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/BoundedHashMapTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/util/BoundedHashMapTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/util/BoundedHashMapTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/util/BoundedHashMapTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/DefaultMethodInvokerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/util/DefaultMethodInvokerTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/util/DefaultMethodInvokerTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/util/DefaultMethodInvokerTests.java
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/RandomUuidGeneratorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/util/RandomUuidGeneratorTests.java
similarity index 100%
rename from spring-integration-core/src/test/java/org/springframework/integration/util/RandomUuidGeneratorTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/util/RandomUuidGeneratorTests.java
diff --git a/spring-integration-ws/.project b/spring-integration-ws/.project
deleted file mode 100644
index 5a31e2c864..0000000000
--- a/spring-integration-ws/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spring-integration-ws</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>