diff --git a/spring-integration-samples/loanshark/.classpath b/spring-integration-samples/loanshark/.classpath
index 9411eaf88d..833cb70c19 100644
--- a/spring-integration-samples/loanshark/.classpath
+++ b/spring-integration-samples/loanshark/.classpath
@@ -5,11 +5,6 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-integration-samples/loanshark/pom.xml b/spring-integration-samples/loanshark/pom.xml
index 24f3e5517a..1114e627cb 100644
--- a/spring-integration-samples/loanshark/pom.xml
+++ b/spring-integration-samples/loanshark/pom.xml
@@ -23,7 +23,7 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
 			<version>2.5</version>
-			<scope>provided</scope>
+			<scope>provided</scope>   
 		</dependency>
 		<dependency>
 			<!-- available only in EBR. see <repositories> section at bottom -->
diff --git a/spring-integration-samples/loanshark/script.roo b/spring-integration-samples/loanshark/script.roo
index 31d8925735..4082442aa3 100644
--- a/spring-integration-samples/loanshark/script.roo
+++ b/spring-integration-samples/loanshark/script.roo
@@ -1,4 +1,4 @@
-project --topLevelPackage com.springframework.integration.loanbroker.loanshark3
+project --topLevelPackage com.springframework.samples.integration.loanbroker.loanshark3
 persistence setup --provider HIBERNATE --database HYPERSONIC_IN_MEMORY
 entity --class ~.domain.LoanShark
 field string --fieldName name
@@ -7,6 +7,6 @@ field number --type java.lang.Double --fieldName averageRate
 finder add --finderName findLoanSharksByName
 controller scaffold --class ~.web.SharkController
 logging setup --level DEBUG
-dependency add --artifactId org.springframework.integration.ip --groupId org.springframework.integration --version 2.0.0.M3
+dependency add --artifactId org.springframework.integration.ip --groupId org.springframework.integration --version 2.0.0.M5
 //change spring version in pom.xml to 3.0.0.RELEASE-A before perform eclipse
 //perform eclipse
diff --git a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/biz/Accumulator.java b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/biz/Accumulator.java
similarity index 90%
rename from spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/biz/Accumulator.java
rename to spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/biz/Accumulator.java
index 8733360f6e..1bb6c8b0ff 100644
--- a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/biz/Accumulator.java
+++ b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/biz/Accumulator.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.springframework.integration.loanbroker.loanshark.biz;
+package com.springframework.integration.samples.loanbroker.loanshark.biz;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.springframework.integration.loanbroker.loanshark.domain.LoanShark;
+import com.springframework.integration.samples.loanbroker.loanshark.domain.LoanShark;
 
 /**
  * @author Gary Russell
diff --git a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/biz/SharkQuote.java b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/biz/SharkQuote.java
similarity index 94%
rename from spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/biz/SharkQuote.java
rename to spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/biz/SharkQuote.java
index 48a5fc8b5c..afe00030b3 100644
--- a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/biz/SharkQuote.java
+++ b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/biz/SharkQuote.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.springframework.integration.loanbroker.loanshark.biz;
+package com.springframework.integration.samples.loanbroker.loanshark.biz;
 
 /**
  * @author Gary Russell
diff --git a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/biz/SharkTransformer.java b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/biz/SharkTransformer.java
similarity index 92%
rename from spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/biz/SharkTransformer.java
rename to spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/biz/SharkTransformer.java
index 3ad692dea1..f793bce8f0 100644
--- a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/biz/SharkTransformer.java
+++ b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/biz/SharkTransformer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.springframework.integration.loanbroker.loanshark.biz;
+package com.springframework.integration.samples.loanbroker.loanshark.biz;
 
 /**
  * @author Gary Russell
diff --git a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark.java b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java
similarity index 83%
rename from spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark.java
rename to spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java
index 9af6f0a6c9..424e17829d 100644
--- a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark.java
+++ b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java
@@ -1,4 +1,4 @@
-package com.springframework.integration.loanbroker.loanshark.domain;
+package com.springframework.integration.samples.loanbroker.loanshark.domain;
 
 import javax.persistence.Entity;
 import org.springframework.roo.addon.entity.RooEntity;
diff --git a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_Configurable.aj b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Configurable.aj
similarity index 69%
rename from spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_Configurable.aj
rename to spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Configurable.aj
index 501963648a..ec6b0f0537 100644
--- a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_Configurable.aj
+++ b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Configurable.aj
@@ -1,4 +1,4 @@
-package com.springframework.integration.loanbroker.loanshark.domain;
+package com.springframework.integration.samples.loanbroker.loanshark.domain;
 
 import org.springframework.beans.factory.annotation.Configurable;
 
diff --git a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_Entity.aj b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Entity.aj
similarity index 95%
rename from spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_Entity.aj
rename to spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Entity.aj
index a0d1033f11..4813d1b57f 100644
--- a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_Entity.aj
+++ b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Entity.aj
@@ -1,6 +1,7 @@
-package com.springframework.integration.loanbroker.loanshark.domain;
+package com.springframework.integration.samples.loanbroker.loanshark.domain;
+
+import com.springframework.integration.samples.loanbroker.loanshark.domain.LoanShark;
 
-import com.springframework.integration.loanbroker.loanshark.domain.LoanShark;
 import java.lang.Integer;
 import java.lang.Long;
 import java.util.List;
diff --git a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_Finder.aj b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Finder.aj
similarity index 89%
rename from spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_Finder.aj
rename to spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Finder.aj
index a9b42788f2..d1fb86965f 100644
--- a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_Finder.aj
+++ b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_Finder.aj
@@ -1,4 +1,4 @@
-package com.springframework.integration.loanbroker.loanshark.domain;
+package com.springframework.integration.samples.loanbroker.loanshark.domain;
 
 import java.lang.String;
 import java.lang.SuppressWarnings;
diff --git a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_JavaBean.aj b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_JavaBean.aj
similarity index 89%
rename from spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_JavaBean.aj
rename to spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_JavaBean.aj
index ccbf0b6f99..5b85d5aa78 100644
--- a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_JavaBean.aj
+++ b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_JavaBean.aj
@@ -1,4 +1,4 @@
-package com.springframework.integration.loanbroker.loanshark.domain;
+package com.springframework.integration.samples.loanbroker.loanshark.domain;
 
 import java.lang.Double;
 import java.lang.Long;
diff --git a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_ToString.aj b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_ToString.aj
similarity index 87%
rename from spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_ToString.aj
rename to spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_ToString.aj
index 5a6dae7363..7384985ef5 100644
--- a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/domain/LoanShark_Roo_ToString.aj
+++ b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark_Roo_ToString.aj
@@ -1,4 +1,4 @@
-package com.springframework.integration.loanbroker.loanshark.domain;
+package com.springframework.integration.samples.loanbroker.loanshark.domain;
 
 import java.lang.String;
 
diff --git a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/web/SharkController.java b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java
similarity index 69%
rename from spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/web/SharkController.java
rename to spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java
index b2f13073c4..05f3679f0f 100644
--- a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/web/SharkController.java
+++ b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java
@@ -1,7 +1,9 @@
-package com.springframework.integration.loanbroker.loanshark.web;
+package com.springframework.integration.samples.loanbroker.loanshark.web;
 
 import org.springframework.roo.addon.web.mvc.controller.RooWebScaffold;
-import com.springframework.integration.loanbroker.loanshark.domain.LoanShark;
+
+import com.springframework.integration.samples.loanbroker.loanshark.domain.LoanShark;
+
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.stereotype.Controller;
 
diff --git a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/web/SharkController_Roo_Controller.aj b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/web/SharkController_Roo_Controller.aj
similarity index 96%
rename from spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/web/SharkController_Roo_Controller.aj
rename to spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/web/SharkController_Roo_Controller.aj
index 1b76095ca8..69097dab2d 100644
--- a/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/loanbroker/loanshark/web/SharkController_Roo_Controller.aj
+++ b/spring-integration-samples/loanshark/src/main/java/com/springframework/integration/samples/loanbroker/loanshark/web/SharkController_Roo_Controller.aj
@@ -1,6 +1,7 @@
-package com.springframework.integration.loanbroker.loanshark.web;
+package com.springframework.integration.samples.loanbroker.loanshark.web;
+
+import com.springframework.integration.samples.loanbroker.loanshark.domain.LoanShark;
 
-import com.springframework.integration.loanbroker.loanshark.domain.LoanShark;
 import java.lang.Long;
 import java.lang.String;
 import javax.validation.Valid;
diff --git a/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/applicationContext.xml b/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/applicationContext.xml
index 9deaede3dc..6c32cfda79 100644
--- a/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/applicationContext.xml
+++ b/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/applicationContext.xml
@@ -46,7 +46,7 @@
 		The most commonly used annotation is @Autowired, which instructs Spring to
 		dependency inject an object into your class.
 	-->
-	<context:component-scan base-package="com.springframework.integration.loanbroker.loanshark">
+	<context:component-scan base-package="com.springframework.integration.samples.loanbroker.loanshark">
 		<context:exclude-filter expression=".*_Roo_.*" type="regex"/>
 		<context:exclude-filter expression="org.springframework.stereotype.Controller" type="annotation"/>
 	</context:component-scan>
diff --git a/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/integrationContext.xml b/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/integrationContext.xml
index e58e47f06c..646b004617 100644
--- a/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/integrationContext.xml
+++ b/spring-integration-samples/loanshark/src/main/resources/META-INF/spring/integrationContext.xml
@@ -24,7 +24,7 @@
 		input-channel="transformedChannel"
 		ref="accumulator" />
 		
-	<bean id="accumulator" class="com.springframework.integration.loanbroker.loanshark.biz.Accumulator" />
-	<bean id="transformer" class="com.springframework.integration.loanbroker.loanshark.biz.SharkTransformer" />
+	<bean id="accumulator" class="com.springframework.integration.loanbroker.samples.loanshark.biz.Accumulator" />
+	<bean id="transformer" class="com.springframework.integration.loanbroker.samples.loanshark.biz.SharkTransformer" />
 		
 </beans>
diff --git a/spring-integration-samples/loanshark/src/test/java/com/springframework/integration/loanbroker/loanshark/biz/TestAccumulator.java b/spring-integration-samples/loanshark/src/test/java/com/springframework/integration/samples/loanbroker/loanshark/biz/TestAccumulator.java
similarity index 82%
rename from spring-integration-samples/loanshark/src/test/java/com/springframework/integration/loanbroker/loanshark/biz/TestAccumulator.java
rename to spring-integration-samples/loanshark/src/test/java/com/springframework/integration/samples/loanbroker/loanshark/biz/TestAccumulator.java
index e62e04f1f7..0aeaf96501 100644
--- a/spring-integration-samples/loanshark/src/test/java/com/springframework/integration/loanbroker/loanshark/biz/TestAccumulator.java
+++ b/spring-integration-samples/loanshark/src/test/java/com/springframework/integration/samples/loanbroker/loanshark/biz/TestAccumulator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.springframework.integration.loanbroker.loanshark.biz;
+package com.springframework.integration.samples.loanbroker.loanshark.biz;
 
 
 import static junit.framework.Assert.assertEquals;
@@ -25,7 +25,9 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.springframework.integration.loanbroker.loanshark.domain.LoanShark;
+import com.springframework.integration.samples.loanbroker.loanshark.biz.Accumulator;
+import com.springframework.integration.samples.loanbroker.loanshark.biz.SharkQuote;
+import com.springframework.integration.samples.loanbroker.loanshark.domain.LoanShark;
 
 
 /**