diff --git a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/LoanBrokerGateway.java b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanBrokerGateway.java
similarity index 84%
rename from spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/LoanBrokerGateway.java
rename to spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanBrokerGateway.java
index 1e10aed099..38820a0914 100644
--- a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/LoanBrokerGateway.java
+++ b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanBrokerGateway.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.loanbroker;
+package org.springframework.integration.samples.loanbroker;
 
 import java.util.List;
 
-import org.springframework.integration.loanbroker.domain.LoanQuote;
-import org.springframework.integration.loanbroker.domain.LoanRequest;
+import org.springframework.integration.samples.loanbroker.domain.LoanQuote;
+import org.springframework.integration.samples.loanbroker.domain.LoanRequest;
 
 /**
  * POJI Gateway that connects method invocations to the request-channel.
diff --git a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/LoanQuoteAggregator.java b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanQuoteAggregator.java
similarity index 90%
rename from spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/LoanQuoteAggregator.java
rename to spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanQuoteAggregator.java
index 97ce1d608a..37983e3870 100644
--- a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/LoanQuoteAggregator.java
+++ b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanQuoteAggregator.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.loanbroker;
+package org.springframework.integration.samples.loanbroker;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.springframework.integration.core.Message;
-import org.springframework.integration.loanbroker.domain.LoanQuote;
+import org.springframework.integration.samples.loanbroker.domain.LoanQuote;
 
 /**
  * Aggregates {@link LoanQuote}s based on the value of the 'RESPONSE_TYPE' message header.
  * When only the <i>best</i> quote is desired, the 'RESPONSE_TYPE' header should have a value
  * of 'BEST'. In this example, that value is set by the 'gateway' when the
- * {@link LoanBrokerGateway#getBestLoanQuote(org.springframework.integration.loanbroker.domain.LoanRequest)}
+ * {@link LoanBrokerGateway#getBestLoanQuote(org.springframework.integration.samples.loanbroker.domain.LoanRequest)}
  * method is invoked by the client.
  * 
  * @author Oleg Zhurakousky
diff --git a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/Address.java b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/Address.java
similarity index 94%
rename from spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/Address.java
rename to spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/Address.java
index 99cee8a21b..11f6fa6f0e 100644
--- a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/Address.java
+++ b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/Address.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.loanbroker.domain;
+package org.springframework.integration.samples.loanbroker.domain;
 
 /**
  * @author Oleg Zhurakousky
diff --git a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/CreditScore.java b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/CreditScore.java
similarity index 93%
rename from spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/CreditScore.java
rename to spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/CreditScore.java
index 788d512610..a026ee8d9f 100644
--- a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/CreditScore.java
+++ b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/CreditScore.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.loanbroker.domain;
+package org.springframework.integration.samples.loanbroker.domain;
 
 /**
  * @author Oleg Zhurakousky
diff --git a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/Customer.java b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/Customer.java
similarity index 94%
rename from spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/Customer.java
rename to spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/Customer.java
index f72c899991..6cc11247b3 100644
--- a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/Customer.java
+++ b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/Customer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.loanbroker.domain;
+package org.springframework.integration.samples.loanbroker.domain;
 
 /**
  * @author Oleg Zhurakousky
diff --git a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/LoanQuote.java b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/LoanQuote.java
similarity index 97%
rename from spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/LoanQuote.java
rename to spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/LoanQuote.java
index 5be22f15a4..4c687b3afc 100644
--- a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/LoanQuote.java
+++ b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/LoanQuote.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.loanbroker.domain;
+package org.springframework.integration.samples.loanbroker.domain;
 
 import java.text.DecimalFormat;
 import java.util.Date;
diff --git a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/LoanRequest.java b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/LoanRequest.java
similarity index 93%
rename from spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/LoanRequest.java
rename to spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/LoanRequest.java
index 65bd785fe5..e77667d46a 100644
--- a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/domain/LoanRequest.java
+++ b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/domain/LoanRequest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.loanbroker.domain;
+package org.springframework.integration.samples.loanbroker.domain;
 
 /**
  * @author Oleg Zhurakousky
diff --git a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/stubs/BankStub.java b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/BankStub.java
similarity index 86%
rename from spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/stubs/BankStub.java
rename to spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/BankStub.java
index 4817027da5..3ba62a5e8a 100644
--- a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/stubs/BankStub.java
+++ b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/BankStub.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.loanbroker.stubs;
+package org.springframework.integration.samples.loanbroker.stubs;
 
 import java.util.Calendar;
 import java.util.Random;
 
-import org.springframework.integration.loanbroker.domain.LoanQuote;
-import org.springframework.integration.loanbroker.domain.LoanRequest;
+import org.springframework.integration.samples.loanbroker.domain.LoanQuote;
+import org.springframework.integration.samples.loanbroker.domain.LoanRequest;
 
 /**
  * @author Oleg Zhurakousky
diff --git a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/stubs/CreditBureauStub.java b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java
similarity index 83%
rename from spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/stubs/CreditBureauStub.java
rename to spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java
index 946398c33a..1a8dd015b7 100644
--- a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/stubs/CreditBureauStub.java
+++ b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.loanbroker.stubs;
+package org.springframework.integration.samples.loanbroker.stubs;
 
 import java.util.Random;
 
 import org.apache.log4j.Logger;
 
-import org.springframework.integration.loanbroker.domain.CreditScore;
-import org.springframework.integration.loanbroker.domain.LoanRequest;
+import org.springframework.integration.samples.loanbroker.domain.CreditScore;
+import org.springframework.integration.samples.loanbroker.domain.LoanRequest;
 
 /**
  * @author Oleg Zhurakousky
diff --git a/spring-integration-samples/loan-broker/src/main/resources/loan-broker-config.xml b/spring-integration-samples/loan-broker/src/main/resources/loan-broker-config.xml
index e1dc66245a..55055a27f0 100644
--- a/spring-integration-samples/loan-broker/src/main/resources/loan-broker-config.xml
+++ b/spring-integration-samples/loan-broker/src/main/resources/loan-broker-config.xml
@@ -12,7 +12,7 @@
 
 	<gateway id="loanBrokerGateway"
 			default-request-channel="loanBrokerPreProcessingChannel"
-			service-interface="org.springframework.integration.loanbroker.LoanBrokerGateway">
+			service-interface="org.springframework.integration.samples.loanbroker.LoanBrokerGateway">
 		<method name="getBestLoanQuote">
 			<header name="RESPONSE_TYPE" value="BEST"/>
 		</method>
@@ -31,7 +31,7 @@
 	<!-- Messages are sent to the banks via bank channels and will be received and processed by an aggregator -->
 	
 	<aggregator input-channel="quotesAggregationChannel" method="aggregateQuotes">
-		<beans:bean class="org.springframework.integration.loanbroker.LoanQuoteAggregator"/>
+		<beans:bean class="org.springframework.integration.samples.loanbroker.LoanQuoteAggregator"/>
 	</aggregator>
 	
 </beans:beans>
diff --git a/spring-integration-samples/loan-broker/src/main/resources/stub-services-config.xml b/spring-integration-samples/loan-broker/src/main/resources/stub-services-config.xml
index 140babcd49..da82045522 100644
--- a/spring-integration-samples/loan-broker/src/main/resources/stub-services-config.xml
+++ b/spring-integration-samples/loan-broker/src/main/resources/stub-services-config.xml
@@ -5,9 +5,9 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
 
-	<bean id="creditBureau" class="org.springframework.integration.loanbroker.stubs.CreditBureauStub" />
+	<bean id="creditBureau" class="org.springframework.integration.samples.loanbroker.stubs.CreditBureauStub" />
 
-	<bean id="bankStub" class="org.springframework.integration.loanbroker.stubs.BankStub"/>
+	<bean id="bankStub" class="org.springframework.integration.samples.loanbroker.stubs.BankStub"/>
 
 	<!-- Bank Endpoints (to be rewired to remoting adapters) -->
 	<int:service-activator input-channel="abcBankChannel" output-channel="quotesAggregationChannel" ref="bankStub"/>
diff --git a/spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/loanbroker/demo/LoanBrokerDemo.java b/spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java
similarity index 81%
rename from spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/loanbroker/demo/LoanBrokerDemo.java
rename to spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java
index 93d4dde09b..bf3f39181e 100644
--- a/spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/loanbroker/demo/LoanBrokerDemo.java
+++ b/spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.loanbroker.demo;
+package org.springframework.integration.samples.loanbroker.demo;
 
 import java.util.List;
 
@@ -23,10 +23,10 @@ import org.junit.Test;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.loanbroker.LoanBrokerGateway;
-import org.springframework.integration.loanbroker.domain.Customer;
-import org.springframework.integration.loanbroker.domain.LoanQuote;
-import org.springframework.integration.loanbroker.domain.LoanRequest;
+import org.springframework.integration.samples.loanbroker.LoanBrokerGateway;
+import org.springframework.integration.samples.loanbroker.domain.Customer;
+import org.springframework.integration.samples.loanbroker.domain.LoanQuote;
+import org.springframework.integration.samples.loanbroker.domain.LoanRequest;
 
 /**
  * @author Oleg Zhurakousky
diff --git a/spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/loanbroker/demo/LoanBrokerSharkDetectorDemo.java b/spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java
similarity index 81%
rename from spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/loanbroker/demo/LoanBrokerSharkDetectorDemo.java
rename to spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java
index 5d7478d422..baaa84f696 100644
--- a/spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/loanbroker/demo/LoanBrokerSharkDetectorDemo.java
+++ b/spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.loanbroker.demo;
+package org.springframework.integration.samples.loanbroker.demo;
 
 import java.util.List;
 
@@ -23,10 +23,10 @@ import org.junit.Test;
 
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.loanbroker.LoanBrokerGateway;
-import org.springframework.integration.loanbroker.domain.Customer;
-import org.springframework.integration.loanbroker.domain.LoanQuote;
-import org.springframework.integration.loanbroker.domain.LoanRequest;
+import org.springframework.integration.samples.loanbroker.LoanBrokerGateway;
+import org.springframework.integration.samples.loanbroker.domain.Customer;
+import org.springframework.integration.samples.loanbroker.domain.LoanQuote;
+import org.springframework.integration.samples.loanbroker.domain.LoanRequest;
 
 /**
  * @author Gary Russell
diff --git a/spring-integration-samples/loan-broker/src/test/resources/log4j.xml b/spring-integration-samples/loan-broker/src/test/resources/log4j.xml
index 0b9e8ee789..64f525ef1a 100644
--- a/spring-integration-samples/loan-broker/src/test/resources/log4j.xml
+++ b/spring-integration-samples/loan-broker/src/test/resources/log4j.xml
@@ -11,12 +11,12 @@
 	</appender>
 
 	<!-- Loggers -->
-	<logger name="org.springframework">
-		<level value="warn" />
-	</logger>
+<!--	<logger name="org.springframework">-->
+<!--		<level value="debug" />-->
+<!--	</logger>-->
 
 	<logger name="org.springframework.integration">
-		<level value="warn" />
+		<level value="info" />
 	</logger>
 	
 	<logger name="org.springframework.integration.loanbroker">