diff --git a/build-spring-integration/build.xml b/build-spring-integration/build.xml
index 9f7f8b4a86..aa8d5bad85 100644
--- a/build-spring-integration/build.xml
+++ b/build-spring-integration/build.xml
@@ -26,7 +26,7 @@
 
 	<target name="clean" depends="common-multi-bundle.clean">
 		<delete verbose="true" includeemptydirs="true">
-			<fileset dir="${basedir}/../org.springframework.integration.samples" includes="*/target/**" defaultexcludes="false"/>
+			<fileset dir="${basedir}/../spring-integration-samples" includes="*/target/**" defaultexcludes="false"/>
 		</delete>
 	</target>
 
diff --git a/build-spring-integration/package-bundle.xml b/build-spring-integration/package-bundle.xml
index e5c50ede81..a5e0b59926 100644
--- a/build-spring-integration/package-bundle.xml
+++ b/build-spring-integration/package-bundle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="package-bundle">
 
-        <import file="publish-maven.xml"/>
+	<import file="publish-maven.xml"/>
 
 	<target name="package" depends="ivy.init">
 		<dist-jar/>
@@ -14,7 +14,7 @@
 		</delete>
 		<mkdir dir="${package.output.dir}/samples" />
 		<copy todir="${package.output.dir}/samples">
-			<fileset dir="${basedir}/../org.springframework.integration.samples"> 
+			<fileset dir="${basedir}/../spring-integration-samples"> 
 				<include name="cafe/**" />
 				<include name="errorhandling/**"/>
 				<include name="filecopy/**"/>
diff --git a/build-spring-integration/pom.xml b/build-spring-integration/pom.xml
index 94169c08a9..a93af97231 100644
--- a/build-spring-integration/pom.xml
+++ b/build-spring-integration/pom.xml
@@ -28,7 +28,6 @@
       <module>../org.springframework.integration.jms</module>
       <module>../org.springframework.integration.mail</module>
       <module>../org.springframework.integration.rmi</module>
-      <module>../org.springframework.integration.samples</module>
       <module>../org.springframework.integration.stream</module>
       <module>../org.springframework.integration.ws</module>
       <module>../org.springframework.integration.xml</module>    
diff --git a/build-spring-integration/publish.xml b/build-spring-integration/publish.xml
index f6a08061f0..b2b352cea1 100644
--- a/build-spring-integration/publish.xml
+++ b/build-spring-integration/publish.xml
@@ -18,7 +18,6 @@
 		<pathelement location="${basedir}/../org.springframework.integration.rmi"/>
 		<pathelement location="${basedir}/../org.springframework.integration.stream"/>
 		<pathelement location="${basedir}/../org.springframework.integration.ws"/>
-		<pathelement location="${basedir}/../org.springframework.integration.samples"/>
   </path>
 
   <path id="modules-with-only-pom-artifacts">
diff --git a/org.springframework.integration.samples/README.txt b/spring-integration-samples/README.txt
similarity index 100%
rename from org.springframework.integration.samples/README.txt
rename to spring-integration-samples/README.txt
diff --git a/org.springframework.integration.samples/cafe/.classpath b/spring-integration-samples/cafe/.classpath
similarity index 100%
rename from org.springframework.integration.samples/cafe/.classpath
rename to spring-integration-samples/cafe/.classpath
diff --git a/org.springframework.integration.samples/cafe/.project b/spring-integration-samples/cafe/.project
similarity index 100%
rename from org.springframework.integration.samples/cafe/.project
rename to spring-integration-samples/cafe/.project
diff --git a/org.springframework.integration.samples/cafe/pom.xml b/spring-integration-samples/cafe/pom.xml
similarity index 100%
rename from org.springframework.integration.samples/cafe/pom.xml
rename to spring-integration-samples/cafe/pom.xml
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Delivery.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Delivery.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Delivery.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Delivery.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Drink.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Drink.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Drink.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Drink.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/DrinkType.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Order.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Order.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Order.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Order.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/OrderItem.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/OrderItem.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/OrderItem.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/OrderItem.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/CafeDemo.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/CafeDemo.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/CafeDemo.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/CafeDemo.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/DrinkRouter.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/DrinkRouter.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/DrinkRouter.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/DrinkRouter.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/OrderSplitter.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/OrderSplitter.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/OrderSplitter.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/OrderSplitter.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemo.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemo.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemo.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemo.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/DrinkRouter.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/DrinkRouter.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/DrinkRouter.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/DrinkRouter.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/OrderSplitter.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/OrderSplitter.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/OrderSplitter.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/OrderSplitter.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Waiter.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Waiter.java
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Waiter.java
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/Waiter.java
diff --git a/org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
similarity index 100%
rename from org.springframework.integration.samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
rename to spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
diff --git a/org.springframework.integration.samples/errorhandling/.classpath b/spring-integration-samples/errorhandling/.classpath
similarity index 100%
rename from org.springframework.integration.samples/errorhandling/.classpath
rename to spring-integration-samples/errorhandling/.classpath
diff --git a/org.springframework.integration.samples/errorhandling/.project b/spring-integration-samples/errorhandling/.project
similarity index 100%
rename from org.springframework.integration.samples/errorhandling/.project
rename to spring-integration-samples/errorhandling/.project
diff --git a/org.springframework.integration.samples/errorhandling/pom.xml b/spring-integration-samples/errorhandling/pom.xml
similarity index 100%
rename from org.springframework.integration.samples/errorhandling/pom.xml
rename to spring-integration-samples/errorhandling/pom.xml
diff --git a/org.springframework.integration.samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java b/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java
similarity index 100%
rename from org.springframework.integration.samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java
rename to spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java
diff --git a/org.springframework.integration.samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/Invitation.java b/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/Invitation.java
similarity index 100%
rename from org.springframework.integration.samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/Invitation.java
rename to spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/Invitation.java
diff --git a/org.springframework.integration.samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyDemo.java b/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyDemo.java
similarity index 100%
rename from org.springframework.integration.samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyDemo.java
rename to spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyDemo.java
diff --git a/org.springframework.integration.samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyGuest.java b/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyGuest.java
similarity index 100%
rename from org.springframework.integration.samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyGuest.java
rename to spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyGuest.java
diff --git a/org.springframework.integration.samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyHost.java b/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyHost.java
similarity index 100%
rename from org.springframework.integration.samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyHost.java
rename to spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/PartyHost.java
diff --git a/org.springframework.integration.samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml b/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml
similarity index 100%
rename from org.springframework.integration.samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml
rename to spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/errorHandlingDemo.xml
diff --git a/org.springframework.integration.samples/filecopy/.classpath b/spring-integration-samples/filecopy/.classpath
similarity index 100%
rename from org.springframework.integration.samples/filecopy/.classpath
rename to spring-integration-samples/filecopy/.classpath
diff --git a/org.springframework.integration.samples/filecopy/.project b/spring-integration-samples/filecopy/.project
similarity index 100%
rename from org.springframework.integration.samples/filecopy/.project
rename to spring-integration-samples/filecopy/.project
diff --git a/org.springframework.integration.samples/filecopy/pom.xml b/spring-integration-samples/filecopy/pom.xml
similarity index 100%
rename from org.springframework.integration.samples/filecopy/pom.xml
rename to spring-integration-samples/filecopy/pom.xml
diff --git a/org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java
similarity index 100%
rename from org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java
rename to spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java
diff --git a/org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/Exclaimer.java b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/Exclaimer.java
similarity index 100%
rename from org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/Exclaimer.java
rename to spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/Exclaimer.java
diff --git a/org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java
similarity index 100%
rename from org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java
rename to spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java
diff --git a/org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java
similarity index 100%
rename from org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java
rename to spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java
diff --git a/org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java
similarity index 100%
rename from org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java
rename to spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java
diff --git a/org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
similarity index 100%
rename from org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
rename to spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
diff --git a/org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
similarity index 100%
rename from org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
rename to spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
diff --git a/org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
similarity index 100%
rename from org.springframework.integration.samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
rename to spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
diff --git a/org.springframework.integration.samples/helloworld/.classpath b/spring-integration-samples/helloworld/.classpath
similarity index 100%
rename from org.springframework.integration.samples/helloworld/.classpath
rename to spring-integration-samples/helloworld/.classpath
diff --git a/org.springframework.integration.samples/helloworld/.project b/spring-integration-samples/helloworld/.project
similarity index 100%
rename from org.springframework.integration.samples/helloworld/.project
rename to spring-integration-samples/helloworld/.project
diff --git a/org.springframework.integration.samples/helloworld/pom.xml b/spring-integration-samples/helloworld/pom.xml
similarity index 100%
rename from org.springframework.integration.samples/helloworld/pom.xml
rename to spring-integration-samples/helloworld/pom.xml
diff --git a/org.springframework.integration.samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java b/spring-integration-samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
similarity index 100%
rename from org.springframework.integration.samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
rename to spring-integration-samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
diff --git a/org.springframework.integration.samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java b/spring-integration-samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
similarity index 100%
rename from org.springframework.integration.samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
rename to spring-integration-samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
diff --git a/org.springframework.integration.samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml b/spring-integration-samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
similarity index 100%
rename from org.springframework.integration.samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
rename to spring-integration-samples/helloworld/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
diff --git a/org.springframework.integration.samples/jms/.classpath b/spring-integration-samples/jms/.classpath
similarity index 100%
rename from org.springframework.integration.samples/jms/.classpath
rename to spring-integration-samples/jms/.classpath
diff --git a/org.springframework.integration.samples/jms/.project b/spring-integration-samples/jms/.project
similarity index 100%
rename from org.springframework.integration.samples/jms/.project
rename to spring-integration-samples/jms/.project
diff --git a/org.springframework.integration.samples/jms/pom.xml b/spring-integration-samples/jms/pom.xml
similarity index 100%
rename from org.springframework.integration.samples/jms/pom.xml
rename to spring-integration-samples/jms/pom.xml
diff --git a/org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java
similarity index 100%
rename from org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java
rename to spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java
diff --git a/org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/DemoBean.java b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/DemoBean.java
similarity index 100%
rename from org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/DemoBean.java
rename to spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/DemoBean.java
diff --git a/org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/GatewayDemo.java b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/GatewayDemo.java
similarity index 100%
rename from org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/GatewayDemo.java
rename to spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/GatewayDemo.java
diff --git a/org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/common.xml b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/common.xml
similarity index 100%
rename from org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/common.xml
rename to spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/common.xml
diff --git a/org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
similarity index 100%
rename from org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
rename to spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
diff --git a/org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
similarity index 100%
rename from org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
rename to spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
diff --git a/org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundChannelAdapter.xml b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundChannelAdapter.xml
similarity index 100%
rename from org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundChannelAdapter.xml
rename to spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundChannelAdapter.xml
diff --git a/org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml b/spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml
similarity index 100%
rename from org.springframework.integration.samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml
rename to spring-integration-samples/jms/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml
diff --git a/org.springframework.integration.samples/oddeven/.classpath b/spring-integration-samples/oddeven/.classpath
similarity index 100%
rename from org.springframework.integration.samples/oddeven/.classpath
rename to spring-integration-samples/oddeven/.classpath
diff --git a/org.springframework.integration.samples/oddeven/.project b/spring-integration-samples/oddeven/.project
similarity index 100%
rename from org.springframework.integration.samples/oddeven/.project
rename to spring-integration-samples/oddeven/.project
diff --git a/org.springframework.integration.samples/oddeven/pom.xml b/spring-integration-samples/oddeven/pom.xml
similarity index 100%
rename from org.springframework.integration.samples/oddeven/pom.xml
rename to spring-integration-samples/oddeven/pom.xml
diff --git a/org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/Counter.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/Counter.java
similarity index 100%
rename from org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/Counter.java
rename to spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/Counter.java
diff --git a/org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java
similarity index 100%
rename from org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java
rename to spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/CronOddEvenDemo.java
diff --git a/org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java
similarity index 100%
rename from org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java
rename to spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java
diff --git a/org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemo.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemo.java
similarity index 100%
rename from org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemo.java
rename to spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/IntervalOddEvenDemo.java
diff --git a/org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java
similarity index 100%
rename from org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java
rename to spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java
diff --git a/org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/ParityResolver.java b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/ParityResolver.java
similarity index 100%
rename from org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/ParityResolver.java
rename to spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/ParityResolver.java
diff --git a/org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
similarity index 100%
rename from org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
rename to spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
diff --git a/org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
similarity index 100%
rename from org.springframework.integration.samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
rename to spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
diff --git a/org.springframework.integration.samples/pom.xml b/spring-integration-samples/pom.xml
similarity index 100%
rename from org.springframework.integration.samples/pom.xml
rename to spring-integration-samples/pom.xml
diff --git a/org.springframework.integration.samples/quote/.classpath b/spring-integration-samples/quote/.classpath
similarity index 100%
rename from org.springframework.integration.samples/quote/.classpath
rename to spring-integration-samples/quote/.classpath
diff --git a/org.springframework.integration.samples/quote/.project b/spring-integration-samples/quote/.project
similarity index 100%
rename from org.springframework.integration.samples/quote/.project
rename to spring-integration-samples/quote/.project
diff --git a/org.springframework.integration.samples/quote/pom.xml b/spring-integration-samples/quote/pom.xml
similarity index 100%
rename from org.springframework.integration.samples/quote/pom.xml
rename to spring-integration-samples/quote/pom.xml
diff --git a/org.springframework.integration.samples/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java b/spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java
similarity index 100%
rename from org.springframework.integration.samples/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java
rename to spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java
diff --git a/org.springframework.integration.samples/quote/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java b/spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java
similarity index 100%
rename from org.springframework.integration.samples/quote/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java
rename to spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java
diff --git a/org.springframework.integration.samples/quote/src/main/java/org/springframework/integration/samples/quote/QuoteService.java b/spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/QuoteService.java
similarity index 100%
rename from org.springframework.integration.samples/quote/src/main/java/org/springframework/integration/samples/quote/QuoteService.java
rename to spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/QuoteService.java
diff --git a/org.springframework.integration.samples/quote/src/main/java/org/springframework/integration/samples/quote/TickerStream.java b/spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/TickerStream.java
similarity index 100%
rename from org.springframework.integration.samples/quote/src/main/java/org/springframework/integration/samples/quote/TickerStream.java
rename to spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/TickerStream.java
diff --git a/org.springframework.integration.samples/quote/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml b/spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
similarity index 100%
rename from org.springframework.integration.samples/quote/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
rename to spring-integration-samples/quote/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
diff --git a/org.springframework.integration.samples/ws/.classpath b/spring-integration-samples/ws/.classpath
similarity index 100%
rename from org.springframework.integration.samples/ws/.classpath
rename to spring-integration-samples/ws/.classpath
diff --git a/org.springframework.integration.samples/ws/.project b/spring-integration-samples/ws/.project
similarity index 100%
rename from org.springframework.integration.samples/ws/.project
rename to spring-integration-samples/ws/.project
diff --git a/org.springframework.integration.samples/ws/pom.xml b/spring-integration-samples/ws/pom.xml
similarity index 100%
rename from org.springframework.integration.samples/ws/pom.xml
rename to spring-integration-samples/ws/pom.xml
diff --git a/org.springframework.integration.samples/ws/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java b/spring-integration-samples/ws/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java
similarity index 100%
rename from org.springframework.integration.samples/ws/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java
rename to spring-integration-samples/ws/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java
diff --git a/org.springframework.integration.samples/ws/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml b/spring-integration-samples/ws/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
similarity index 100%
rename from org.springframework.integration.samples/ws/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
rename to spring-integration-samples/ws/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
diff --git a/org.springframework.integration.samples/xml/.classpath b/spring-integration-samples/xml/.classpath
similarity index 100%
rename from org.springframework.integration.samples/xml/.classpath
rename to spring-integration-samples/xml/.classpath
diff --git a/org.springframework.integration.samples/xml/.project b/spring-integration-samples/xml/.project
similarity index 100%
rename from org.springframework.integration.samples/xml/.project
rename to spring-integration-samples/xml/.project
diff --git a/org.springframework.integration.samples/xml/.settings/org.eclipse.jdt.core.prefs b/spring-integration-samples/xml/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.springframework.integration.samples/xml/.settings/org.eclipse.jdt.core.prefs
rename to spring-integration-samples/xml/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.springframework.integration.samples/xml/.settings/org.maven.ide.eclipse.prefs b/spring-integration-samples/xml/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from org.springframework.integration.samples/xml/.settings/org.maven.ide.eclipse.prefs
rename to spring-integration-samples/xml/.settings/org.maven.ide.eclipse.prefs
diff --git a/org.springframework.integration.samples/xml/pom.xml b/spring-integration-samples/xml/pom.xml
similarity index 100%
rename from org.springframework.integration.samples/xml/pom.xml
rename to spring-integration-samples/xml/pom.xml
diff --git a/org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/BookOrderProcessingSample.java b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/BookOrderProcessingSample.java
similarity index 100%
rename from org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/BookOrderProcessingSample.java
rename to spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/BookOrderProcessingSample.java
diff --git a/org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java
similarity index 100%
rename from org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java
rename to spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java
diff --git a/org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/StockChecker.java b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/StockChecker.java
similarity index 100%
rename from org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/StockChecker.java
rename to spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/StockChecker.java
diff --git a/org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java
similarity index 100%
rename from org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java
rename to spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java
diff --git a/org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/XmlUtil.java b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/XmlUtil.java
similarity index 100%
rename from org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/XmlUtil.java
rename to spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/XmlUtil.java
diff --git a/org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/bigBooksSupplierTransformer.xsl b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/bigBooksSupplierTransformer.xsl
similarity index 100%
rename from org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/bigBooksSupplierTransformer.xsl
rename to spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/bigBooksSupplierTransformer.xsl
diff --git a/org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/order.xml b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/order.xml
similarity index 100%
rename from org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/order.xml
rename to spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/order.xml
diff --git a/org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/orderProcessingSample.xml b/spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/orderProcessingSample.xml
similarity index 100%
rename from org.springframework.integration.samples/xml/src/main/java/org/springframework/integration/samples/xml/orderProcessingSample.xml
rename to spring-integration-samples/xml/src/main/java/org/springframework/integration/samples/xml/orderProcessingSample.xml