diff --git a/spring-batch-samples/.springBeans b/spring-batch-samples/.springBeans
index 367ebfe4a..ecdb96f8a 100644
--- a/spring-batch-samples/.springBeans
+++ b/spring-batch-samples/.springBeans
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.1.0.v200808011800]]></pluginVersion>
+	<pluginVersion><![CDATA[2.2.0.v200809261800]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
@@ -43,6 +43,9 @@
 		<config>src/main/resources/jobs/taskletJob.xml</config>
 		<config>src/main/resources/jobs/headerFooterSample.xml</config>
 		<config>src/main/resources/jobs/customerFilterJob.xml</config>
+		<config>src/main/resources/jobs/nonSequentialDecisionJob.xml</config>
+		<config>src/main/resources/jobs/nonSequentialJob-base.xml</config>
+		<config>src/main/resources/jobs/nonSequentialJob.xml</config>
 	</configs>
 	<configSets>
 		<configSet>
@@ -370,5 +373,31 @@
 				<config>src/main/resources/org/springframework/batch/sample/config/common-context.xml</config>
 			</configs>
 		</configSet>
+		<configSet>
+			<name><![CDATA[nonSequentialDecision]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/jobs/nonSequentialDecisionJob.xml</config>
+				<config>src/main/resources/jobs/nonSequentialJob-base.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/org/springframework/batch/sample/config/common-context.xml</config>
+				<config>src/main/resources/simple-job-launcher-context.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[nonSequential]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/jobs/nonSequentialJob.xml</config>
+				<config>src/main/resources/jobs/nonSequentialJob-base.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/simple-job-launcher-context.xml</config>
+				<config>src/main/resources/org/springframework/batch/sample/config/common-context.xml</config>
+			</configs>
+		</configSet>
 	</configSets>
 </beansProjectDescription>
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/nonSequential/internal/ErrorLogWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/ErrorLogWriter.java
similarity index 92%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/nonSequential/internal/ErrorLogWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/ErrorLogWriter.java
index 06c532f57..30aaa7beb 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/nonSequential/internal/ErrorLogWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/ErrorLogWriter.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.nonSequential.internal;
+package org.springframework.batch.sample.domain.football.internal;
 
 import javax.sql.DataSource;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/nonSequential/internal/SkipCheckingDecider.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/SkipCheckingDecider.java
similarity index 89%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/nonSequential/internal/SkipCheckingDecider.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/SkipCheckingDecider.java
index c94fe516b..c248fbc49 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/nonSequential/internal/SkipCheckingDecider.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/SkipCheckingDecider.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.nonSequential.internal;
+package org.springframework.batch.sample.domain.football.internal;
 
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.JobExecution;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/nonSequential/internal/SkipCheckingListener.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/SkipCheckingListener.java
similarity index 88%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/nonSequential/internal/SkipCheckingListener.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/SkipCheckingListener.java
index 56c28c0a8..232d86b89 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/nonSequential/internal/SkipCheckingListener.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/SkipCheckingListener.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.nonSequential.internal;
+package org.springframework.batch.sample.domain.football.internal;
 
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.StepExecution;
diff --git a/spring-batch-samples/src/main/resources/jobs/nonSequentialDecisionJob.xml b/spring-batch-samples/src/main/resources/jobs/nonSequentialDecisionJob.xml
index 7c4d83843..09b7680d9 100644
--- a/spring-batch-samples/src/main/resources/jobs/nonSequentialDecisionJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/nonSequentialDecisionJob.xml
@@ -1,48 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:batch="http://www.springframework.org/schema/batch" 
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/batch 
-		http://www.springframework.org/schema/batch/spring-batch-2.0.xsd
-		http://www.springframework.org/schema/beans 
-		http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<import resource="nonSequentialJob-base.xml" />
-
-	<bean id="skipCheckingDecider" class="org.springframework.batch.sample.domain.nonSequential.internal.SkipCheckingDecider"/>
-
-	<batch:job id="nonSequentialDecisionJob">
-		<batch:step name="playerload">
-			<batch:next on="*" to="skipCheckingDecision" />
-		</batch:step>
-		<batch:decision id="skipCheckingDecision" decider="skipCheckingDecider">
-			<batch:end on="FAILED" status="FAILED"/>
-			<batch:next on="COMPLETED WITH SKIPS" to="errorPrint" />
-			<batch:next on="*" to="gameLoad" />
-		</batch:decision>
-		<batch:step name="errorPrint">
-			<batch:next on="*" to="gameLoad" />
-		</batch:step>
-		<batch:step name="gameLoad">
-			<batch:next on="*" to="playerSummarization" />
-		</batch:step>
-		<batch:step name="playerSummarization"/>
-	</batch:job>
-
-	<bean id="footballProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="properties">
-			<value>
-				games.file.name=games-small.csv
-<!--				player.file.name=player-small.csv-->
-				player.file.name=player-containsBadRecords.csv
-				job.commit.interval=2
-			</value>
-		</property>
-		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-		<property name="ignoreUnresolvablePlaceholders" value="true" />
-		<property name="order" value="1" />
-	</bean>
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:batch="http://www.springframework.org/schema/batch" 
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/batch 
+		http://www.springframework.org/schema/batch/spring-batch-2.0.xsd
+		http://www.springframework.org/schema/beans 
+		http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<import resource="nonSequentialJob-base.xml" />
+
+	<bean id="skipCheckingDecider" class="org.springframework.batch.sample.domain.football.internal.SkipCheckingDecider"/>
+
+	<batch:job id="nonSequentialDecisionJob">
+		<batch:step name="playerload">
+			<batch:next on="*" to="skipCheckingDecision" />
+		</batch:step>
+		<batch:decision id="skipCheckingDecision" decider="skipCheckingDecider">
+			<batch:end on="FAILED" status="FAILED"/>
+			<batch:next on="COMPLETED WITH SKIPS" to="errorPrint" />
+			<batch:next on="*" to="gameLoad" />
+		</batch:decision>
+		<batch:step name="errorPrint">
+			<batch:next on="*" to="gameLoad" />
+		</batch:step>
+		<batch:step name="gameLoad">
+			<batch:next on="*" to="playerSummarization" />
+		</batch:step>
+		<batch:step name="playerSummarization"/>
+	</batch:job>
+
+	<bean id="footballProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="properties">
+			<value>
+				games.file.name=games-small.csv
+<!--				player.file.name=player-small.csv-->
+				player.file.name=player-containsBadRecords.csv
+				job.commit.interval=2
+			</value>
+		</property>
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
+		<property name="order" value="1" />
+	</bean>
+
+</beans>
diff --git a/spring-batch-samples/src/main/resources/jobs/nonSequentialJob-base.xml b/spring-batch-samples/src/main/resources/jobs/nonSequentialJob-base.xml
index 96c82d45d..f967ae361 100644
--- a/spring-batch-samples/src/main/resources/jobs/nonSequentialJob-base.xml
+++ b/spring-batch-samples/src/main/resources/jobs/nonSequentialJob-base.xml
@@ -26,14 +26,14 @@
 		</property>
 		<property name="listeners">
 			<list> 
-				<bean class="org.springframework.batch.sample.domain.nonSequential.internal.SkipCheckingListener"/>
+				<bean class="org.springframework.batch.sample.domain.football.internal.SkipCheckingListener"/>
 			</list>
 		</property>
 	</bean>
 	
 	<bean id="errorPrint" parent="taskletStep">
 		<property name="tasklet">
-			<bean class="org.springframework.batch.sample.domain.nonSequential.internal.ErrorLogWriter">
+			<bean class="org.springframework.batch.sample.domain.football.internal.ErrorLogWriter">
 				<property name="dataSource" ref="dataSource"/>
 			</bean>
 		</property>
diff --git a/spring-batch-samples/src/main/resources/jobs/nonSequentialJob.xml b/spring-batch-samples/src/main/resources/jobs/nonSequentialJob.xml
index e7c5dd784..7c7d0c58c 100644
--- a/spring-batch-samples/src/main/resources/jobs/nonSequentialJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/nonSequentialJob.xml
@@ -38,4 +38,5 @@
 		<property name="ignoreUnresolvablePlaceholders" value="true" />
 		<property name="order" value="1" />
 	</bean>
+
 </beans>