diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/FootballExceptionHandler.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/FootballExceptionHandler.java
similarity index 90%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/FootballExceptionHandler.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/FootballExceptionHandler.java
index f90c47cff..ba6796b00 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/FootballExceptionHandler.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/FootballExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/GameFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/GameFieldSetMapper.java
similarity index 88%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/GameFieldSetMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/GameFieldSetMapper.java
index f112cbd03..1fdf70e26 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/GameFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/GameFieldSetMapper.java
@@ -1,7 +1,8 @@
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.sample.domain.football.Game;
 
 public class GameFieldSetMapper implements FieldSetMapper<Game> {
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcGameDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDao.java
similarity index 93%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcGameDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDao.java
index 80e1ede78..be1417a11 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcGameDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDao.java
@@ -1,8 +1,9 @@
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;
 import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.sample.domain.football.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/domain/football/JdbcPlayerDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerDao.java
similarity index 76%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcPlayerDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerDao.java
index cf309ccc1..3d0a34db5 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcPlayerDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerDao.java
@@ -1,8 +1,10 @@
 /**
  * 
  */
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
+import org.springframework.batch.sample.domain.football.Player;
+import org.springframework.batch.sample.domain.football.PlayerDao;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcPlayerSummaryDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDao.java
similarity index 90%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcPlayerSummaryDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDao.java
index fe131d126..18363d10a 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcPlayerSummaryDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDao.java
@@ -1,8 +1,9 @@
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;
 import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.sample.domain.football.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/football/PlayerFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerFieldSetMapper.java
similarity index 82%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerFieldSetMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerFieldSetMapper.java
index 8a3178535..394e0ca56 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerFieldSetMapper.java
@@ -1,7 +1,8 @@
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.sample.domain.football.Player;
 
 public class PlayerFieldSetMapper implements FieldSetMapper<Player> {
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerItemWriter.java
similarity index 63%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerItemWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerItemWriter.java
index 229dbb38c..e44de24e9 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerItemWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerItemWriter.java
@@ -1,6 +1,8 @@
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
+import org.springframework.batch.sample.domain.football.Player;
+import org.springframework.batch.sample.domain.football.PlayerDao;
 
 public class PlayerItemWriter extends AbstractItemWriter<Player> {
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummaryMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryMapper.java
similarity index 92%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummaryMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryMapper.java
index 66624f0a3..1e9b46733 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummaryMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryMapper.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.springframework.batch.sample.domain.football.PlayerSummary;
 import org.springframework.jdbc.core.RowMapper;
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummaryRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryRowMapper.java
similarity index 92%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummaryRowMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryRowMapper.java
index adc58f0ea..7d5f3f787 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummaryRowMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryRowMapper.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.springframework.batch.sample.domain.football.PlayerSummary;
 import org.springframework.jdbc.core.RowMapper;
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/AddressFieldSetMapper.java
similarity index 93%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/AddressFieldSetMapper.java
index d1ae190fe..b628ee3fe 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/AddressFieldSetMapper.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order;
+package org.springframework.batch.sample.domain.order.internal;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.sample.domain.order.Address;
 
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/BillingFieldSetMapper.java
similarity index 90%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/BillingFieldSetMapper.java
index 520af860e..8b717e22f 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/BillingFieldSetMapper.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order;
+package org.springframework.batch.sample.domain.order.internal;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.sample.domain.order.BillingInfo;
 
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/CustomerFieldSetMapper.java
similarity index 94%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/CustomerFieldSetMapper.java
index 1300bc55f..f825f1c26 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/CustomerFieldSetMapper.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order;
+package org.springframework.batch.sample.domain.order.internal;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.sample.domain.order.Customer;
 
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/HeaderFieldSetMapper.java
similarity index 90%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/HeaderFieldSetMapper.java
index 5c3782514..3385ffc5f 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/HeaderFieldSetMapper.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order;
+package org.springframework.batch.sample.domain.order.internal;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.sample.domain.order.Order;
 
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemFieldSetMapper.java
similarity index 94%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemFieldSetMapper.java
index bb9fb09fb..936c069eb 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemFieldSetMapper.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order;
+package org.springframework.batch.sample.domain.order.internal;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.sample.domain.order.LineItem;
 
 
 public class OrderItemFieldSetMapper implements FieldSetMapper<LineItem> {
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java
similarity index 92%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderItemReader.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java
index fcc1d8cdc..6c13b1283 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderItemReader.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order;
+package org.springframework.batch.sample.domain.order.internal;
 
 import java.util.ArrayList;
 
@@ -24,6 +24,12 @@ import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.support.AbstractItemReader;
+import org.springframework.batch.sample.domain.order.Address;
+import org.springframework.batch.sample.domain.order.BillingInfo;
+import org.springframework.batch.sample.domain.order.Customer;
+import org.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.Order;
+import org.springframework.batch.sample.domain.order.ShippingInfo;
 
 /**
  * @author peter.zozom
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderTransformer.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderTransformer.java
similarity index 91%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderTransformer.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderTransformer.java
index 8000178ff..ed6962bf1 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderTransformer.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderTransformer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order;
+package org.springframework.batch.sample.domain.order.internal;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -25,6 +25,11 @@ import org.springframework.batch.item.file.mapping.DefaultFieldSet;
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.transform.LineAggregator;
 import org.springframework.batch.item.transform.ItemTransformer;
+import org.springframework.batch.sample.domain.order.Address;
+import org.springframework.batch.sample.domain.order.BillingInfo;
+import org.springframework.batch.sample.domain.order.Customer;
+import org.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.Order;
 
 /**
  * Converts <code>Order</code> object to a String.
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/ShippingFieldSetMapper.java
similarity index 91%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/ShippingFieldSetMapper.java
index 2126338cb..69197bc8b 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/ShippingFieldSetMapper.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order;
+package org.springframework.batch.sample.domain.order.internal;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.sample.domain.order.ShippingInfo;
 
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/FutureDateFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/FutureDateFunction.java
similarity index 96%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/FutureDateFunction.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/FutureDateFunction.java
index 9686a9b12..3e05664d4 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/FutureDateFunction.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/FutureDateFunction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import java.util.Date;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/TotalOrderItemsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/TotalOrderItemsFunction.java
similarity index 96%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/TotalOrderItemsFunction.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/TotalOrderItemsFunction.java
index 233c206eb..c55d032b7 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/TotalOrderItemsFunction.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/TotalOrderItemsFunction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateDiscountsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateDiscountsFunction.java
similarity index 97%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateDiscountsFunction.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateDiscountsFunction.java
index a0e7ac107..38fcc23fb 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateDiscountsFunction.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateDiscountsFunction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateHandlingPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateHandlingPricesFunction.java
similarity index 96%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateHandlingPricesFunction.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateHandlingPricesFunction.java
index 9a93686ae..29558b768 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateHandlingPricesFunction.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateHandlingPricesFunction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateIdsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateIdsFunction.java
similarity index 95%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateIdsFunction.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateIdsFunction.java
index a4464468d..85f08feb0 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateIdsFunction.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateIdsFunction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import java.util.List;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidatePricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidatePricesFunction.java
similarity index 96%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidatePricesFunction.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidatePricesFunction.java
index 89560e8aa..7157abc86 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidatePricesFunction.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidatePricesFunction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateQuantitiesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateQuantitiesFunction.java
similarity index 96%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateQuantitiesFunction.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateQuantitiesFunction.java
index 1bde2c15d..fbb17e77d 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateQuantitiesFunction.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateQuantitiesFunction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import java.util.List;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateShippingPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateShippingPricesFunction.java
similarity index 96%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateShippingPricesFunction.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateShippingPricesFunction.java
index 0ce4cefc3..e393a9273 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateShippingPricesFunction.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateShippingPricesFunction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateTotalPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateTotalPricesFunction.java
similarity index 97%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateTotalPricesFunction.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateTotalPricesFunction.java
index 654afa362..3bf54744d 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateTotalPricesFunction.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateTotalPricesFunction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Customer.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Customer.java
similarity index 95%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Customer.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Customer.java
index 1853e9c01..74e2f6554 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Customer.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Customer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order.xml;
+package org.springframework.batch.sample.domain.order.internal.xml;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/LineItem.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/LineItem.java
similarity index 95%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/LineItem.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/LineItem.java
index 4c8a467cf..e614ce449 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/LineItem.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/LineItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order.xml;
+package org.springframework.batch.sample.domain.order.internal.xml;
 
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Order.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Order.java
similarity index 95%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Order.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Order.java
index 33e9fb668..f18ba4cd9 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Order.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Order.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order.xml;
+package org.springframework.batch.sample.domain.order.internal.xml;
 
 import java.util.Date;
 import java.util.List;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Shipper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Shipper.java
similarity index 94%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Shipper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Shipper.java
index 51a6d5bdc..696e28cd1 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Shipper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Shipper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order.xml;
+package org.springframework.batch.sample.domain.order.internal.xml;
 
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/internal/PersonWriter.java
similarity index 90%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/internal/PersonWriter.java
index c63473535..7273c9d1e 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/internal/PersonWriter.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.person;
+package org.springframework.batch.sample.domain.person.internal;
 
 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.Person;
 
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditIncreaseWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseWriter.java
similarity index 82%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditIncreaseWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseWriter.java
index a5f4f6404..a14126e27 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditIncreaseWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseWriter.java
@@ -1,8 +1,10 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.math.BigDecimal;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
 
 /**
  * Increases customer's credit by fixed amount.
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapper.java
similarity index 83%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditRowMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapper.java
index 7d0a98b67..f6db64c4c 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditRowMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapper.java
@@ -1,8 +1,9 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.springframework.batch.sample.domain.trade.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/domain/trade/CustomerCreditUpdatePreparedStatementSetter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetter.java
similarity index 91%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdatePreparedStatementSetter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetter.java
index 9baaf92e7..b029f73ab 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdatePreparedStatementSetter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetter.java
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 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.trade.CustomerCredit;
 
 /**
  * @author Dave Syer
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdateWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateWriter.java
similarity index 85%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdateWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateWriter.java
index 0717fd901..ef2aa03f7 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdateWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateWriter.java
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
 
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebitRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerDebitRowMapper.java
similarity index 90%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebitRowMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerDebitRowMapper.java
index c550a007b..09a02190d 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebitRowMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerDebitRowMapper.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.springframework.batch.sample.domain.trade.CustomerDebit;
 import org.springframework.jdbc.core.RowMapper;
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateWriter.java
similarity index 82%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateWriter.java
index 7f0502bd5..e81bc41a9 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateWriter.java
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
+import org.springframework.batch.sample.domain.trade.CustomerDebit;
+import org.springframework.batch.sample.domain.trade.CustomerDebitDao;
+import org.springframework.batch.sample.domain.trade.Trade;
 
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/FlatFileCustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDao.java
similarity index 91%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/FlatFileCustomerCreditDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDao.java
index b134daee1..4f1a3079b 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/FlatFileCustomerCreditDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDao.java
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
 import org.springframework.beans.factory.DisposableBean;
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/GeneratingTradeItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/GeneratingTradeItemReader.java
similarity index 91%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/GeneratingTradeItemReader.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/GeneratingTradeItemReader.java
index 245d29106..bf3d64e22 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/GeneratingTradeItemReader.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/GeneratingTradeItemReader.java
@@ -1,10 +1,11 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 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.Trade;
 
 /**
  * Generates configurable number of {@link Trade} items.
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/HibernateCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/HibernateCreditDao.java
similarity index 89%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/HibernateCreditDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/HibernateCreditDao.java
index 3175c1dab..622c85fe2 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/HibernateCreditDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/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.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,6 +21,8 @@ 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.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**
@@ -46,7 +48,7 @@ public class HibernateCreditDao extends HibernateDaoSupport implements
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.springframework.batch.sample.domain.trade.CustomerCreditWriter#write(org.springframework.batch.sample.domain.CustomerCredit)
+	 * @see org.springframework.batch.sample.domain.trade.internal.CustomerCreditWriter#write(org.springframework.batch.sample.domain.CustomerCredit)
 	 */
 	public void writeCredit(CustomerCredit customerCredit) {
 		if (customerCredit.getId() == failOnFlush) {
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/IbatisCustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/IbatisCustomerCreditDao.java
similarity index 78%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/IbatisCustomerCreditDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/IbatisCustomerCreditDao.java
index 71b4dbb63..23342431b 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/IbatisCustomerCreditDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/IbatisCustomerCreditDao.java
@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
 import org.springframework.orm.ibatis.support.SqlMapClientDaoSupport;
 
 /**
@@ -27,7 +29,7 @@ public class IbatisCustomerCreditDao extends SqlMapClientDaoSupport
 	String statementId;
 
 	/* (non-Javadoc)
-	 * @see org.springframework.batch.sample.domain.trade.CustomerCreditWriter#write(org.springframework.batch.sample.domain.CustomerCredit)
+	 * @see org.springframework.batch.sample.domain.trade.internal.CustomerCreditWriter#write(org.springframework.batch.sample.domain.CustomerCredit)
 	 */
 	public void writeCredit(CustomerCredit customerCredit) {
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/JdbcCustomerDebitDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDao.java
similarity index 87%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/JdbcCustomerDebitDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDao.java
index 6a18655a7..9ae088a9c 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/JdbcCustomerDebitDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDao.java
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import javax.sql.DataSource;
 
+import org.springframework.batch.sample.domain.trade.CustomerDebit;
+import org.springframework.batch.sample.domain.trade.CustomerDebitDao;
 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/domain/trade/JdbcTradeDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeDao.java
similarity index 91%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/JdbcTradeDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeDao.java
index 0cf64e6da..e7e744991 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/JdbcTradeDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeDao.java
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.sample.domain.trade.TradeDao;
 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/domain/trade/TradeFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java
similarity index 93%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeFieldSetMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java
index c734ea2a1..5e177dcfb 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 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.Trade;
 
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapper.java
similarity index 91%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeRowMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapper.java
index bf8461a83..9e372a8ca 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeRowMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapper.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.springframework.batch.sample.domain.trade.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/domain/trade/TradeWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeWriter.java
similarity index 89%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeWriter.java
index 5a312ba64..66e79fd36 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeWriter.java
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 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.trade.Trade;
+import org.springframework.batch.sample.domain.trade.TradeDao;
 
 /**
  * Delegates the actual writing to custom DAO delegate. Allows configurable
diff --git a/spring-batch-samples/src/main/resources/jobs/batchUpdateJob.xml b/spring-batch-samples/src/main/resources/jobs/batchUpdateJob.xml
index 8f397720c..1f0bd8370 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.domain.trade.CustomerCreditUpdatePreparedStatementSetter" />
+			<bean class="org.springframework.batch.sample.domain.trade.internal.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.domain.trade.CustomerCreditRowMapper" />
+			<bean class="org.springframework.batch.sample.domain.trade.internal.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 4235323d0..98a1b12c4 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.domain.trade.TradeWriter">
+							class="org.springframework.batch.sample.domain.trade.internal.TradeWriter">
 							<property name="dao" ref="tradeDao" />
 						</bean>
 					</property>
@@ -35,7 +35,7 @@
 						ref="personFileItemReader" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.domain.person.PersonWriter" />
+							class="org.springframework.batch.sample.domain.person.internal.PersonWriter" />
 					</property>
 				</bean>
 
@@ -91,7 +91,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.domain.trade.JdbcTradeDao">
+		class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
diff --git a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
index 919f3c8c7..ae0174633 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.domain.trade.TradeWriter">
+					class="org.springframework.batch.sample.domain.trade.internal.TradeWriter">
 					<property name="dao" ref="tradeDao" />
 				</bean>
 				<ref bean="fileItemWriter" />
@@ -77,7 +77,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.domain.trade.JdbcTradeDao">
+		class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -98,6 +98,6 @@
 	</bean>
 
 	<bean id="fieldSetMapper"
-		class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.trade.internal.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 210271855..b2cea9229 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.domain.trade.TradeWriter">
+					<bean class="org.springframework.batch.sample.domain.trade.internal.TradeWriter">
 						<property name="dao" ref="tradeDao" />
 					</bean>
 				</property>
@@ -57,7 +57,7 @@
 		</property>
 	</bean>
 
-	<bean id="tradeDao" class="org.springframework.batch.sample.domain.trade.JdbcTradeDao">
+	<bean id="tradeDao" class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -67,6 +67,6 @@
 		</property>
 	</bean>
 
-	<bean id="fieldSetMapper" class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" />
+	<bean id="fieldSetMapper" class="org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper" />
 
 </beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
index b29f68e46..101e0e2ee 100644
--- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
@@ -19,10 +19,10 @@
 						ref="playerFileItemReader" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.domain.football.PlayerItemWriter">
+							class="org.springframework.batch.sample.domain.football.internal.PlayerItemWriter">
 							<property name="playerDao">
 								<bean
-									class="org.springframework.batch.sample.domain.football.JdbcPlayerDao">
+									class="org.springframework.batch.sample.domain.football.internal.JdbcPlayerDao">
 									<property name="dataSource"
 										ref="dataSource" />
 								</bean>
@@ -35,7 +35,7 @@
 						ref="gameFileItemReader" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.domain.football.JdbcGameDao">
+							class="org.springframework.batch.sample.domain.football.internal.JdbcGameDao">
 							<property name="dataSource"
 								ref="dataSource" />
 						</bean>
@@ -48,7 +48,7 @@
 						ref="playerSummarizationSource" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.domain.football.JdbcPlayerSummaryDao">
+							class="org.springframework.batch.sample.domain.football.internal.JdbcPlayerSummaryDao">
 							<property name="dataSource"
 								ref="dataSource" />
 						</bean>
@@ -71,7 +71,7 @@
 		</property>
 		<property name="fieldSetMapper">
 			<bean
-				class="org.springframework.batch.sample.domain.football.PlayerFieldSetMapper" />
+				class="org.springframework.batch.sample.domain.football.internal.PlayerFieldSetMapper" />
 		</property>
 	</bean>
 
@@ -88,7 +88,7 @@
 		</property>
 		<property name="fieldSetMapper">
 			<bean
-				class="org.springframework.batch.sample.domain.football.GameFieldSetMapper" />
+				class="org.springframework.batch.sample.domain.football.internal.GameFieldSetMapper" />
 		</property>
 	</bean>
 
@@ -97,7 +97,7 @@
 		<property name="dataSource" ref="dataSource" />
 		<property name="mapper">
 			<bean
-				class="org.springframework.batch.sample.domain.football.PlayerSummaryMapper" />
+				class="org.springframework.batch.sample.domain.football.internal.PlayerSummaryMapper" />
 		</property>
 		<property name="sql">
 			<value>
diff --git a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
index 4624c0a73..a8b021daf 100644
--- a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
@@ -33,12 +33,12 @@
 	</bean>
 
 	<bean id="hibernateCreditWriter"
-		class="org.springframework.batch.sample.domain.trade.CustomerCreditIncreaseWriter">
+		class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseWriter">
 		<property name="customerCreditDao" ref="customerCreditDao" />
 	</bean>
 
 	<bean id="customerCreditDao"
-		class="org.springframework.batch.sample.domain.trade.HibernateCreditDao">
+		class="org.springframework.batch.sample.domain.trade.internal.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 555aa9d57..f2f2e1751 100644
--- a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
@@ -17,10 +17,10 @@
 				<property name="itemReader" ref="ibatisItemReader" />
 				<property name="itemWriter">
 					<bean
-						class="org.springframework.batch.sample.domain.trade.CustomerCreditIncreaseWriter">
+						class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseWriter">
 						<property name="customerCreditDao">
 							<bean
-								class="org.springframework.batch.sample.domain.trade.IbatisCustomerCreditDao">
+								class="org.springframework.batch.sample.domain.trade.internal.IbatisCustomerCreditDao">
 								<property name="sqlMapClient"
 									ref="sqlMapClient" />
 								<property name="statementId"
diff --git a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
index aa37d86c2..d61ca1057 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.domain.trade.GeneratingTradeItemReader">
+					<bean id="reader" class="org.springframework.batch.sample.domain.trade.internal.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 b3bfd20d7..3bb349bf1 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.domain.trade.TradeWriter">
+						class="org.springframework.batch.sample.domain.trade.internal.TradeWriter">
 						<property name="dao" ref="tradeDao" />
 					</bean>
 				</property>
@@ -75,7 +75,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.domain.trade.JdbcTradeDao">
+		class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -86,6 +86,6 @@
 	</bean>
 
 	<bean id="fieldSetMapper"
-		class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.trade.internal.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 40ca9612e..717b575d3 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.domain.trade.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper" />
 
 	<bean id="fixedFileDescriptor"
 		class="org.springframework.batch.item.file.transform.PrefixMatchingCompositeLineTokenizer">
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
index f6efe5d92..05184f441 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
@@ -25,7 +25,7 @@
 						class="org.springframework.batch.item.validator.ValidatingItemReader">
 						<property name="itemReader">
 							<bean
-								class="org.springframework.batch.sample.domain.order.OrderItemReader">
+								class="org.springframework.batch.sample.domain.order.internal.OrderItemReader">
 								<property name="fieldSetReader"
 									ref="fileItemReader" />
 								<property name="headerMapper"
@@ -55,24 +55,24 @@
 		<property name="delegate" ref="flatFileTransformerWriter" />
 		<property name="itemTransformer">
 			<bean
-				class="org.springframework.batch.sample.domain.order.OrderTransformer">
+				class="org.springframework.batch.sample.domain.order.internal.OrderTransformer">
 				<property name="aggregators" ref="outputAggregators" />
 			</bean>
 		</property>
 	</bean>
 
 	<bean id="headerFieldSetMapper"
-		class="org.springframework.batch.sample.domain.order.HeaderFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.order.internal.HeaderFieldSetMapper" />
 	<bean id="customerFieldSetMapper"
-		class="org.springframework.batch.sample.domain.order.CustomerFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.order.internal.CustomerFieldSetMapper" />
 	<bean id="addressFieldSetMapper"
-		class="org.springframework.batch.sample.domain.order.AddressFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.order.internal.AddressFieldSetMapper" />
 	<bean id="billingFieldSetMapper"
-		class="org.springframework.batch.sample.domain.order.BillingFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.order.internal.BillingFieldSetMapper" />
 	<bean id="orderItemFieldSetMapper"
-		class="org.springframework.batch.sample.domain.order.OrderItemFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.order.internal.OrderItemFieldSetMapper" />
 	<bean id="shippingFieldSetMapper"
-		class="org.springframework.batch.sample.domain.order.ShippingFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.order.internal.ShippingFieldSetMapper" />
 
 	<bean id="validator"
 		class="org.springframework.batch.item.validator.SpringValidator">
@@ -131,23 +131,23 @@
 				<property name="customFunctions">
 					<map>
 						<entry key="isFutureDate"
-							value="org.springframework.batch.sample.domain.order.valang.FutureDateFunction" />
+							value="org.springframework.batch.sample.domain.order.internal.valang.FutureDateFunction" />
 						<entry key="validateTotalItemsCount"
-							value="org.springframework.batch.sample.domain.order.valang.TotalOrderItemsFunction" />
+							value="org.springframework.batch.sample.domain.order.internal.valang.TotalOrderItemsFunction" />
 						<entry key="validateIds"
-							value="org.springframework.batch.sample.domain.order.valang.ValidateIdsFunction" />
+							value="org.springframework.batch.sample.domain.order.internal.valang.ValidateIdsFunction" />
 						<entry key="validatePrices"
-							value="org.springframework.batch.sample.domain.order.valang.ValidatePricesFunction" />
+							value="org.springframework.batch.sample.domain.order.internal.valang.ValidatePricesFunction" />
 						<entry key="validateDiscounts"
-							value="org.springframework.batch.sample.domain.order.valang.ValidateDiscountsFunction" />
+							value="org.springframework.batch.sample.domain.order.internal.valang.ValidateDiscountsFunction" />
 						<entry key="validateShippingPrices"
-							value="org.springframework.batch.sample.domain.order.valang.ValidateShippingPricesFunction" />
+							value="org.springframework.batch.sample.domain.order.internal.valang.ValidateShippingPricesFunction" />
 						<entry key="validateHandlingPrices"
-							value="org.springframework.batch.sample.domain.order.valang.ValidateHandlingPricesFunction" />
+							value="org.springframework.batch.sample.domain.order.internal.valang.ValidateHandlingPricesFunction" />
 						<entry key="validateQuantities"
-							value="org.springframework.batch.sample.domain.order.valang.ValidateQuantitiesFunction" />
+							value="org.springframework.batch.sample.domain.order.internal.valang.ValidateQuantitiesFunction" />
 						<entry key="validateTotalPrices"
-							value="org.springframework.batch.sample.domain.order.valang.ValidateTotalPricesFunction" />
+							value="org.springframework.batch.sample.domain.order.internal.valang.ValidateTotalPricesFunction" />
 					</map>
 				</property>
 			</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
index f549bdaf9..898964b5c 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.domain.trade.TradeWriter">
+							class="org.springframework.batch.sample.domain.trade.internal.TradeWriter">
 							<property name="dao" ref="tradeDao" />
 						</bean>
 					</property>
@@ -104,7 +104,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.domain.trade.JdbcTradeDao">
+		class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -115,7 +115,7 @@
 	</bean>
 
 	<bean id="fieldSetMapper"
-		class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.trade.internal.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 87e69d1e8..293e05f5a 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.domain.trade.TradeWriter">
+						class="org.springframework.batch.sample.domain.trade.internal.TradeWriter">
 						<property name="dao" ref="tradeDao" />
 					</bean>
 				</property>
@@ -70,7 +70,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.domain.trade.JdbcTradeDao">
+		class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -81,6 +81,6 @@
 	</bean>
 
 	<bean id="fieldSetMapper"
-		class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.trade.internal.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 423fc5b74..a47f51388 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.domain.trade.GeneratingTradeItemReader">
+	<bean id="itemGenerator" class="org.springframework.batch.sample.domain.trade.internal.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 6ca986125..1e1189d9a 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.domain.trade.TradeWriter"
+							class="org.springframework.batch.sample.domain.trade.internal.TradeWriter"
 							p:dao-ref="tradeDao" p:failure="3" />
 					</property>
 				</bean>
@@ -57,7 +57,7 @@
 			value="SELECT id, quantity, price, customer from TRADE" />
 		<property name="mapper">
 			<bean
-				class="org.springframework.batch.sample.domain.trade.TradeRowMapper" />
+				class="org.springframework.batch.sample.domain.trade.internal.TradeRowMapper" />
 		</property>
 	</bean>
 
@@ -68,7 +68,7 @@
 			value="SELECT id, name, credit FROM customer " />
 		<property name="mapper">
 			<bean
-				class="org.springframework.batch.sample.domain.trade.CustomerCreditRowMapper" />
+				class="org.springframework.batch.sample.domain.trade.internal.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 7e8660d35..b3bb077d6 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.domain.trade.TradeWriter"
+							class="org.springframework.batch.sample.domain.trade.internal.TradeWriter"
 							p:dao-ref="tradeDao" />
 					</property>
 				</bean>
@@ -36,7 +36,7 @@
 						ref="tradeSqlItemReader" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.domain.trade.CustomerUpdateWriter"
+							class="org.springframework.batch.sample.domain.trade.internal.CustomerUpdateWriter"
 							p:dao-ref="customerDao" />
 					</property>
 				</bean>
@@ -45,7 +45,7 @@
 						ref="customerSqlItemReader" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.domain.trade.CustomerCreditUpdateWriter"
+							class="org.springframework.batch.sample.domain.trade.internal.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.domain.trade.TradeRowMapper" />
+				class="org.springframework.batch.sample.domain.trade.internal.TradeRowMapper" />
 		</property>
 	</bean>
 
@@ -71,7 +71,7 @@
 			value="SELECT id, name, credit FROM customer " />
 		<property name="mapper">
 			<bean
-				class="org.springframework.batch.sample.domain.trade.CustomerCreditRowMapper" />
+				class="org.springframework.batch.sample.domain.trade.internal.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 f25900f5a..da78bd05a 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.domain.trade.JdbcTradeDao"
+	<bean class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao"
 		id="tradeDao" p:jdbcTemplate-ref="jdbcTemplate">
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -19,11 +19,11 @@
 	</bean>
 
 	<bean
-		class="org.springframework.batch.sample.domain.trade.JdbcCustomerDebitDao"
+		class="org.springframework.batch.sample.domain.trade.internal.JdbcCustomerDebitDao"
 		id="customerDao" p:dataSource-ref="dataSource" />
 
 	<bean
-		class="org.springframework.batch.sample.domain.trade.FlatFileCustomerCreditDao"
+		class="org.springframework.batch.sample.domain.trade.internal.FlatFileCustomerCreditDao"
 		id="customerReportItemWriter">
 		<property name="itemWriter">
 			<bean
@@ -44,7 +44,7 @@
 		<property name="lineTokenizer" ref="tradeFileDescriptor" />
 		<property name="fieldSetMapper">
 			<bean
-				class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" />
+				class="org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper" />
 		</property>
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/xstream-config.xml b/spring-batch-samples/src/main/resources/xstream-config.xml
index 65cf6158c..a61f8a2a8 100644
--- a/spring-batch-samples/src/main/resources/xstream-config.xml
+++ b/spring-batch-samples/src/main/resources/xstream-config.xml
@@ -22,13 +22,13 @@
   </type-aliases>
   <field-aliases>
     <field-alias>
-      <alias-name>org.springframework.batch.sample.domain.order.xml.Customer</alias-name>
-      <type>org.springframework.batch.sample.domain.order.xml.Order</type>
+      <alias-name>org.springframework.batch.sample.domain.order.internal.xml.Customer</alias-name>
+      <type>org.springframework.batch.sample.domain.order.internal.xml.Order</type>
       <field-name>customer</field-name>
     </field-alias>
     <field-alias>
-      <alias-name>org.springframework.batch.sample.domain.order.xml.Shipper</alias-name>
-      <type>org.springframework.batch.sample.domain.order.xml.Order</type>
+      <alias-name>org.springframework.batch.sample.domain.order.internal.xml.Shipper</alias-name>
+      <type>org.springframework.batch.sample.domain.order.internal.xml.Order</type>
       <field-name>shipper</field-name>
     </field-alias>
   </field-aliases>
@@ -51,25 +51,25 @@
       <namespaceURI>http://adsj.accenture.com/purchaseorders</namespaceURI>
       <localPart>order</localPart>
       <prefix></prefix>
-      <class-name>org.springframework.batch.sample.domain.order.xml.Order</class-name>
+      <class-name>org.springframework.batch.sample.domain.order.internal.xml.Order</class-name>
     </mapping>
     <mapping>
       <namespaceURI>http://adsj.accenture.com/purchaseorders</namespaceURI>
       <localPart>customer</localPart>
       <prefix></prefix>
-       <class-name>org.springframework.batch.sample.domain.order.xml.Customer</class-name>
+       <class-name>org.springframework.batch.sample.domain.order.internal.xml.Customer</class-name>
     </mapping>
     <mapping>
       <namespaceURI>http://adsj.accenture.com/purchaseorders</namespaceURI>
       <localPart>shipper</localPart>
       <prefix></prefix>
-       <class-name>org.springframework.batch.sample.domain.order.xml.Shipper</class-name>
+       <class-name>org.springframework.batch.sample.domain.order.internal.xml.Shipper</class-name>
     </mapping>
     <mapping>
       <namespaceURI>http://adsj.accenture.com/purchaseorders</namespaceURI>
       <localPart>lineItem</localPart>
       <prefix></prefix>
-       <class-name>org.springframework.batch.sample.domain.order.xml.LineItem</class-name>
+       <class-name>org.springframework.batch.sample.domain.order.internal.xml.LineItem</class-name>
     </mapping>
   </mappings>
 </configuration>
diff --git a/spring-batch-samples/src/site/apt/index.apt b/spring-batch-samples/src/site/apt/index.apt
index 5527d056c..4ab77577a 100644
--- a/spring-batch-samples/src/site/apt/index.apt
+++ b/spring-batch-samples/src/site/apt/index.apt
@@ -425,10 +425,10 @@ AbduKa00,1996,mia,15,nyg,0,0,0,0,0,17,96,,14,0
     ref="playerFileItemReader" />
   <property name="itemWriter">
     <bean
-      class="org.springframework.batch.sample.domain.football.PlayerItemWriter">
+      class="org.springframework.batch.sample.domain.football.internal.internal.PlayerItemWriter">
       <property name="playerDao">
         <bean
-          class="org.springframework.batch.sample.domain.football.JdbcPlayerDao">
+          class="org.springframework.batch.sample.domain.football.internal.internal.JdbcPlayerDao">
           <property name="dataSource"
             ref="dataSource" />
         </bean>
@@ -504,7 +504,7 @@ AbduKa00,1996,mia,15,nyg,0,0,0,0,0,17,96,,14,0
   </property>
   <property name="fieldSetMapper">
     <bean
-      class="org.springframework.batch.sample.domain.football.PlayerFieldSetMapper" />
+      class="org.springframework.batch.sample.domain.football.internal.internal.PlayerFieldSetMapper" />
   </property>
 </bean>
 +---
@@ -581,7 +581,7 @@ public class
   <property name="dataSource" ref="dataSource" />
   <property name="mapper">
   <bean
-      class="org.springframework.batch.sample.domain.football.PlayerSummaryMapper" />
+      class="org.springframework.batch.sample.domain.football.internal.internal.PlayerSummaryMapper" />
   </property>
   <property name="sql">
     <value>
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 0f5ed05d1..0af6d0b1b 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
@@ -10,7 +10,7 @@ import java.util.List;
 
 import javax.sql.DataSource;
 
-import org.springframework.batch.sample.domain.trade.CustomerCreditIncreaseWriter;
+import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseWriter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcOperations;
 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 442588b4c..038277317 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
@@ -33,7 +33,7 @@ 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.Trade;
-import org.springframework.batch.sample.domain.trade.TradeFieldSetMapper;
+import org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
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 5b2022ad3..cf6cb69ce 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.domain.trade.HibernateCreditDao;
+import org.springframework.batch.sample.domain.trade.internal.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 b5db064e2..5096f2ba6 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.domain.trade.GeneratingTradeItemReader;
+import org.springframework.batch.sample.domain.trade.internal.GeneratingTradeItemReader;
 import org.springframework.batch.sample.support.RetrySampleItemWriter;
 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/domain/football/JdbcGameDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDaoIntegrationTests.java
similarity index 95%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/JdbcGameDaoIntegrationTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDaoIntegrationTests.java
index 6d479e250..4f96a2bb8 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/JdbcGameDaoIntegrationTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDaoIntegrationTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.sample.domain.football.Game;
-import org.springframework.batch.sample.domain.football.JdbcGameDao;
+import org.springframework.batch.sample.domain.football.internal.JdbcGameDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
 import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/JdbcPlayerDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerDaoIntegrationTests.java
similarity index 94%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/JdbcPlayerDaoIntegrationTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerDaoIntegrationTests.java
index 7cc2dcc0b..9ab1abaef 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/JdbcPlayerDaoIntegrationTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerDaoIntegrationTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import static org.junit.Assert.assertEquals;
 
@@ -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.football.JdbcPlayerDao;
 import org.springframework.batch.sample.domain.football.Player;
+import org.springframework.batch.sample.domain.football.internal.JdbcPlayerDao;
 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/domain/football/JdbcPlayerSummaryDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDaoIntegrationTests.java
similarity index 91%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/JdbcPlayerSummaryDaoIntegrationTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDaoIntegrationTests.java
index 9e042fd1d..b34ea781e 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/JdbcPlayerSummaryDaoIntegrationTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDaoIntegrationTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,9 +22,9 @@ import javax.sql.DataSource;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.domain.football.JdbcPlayerSummaryDao;
 import org.springframework.batch.sample.domain.football.PlayerSummary;
-import org.springframework.batch.sample.domain.football.PlayerSummaryMapper;
+import org.springframework.batch.sample.domain.football.internal.JdbcPlayerSummaryDao;
+import org.springframework.batch.sample.domain.football.internal.PlayerSummaryMapper;
 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/domain/order/AddressFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapperTests.java
index 00e8b905d..bedcaffb6 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapperTests.java
@@ -4,7 +4,7 @@ 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.order.Address;
-import org.springframework.batch.sample.domain.order.AddressFieldSetMapper;
+import org.springframework.batch.sample.domain.order.internal.AddressFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapperTests.java
index f7a7f3c27..645e15057 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapperTests.java
@@ -3,8 +3,8 @@ package org.springframework.batch.sample.domain.order;
 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.order.BillingFieldSetMapper;
 import org.springframework.batch.sample.domain.order.BillingInfo;
+import org.springframework.batch.sample.domain.order.internal.BillingFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class BillingFieldSetMapperTests extends AbstractFieldSetMapperTests{
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapperTests.java
index 94d316349..d034cfe46 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapperTests.java
@@ -4,7 +4,7 @@ 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.order.Customer;
-import org.springframework.batch.sample.domain.order.CustomerFieldSetMapper;
+import org.springframework.batch.sample.domain.order.internal.CustomerFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class CustomerFieldSetMapperTests extends AbstractFieldSetMapperTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/FlatFileOrderWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/FlatFileOrderWriterTests.java
index fa69d027a..10c15a1d2 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/FlatFileOrderWriterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/FlatFileOrderWriterTests.java
@@ -37,7 +37,7 @@ import org.springframework.batch.sample.domain.order.BillingInfo;
 import org.springframework.batch.sample.domain.order.Customer;
 import org.springframework.batch.sample.domain.order.LineItem;
 import org.springframework.batch.sample.domain.order.Order;
-import org.springframework.batch.sample.domain.order.OrderTransformer;
+import org.springframework.batch.sample.domain.order.internal.OrderTransformer;
 
 public class FlatFileOrderWriterTests {
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapperTests.java
index 59ca39634..f5ce3a728 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapperTests.java
@@ -5,8 +5,8 @@ import java.util.Calendar;
 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.order.HeaderFieldSetMapper;
 import org.springframework.batch.sample.domain.order.Order;
+import org.springframework.batch.sample.domain.order.internal.HeaderFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class HeaderFieldSetMapperTests extends AbstractFieldSetMapperTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapperTests.java
index 9bb9e6455..07e740db9 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapperTests.java
@@ -6,7 +6,7 @@ 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.order.LineItem;
-import org.springframework.batch.sample.domain.order.OrderItemFieldSetMapper;
+import org.springframework.batch.sample.domain.order.internal.OrderItemFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class OrderItemFieldSetMapperTests extends AbstractFieldSetMapperTests{
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java
index e723ad5cd..9ccd192b4 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java
@@ -23,8 +23,8 @@ import org.springframework.batch.sample.domain.order.BillingInfo;
 import org.springframework.batch.sample.domain.order.Customer;
 import org.springframework.batch.sample.domain.order.LineItem;
 import org.springframework.batch.sample.domain.order.Order;
-import org.springframework.batch.sample.domain.order.OrderItemReader;
 import org.springframework.batch.sample.domain.order.ShippingInfo;
+import org.springframework.batch.sample.domain.order.internal.OrderItemReader;
 
 public class OrderItemReaderTests {
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderTransformerTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderTransformerTests.java
index 9f2717261..ff1eb9edc 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderTransformerTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderTransformerTests.java
@@ -31,7 +31,7 @@ import org.springframework.batch.sample.domain.order.BillingInfo;
 import org.springframework.batch.sample.domain.order.Customer;
 import org.springframework.batch.sample.domain.order.LineItem;
 import org.springframework.batch.sample.domain.order.Order;
-import org.springframework.batch.sample.domain.order.OrderTransformer;
+import org.springframework.batch.sample.domain.order.internal.OrderTransformer;
 
 /**
  * @author Dave Syer
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapperTests.java
index d3a732541..3cef39e24 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapperTests.java
@@ -3,8 +3,8 @@ package org.springframework.batch.sample.domain.order;
 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.order.ShippingFieldSetMapper;
 import org.springframework.batch.sample.domain.order.ShippingInfo;
+import org.springframework.batch.sample.domain.order.internal.ShippingFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class ShippingFieldSetMapperTests extends AbstractFieldSetMapperTests{
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/FutureDateFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/FutureDateFunctionTests.java
similarity index 91%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/FutureDateFunctionTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/FutureDateFunctionTests.java
index 7569c8c71..0b742dd89 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/FutureDateFunctionTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/FutureDateFunctionTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -11,7 +11,7 @@ import java.util.Date;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.batch.sample.domain.order.valang.FutureDateFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.FutureDateFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class FutureDateFunctionTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/TotalOrderItemsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/TotalOrderItemsFunctionTests.java
similarity index 92%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/TotalOrderItemsFunctionTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/TotalOrderItemsFunctionTests.java
index 4707cac14..256b40164 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/TotalOrderItemsFunctionTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/TotalOrderItemsFunctionTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -13,7 +13,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.TotalOrderItemsFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.TotalOrderItemsFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class TotalOrderItemsFunctionTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateDiscountsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateDiscountsFunctionTests.java
similarity index 97%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateDiscountsFunctionTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateDiscountsFunctionTests.java
index a14e09bb9..8a8af22b9 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateDiscountsFunctionTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateDiscountsFunctionTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -13,7 +13,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.ValidateDiscountsFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.ValidateDiscountsFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateDiscountsFunctionTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateHandlingPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateHandlingPricesFunctionTests.java
similarity index 93%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateHandlingPricesFunctionTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateHandlingPricesFunctionTests.java
index 3ee994640..989e68eb7 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateHandlingPricesFunctionTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateHandlingPricesFunctionTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -13,7 +13,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.ValidateHandlingPricesFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.ValidateHandlingPricesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateHandlingPricesFunctionTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateIdsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateIdsFunctionTests.java
similarity index 93%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateIdsFunctionTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateIdsFunctionTests.java
index 146afc420..be328ecfb 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateIdsFunctionTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateIdsFunctionTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -12,7 +12,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.ValidateIdsFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.ValidateIdsFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateIdsFunctionTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidatePricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidatePricesFunctionTests.java
similarity index 93%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidatePricesFunctionTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidatePricesFunctionTests.java
index 22175af0a..09f1312cf 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidatePricesFunctionTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidatePricesFunctionTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -13,7 +13,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.ValidatePricesFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.ValidatePricesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidatePricesFunctionTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateQuantitiesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateQuantitiesFunctionTests.java
similarity index 93%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateQuantitiesFunctionTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateQuantitiesFunctionTests.java
index 758785805..565dde518 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateQuantitiesFunctionTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateQuantitiesFunctionTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -12,7 +12,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.ValidateQuantitiesFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.ValidateQuantitiesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateQuantitiesFunctionTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateShippingPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateShippingPricesFunctionTests.java
similarity index 93%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateShippingPricesFunctionTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateShippingPricesFunctionTests.java
index 031b50a93..b8d6738f9 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateShippingPricesFunctionTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateShippingPricesFunctionTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -13,7 +13,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.ValidateShippingPricesFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.ValidateShippingPricesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateShippingPricesFunctionTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateTotalPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateTotalPricesFunctionTests.java
similarity index 96%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateTotalPricesFunctionTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateTotalPricesFunctionTests.java
index fd400431e..5f23b4474 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateTotalPricesFunctionTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateTotalPricesFunctionTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -14,7 +14,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.ValidateTotalPricesFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.ValidateTotalPricesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateTotalPricesFunctionTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditIncreaseProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java
similarity index 88%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditIncreaseProcessorTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java
index 4851c6b10..6a56a0405 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditIncreaseProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import static org.junit.Assert.assertTrue;
 
@@ -7,7 +7,7 @@ import java.math.BigDecimal;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.trade.CustomerCredit;
 import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
-import org.springframework.batch.sample.domain.trade.CustomerCreditIncreaseWriter;
+import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseWriter;
 
 /**
  * Tests for {@link CustomerCreditIncreaseWriter}.
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapperTests.java
similarity index 88%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditRowMapperTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapperTests.java
index e65b97b00..1a23ea7ff 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditRowMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapperTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.math.BigDecimal;
 import java.sql.ResultSet;
@@ -6,7 +6,7 @@ import java.sql.SQLException;
 
 import org.easymock.MockControl;
 import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.CustomerCreditRowMapper;
+import org.springframework.batch.sample.domain.trade.internal.CustomerCreditRowMapper;
 import org.springframework.batch.sample.support.AbstractRowMapperTests;
 import org.springframework.jdbc.core.RowMapper;
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdatePreparedStatementSetterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java
similarity index 86%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdatePreparedStatementSetterTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java
index 9ba5f935c..d31d0a760 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdatePreparedStatementSetterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.math.BigDecimal;
 import java.sql.PreparedStatement;
@@ -23,7 +23,7 @@ import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.CustomerCreditUpdatePreparedStatementSetter;
+import org.springframework.batch.sample.domain.trade.internal.CustomerCreditUpdatePreparedStatementSetter;
 
 /**
  * @author Dave Syer
@@ -47,7 +47,7 @@ public class CustomerCreditUpdatePreparedStatementSetterTests {
 	}
 	
 	/**
-	 * Test method for {@link org.springframework.batch.sample.domain.trade.CustomerCreditUpdatePreparedStatementSetter#setValues(CustomerCredit, PreparedStatement) }
+	 * Test method for {@link org.springframework.batch.sample.domain.trade.internal.CustomerCreditUpdatePreparedStatementSetter#setValues(CustomerCredit, PreparedStatement) }
 	 * @throws SQLException 
 	 */
 	@Test
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java
similarity index 91%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdateProcessorTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java
index 50b67db4b..5506eafcc 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdateProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.math.BigDecimal;
 
@@ -7,7 +7,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.trade.CustomerCredit;
 import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
-import org.springframework.batch.sample.domain.trade.CustomerCreditUpdateWriter;
+import org.springframework.batch.sample.domain.trade.internal.CustomerCreditUpdateWriter;
 
 public class CustomerCreditUpdateProcessorTests {
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java
similarity index 87%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessorTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java
index 8f48b3b17..b06385c57 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import static org.junit.Assert.assertEquals;
 
@@ -7,8 +7,8 @@ import java.math.BigDecimal;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.trade.CustomerDebit;
 import org.springframework.batch.sample.domain.trade.CustomerDebitDao;
-import org.springframework.batch.sample.domain.trade.CustomerUpdateWriter;
 import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.sample.domain.trade.internal.CustomerUpdateWriter;
 
 public class CustomerUpdateProcessorTests {
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/FlatFileCustomerCreditDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java
similarity index 94%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/FlatFileCustomerCreditDaoTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java
index e95f5d82a..8c042852a 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/FlatFileCustomerCreditDaoTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.replay;
@@ -27,7 +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.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.FlatFileCustomerCreditDao;
+import org.springframework.batch.sample.domain.trade.internal.FlatFileCustomerCreditDao;
 
 public class FlatFileCustomerCreditDaoTests {
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/GeneratingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java
similarity index 81%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/GeneratingItemReaderTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java
index d599785b4..7bcd119db 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/GeneratingItemReaderTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java
@@ -1,9 +1,9 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.springframework.batch.sample.domain.trade.GeneratingTradeItemReader;
+import org.springframework.batch.sample.domain.trade.internal.GeneratingTradeItemReader;
 
 /**
  * Tests for {@link GeneratingTradeItemReader}.
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/JdbcCustomerDebitDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests.java
similarity index 94%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/JdbcCustomerDebitDaoTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests.java
index 41ba24d86..00181826c 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/JdbcCustomerDebitDaoTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ import javax.sql.DataSource;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.sample.domain.trade.CustomerDebit;
-import org.springframework.batch.sample.domain.trade.JdbcCustomerDebitDao;
+import org.springframework.batch.sample.domain.trade.internal.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/domain/trade/JdbcTradeWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeWriterTests.java
similarity index 94%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/JdbcTradeWriterTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeWriterTests.java
index 35b563855..c80f8bb0b 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/JdbcTradeWriterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeWriterTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import static org.junit.Assert.assertEquals;
 
@@ -25,8 +25,8 @@ import javax.sql.DataSource;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.domain.trade.JdbcTradeDao;
 import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao;
 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/domain/trade/TradeFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java
similarity index 92%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeFieldSetMapperTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java
index f73dd4391..096cd2e35 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeFieldSetMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import static org.junit.Assert.assertEquals;
 
@@ -10,7 +10,7 @@ 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.Trade;
-import org.springframework.batch.sample.domain.trade.TradeFieldSetMapper;
+import org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java
similarity index 85%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeProcessorTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java
index ab961b000..999da7a34 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java
@@ -1,11 +1,11 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import org.easymock.MockControl;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.trade.Trade;
 import org.springframework.batch.sample.domain.trade.TradeDao;
-import org.springframework.batch.sample.domain.trade.TradeWriter;
+import org.springframework.batch.sample.domain.trade.internal.TradeWriter;
 
 public class TradeProcessorTests {
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapperTests.java
similarity index 90%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeRowMapperTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapperTests.java
index 9c368168b..02845dad9 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeRowMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapperTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.math.BigDecimal;
 import java.sql.ResultSet;
@@ -6,7 +6,7 @@ import java.sql.SQLException;
 
 import org.easymock.MockControl;
 import org.springframework.batch.sample.domain.trade.Trade;
-import org.springframework.batch.sample.domain.trade.TradeRowMapper;
+import org.springframework.batch.sample.domain.trade.internal.TradeRowMapper;
 import org.springframework.batch.sample.support.AbstractRowMapperTests;
 import org.springframework.jdbc.core.RowMapper;
 
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/domain/trade/JdbcCustomerDebitDaoTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests-context.xml
similarity index 84%
rename from spring-batch-samples/src/test/resources/org/springframework/batch/sample/domain/trade/JdbcCustomerDebitDaoTests-context.xml
rename to spring-batch-samples/src/test/resources/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests-context.xml
index 599291b26..3b5d17628 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/domain/trade/JdbcCustomerDebitDaoTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests-context.xml
@@ -6,6 +6,6 @@
 
 	<import resource="classpath:data-source-context.xml"/>
 
-	<bean class="org.springframework.batch.sample.domain.trade.JdbcCustomerDebitDao"/>
+	<bean class="org.springframework.batch.sample.domain.trade.internal.JdbcCustomerDebitDao"/>
 
 </beans>
\ No newline at end of file