diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/GameFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/GameFieldSetMapper.java
similarity index 95%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/GameFieldSetMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/football/GameFieldSetMapper.java
index c5c6f048f..d0a5bb053 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/GameFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/GameFieldSetMapper.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.football;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcGameDao.java
similarity index 97%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcGameDao.java
index 950628733..3d61e8590 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcGameDao.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.football;
 
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerDao.java
similarity index 93%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerDao.java
index d913d0a48..fa840593c 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerDao.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.football;
 
 import org.springframework.batch.sample.domain.Player;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerSummaryDao.java
similarity index 96%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerSummaryDao.java
index 5b2131ee0..032ce0a51 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerSummaryDao.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.football;
 
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/PlayerDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerDao.java
similarity index 79%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/PlayerDao.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerDao.java
index fdbebce1d..1a115de36 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/PlayerDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerDao.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.football;
 
 import org.springframework.batch.sample.domain.Player;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PlayerFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerFieldSetMapper.java
similarity index 93%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PlayerFieldSetMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerFieldSetMapper.java
index d4f0c29b9..fd3a3ab3e 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PlayerFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerFieldSetMapper.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.football;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PlayerItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerItemWriter.java
similarity index 78%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PlayerItemWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerItemWriter.java
index abf76dc5f..8bf6149c9 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PlayerItemWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerItemWriter.java
@@ -1,7 +1,6 @@
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.football;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
-import org.springframework.batch.sample.dao.PlayerDao;
 import org.springframework.batch.sample.domain.Player;
 
 public class PlayerItemWriter extends AbstractItemWriter<Player> {
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PlayerSummaryMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryMapper.java
similarity index 97%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PlayerSummaryMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryMapper.java
index 5c62eefba..d4e3c0abb 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PlayerSummaryMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryMapper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.football;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PlayerSummaryRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryRowMapper.java
similarity index 97%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PlayerSummaryRowMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryRowMapper.java
index c2f9bf7a2..64164e690 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PlayerSummaryRowMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryRowMapper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.football;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/GeneratingItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/GeneratingTradeItemReader.java
similarity index 94%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/GeneratingItemReader.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/GeneratingTradeItemReader.java
index 0dd67f28d..a58011f15 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/GeneratingItemReader.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/GeneratingTradeItemReader.java
@@ -12,7 +12,7 @@ import org.springframework.batch.sample.domain.Trade;
  * 
  * @author Robert Kasanicky
  */
-public class GeneratingItemReader implements ItemReader<Trade> {
+public class GeneratingTradeItemReader implements ItemReader<Trade> {
 
 	private int limit = 1;
 	
diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
index 8e82d7c60..b4fc7e967 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.item.writer.PlayerItemWriter">
+							class="org.springframework.batch.sample.football.PlayerItemWriter">
 							<property name="playerDao">
 								<bean
-									class="org.springframework.batch.sample.dao.JdbcPlayerDao">
+									class="org.springframework.batch.sample.football.JdbcPlayerDao">
 									<property name="dataSource"
 										ref="dataSource" />
 								</bean>
@@ -35,7 +35,7 @@
 						ref="gameFileItemReader" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.dao.JdbcGameDao">
+							class="org.springframework.batch.sample.football.JdbcGameDao">
 							<property name="dataSource"
 								ref="dataSource" />
 						</bean>
@@ -48,7 +48,7 @@
 						ref="playerSummarizationSource" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.dao.JdbcPlayerSummaryDao">
+							class="org.springframework.batch.sample.football.JdbcPlayerSummaryDao">
 							<property name="dataSource"
 								ref="dataSource" />
 						</bean>
@@ -71,7 +71,7 @@
 		</property>
 		<property name="fieldSetMapper">
 			<bean
-				class="org.springframework.batch.sample.mapping.PlayerFieldSetMapper" />
+				class="org.springframework.batch.sample.football.PlayerFieldSetMapper" />
 		</property>
 	</bean>
 
@@ -88,7 +88,7 @@
 		</property>
 		<property name="fieldSetMapper">
 			<bean
-				class="org.springframework.batch.sample.mapping.GameFieldSetMapper" />
+				class="org.springframework.batch.sample.football.GameFieldSetMapper" />
 		</property>
 	</bean>
 
@@ -97,7 +97,7 @@
 		<property name="dataSource" ref="dataSource" />
 		<property name="mapper">
 			<bean
-				class="org.springframework.batch.sample.mapping.PlayerSummaryMapper" />
+				class="org.springframework.batch.sample.football.PlayerSummaryMapper" />
 		</property>
 		<property name="sql">
 			<value>
diff --git a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
index cd316e811..81ee70727 100644
--- a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
@@ -25,7 +25,7 @@
 			</bean-->
 			<bean id="infiniteStep" parent="simpleStep">
 				<property name="itemReader">
-					<bean id="reader" class="org.springframework.batch.sample.item.reader.GeneratingItemReader">
+					<bean id="reader" class="org.springframework.batch.sample.item.reader.GeneratingTradeItemReader">
 						<property name="limit" value="1000000" />
 					</bean>
 				</property>
diff --git a/spring-batch-samples/src/main/resources/jobs/retrySample.xml b/spring-batch-samples/src/main/resources/jobs/retrySample.xml
index b2ee64202..61f883c27 100644
--- a/spring-batch-samples/src/main/resources/jobs/retrySample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/retrySample.xml
@@ -19,7 +19,7 @@
 		</property>
 	</bean>
 
-	<bean id="itemGenerator" class="org.springframework.batch.sample.item.reader.GeneratingItemReader">
+	<bean id="itemGenerator" class="org.springframework.batch.sample.item.reader.GeneratingTradeItemReader">
 		<property name="limit" value="10" />
 	</bean>
 
diff --git a/spring-batch-samples/src/site/apt/index.apt b/spring-batch-samples/src/site/apt/index.apt
index 5e0c47eb8..a6ea05f7d 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.item.writer.PlayerItemWriter">
+      class="org.springframework.batch.sample.football.PlayerItemWriter">
       <property name="playerDao">
         <bean
-          class="org.springframework.batch.sample.dao.JdbcPlayerDao">
+          class="org.springframework.batch.sample.football.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.mapping.PlayerFieldSetMapper" />
+      class="org.springframework.batch.sample.football.PlayerFieldSetMapper" />
   </property>
 </bean>
 +---
@@ -581,7 +581,7 @@ public class
   <property name="dataSource" ref="dataSource" />
   <property name="mapper">
   <bean
-      class="org.springframework.batch.sample.mapping.PlayerSummaryMapper" />
+      class="org.springframework.batch.sample.football.PlayerSummaryMapper" />
   </property>
   <property name="sql">
     <value>
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 311cc5a3c..d10ade29c 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.*;
 import org.junit.runner.RunWith;
 
-import org.springframework.batch.sample.item.reader.GeneratingItemReader;
+import org.springframework.batch.sample.item.reader.GeneratingTradeItemReader;
 import org.springframework.batch.sample.item.writer.RetrySampleItemWriter;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.ContextConfiguration;
@@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 public class RetrySampleFunctionalTests extends AbstractValidatingBatchLauncherTests {
 
 	@Autowired
-	private GeneratingItemReader itemGenerator;
+	private GeneratingTradeItemReader itemGenerator;
 	
 	@Autowired
 	private RetrySampleItemWriter<?> itemProcessor;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java
index a2657da55..08ec491c1 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java
@@ -20,6 +20,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.sample.domain.Game;
+import org.springframework.batch.sample.football.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/dao/JdbcPlayerDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java
index b682435e2..3d54a7f33 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java
@@ -26,6 +26,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.sample.domain.Player;
+import org.springframework.batch.sample.football.JdbcPlayerDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowCallbackHandler;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java
index 3bb9bed3b..2b8ec324d 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java
@@ -20,7 +20,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.sample.domain.PlayerSummary;
-import org.springframework.batch.sample.mapping.PlayerSummaryMapper;
+import org.springframework.batch.sample.football.JdbcPlayerSummaryDao;
+import org.springframework.batch.sample.football.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/item/reader/GeneratingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java
index ce50717e3..9a3d81534 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java
@@ -4,13 +4,13 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
 /**
- * Tests for {@link GeneratingItemReader}.
+ * Tests for {@link GeneratingTradeItemReader}.
  * 
  * @author Robert Kasanicky
  */
 public class GeneratingItemReaderTests {
 
-	private GeneratingItemReader reader = new GeneratingItemReader();
+	private GeneratingTradeItemReader reader = new GeneratingTradeItemReader();
 	
 	/**
 	 * Generates a given number of not-null records,