diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Person.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/person/Person.java
similarity index 98%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Person.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/person/Person.java
index f1d8783c7..19c3b12c6 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Person.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/person/Person.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.person;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/person/PersonService.java
similarity index 97%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/person/PersonService.java
index a72f66c21..330a0afd4 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/person/PersonService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.person;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PersonWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/person/PersonWriter.java
similarity index 91%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PersonWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/person/PersonWriter.java
index 53cc04f9b..a61962fdc 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PersonWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/person/PersonWriter.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.person;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.item.support.AbstractItemWriter;
-import org.springframework.batch.sample.domain.Person;
 
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/retry/RetrySampleItemWriter.java
similarity index 91%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/retry/RetrySampleItemWriter.java
index 62d07dc51..aff2f1fdf 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/retry/RetrySampleItemWriter.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.retry;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditDao.java
similarity index 88%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerCreditDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditDao.java
index 7a44b5258..a55775e93 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerCreditDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditDao.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.trade;
 
-import org.springframework.batch.sample.trade.CustomerCredit;
 
 /**
  * Interface for writing customer's credit information to output.
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditIncreaseWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditIncreaseWriter.java
index fb2303f93..ec4c15610 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditIncreaseWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditIncreaseWriter.java
@@ -3,7 +3,6 @@ package org.springframework.batch.sample.trade;
 import java.math.BigDecimal;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
-import org.springframework.batch.sample.dao.CustomerCreditDao;
 
 /**
  * Increases customer's credit by fixed amount.
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdateWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdateWriter.java
index d89715831..53753a103 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdateWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdateWriter.java
@@ -17,7 +17,6 @@
 package org.springframework.batch.sample.trade;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
-import org.springframework.batch.sample.dao.CustomerCreditDao;
 
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerDebitDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebitDao.java
similarity index 88%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerDebitDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebitDao.java
index 88c2ab39e..ead43f241 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerDebitDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebitDao.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.trade;
 
-import org.springframework.batch.sample.trade.CustomerDebit;
 
 /**
  * Interface for writing {@link CustomerDebitDao} object to arbitrary output.
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerUpdateWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerUpdateWriter.java
index ef83dfd4e..7d30f55d0 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerUpdateWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerUpdateWriter.java
@@ -17,7 +17,6 @@
 package org.springframework.batch.sample.trade;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
-import org.springframework.batch.sample.dao.CustomerDebitDao;
 
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/FlatFileCustomerCreditDao.java
similarity index 95%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/FlatFileCustomerCreditDao.java
index a1a00ff7d..d136737da 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/FlatFileCustomerCreditDao.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.trade;
 
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.sample.trade.CustomerCredit;
 import org.springframework.beans.factory.DisposableBean;
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/HibernateCreditDao.java
similarity index 96%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/HibernateCreditDao.java
index 79e4ebf89..f4452db81 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/HibernateCreditDao.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.trade;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,7 +21,6 @@ import java.util.List;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.RepeatListener;
-import org.springframework.batch.sample.trade.CustomerCredit;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/IbatisCustomerCreditDao.java
similarity index 93%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/IbatisCustomerCreditDao.java
index df2b2748e..e8bf3f675 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/IbatisCustomerCreditDao.java
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.trade;
 
-import org.springframework.batch.sample.trade.CustomerCredit;
 import org.springframework.orm.ibatis.support.SqlMapClientDaoSupport;
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/JdbcCustomerDebitDao.java
similarity index 93%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/JdbcCustomerDebitDao.java
index 6132c329f..750bf4ea2 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/JdbcCustomerDebitDao.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.trade;
 
 import javax.sql.DataSource;
 
-import org.springframework.batch.sample.trade.CustomerDebit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.simple.SimpleJdbcOperations;
 import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcTradeDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/JdbcTradeDao.java
similarity index 95%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcTradeDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/JdbcTradeDao.java
index 1f5594302..c8929b97e 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcTradeDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/JdbcTradeDao.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.trade;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.sample.trade.Trade;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/TradeDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeDao.java
similarity index 90%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/TradeDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeDao.java
index 858a96960..552c5aae3 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/TradeDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeDao.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.trade;
 
-import org.springframework.batch.sample.trade.Trade;
 
 /**
  * Interface for writing a Trade object to an arbitrary output.
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeWriter.java
index 106156693..dad7a4e8e 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeWriter.java
@@ -19,7 +19,6 @@ package org.springframework.batch.sample.trade;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.item.support.AbstractItemWriter;
-import org.springframework.batch.sample.dao.TradeDao;
 
 /**
  * Delegates the actual writing to custom DAO delegate. Allows configurable
diff --git a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
index 3bf2afe9c..101c61551 100644
--- a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
@@ -35,7 +35,7 @@
 						ref="personFileItemReader" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.item.writer.PersonWriter" />
+							class="org.springframework.batch.sample.person.PersonWriter" />
 					</property>
 				</bean>
 
@@ -91,7 +91,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.dao.JdbcTradeDao">
+		class="org.springframework.batch.sample.trade.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -115,7 +115,7 @@
 		scope="prototype" />
 
 	<bean id="person"
-		class="org.springframework.batch.sample.domain.Person"
+		class="org.springframework.batch.sample.person.Person"
 		scope="prototype" />
 
 </beans>
diff --git a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
index 25fc7d579..2d2a3507e 100644
--- a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
@@ -77,7 +77,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.dao.JdbcTradeDao">
+		class="org.springframework.batch.sample.trade.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
diff --git a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
index 53bcf80e8..d787d9e3a 100644
--- a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
@@ -47,6 +47,6 @@
 	</bean>
 
 	<bean id="delegateObject"
-		class="org.springframework.batch.sample.domain.PersonService" />
+		class="org.springframework.batch.sample.person.PersonService" />
 
 </beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
index 0ba9fa17b..a566c8c1c 100644
--- a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
@@ -57,7 +57,7 @@
 		</property>
 	</bean>
 
-	<bean id="tradeDao" class="org.springframework.batch.sample.dao.JdbcTradeDao">
+	<bean id="tradeDao" class="org.springframework.batch.sample.trade.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
diff --git a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
index b04335c02..7bb7e8a1f 100644
--- a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
@@ -38,7 +38,7 @@
 	</bean>
 
 	<bean id="customerCreditDao"
-		class="org.springframework.batch.sample.dao.HibernateCreditDao">
+		class="org.springframework.batch.sample.trade.HibernateCreditDao">
 		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
index 954af6246..47235c7ea 100644
--- a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
@@ -20,7 +20,7 @@
 						class="org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter">
 						<property name="customerCreditDao">
 							<bean
-								class="org.springframework.batch.sample.dao.IbatisCustomerCreditDao">
+								class="org.springframework.batch.sample.trade.IbatisCustomerCreditDao">
 								<property name="sqlMapClient"
 									ref="sqlMapClient" />
 								<property name="statementId"
diff --git a/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml b/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml
index ca89a9e91..6b6a87779 100644
--- a/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml
@@ -75,7 +75,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.dao.JdbcTradeDao">
+		class="org.springframework.batch.sample.trade.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
index 382152b1b..dd072f708 100644
--- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
@@ -104,7 +104,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.dao.JdbcTradeDao">
+		class="org.springframework.batch.sample.trade.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
diff --git a/spring-batch-samples/src/main/resources/jobs/restartSample.xml b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
index ab62f02c8..4f2ceeafc 100644
--- a/spring-batch-samples/src/main/resources/jobs/restartSample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
@@ -70,7 +70,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.dao.JdbcTradeDao">
+		class="org.springframework.batch.sample.trade.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
diff --git a/spring-batch-samples/src/main/resources/jobs/retrySample.xml b/spring-batch-samples/src/main/resources/jobs/retrySample.xml
index 1a978a70d..1b05fbb29 100644
--- a/spring-batch-samples/src/main/resources/jobs/retrySample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/retrySample.xml
@@ -23,6 +23,6 @@
 		<property name="limit" value="10" />
 	</bean>
 
-	<bean id="itemWriter" class="org.springframework.batch.sample.item.writer.RetrySampleItemWriter" />
+	<bean id="itemWriter" class="org.springframework.batch.sample.retry.RetrySampleItemWriter" />
 
 </beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
index 90f0749ba..212a2054a 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
@@ -9,7 +9,7 @@
  			http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
 
-	<bean class="org.springframework.batch.sample.dao.JdbcTradeDao"
+	<bean class="org.springframework.batch.sample.trade.JdbcTradeDao"
 		id="tradeDao" p:jdbcTemplate-ref="jdbcTemplate">
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -19,11 +19,11 @@
 	</bean>
 
 	<bean
-		class="org.springframework.batch.sample.dao.JdbcCustomerDebitDao"
+		class="org.springframework.batch.sample.trade.JdbcCustomerDebitDao"
 		id="customerDao" p:dataSource-ref="dataSource" />
 
 	<bean
-		class="org.springframework.batch.sample.dao.FlatFileCustomerCreditDao"
+		class="org.springframework.batch.sample.trade.FlatFileCustomerCreditDao"
 		id="customerReportItemWriter">
 		<property name="itemWriter">
 			<bean
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java
index 6388ac980..3232f5be7 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java
@@ -4,7 +4,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.domain.PersonService;
+import org.springframework.batch.sample.person.PersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java
index 685d23f37..feab27c74 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java
@@ -11,7 +11,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.sample.dao.HibernateCreditDao;
+import org.springframework.batch.sample.trade.HibernateCreditDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.orm.hibernate3.HibernateJdbcException;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java
index f8e2ddbee..e5b26947d 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java
@@ -3,7 +3,7 @@ package org.springframework.batch.sample;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.item.writer.RetrySampleItemWriter;
+import org.springframework.batch.sample.retry.RetrySampleItemWriter;
 import org.springframework.batch.sample.trade.GeneratingTradeItemReader;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java
index 294d5949e..02ed82024 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java
@@ -27,6 +27,7 @@ import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.sample.trade.CustomerCredit;
+import org.springframework.batch.sample.trade.FlatFileCustomerCreditDao;
 
 public class FlatFileCustomerCreditDaoTests {
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java
index b6d56a288..2e751e24e 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java
@@ -26,6 +26,7 @@ import javax.sql.DataSource;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.sample.trade.CustomerDebit;
+import org.springframework.batch.sample.trade.JdbcCustomerDebitDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.RowCallbackHandler;
 import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java
index fb2dc6148..a53c49a0d 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java
@@ -25,6 +25,7 @@ import javax.sql.DataSource;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.batch.sample.trade.JdbcTradeDao;
 import org.springframework.batch.sample.trade.Trade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java
index 87729476b..aed57f6f4 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java
@@ -5,8 +5,8 @@ import static org.junit.Assert.assertTrue;
 import java.math.BigDecimal;
 
 import org.junit.Test;
-import org.springframework.batch.sample.dao.CustomerCreditDao;
 import org.springframework.batch.sample.trade.CustomerCredit;
+import org.springframework.batch.sample.trade.CustomerCreditDao;
 import org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter;
 
 /**
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java
index bf3da9feb..a98909599 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java
@@ -5,8 +5,8 @@ import java.math.BigDecimal;
 import org.easymock.MockControl;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.batch.sample.dao.CustomerCreditDao;
 import org.springframework.batch.sample.trade.CustomerCredit;
+import org.springframework.batch.sample.trade.CustomerCreditDao;
 import org.springframework.batch.sample.trade.CustomerCreditUpdateWriter;
 
 public class CustomerCreditUpdateProcessorTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java
index a223bbe33..fe4403f04 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java
@@ -5,8 +5,8 @@ import static org.junit.Assert.assertEquals;
 import java.math.BigDecimal;
 
 import org.junit.Test;
-import org.springframework.batch.sample.dao.CustomerDebitDao;
 import org.springframework.batch.sample.trade.CustomerDebit;
+import org.springframework.batch.sample.trade.CustomerDebitDao;
 import org.springframework.batch.sample.trade.CustomerUpdateWriter;
 import org.springframework.batch.sample.trade.Trade;
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java
index 0e7cb37f7..3d04e7adc 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java
@@ -4,6 +4,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import org.junit.Test;
+import org.springframework.batch.sample.retry.RetrySampleItemWriter;
 
 /**
  * Tests for {@link RetrySampleItemWriter}.
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java
index f27800e1f..3d033ad0a 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java
@@ -3,8 +3,8 @@ package org.springframework.batch.sample.item.writer;
 import org.easymock.MockControl;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.batch.sample.dao.TradeDao;
 import org.springframework.batch.sample.trade.Trade;
+import org.springframework.batch.sample.trade.TradeDao;
 import org.springframework.batch.sample.trade.TradeWriter;
 
 public class TradeProcessorTests {
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests-context.xml
index 0f0aa9908..f6c89efa5 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests-context.xml
@@ -6,6 +6,6 @@
 
 	<import resource="classpath:data-source-context.xml"/>
 
-	<bean class="org.springframework.batch.sample.dao.JdbcCustomerDebitDao"/>
+	<bean class="org.springframework.batch.sample.trade.JdbcCustomerDebitDao"/>
 
 </beans>
\ No newline at end of file