diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/TradeWriterLogAdvice.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/TradeWriterLogAdvice.java
index dbf540422..bd24b3f4f 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/TradeWriterLogAdvice.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/TradeWriterLogAdvice.java
@@ -19,7 +19,7 @@ package org.springframework.batch.sample.advice;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.aspectj.lang.JoinPoint;
-import org.springframework.batch.sample.domain.Trade;
+import org.springframework.batch.sample.trade.Trade;
 
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/ExceptionThrowingItemReaderProxy.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxy.java
similarity index 96%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/ExceptionThrowingItemReaderProxy.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxy.java
index ea0c8c0ee..033466625 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/ExceptionThrowingItemReaderProxy.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.item.reader;
+package org.springframework.batch.sample.common;
 
 
 import org.springframework.batch.core.UnexpectedJobExecutionException;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/ItemTrackingItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ItemTrackingItemWriter.java
similarity index 88%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/ItemTrackingItemWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ItemTrackingItemWriter.java
index 84b0b86fc..1335dd460 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/ItemTrackingItemWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ItemTrackingItemWriter.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.common;
 
 import java.util.ArrayList;
 import java.util.List;
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/dao/CustomerCreditDao.java
index fd4e8e656..7a44b5258 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/dao/CustomerCreditDao.java
@@ -16,7 +16,7 @@
 
 package org.springframework.batch.sample.dao;
 
-import org.springframework.batch.sample.domain.CustomerCredit;
+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/dao/CustomerDebitDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerDebitDao.java
index b2125adf1..88c2ab39e 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/dao/CustomerDebitDao.java
@@ -16,7 +16,7 @@
 
 package org.springframework.batch.sample.dao;
 
-import org.springframework.batch.sample.domain.CustomerDebit;
+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/dao/FlatFileCustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java
index d9c1a613c..a1a00ff7d 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/dao/FlatFileCustomerCreditDao.java
@@ -19,7 +19,7 @@ package org.springframework.batch.sample.dao;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.sample.domain.CustomerCredit;
+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/dao/HibernateCreditDao.java
index 38127c049..79e4ebf89 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/dao/HibernateCreditDao.java
@@ -21,7 +21,7 @@ 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.domain.CustomerCredit;
+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/dao/IbatisCustomerCreditDao.java
index 510c8edad..df2b2748e 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/dao/IbatisCustomerCreditDao.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.sample.dao;
 
-import org.springframework.batch.sample.domain.CustomerCredit;
+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/dao/JdbcCustomerDebitDao.java
index 05f023d70..6132c329f 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/dao/JdbcCustomerDebitDao.java
@@ -18,7 +18,7 @@ package org.springframework.batch.sample.dao;
 
 import javax.sql.DataSource;
 
-import org.springframework.batch.sample.domain.CustomerDebit;
+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/dao/JdbcTradeDao.java
index a372d62ce..1f5594302 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/dao/JdbcTradeDao.java
@@ -18,7 +18,7 @@ package org.springframework.batch.sample.dao;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.sample.domain.Trade;
+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/dao/TradeDao.java
index 312401e3e..858a96960 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/dao/TradeDao.java
@@ -16,7 +16,7 @@
 
 package org.springframework.batch.sample.dao;
 
-import org.springframework.batch.sample.domain.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/domain/Game.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Game.java
similarity index 98%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Game.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Game.java
index d49d02b39..c4107ac03 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Game.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Game.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.football;
 
 import java.io.Serializable;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/GameFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/GameFieldSetMapper.java
index d0a5bb053..09041e28f 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/GameFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/GameFieldSetMapper.java
@@ -2,7 +2,6 @@ package org.springframework.batch.sample.football;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
-import org.springframework.batch.sample.domain.Game;
 
 public class GameFieldSetMapper implements FieldSetMapper<Game> {
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcGameDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcGameDao.java
index 3d61e8590..d8f1830eb 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcGameDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcGameDao.java
@@ -3,7 +3,6 @@ package org.springframework.batch.sample.football;
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.sample.domain.Game;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.jdbc.core.simple.SimpleJdbcDaoSupport;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerDao.java
index fa840593c..9118cfd5d 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerDao.java
@@ -3,7 +3,6 @@
  */
 package org.springframework.batch.sample.football;
 
-import org.springframework.batch.sample.domain.Player;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerSummaryDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerSummaryDao.java
index 032ce0a51..9c1eebdb4 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerSummaryDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerSummaryDao.java
@@ -3,7 +3,6 @@ package org.springframework.batch.sample.football;
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.sample.domain.PlayerSummary;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 
 public class JdbcPlayerSummaryDao extends JdbcDaoSupport implements ItemWriter<PlayerSummary> {
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Player.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Player.java
similarity index 95%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Player.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Player.java
index f798f4156..3644fc244 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Player.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Player.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.football;
 
 import java.io.Serializable;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerDao.java
index 1a115de36..1474e103c 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerDao.java
@@ -1,6 +1,5 @@
 package org.springframework.batch.sample.football;
 
-import org.springframework.batch.sample.domain.Player;
 
 /**
  * Interface for writing {@link Player} objects to arbitrary output.
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerFieldSetMapper.java
index fd3a3ab3e..c6bc086b1 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerFieldSetMapper.java
@@ -2,7 +2,6 @@ package org.springframework.batch.sample.football;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
-import org.springframework.batch.sample.domain.Player;
 
 public class PlayerFieldSetMapper implements FieldSetMapper<Player> {
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerItemWriter.java
index 8bf6149c9..dd802e7a4 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerItemWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerItemWriter.java
@@ -1,7 +1,6 @@
 package org.springframework.batch.sample.football;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
-import org.springframework.batch.sample.domain.Player;
 
 public class PlayerItemWriter extends AbstractItemWriter<Player> {
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PlayerSummary.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummary.java
similarity index 97%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PlayerSummary.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummary.java
index 048731904..24b4bb4fb 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PlayerSummary.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummary.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.football;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryMapper.java
index d4e3c0abb..ffcfb313f 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryMapper.java
@@ -18,7 +18,6 @@ package org.springframework.batch.sample.football;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.springframework.batch.sample.domain.PlayerSummary;
 import org.springframework.jdbc.core.RowMapper;
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryRowMapper.java
index 64164e690..e31dbcf8d 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryRowMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryRowMapper.java
@@ -18,7 +18,6 @@ package org.springframework.batch.sample.football;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.springframework.batch.sample.domain.PlayerSummary;
 import org.springframework.jdbc.core.RowMapper;
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/CustomerCredit.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCredit.java
similarity index 97%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/CustomerCredit.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCredit.java
index 30c08a0bb..a8ccfe2a0 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/CustomerCredit.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCredit.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.trade;
 
 import java.math.BigDecimal;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditIncreaseWriter.java
similarity index 89%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditIncreaseWriter.java
index 9c35c96c2..fb2303f93 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditIncreaseWriter.java
@@ -1,10 +1,9 @@
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.trade;
 
 import java.math.BigDecimal;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.sample.dao.CustomerCreditDao;
-import org.springframework.batch.sample.domain.CustomerCredit;
 
 /**
  * Increases customer's credit by fixed amount.
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditRowMapper.java
similarity index 85%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditRowMapper.java
index 247fb940d..48337821a 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditRowMapper.java
@@ -1,9 +1,8 @@
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.trade;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.springframework.batch.sample.domain.CustomerCredit;
 import org.springframework.jdbc.core.RowMapper;
 
 public class CustomerCreditRowMapper implements RowMapper {
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdatePreparedStatementSetter.java
similarity index 92%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdatePreparedStatementSetter.java
index 56152b32c..dd5915a9f 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdatePreparedStatementSetter.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.trade;
 
 import java.math.BigDecimal;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
 import org.springframework.batch.item.database.ItemPreparedStatementSetter;
-import org.springframework.batch.sample.domain.CustomerCredit;
 
 /**
  * @author Dave Syer
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdateWriter.java
similarity index 91%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdateWriter.java
index 820738006..d89715831 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdateWriter.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.trade;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.sample.dao.CustomerCreditDao;
-import org.springframework.batch.sample.domain.CustomerCredit;
 
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/CustomerDebit.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebit.java
similarity index 96%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/CustomerDebit.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebit.java
index 5c93fd49c..5e551d190 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/CustomerDebit.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebit.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.trade;
 
 import java.math.BigDecimal;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerDebitRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebitRowMapper.java
similarity index 91%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerDebitRowMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebitRowMapper.java
index c96c98922..03da33d76 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerDebitRowMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebitRowMapper.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.trade;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.springframework.batch.sample.domain.CustomerDebit;
 import org.springframework.jdbc.core.RowMapper;
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerUpdateWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerUpdateWriter.java
similarity index 88%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerUpdateWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerUpdateWriter.java
index 5d1d95ebe..ef83dfd4e 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerUpdateWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerUpdateWriter.java
@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.trade;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.sample.dao.CustomerDebitDao;
-import org.springframework.batch.sample.domain.CustomerDebit;
-import org.springframework.batch.sample.domain.Trade;
 
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/GeneratingTradeItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/GeneratingTradeItemReader.java
similarity index 92%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/GeneratingTradeItemReader.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/GeneratingTradeItemReader.java
index a58011f15..0950d1827 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/GeneratingTradeItemReader.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/GeneratingTradeItemReader.java
@@ -1,11 +1,10 @@
-package org.springframework.batch.sample.item.reader;
+package org.springframework.batch.sample.trade;
 
 import java.math.BigDecimal;
 
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.MarkFailedException;
 import org.springframework.batch.item.ResetFailedException;
-import org.springframework.batch.sample.domain.Trade;
 
 /**
  * Generates configurable number of {@link Trade} items.
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Trade.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/Trade.java
similarity index 97%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Trade.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/Trade.java
index 666a88391..53ca6a046 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Trade.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/Trade.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.trade;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeFieldSetMapper.java
similarity index 94%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeFieldSetMapper.java
index f13e665dc..54b119a5b 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeFieldSetMapper.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.trade;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.support.AggregateItemReader;
-import org.springframework.batch.sample.domain.Trade;
 
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeRowMapper.java
similarity index 92%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeRowMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeRowMapper.java
index 588473614..cdd142760 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeRowMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeRowMapper.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.trade;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.springframework.batch.sample.domain.Trade;
 import org.springframework.jdbc.core.RowMapper;
 
 public class TradeRowMapper implements RowMapper {
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/TradeWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeWriter.java
similarity index 93%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/TradeWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeWriter.java
index 5a58fba10..106156693 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/TradeWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeWriter.java
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.item.writer;
+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;
-import org.springframework.batch.sample.domain.Trade;
 
 /**
  * Delegates the actual writing to custom DAO delegate. Allows configurable
diff --git a/spring-batch-samples/src/main/resources/CustomerCredit.hbm.xml b/spring-batch-samples/src/main/resources/CustomerCredit.hbm.xml
index 900fffb9f..90b7ca5c7 100644
--- a/spring-batch-samples/src/main/resources/CustomerCredit.hbm.xml
+++ b/spring-batch-samples/src/main/resources/CustomerCredit.hbm.xml
@@ -4,7 +4,7 @@
         "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
-	<class name="org.springframework.batch.sample.domain.CustomerCredit"
+	<class name="org.springframework.batch.sample.trade.CustomerCredit"
 		table="CUSTOMER">
 		<id name="id">
 			<!-- To make the job fail on flush we need assigned IDs -->
diff --git a/spring-batch-samples/src/main/resources/ibatis-customer-credit.xml b/spring-batch-samples/src/main/resources/ibatis-customer-credit.xml
index 14c8ae096..44b7047c1 100644
--- a/spring-batch-samples/src/main/resources/ibatis-customer-credit.xml
+++ b/spring-batch-samples/src/main/resources/ibatis-customer-credit.xml
@@ -4,7 +4,7 @@
 
 <sqlMap namespace="Customer">
 
-  <resultMap id="result" class="org.springframework.batch.sample.domain.CustomerCredit">
+  <resultMap id="result" class="org.springframework.batch.sample.trade.CustomerCredit">
     <result property="name" column="NAME" />
     <result property="credit" column="CREDIT" />
   </resultMap>
@@ -17,7 +17,7 @@
   	select NAME, CREDIT from CUSTOMER where ID = #value#
   </select>
   
-  <update id="updateCredit" parameterClass="org.springframework.batch.sample.domain.CustomerCredit" >
+  <update id="updateCredit" parameterClass="org.springframework.batch.sample.trade.CustomerCredit" >
   	update CUSTOMER set CREDIT = #credit# where NAME = #name#
   </update>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/batchUpdateJob.xml b/spring-batch-samples/src/main/resources/jobs/batchUpdateJob.xml
index aaf00bd63..3a1a9454a 100644
--- a/spring-batch-samples/src/main/resources/jobs/batchUpdateJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/batchUpdateJob.xml
@@ -28,7 +28,7 @@
 			<value><![CDATA[UPDATE CUSTOMER SET CREDIT=? WHERE ID=?]]></value>
 		</property>
 		<property name="itemPreparedStatementSetter">
-			<bean class="org.springframework.batch.sample.item.writer.CustomerCreditUpdatePreparedStatementSetter" />
+			<bean class="org.springframework.batch.sample.trade.CustomerCreditUpdatePreparedStatementSetter" />
 		</property>
 	</bean>
 
@@ -36,7 +36,7 @@
 		<property name="dataSource" ref="dataSource" />
 		<property name="sql" value="SELECT id, name, credit FROM customer " />
 		<property name="mapper">
-			<bean class="org.springframework.batch.sample.mapping.CustomerCreditRowMapper" />
+			<bean class="org.springframework.batch.sample.trade.CustomerCreditRowMapper" />
 		</property>
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
index 5ee0b14fe..3bf2afe9c 100644
--- a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
@@ -25,7 +25,7 @@
 					</property>
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.item.writer.TradeWriter">
+							class="org.springframework.batch.sample.trade.TradeWriter">
 							<property name="dao" ref="tradeDao" />
 						</bean>
 					</property>
@@ -111,7 +111,7 @@
 	</bean>
 
 	<bean id="trade"
-		class="org.springframework.batch.sample.domain.Trade"
+		class="org.springframework.batch.sample.trade.Trade"
 		scope="prototype" />
 
 	<bean id="person"
diff --git a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
index d6bfa529b..25fc7d579 100644
--- a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
@@ -38,7 +38,7 @@
 		<property name="delegates">
 			<list>
 				<bean
-					class="org.springframework.batch.sample.item.writer.TradeWriter">
+					class="org.springframework.batch.sample.trade.TradeWriter">
 					<property name="dao" ref="tradeDao" />
 				</bean>
 				<ref bean="fileItemWriter" />
@@ -98,6 +98,6 @@
 	</bean>
 
 	<bean id="fieldSetMapper"
-		class="org.springframework.batch.sample.mapping.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.trade.TradeFieldSetMapper" />
 
 </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 4709efa44..0ba9fa17b 100644
--- a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
@@ -18,7 +18,7 @@
 					</bean>
 				</property>
 				<property name="itemWriter">
-					<bean class="org.springframework.batch.sample.item.writer.TradeWriter">
+					<bean class="org.springframework.batch.sample.trade.TradeWriter">
 						<property name="dao" ref="tradeDao" />
 					</bean>
 				</property>
@@ -67,6 +67,6 @@
 		</property>
 	</bean>
 
-	<bean id="fieldSetMapper" class="org.springframework.batch.sample.mapping.TradeFieldSetMapper" />
+	<bean id="fieldSetMapper" class="org.springframework.batch.sample.trade.TradeFieldSetMapper" />
 
 </beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
index f307ce10c..b04335c02 100644
--- a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
@@ -33,7 +33,7 @@
 	</bean>
 
 	<bean id="hibernateCreditWriter"
-		class="org.springframework.batch.sample.item.writer.CustomerCreditIncreaseWriter">
+		class="org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter">
 		<property name="customerCreditDao" ref="customerCreditDao" />
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
index f148f8dc8..954af6246 100644
--- a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
@@ -17,7 +17,7 @@
 				<property name="itemReader" ref="ibatisItemReader" />
 				<property name="itemWriter">
 					<bean
-						class="org.springframework.batch.sample.item.writer.CustomerCreditIncreaseWriter">
+						class="org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter">
 						<property name="customerCreditDao">
 							<bean
 								class="org.springframework.batch.sample.dao.IbatisCustomerCreditDao">
diff --git a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
index 81ee70727..bf52a21b4 100644
--- a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
@@ -25,7 +25,7 @@
 			</bean-->
 			<bean id="infiniteStep" parent="simpleStep">
 				<property name="itemReader">
-					<bean id="reader" class="org.springframework.batch.sample.item.reader.GeneratingTradeItemReader">
+					<bean id="reader" class="org.springframework.batch.sample.trade.GeneratingTradeItemReader">
 						<property name="limit" value="1000000" />
 					</bean>
 				</property>
diff --git a/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml b/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml
index 878791555..ca89a9e91 100644
--- a/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml
@@ -23,7 +23,7 @@
 				</property>
 				<property name="itemWriter">
 					<bean
-						class="org.springframework.batch.sample.item.writer.TradeWriter">
+						class="org.springframework.batch.sample.trade.TradeWriter">
 						<property name="dao" ref="tradeDao" />
 					</bean>
 				</property>
@@ -86,6 +86,6 @@
 	</bean>
 
 	<bean id="fieldSetMapper"
-		class="org.springframework.batch.sample.mapping.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.trade.TradeFieldSetMapper" />
 
 </beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
index c1500317f..f9ca8ff79 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
@@ -42,7 +42,7 @@
 	</bean>
 
 	<bean id="tradeLineMapper"
-		class="org.springframework.batch.sample.mapping.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.trade.TradeFieldSetMapper" />
 
 	<bean id="fixedFileDescriptor"
 		class="org.springframework.batch.item.file.transform.PrefixMatchingCompositeLineTokenizer">
diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
index 0aadd448a..382152b1b 100644
--- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
@@ -57,7 +57,7 @@
 					</property>
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.item.writer.TradeWriter">
+							class="org.springframework.batch.sample.trade.TradeWriter">
 							<property name="dao" ref="tradeDao" />
 						</bean>
 					</property>
@@ -115,7 +115,7 @@
 	</bean>
 
 	<bean id="fieldSetMapper"
-		class="org.springframework.batch.sample.mapping.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.trade.TradeFieldSetMapper" />
 
 	<aop:config>
 		<aop:aspect id="moduleLogging" ref="logAdvice">
diff --git a/spring-batch-samples/src/main/resources/jobs/restartSample.xml b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
index 82eaf3a02..ab62f02c8 100644
--- a/spring-batch-samples/src/main/resources/jobs/restartSample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
@@ -22,7 +22,7 @@
 				</property>
 				<property name="itemWriter">
 					<bean
-						class="org.springframework.batch.sample.item.writer.TradeWriter">
+						class="org.springframework.batch.sample.trade.TradeWriter">
 						<property name="dao" ref="tradeDao" />
 					</bean>
 				</property>
@@ -34,7 +34,7 @@
 	<!-- INFRASTRUCTURE SETUP -->
 
 	<bean id="itemReader"
-		class="org.springframework.batch.sample.item.reader.ExceptionThrowingItemReaderProxy">
+		class="org.springframework.batch.sample.common.ExceptionThrowingItemReaderProxy">
 		<property name="itemReader" ref="fileItemReader" />
 	</bean>
 
@@ -81,6 +81,6 @@
 	</bean>
 
 	<bean id="fieldSetMapper"
-		class="org.springframework.batch.sample.mapping.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.trade.TradeFieldSetMapper" />
 
 </beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/retrySample.xml b/spring-batch-samples/src/main/resources/jobs/retrySample.xml
index 61f883c27..1a978a70d 100644
--- a/spring-batch-samples/src/main/resources/jobs/retrySample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/retrySample.xml
@@ -19,7 +19,7 @@
 		</property>
 	</bean>
 
-	<bean id="itemGenerator" class="org.springframework.batch.sample.item.reader.GeneratingTradeItemReader">
+	<bean id="itemGenerator" class="org.springframework.batch.sample.trade.GeneratingTradeItemReader">
 		<property name="limit" value="10" />
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
index b245247a2..09396341e 100644
--- a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
@@ -27,7 +27,7 @@
 					</property>
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.item.writer.TradeWriter"
+							class="org.springframework.batch.sample.trade.TradeWriter"
 							p:dao-ref="tradeDao" p:failure="3" />
 					</property>
 				</bean>
@@ -47,7 +47,7 @@
 	</bean>
 
 	<bean id="itemTrackingWriter"
-		class="org.springframework.batch.sample.item.writer.ItemTrackingItemWriter"
+		class="org.springframework.batch.sample.common.ItemTrackingItemWriter"
 		p:validationFailure="2" />
 
 	<bean id="tradeSqlItemReader"
@@ -57,7 +57,7 @@
 			value="SELECT id, quantity, price, customer from TRADE" />
 		<property name="mapper">
 			<bean
-				class="org.springframework.batch.sample.mapping.TradeRowMapper" />
+				class="org.springframework.batch.sample.trade.TradeRowMapper" />
 		</property>
 	</bean>
 
@@ -68,7 +68,7 @@
 			value="SELECT id, name, credit FROM customer " />
 		<property name="mapper">
 			<bean
-				class="org.springframework.batch.sample.mapping.CustomerCreditRowMapper" />
+				class="org.springframework.batch.sample.trade.CustomerCreditRowMapper" />
 		</property>
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
index b794e74fa..660f3775b 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
@@ -27,7 +27,7 @@
 					</property>
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.item.writer.TradeWriter"
+							class="org.springframework.batch.sample.trade.TradeWriter"
 							p:dao-ref="tradeDao" />
 					</property>
 				</bean>
@@ -36,7 +36,7 @@
 						ref="tradeSqlItemReader" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.item.writer.CustomerUpdateWriter"
+							class="org.springframework.batch.sample.trade.CustomerUpdateWriter"
 							p:dao-ref="customerDao" />
 					</property>
 				</bean>
@@ -45,7 +45,7 @@
 						ref="customerSqlItemReader" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.item.writer.CustomerCreditUpdateWriter"
+							class="org.springframework.batch.sample.trade.CustomerCreditUpdateWriter"
 							p:dao-ref="customerReportItemWriter" />
 					</property>
 				</bean>
@@ -60,7 +60,7 @@
 			value="SELECT id, quantity, price, customer from TRADE" />
 		<property name="mapper">
 			<bean
-				class="org.springframework.batch.sample.mapping.TradeRowMapper" />
+				class="org.springframework.batch.sample.trade.TradeRowMapper" />
 		</property>
 	</bean>
 
@@ -71,7 +71,7 @@
 			value="SELECT id, name, credit FROM customer " />
 		<property name="mapper">
 			<bean
-				class="org.springframework.batch.sample.mapping.CustomerCreditRowMapper" />
+				class="org.springframework.batch.sample.trade.CustomerCreditRowMapper" />
 		</property>
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
index 827a58c6c..90f0749ba 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
@@ -44,7 +44,7 @@
 		<property name="lineTokenizer" ref="tradeFileDescriptor" />
 		<property name="fieldSetMapper">
 			<bean
-				class="org.springframework.batch.sample.mapping.TradeFieldSetMapper" />
+				class="org.springframework.batch.sample.trade.TradeFieldSetMapper" />
 		</property>
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
index 4de6a1140..0fd04608a 100644
--- a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
@@ -62,7 +62,7 @@
 
 	<util:map id="aliases">
 		<entry key="trade"
-			value="org.springframework.batch.sample.domain.Trade" />
+			value="org.springframework.batch.sample.trade.Trade" />
 		<entry key="isin" value="java.lang.String" />
 		<entry key="quantity" value="long" />
 		<entry key="price" value="java.math.BigDecimal" />
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java
index 41f9cf11f..a0133c318 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java
@@ -7,7 +7,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.batch.sample.item.writer.CustomerCreditIncreaseWriter;
+import org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java
index 6ad4a44b2..8502c0867 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java
@@ -4,7 +4,7 @@ import static org.junit.Assert.assertEquals;
 
 import org.apache.commons.io.IOUtils;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.domain.Trade;
+import org.springframework.batch.sample.trade.Trade;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.RowCallbackHandler;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
index bfbac3d5c..82f4e837c 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
@@ -27,8 +27,8 @@ import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.file.transform.LineTokenizer;
-import org.springframework.batch.sample.domain.Trade;
-import org.springframework.batch.sample.mapping.TradeFieldSetMapper;
+import org.springframework.batch.sample.trade.Trade;
+import org.springframework.batch.sample.trade.TradeFieldSetMapper;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.jdbc.core.JdbcOperations;
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 d10ade29c..8e6d326f6 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,8 +3,8 @@ package org.springframework.batch.sample;
 import static org.junit.Assert.*;
 import org.junit.runner.RunWith;
 
-import org.springframework.batch.sample.item.reader.GeneratingTradeItemReader;
 import org.springframework.batch.sample.item.writer.RetrySampleItemWriter;
+import org.springframework.batch.sample.trade.GeneratingTradeItemReader;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java
index 3fc061508..32e621298 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java
@@ -3,7 +3,7 @@ package org.springframework.batch.sample;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.item.writer.ItemTrackingItemWriter;
+import org.springframework.batch.sample.common.ItemTrackingItemWriter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java
index ca090293c..0090b13d3 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java
@@ -27,7 +27,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.batch.sample.domain.Trade;
+import org.springframework.batch.sample.trade.Trade;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.jdbc.core.JdbcOperations;
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 79c5ee495..c283797dc 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
@@ -22,7 +22,7 @@ import org.junit.Test;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.sample.domain.CustomerCredit;
+import org.springframework.batch.sample.trade.CustomerCredit;
 
 import java.math.BigDecimal;
 
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 13261fb22..ae71d2155 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
@@ -18,7 +18,7 @@ package org.springframework.batch.sample.dao;
 import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.domain.CustomerDebit;
+import org.springframework.batch.sample.trade.CustomerDebit;
 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/JdbcGameDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java
index 08ec491c1..7dd2a5d63 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java
@@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.domain.Game;
+import org.springframework.batch.sample.football.Game;
 import org.springframework.batch.sample.football.JdbcGameDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java
index 3d54a7f33..8cf266429 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java
@@ -25,8 +25,8 @@ import javax.sql.DataSource;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.domain.Player;
 import org.springframework.batch.sample.football.JdbcPlayerDao;
+import org.springframework.batch.sample.football.Player;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowCallbackHandler;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java
index 2b8ec324d..0100168d2 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java
@@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.domain.PlayerSummary;
 import org.springframework.batch.sample.football.JdbcPlayerSummaryDao;
+import org.springframework.batch.sample.football.PlayerSummary;
 import org.springframework.batch.sample.football.PlayerSummaryMapper;
 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/dao/JdbcTradeWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java
index facd3d788..fb2dc6148 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,7 +25,7 @@ import javax.sql.DataSource;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.domain.Trade;
+import org.springframework.batch.sample.trade.Trade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowCallbackHandler;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java
index 9a3d81534..30c7fe47d 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java
@@ -2,6 +2,7 @@ package org.springframework.batch.sample.item.reader;
 
 import static org.junit.Assert.assertEquals;
 import org.junit.Test;
+import org.springframework.batch.sample.trade.GeneratingTradeItemReader;
 
 /**
  * Tests for {@link GeneratingTradeItemReader}.
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java
index 2423f113c..79c60d01d 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java
@@ -1,11 +1,19 @@
 package org.springframework.batch.sample.item.reader;
 
-import static org.junit.Assert.*;
-
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Iterator;
 
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.file.mapping.DefaultFieldSet;
 import org.springframework.batch.item.file.mapping.FieldSet;
@@ -16,8 +24,6 @@ import org.springframework.batch.sample.domain.Customer;
 import org.springframework.batch.sample.domain.LineItem;
 import org.springframework.batch.sample.domain.Order;
 import org.springframework.batch.sample.domain.ShippingInfo;
-import org.junit.Before;
-import org.junit.Test;
 
 public class OrderItemReaderTests {
 
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 1953b3a00..69e4c500d 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
@@ -6,7 +6,8 @@ import org.junit.Test;
 import java.math.BigDecimal;
 
 import org.springframework.batch.sample.dao.CustomerCreditDao;
-import org.springframework.batch.sample.domain.CustomerCredit;
+import org.springframework.batch.sample.trade.CustomerCredit;
+import org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter;
 
 /**
  * Tests for {@link CustomerCreditIncreaseWriter}.
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetterTests.java
index 448e76538..67136b3b6 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetterTests.java
@@ -22,7 +22,8 @@ import java.sql.SQLException;
 import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.batch.sample.domain.CustomerCredit;
+import org.springframework.batch.sample.trade.CustomerCredit;
+import org.springframework.batch.sample.trade.CustomerCreditUpdatePreparedStatementSetter;
 
 /**
  * @author Dave Syer
@@ -46,7 +47,7 @@ public class CustomerCreditUpdatePreparedStatementSetterTests {
 	}
 	
 	/**
-	 * Test method for {@link org.springframework.batch.sample.item.writer.CustomerCreditUpdatePreparedStatementSetter#setValues(CustomerCredit, PreparedStatement) }
+	 * Test method for {@link org.springframework.batch.sample.trade.CustomerCreditUpdatePreparedStatementSetter#setValues(CustomerCredit, PreparedStatement) }
 	 * @throws SQLException 
 	 */
 	@Test
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 751a80d3c..9727a8fc0 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
@@ -4,7 +4,8 @@ import java.math.BigDecimal;
 
 import org.easymock.MockControl;
 import org.springframework.batch.sample.dao.CustomerCreditDao;
-import org.springframework.batch.sample.domain.CustomerCredit;
+import org.springframework.batch.sample.trade.CustomerCredit;
+import org.springframework.batch.sample.trade.CustomerCreditUpdateWriter;
 import org.junit.Before;
 import org.junit.Test;
 
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 16080c24a..43c02cc0f 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
@@ -6,8 +6,9 @@ import org.junit.Test;
 import java.math.BigDecimal;
 
 import org.springframework.batch.sample.dao.CustomerDebitDao;
-import org.springframework.batch.sample.domain.CustomerDebit;
-import org.springframework.batch.sample.domain.Trade;
+import org.springframework.batch.sample.trade.CustomerDebit;
+import org.springframework.batch.sample.trade.CustomerUpdateWriter;
+import org.springframework.batch.sample.trade.Trade;
 
 public class CustomerUpdateProcessorTests {
 
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 8502a776a..f27800e1f 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
@@ -4,7 +4,8 @@ import org.easymock.MockControl;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.dao.TradeDao;
-import org.springframework.batch.sample.domain.Trade;
+import org.springframework.batch.sample.trade.Trade;
+import org.springframework.batch.sample.trade.TradeWriter;
 
 public class TradeProcessorTests {
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java
index ce7abb636..9a395a59e 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java
@@ -5,7 +5,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.easymock.MockControl;
-import org.springframework.batch.sample.domain.CustomerCredit;
+import org.springframework.batch.sample.trade.CustomerCredit;
+import org.springframework.batch.sample.trade.CustomerCreditRowMapper;
 import org.springframework.jdbc.core.RowMapper;
 
 public class CustomerCreditRowMapperTests extends AbstractRowMapperTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java
index d4edb468e..8478282ad 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java
@@ -4,7 +4,6 @@ import org.springframework.batch.item.file.mapping.DefaultFieldSet;
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.sample.domain.Customer;
-import org.springframework.batch.sample.mapping.CustomerFieldSetMapper;
 
 public class CustomerFieldSetMapperTests extends AbstractFieldSetMapperTests {
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java
index 4d7deb780..f7f08c889 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java
@@ -6,7 +6,8 @@ import org.springframework.batch.item.file.mapping.DefaultFieldSet;
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.support.AggregateItemReader;
-import org.springframework.batch.sample.domain.Trade;
+import org.springframework.batch.sample.trade.Trade;
+import org.springframework.batch.sample.trade.TradeFieldSetMapper;
 
 import java.math.BigDecimal;
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java
index 8eb4c4862..06dc338be 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java
@@ -5,7 +5,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.easymock.MockControl;
-import org.springframework.batch.sample.domain.Trade;
+import org.springframework.batch.sample.trade.Trade;
+import org.springframework.batch.sample.trade.TradeRowMapper;
 import org.springframework.jdbc.core.RowMapper;
 
 public class TradeRowMapperTests extends AbstractRowMapperTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java
index 505bae62c..5a497d802 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java
@@ -8,7 +8,7 @@ import org.springframework.batch.core.UnexpectedJobExecutionException;
 import org.springframework.batch.item.support.ListItemReader;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
 import org.springframework.batch.repeat.support.RepeatSynchronizationManager;
-import org.springframework.batch.sample.item.reader.ExceptionThrowingItemReaderProxy;
+import org.springframework.batch.sample.common.ExceptionThrowingItemReaderProxy;
 import org.junit.After;
 import org.junit.Test;