diff --git a/spring-batch-integration/.springBeans b/spring-batch-integration/.springBeans
index 13e46bd54..afc27bc56 100644
--- a/spring-batch-integration/.springBeans
+++ b/spring-batch-integration/.springBeans
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.0.5.v200805211800]]></pluginVersion>
+	<pluginVersion><![CDATA[2.1.0.v200806081427]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
-	<enableImports><![CDATA[false]]></enableImports>
+	<enableImports><![CDATA[true]]></enableImports>
 	<configs>
 		<config>src/test/resources/integration-context.xml</config>
 		<config>src/test/resources/job-execution-context.xml</config>
-		<config>src/test/resources/org/springframework/integration/batch/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml</config>
-		<config>src/test/resources/org/springframework/integration/batch/item/MessageChannelItemWriterIntegrationTests-context.xml</config>
-		<config>src/test/resources/org/springframework/integration/batch/job/MessageOrientedStepIntegrationTests-context.xml</config>
-		<config>src/test/resources/org/springframework/integration/batch/file/ResourceSplitterIntegrationTests-context.xml</config>
 		<config>src/test/resources/simple-job-launcher-context.xml</config>
+		<config>src/test/resources/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests-context.xml</config>
+		<config>src/test/resources/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml</config>
+		<config>src/test/resources/org/springframework/batch/integration/item/MessageChannelItemWriterIntegrationTests-context.xml</config>
+		<config>src/test/resources/org/springframework/batch/integration/job/MessageOrientedStepIntegrationTests-context.xml</config>
+		<config>src/test/resources/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests-context.xml</config>
 	</configs>
 	<configSets>
 	</configSets>
diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml
index f19873fbf..b1d0ab088 100644
--- a/spring-batch-integration/pom.xml
+++ b/spring-batch-integration/pom.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Apache Maven 2 POM generated by Apache Ivy
-	http://ant.apache.org/ivy/
-	Apache Ivy version: 2.0.0-beta2 20080225093827
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.batch</groupId>
 	<artifactId>spring-batch-integration</artifactId>
 	<packaging>jar</packaging>
-	<version>1.1.0.DEV-SNAPSHOT</version>
+	<parent>
+		<groupId>org.springframework.batch</groupId>
+		<artifactId>spring-batch</artifactId>
+		<version>1.1.0.DEV-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
 	<properties>
-		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<spring.framework.version>2.5.4.A</spring.framework.version>
 		<spring.integration.version>1.0.0.M4</spring.integration.version>
 	</properties>
@@ -29,16 +27,9 @@
 			<version>4.4</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.12</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>cglib</groupId>
 			<artifactId>cglib-nodep</artifactId>
-			<version>2.1_3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -86,7 +77,7 @@
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
 			<artifactId>spring-batch-core</artifactId>
-			<version>1.1.0.DEV-SNAPSHOT</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 			<exclusions>
 				<exclusion>
@@ -97,6 +88,10 @@
 					<groupId>org.springframework</groupId>
 					<artifactId>spring-beans</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-core</artifactId>
+				</exclusion>
 				<exclusion>
 					<groupId>org.springframework</groupId>
 					<artifactId>spring-aop</artifactId>
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/AsynchronousFailureException.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/AsynchronousFailureException.java
similarity index 90%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/AsynchronousFailureException.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/AsynchronousFailureException.java
index 69a00f084..e56ef64dc 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/AsynchronousFailureException.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/AsynchronousFailureException.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 import org.springframework.batch.item.ItemWriterException;
 
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ChunkHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkHandler.java
similarity index 58%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ChunkHandler.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkHandler.java
index 3f496d10c..5032022bb 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ChunkHandler.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkHandler.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 
 public interface ChunkHandler {
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ChunkMessageChannelItemWriter.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
similarity index 96%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ChunkMessageChannelItemWriter.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
index 2d7f7b61c..b57bc00ca 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ChunkMessageChannelItemWriter.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ChunkRequest.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkRequest.java
similarity index 86%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ChunkRequest.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkRequest.java
index bdb9b406a..abc310387 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ChunkRequest.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkRequest.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ChunkResponse.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkResponse.java
similarity index 86%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ChunkResponse.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkResponse.java
index 6ee3fea02..8e4ecaf65 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ChunkResponse.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkResponse.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 import java.io.Serializable;
 
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ItemWriterChunkHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandler.java
similarity index 94%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ItemWriterChunkHandler.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandler.java
index d0e21c629..b95fc8275 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/chunk/ItemWriterChunkHandler.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandler.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/file/FileToMessagesJobFactoryBean.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBean.java
similarity index 93%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/file/FileToMessagesJobFactoryBean.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBean.java
index 824f5da53..de8b13f84 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/file/FileToMessagesJobFactoryBean.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBean.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.file;
+package org.springframework.batch.integration.file;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobParameters;
@@ -23,6 +23,8 @@ import org.springframework.batch.core.job.SimpleJob;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.resource.StepExecutionResourceProxy;
 import org.springframework.batch.core.step.item.SimpleStepFactoryBean;
+import org.springframework.batch.integration.item.MessageChannelItemWriter;
+import org.springframework.batch.integration.launch.JobLaunchingMessageHandler;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.xml.StaxEventItemReader;
@@ -30,8 +32,6 @@ import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.core.io.Resource;
-import org.springframework.integration.batch.item.MessageChannelItemWriter;
-import org.springframework.integration.batch.launch.JobLaunchingMessageHandler;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.dispatcher.DirectChannel;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -40,7 +40,7 @@ import org.springframework.util.Assert;
 /**
  * A FactoryBean for a {@link Job} with a single step which just pumps messages
  * from a file into a channel. The channel has to be a
- * {@link SynchronousChannel} to ensure that failures propagate up to the step
+ * {@link DirectChannel} to ensure that failures propagate up to the step
  * and fail the job execution. Normally this job will be used in conjunction
  * with a {@link JobLaunchingMessageHandler} and a
  * {@link ResourcePayloadAsJobParameterStrategy}, so that the user can just
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/file/ResourcePayloadAsJobParameterStrategy.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/file/ResourcePayloadAsJobParameterStrategy.java
similarity index 88%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/file/ResourcePayloadAsJobParameterStrategy.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/file/ResourcePayloadAsJobParameterStrategy.java
index 5780eddf8..eb4872fee 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/file/ResourcePayloadAsJobParameterStrategy.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/file/ResourcePayloadAsJobParameterStrategy.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.file;
+package org.springframework.batch.integration.file;
 
 import java.io.IOException;
 
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.integration.launch.MessageToJobParametersStrategy;
 import org.springframework.batch.item.ItemStreamException;
 import org.springframework.core.io.Resource;
-import org.springframework.integration.batch.launch.MessageToJobParametersStrategy;
 import org.springframework.integration.message.Message;
 
 /**
@@ -39,7 +39,7 @@ public class ResourcePayloadAsJobParameterStrategy implements MessageToJobParame
 	 * Convert a message payload which is a {@link Resource} to its URL
 	 * representation and load that into a job parameter.
 	 * 
-	 * @see org.springframework.integration.batch.launch.MessageToJobParametersStrategy#getJobParameters(org.springframework.integration.message.Message)
+	 * @see org.springframework.batch.integration.launch.MessageToJobParametersStrategy#getJobParameters(org.springframework.integration.message.Message)
 	 */
 	public JobParameters getJobParameters(Message<?> message) {
 		JobParametersBuilder builder = new JobParametersBuilder();
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/item/MessageChannelItemWriter.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/item/MessageChannelItemWriter.java
similarity index 93%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/item/MessageChannelItemWriter.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/item/MessageChannelItemWriter.java
index d58168eea..d5c860674 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/item/MessageChannelItemWriter.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/item/MessageChannelItemWriter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.item;
+package org.springframework.batch.integration.item;
 
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.beans.factory.annotation.Required;
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/job/JobExecutionReply.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/job/JobExecutionReply.java
similarity index 90%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/job/JobExecutionReply.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/job/JobExecutionReply.java
index e731fb883..6990ae5c1 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/job/JobExecutionReply.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/job/JobExecutionReply.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.job;
+package org.springframework.batch.integration.job;
 
 /**
  * @author dsyer
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/job/JobExecutionRequest.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/job/JobExecutionRequest.java
similarity index 90%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/job/JobExecutionRequest.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/job/JobExecutionRequest.java
index b1889be73..f7d4c2199 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/job/JobExecutionRequest.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/job/JobExecutionRequest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.job;
+package org.springframework.batch.integration.job;
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobExecution;
@@ -52,14 +52,14 @@ public class JobExecutionRequest extends AttributeAccessorSupport {
 	}
 
 	/**
-	 * @return
+	 * @return the current job execution id
 	 */
 	public Long getJobId() {
 		return this.jobExecution.getJobId();
 	}
 
 	/**
-	 * @return
+	 * @return the current {@link BatchStatus}
 	 */
 	public BatchStatus getStatus() {
 		return status;
@@ -74,7 +74,7 @@ public class JobExecutionRequest extends AttributeAccessorSupport {
 	}
 
 	/**
-	 * @return
+	 * @return true if there are errors
 	 */
 	public boolean hasErrors() {
 		return throwable != null;
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/job/MessageOrientedStep.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/job/MessageOrientedStep.java
similarity index 95%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/job/MessageOrientedStep.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/job/MessageOrientedStep.java
index 6747e40d3..d8f184d45 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/job/MessageOrientedStep.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/job/MessageOrientedStep.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.job;
+package org.springframework.batch.integration.job;
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobInterruptedException;
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/job/StepExecutionMessageHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/job/StepExecutionMessageHandler.java
similarity index 96%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/job/StepExecutionMessageHandler.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/job/StepExecutionMessageHandler.java
index a6c17381b..b67e98fb5 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/job/StepExecutionMessageHandler.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/job/StepExecutionMessageHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.job;
+package org.springframework.batch.integration.job;
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobExecution;
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/job/StepExecutionTimeoutException.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/job/StepExecutionTimeoutException.java
similarity index 91%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/job/StepExecutionTimeoutException.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/job/StepExecutionTimeoutException.java
index a98b83ab2..424a63dd0 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/job/StepExecutionTimeoutException.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/job/StepExecutionTimeoutException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.job;
+package org.springframework.batch.integration.job;
 
 import org.springframework.batch.core.UnexpectedJobExecutionException;
 
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/JobLaunchingMessageHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandler.java
similarity index 93%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/JobLaunchingMessageHandler.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandler.java
index 85dcfdf68..67e2a4171 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/JobLaunchingMessageHandler.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandler.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
@@ -6,7 +6,6 @@ import org.springframework.batch.core.JobExecutionException;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.integration.annotation.Handler;
-import org.springframework.integration.annotation.MessageEndpoint;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageHandlingException;
 
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/JobLaunchingPostReceiveChannelInterceptor.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingPostReceiveChannelInterceptor.java
similarity index 95%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/JobLaunchingPostReceiveChannelInterceptor.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingPostReceiveChannelInterceptor.java
index 5a6981eec..954b6883b 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/JobLaunchingPostReceiveChannelInterceptor.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingPostReceiveChannelInterceptor.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecutionException;
@@ -27,7 +27,6 @@ public class JobLaunchingPostReceiveChannelInterceptor extends ChannelIntercepto
 	 * 
 	 * @param job The job to launch
 	 * @param jobLauncher
-	 * @param errorHandler
 	 */
 	public JobLaunchingPostReceiveChannelInterceptor(Job job, JobLauncher jobLauncher) {
 		super();
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/MessagePropertiesToJobParametersStrategy.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/MessagePropertiesToJobParametersStrategy.java
similarity index 93%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/MessagePropertiesToJobParametersStrategy.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/MessagePropertiesToJobParametersStrategy.java
index fd0720a40..23a60017e 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/MessagePropertiesToJobParametersStrategy.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/MessagePropertiesToJobParametersStrategy.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import java.util.Set;
 
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/MessageToJobParametersStrategy.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/MessageToJobParametersStrategy.java
similarity index 83%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/MessageToJobParametersStrategy.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/MessageToJobParametersStrategy.java
index d092cd253..7d04a3cd3 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/MessageToJobParametersStrategy.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/MessageToJobParametersStrategy.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import org.springframework.batch.core.JobParameters;
 import org.springframework.integration.message.Message;
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/MessageToJobStrategy.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/MessageToJobStrategy.java
similarity index 85%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/MessageToJobStrategy.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/MessageToJobStrategy.java
index d1d26d5db..9abbfbf6c 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/MessageToJobStrategy.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/MessageToJobStrategy.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import org.springframework.batch.core.Job;
 import org.springframework.integration.message.Message;
diff --git a/spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/StringPayloadAsJobNameStrategy.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/StringPayloadAsJobNameStrategy.java
similarity index 94%
rename from spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/StringPayloadAsJobNameStrategy.java
rename to spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/StringPayloadAsJobNameStrategy.java
index 58a255f82..cd285b99d 100644
--- a/spring-batch-integration/src/main/java/org/springframework/integration/batch/launch/StringPayloadAsJobNameStrategy.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/StringPayloadAsJobNameStrategy.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.configuration.JobLocator;
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/JobRepositorySupport.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobRepositorySupport.java
similarity index 96%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/JobRepositorySupport.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/JobRepositorySupport.java
index 33113d810..db9664e48 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/JobRepositorySupport.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobRepositorySupport.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch;
+package org.springframework.batch.integration;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/JobSupport.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobSupport.java
similarity index 93%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/JobSupport.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/JobSupport.java
index 813193423..f3b3589c3 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/JobSupport.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobSupport.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch;
+package org.springframework.batch.integration;
 
 import java.util.List;
 
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/SmokeTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/SmokeTests.java
similarity index 94%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/SmokeTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/SmokeTests.java
index 722baf0f4..06d4ab800 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/SmokeTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/SmokeTests.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch;
+package org.springframework.batch.integration;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/StepSupport.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/StepSupport.java
similarity index 93%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/StepSupport.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/StepSupport.java
index bac3efac8..7b02b7a13 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/StepSupport.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/StepSupport.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch;
+package org.springframework.batch.integration;
 
 import org.springframework.batch.core.JobInterruptedException;
 import org.springframework.batch.core.Step;
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/chunk/ChunkMessageItemWriterIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java
similarity index 94%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/chunk/ChunkMessageItemWriterIntegrationTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java
index 38d5d92d7..6aba45ab2 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/chunk/ChunkMessageItemWriterIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -25,6 +25,9 @@ import org.springframework.batch.core.repository.dao.MapJobInstanceDao;
 import org.springframework.batch.core.repository.dao.MapStepExecutionDao;
 import org.springframework.batch.core.repository.support.SimpleJobRepository;
 import org.springframework.batch.core.step.item.SimpleStepFactoryBean;
+import org.springframework.batch.integration.chunk.AsynchronousFailureException;
+import org.springframework.batch.integration.chunk.ChunkMessageChannelItemWriter;
+import org.springframework.batch.integration.chunk.ChunkRequest;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.support.ListItemReader;
 import org.springframework.batch.repeat.ExitStatus;
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/chunk/ItemWriterChunkHandlerTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandlerTests.java
similarity index 88%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/chunk/ItemWriterChunkHandlerTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandlerTests.java
index 33a651f09..4dfcc73c1 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/chunk/ItemWriterChunkHandlerTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandlerTests.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 import static org.junit.Assert.assertEquals;
 
@@ -6,6 +6,9 @@ import org.junit.Test;
 import org.springframework.batch.core.SkipListener;
 import org.springframework.batch.core.listener.SkipListenerSupport;
 import org.springframework.batch.core.step.skip.AlwaysSkipItemSkipPolicy;
+import org.springframework.batch.integration.chunk.ChunkRequest;
+import org.springframework.batch.integration.chunk.ChunkResponse;
+import org.springframework.batch.integration.chunk.ItemWriterChunkHandler;
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.util.StringUtils;
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/chunk/TestItemWriter.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/TestItemWriter.java
similarity index 91%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/chunk/TestItemWriter.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/TestItemWriter.java
index 2f8bbf066..afc3c2002 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/chunk/TestItemWriter.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/TestItemWriter.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/file/FileToMessagesJobFactoryBeanTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBeanTests.java
similarity index 87%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/file/FileToMessagesJobFactoryBeanTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBeanTests.java
index d3c656441..91c3d0171 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/file/FileToMessagesJobFactoryBeanTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBeanTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.file;
+package org.springframework.batch.integration.file;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -30,6 +30,9 @@ import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.JobParametersBuilder;
 import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.integration.JobRepositorySupport;
+import org.springframework.batch.integration.file.FileToMessagesJobFactoryBean;
+import org.springframework.batch.integration.file.ResourcePayloadAsJobParameterStrategy;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.file.mapping.FieldSet;
@@ -37,7 +40,6 @@ import org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper;
 import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.integration.batch.JobRepositorySupport;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.ThreadLocalChannel;
 import org.springframework.integration.dispatcher.DirectChannel;
@@ -76,7 +78,7 @@ public class FileToMessagesJobFactoryBeanTests {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.integration.batch.file.FileToMessagesJobFactoryBean#setBeanName(java.lang.String)}.
+	 * {@link org.springframework.batch.integration.file.FileToMessagesJobFactoryBean#setBeanName(java.lang.String)}.
 	 * @throws Exception 
 	 */
 	@Test
@@ -86,7 +88,7 @@ public class FileToMessagesJobFactoryBeanTests {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.integration.batch.file.FileToMessagesJobFactoryBean#setItemReader(org.springframework.batch.item.ItemReader)}.
+	 * {@link org.springframework.batch.integration.file.FileToMessagesJobFactoryBean#setItemReader(org.springframework.batch.item.ItemReader)}.
 	 */
 	@Test
 	public void testSetItemReader() {
@@ -100,7 +102,7 @@ public class FileToMessagesJobFactoryBeanTests {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.integration.batch.file.FileToMessagesJobFactoryBean#setChannel(org.springframework.integration.channel.MessageChannel)}.
+	 * {@link org.springframework.batch.integration.file.FileToMessagesJobFactoryBean#setChannel(org.springframework.integration.channel.MessageChannel)}.
 	 */
 	@Test
 	public void testSetChannel() {
@@ -114,7 +116,7 @@ public class FileToMessagesJobFactoryBeanTests {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.integration.batch.file.FileToMessagesJobFactoryBean#setJobRepository(org.springframework.batch.core.repository.JobRepository)}.
+	 * {@link org.springframework.batch.integration.file.FileToMessagesJobFactoryBean#setJobRepository(org.springframework.batch.core.repository.JobRepository)}.
 	 */
 	@Test
 	public void testSetJobRepository() {
@@ -128,7 +130,7 @@ public class FileToMessagesJobFactoryBeanTests {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.integration.batch.file.FileToMessagesJobFactoryBean#setTransactionManager(org.springframework.transaction.PlatformTransactionManager)}.
+	 * {@link org.springframework.batch.integration.file.FileToMessagesJobFactoryBean#setTransactionManager(org.springframework.transaction.PlatformTransactionManager)}.
 	 */
 	@Test
 	public void testSetTransactionManager() {
@@ -142,7 +144,7 @@ public class FileToMessagesJobFactoryBeanTests {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.integration.batch.file.FileToMessagesJobFactoryBean#getObject()}.
+	 * {@link org.springframework.batch.integration.file.FileToMessagesJobFactoryBean#getObject()}.
 	 * @throws Exception 
 	 */
 	@Test
@@ -152,7 +154,7 @@ public class FileToMessagesJobFactoryBeanTests {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.integration.batch.file.FileToMessagesJobFactoryBean#getObjectType()}.
+	 * {@link org.springframework.batch.integration.file.FileToMessagesJobFactoryBean#getObjectType()}.
 	 */
 	@Test
 	public void testGetObjectType() {
@@ -162,7 +164,7 @@ public class FileToMessagesJobFactoryBeanTests {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.integration.batch.file.FileToMessagesJobFactoryBean#isSingleton()}.
+	 * {@link org.springframework.batch.integration.file.FileToMessagesJobFactoryBean#isSingleton()}.
 	 */
 	@Test
 	public void testIsSingleton() {
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/file/ResourcePayloadAsJobParameterStrategyTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourcePayloadAsJobParameterStrategyTests.java
similarity index 87%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/file/ResourcePayloadAsJobParameterStrategyTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourcePayloadAsJobParameterStrategyTests.java
index 81467334a..8ed2ef8eb 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/file/ResourcePayloadAsJobParameterStrategyTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourcePayloadAsJobParameterStrategyTests.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.file;
+package org.springframework.batch.integration.file;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.integration.file.ResourcePayloadAsJobParameterStrategy;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
-import org.springframework.integration.batch.file.ResourcePayloadAsJobParameterStrategy;
 import org.springframework.integration.message.GenericMessage;
 
 /**
@@ -36,7 +36,7 @@ public class ResourcePayloadAsJobParameterStrategyTests {
 	private static final String INPUT_FILE_PATH = ResourcePayloadAsJobParameterStrategy.FILE_INPUT_PATH;
 
 	/**
-	 * Test method for {@link org.springframework.integration.batch.file.ResourcePayloadAsJobParameterStrategy#getJobParameters(org.springframework.integration.message.Message)}.
+	 * Test method for {@link org.springframework.batch.integration.file.ResourcePayloadAsJobParameterStrategy#getJobParameters(org.springframework.integration.message.Message)}.
 	 */
 	@Test
 	public void testGetJobParameters() {
@@ -46,7 +46,7 @@ public class ResourcePayloadAsJobParameterStrategyTests {
 	}
 
 	/**
-	 * Test method for {@link org.springframework.integration.batch.file.ResourcePayloadAsJobParameterStrategy#getJobParameters(org.springframework.integration.message.Message)}.
+	 * Test method for {@link org.springframework.batch.integration.file.ResourcePayloadAsJobParameterStrategy#getJobParameters(org.springframework.integration.message.Message)}.
 	 */
 	@Test
 	public void testGetJobParametersWithWrongPayload() {
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/file/ResourceSplitterIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java
similarity index 95%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/file/ResourceSplitterIntegrationTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java
index f30223446..89918ba0a 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/file/ResourceSplitterIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.file;
+package org.springframework.batch.integration.file;
 
 import static org.junit.Assert.assertNotNull;
 
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/item/MessageChannelItemWriterIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterIntegrationTests.java
similarity index 93%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/item/MessageChannelItemWriterIntegrationTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterIntegrationTests.java
index 4a2b409be..6c1deba8e 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/item/MessageChannelItemWriterIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterIntegrationTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.item;
+package org.springframework.batch.integration.item;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/item/MessageChannelItemWriterTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterTests.java
similarity index 88%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/item/MessageChannelItemWriterTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterTests.java
index e5731273d..850889e7c 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/item/MessageChannelItemWriterTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.item;
+package org.springframework.batch.integration.item;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -23,6 +23,7 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
 import org.junit.Test;
+import org.springframework.batch.integration.item.MessageChannelItemWriter;
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.integration.channel.MessageChannel;
@@ -42,7 +43,7 @@ import org.springframework.util.ReflectionUtils;
 public class MessageChannelItemWriterTests {
 
 	/**
-	 * Test method for {@link org.springframework.integration.batch.item.MessageChannelItemWriter#setChannel(org.springframework.integration.channel.MessageChannel)}.
+	 * Test method for {@link org.springframework.batch.integration.item.MessageChannelItemWriter#setChannel(org.springframework.integration.channel.MessageChannel)}.
 	 */
 	@Test
 	public void testSetChannel() {
@@ -54,7 +55,7 @@ public class MessageChannelItemWriterTests {
 	}
 
 	/**
-	 * Test method for {@link org.springframework.integration.batch.item.MessageChannelItemWriter#write(java.lang.Object)}.
+	 * Test method for {@link org.springframework.batch.integration.item.MessageChannelItemWriter#write(java.lang.Object)}.
 	 * @throws Exception 
 	 */
 	@Test
@@ -71,7 +72,7 @@ public class MessageChannelItemWriterTests {
 	}
 
 	/**
-	 * Test method for {@link org.springframework.integration.batch.item.MessageChannelItemWriter#write(java.lang.Object)}.
+	 * Test method for {@link org.springframework.batch.integration.item.MessageChannelItemWriter#write(java.lang.Object)}.
 	 * @throws Exception 
 	 */
 	@Test
@@ -94,7 +95,7 @@ public class MessageChannelItemWriterTests {
 	}
 
 	/**
-	 * Test method for {@link org.springframework.integration.batch.item.MessageChannelItemWriter#write(java.lang.Object)}.
+	 * Test method for {@link org.springframework.batch.integration.item.MessageChannelItemWriter#write(java.lang.Object)}.
 	 * @throws Exception 
 	 */
 	@Test
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/job/MessageOrientedStepIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/job/MessageOrientedStepIntegrationTests.java
similarity index 94%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/job/MessageOrientedStepIntegrationTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/job/MessageOrientedStepIntegrationTests.java
index 8efbd40fa..1119b6369 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/job/MessageOrientedStepIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/job/MessageOrientedStepIntegrationTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.job;
+package org.springframework.batch.integration.job;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/job/MessageOrientedStepTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/job/MessageOrientedStepTests.java
similarity index 88%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/job/MessageOrientedStepTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/job/MessageOrientedStepTests.java
index f6a430fe8..52a127916 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/job/MessageOrientedStepTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/job/MessageOrientedStepTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.job;
+package org.springframework.batch.integration.job;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -30,9 +30,12 @@ import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobInstance;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.integration.JobRepositorySupport;
+import org.springframework.batch.integration.job.JobExecutionRequest;
+import org.springframework.batch.integration.job.MessageOrientedStep;
+import org.springframework.batch.integration.job.StepExecutionTimeoutException;
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.integration.batch.JobRepositorySupport;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.ThreadLocalChannel;
 import org.springframework.integration.dispatcher.DirectChannel;
@@ -55,9 +58,6 @@ public class MessageOrientedStepTests {
 
 	private MessageChannel replyChannel;
 
-	/**
-	 * @return
-	 */
 	@Before
 	public void createStep() {
 		replyChannel = new ThreadLocalChannel();
@@ -73,7 +73,7 @@ public class MessageOrientedStepTests {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.integration.batch.job.MessageOrientedStep#setRequestChannel(org.springframework.integration.channel.MessageChannel)}.
+	 * {@link org.springframework.batch.integration.job.MessageOrientedStep#setRequestChannel(org.springframework.integration.channel.MessageChannel)}.
 	 */
 	@Test
 	public void testSetRequestChannel() {
@@ -87,7 +87,7 @@ public class MessageOrientedStepTests {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.integration.batch.job.MessageOrientedStep#setReplyChannel(org.springframework.integration.channel.MessageChannel)}.
+	 * {@link org.springframework.batch.integration.job.MessageOrientedStep#setReplyChannel(org.springframework.integration.channel.MessageChannel)}.
 	 */
 	@Test
 	public void testSetReplyChannel() {
@@ -101,9 +101,8 @@ public class MessageOrientedStepTests {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.integration.batch.job.MessageOrientedStep#execute(org.springframework.batch.core.StepExecution)}.
+	 * {@link org.springframework.batch.integration.job.MessageOrientedStep#execute(org.springframework.batch.core.StepExecution)}.
 	 * @throws Exception
-	 * @throws
 	 */
 	@Test
 	public void testExecuteWithTimeout() throws Exception {
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/job/StepExecutionMessageHandlerTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/job/StepExecutionMessageHandlerTests.java
similarity index 90%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/job/StepExecutionMessageHandlerTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/job/StepExecutionMessageHandlerTests.java
index c276a7163..6603dcea8 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/job/StepExecutionMessageHandlerTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/job/StepExecutionMessageHandlerTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.job;
+package org.springframework.batch.integration.job;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -32,16 +32,16 @@ import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.StartLimitExceededException;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.JobRestartException;
+import org.springframework.batch.integration.JobRepositorySupport;
+import org.springframework.batch.integration.JobSupport;
+import org.springframework.batch.integration.StepSupport;
+import org.springframework.batch.integration.job.JobExecutionRequest;
+import org.springframework.batch.integration.job.StepExecutionMessageHandler;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.support.PropertiesConverter;
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.integration.batch.JobRepositorySupport;
-import org.springframework.integration.batch.JobSupport;
-import org.springframework.integration.batch.StepSupport;
 import org.springframework.util.ReflectionUtils;
 
 /**
@@ -52,7 +52,7 @@ public class StepExecutionMessageHandlerTests {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.integration.batch.job.StepExecutionMessageHandler#setStep(org.springframework.batch.core.Step)}.
+	 * {@link org.springframework.batch.integration.job.StepExecutionMessageHandler#setStep(org.springframework.batch.core.Step)}.
 	 */
 	@Test
 	public void testSetStep() {
@@ -66,7 +66,7 @@ public class StepExecutionMessageHandlerTests {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.integration.batch.job.StepExecutionMessageHandler#setJobRepository(org.springframework.batch.core.repository.JobRepository)}.
+	 * {@link org.springframework.batch.integration.job.StepExecutionMessageHandler#setJobRepository(org.springframework.batch.core.repository.JobRepository)}.
 	 */
 	@Test
 	public void testSetJobRepository() {
@@ -78,13 +78,6 @@ public class StepExecutionMessageHandlerTests {
 		assertEquals(Required.class, annotations[0].annotationType());
 	}
 
-	/**
-	 * Test method for
-	 * {@link org.springframework.integration.batch.job.StepExecutionMessageHandler#handle(org.springframework.integration.message.Message)}.
-	 * @throws Exception
-	 * @throws JobRestartException
-	 * @throws JobExecutionAlreadyRunningException
-	 */
 	@SuppressWarnings("unchecked")
 	@Test
 	public void testVanillaHandle() throws Exception {
@@ -232,7 +225,7 @@ public class StepExecutionMessageHandlerTests {
 
 	/**
 	 * @param jobRepository
-	 * @return
+	 * @return a handler for step executions
 	 * 
 	 */
 	public StepExecutionMessageHandler createHandler(JobRepositorySupport jobRepository) {
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/job/TestTasklet.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/job/TestTasklet.java
similarity index 92%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/job/TestTasklet.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/job/TestTasklet.java
index 9dc78b039..5d539ce6b 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/job/TestTasklet.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/job/TestTasklet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.job;
+package org.springframework.batch.integration.job;
 
 import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.repeat.ExitStatus;
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/launch/JobLaunchingMessageHandlerIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java
similarity index 97%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/launch/JobLaunchingMessageHandlerIntegrationTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java
index 26df95a52..07820feda 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/launch/JobLaunchingMessageHandlerIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import static org.junit.Assert.*;
 
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/launch/JobLaunchingMessageHandlerTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java
similarity index 90%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/launch/JobLaunchingMessageHandlerTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java
index c67844cf5..60ab9fa2b 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/launch/JobLaunchingMessageHandlerTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import static org.junit.Assert.assertEquals;
 
@@ -13,8 +13,10 @@ import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobInstance;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.integration.JobSupport;
+import org.springframework.batch.integration.launch.JobLaunchingMessageHandler;
+import org.springframework.batch.integration.launch.MessageToJobStrategy;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.integration.batch.JobSupport;
 import org.springframework.integration.bus.MessageBus;
 import org.springframework.integration.channel.AbstractMessageChannel;
 import org.springframework.integration.message.Message;
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/launch/JobLaunchingPostReceiveChannelAdapterTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingPostReceiveChannelAdapterTests.java
similarity index 92%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/launch/JobLaunchingPostReceiveChannelAdapterTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingPostReceiveChannelAdapterTests.java
index 0c8d58fd1..f7511ec95 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/launch/JobLaunchingPostReceiveChannelAdapterTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingPostReceiveChannelAdapterTests.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -13,7 +13,8 @@ import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.integration.batch.JobSupport;
+import org.springframework.batch.integration.JobSupport;
+import org.springframework.batch.integration.launch.JobLaunchingPostReceiveChannelInterceptor;
 import org.springframework.integration.channel.AbstractMessageChannel;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-batch-integration/src/test/java/org/springframework/integration/batch/retry/PollableSourceRetryTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/PollableSourceRetryTests.java
similarity index 96%
rename from spring-batch-integration/src/test/java/org/springframework/integration/batch/retry/PollableSourceRetryTests.java
rename to spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/PollableSourceRetryTests.java
index c0c9e33b7..696115771 100644
--- a/spring-batch-integration/src/test/java/org/springframework/integration/batch/retry/PollableSourceRetryTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/PollableSourceRetryTests.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.retry;
+package org.springframework.batch.integration.retry;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/spring-batch-integration/src/test/resources/org/springframework/integration/batch/chunk/ChunkMessageItemWriterIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests-context.xml
similarity index 89%
rename from spring-batch-integration/src/test/resources/org/springframework/integration/batch/chunk/ChunkMessageItemWriterIntegrationTests-context.xml
rename to spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests-context.xml
index 4c1bc61e9..22061dcbc 100644
--- a/spring-batch-integration/src/test/resources/org/springframework/integration/batch/chunk/ChunkMessageItemWriterIntegrationTests-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests-context.xml
@@ -2,29 +2,29 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-                                 http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-                                 http://www.springframework.org/schema/integration
-                                 http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
-                                 http://www.springframework.org/schema/context
-                                 http://www.springframework.org/schema/context/spring-context-2.5.xsd
-                                 http://www.springframework.org/schema/tx
-                                 http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+                                 http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+                                 http://www.springframework.org/schema/integration
+                                 http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+                                 http://www.springframework.org/schema/context
+                                 http://www.springframework.org/schema/context/spring-context-2.5.xsd
+                                 http://www.springframework.org/schema/tx
+                                 http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 
-	<message-bus auto-create-channels="true" />
+	<message-bus auto-create-channels="true" />
 
-	<annotation-driven />
+	<annotation-driven />
 
-	<channel id="requests" />
-	<channel id="replies" />
+	<channel id="requests" />
+	<channel id="replies" />
 
 	<beans:bean id="transactionManager"
 		class="org.springframework.batch.support.transaction.ResourcelessTransactionManager" />
 	<tx:annotation-driven />
 
-	<beans:bean id="chunkHandler" class="org.springframework.integration.batch.chunk.ItemWriterChunkHandler">
+	<beans:bean id="chunkHandler" class="org.springframework.batch.integration.chunk.ItemWriterChunkHandler">
 		<beans:property name="itemWriter">
-			<beans:bean class="org.springframework.integration.batch.chunk.TestItemWriter"></beans:bean>
+			<beans:bean class="org.springframework.batch.integration.chunk.TestItemWriter"></beans:bean>
 		</beans:property>
 	</beans:bean>
 
diff --git a/spring-batch-integration/src/test/resources/org/springframework/integration/batch/file/ResourceSplitterIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests-context.xml
similarity index 100%
rename from spring-batch-integration/src/test/resources/org/springframework/integration/batch/file/ResourceSplitterIntegrationTests-context.xml
rename to spring-batch-integration/src/test/resources/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests-context.xml
diff --git a/spring-batch-integration/src/test/resources/org/springframework/integration/batch/item/MessageChannelItemWriterIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/item/MessageChannelItemWriterIntegrationTests-context.xml
similarity index 91%
rename from spring-batch-integration/src/test/resources/org/springframework/integration/batch/item/MessageChannelItemWriterIntegrationTests-context.xml
rename to spring-batch-integration/src/test/resources/org/springframework/batch/integration/item/MessageChannelItemWriterIntegrationTests-context.xml
index a0d338d14..e534226fb 100644
--- a/spring-batch-integration/src/test/resources/org/springframework/integration/batch/item/MessageChannelItemWriterIntegrationTests-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/item/MessageChannelItemWriterIntegrationTests-context.xml
@@ -13,7 +13,7 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 	<integration:message-bus auto-create-channels="true" />
 	<integration:channel id="requests" />
-	<bean id="itemWriter" class="org.springframework.integration.batch.item.MessageChannelItemWriter">
+	<bean id="itemWriter" class="org.springframework.batch.integration.item.MessageChannelItemWriter">
 		<property name="channel" ref="requests"/>
 	</bean>
 </beans>
\ No newline at end of file
diff --git a/spring-batch-integration/src/test/resources/org/springframework/integration/batch/job/MessageOrientedStepIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/job/MessageOrientedStepIntegrationTests-context.xml
similarity index 89%
rename from spring-batch-integration/src/test/resources/org/springframework/integration/batch/job/MessageOrientedStepIntegrationTests-context.xml
rename to spring-batch-integration/src/test/resources/org/springframework/batch/integration/job/MessageOrientedStepIntegrationTests-context.xml
index e292418c4..2efb124e6 100644
--- a/spring-batch-integration/src/test/resources/org/springframework/integration/batch/job/MessageOrientedStepIntegrationTests-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/job/MessageOrientedStepIntegrationTests-context.xml
@@ -21,7 +21,7 @@
 	<bean id="job" parent="simpleJob">
 		<property name="steps">
 			<bean
-				class="org.springframework.integration.batch.job.MessageOrientedStep">
+				class="org.springframework.batch.integration.job.MessageOrientedStep">
 				<property name="name" value="TODO: I shouldn't have to set this"/>
 				<property name="requestChannel" ref="requests" />
 				<property name="replyChannel" ref="replies" />
@@ -31,12 +31,12 @@
 		<property name="jobRepository" ref="jobRepository" />
 	</bean>
 	<bean id="step"
-		class="org.springframework.integration.batch.job.StepExecutionMessageHandler">
+		class="org.springframework.batch.integration.job.StepExecutionMessageHandler">
 		<property name="step">
 			<bean parent="taskletStep">
 				<property name="tasklet">
 					<bean
-						class="org.springframework.integration.batch.job.TestTasklet" />
+						class="org.springframework.batch.integration.job.TestTasklet" />
 				</property>
 			</bean>
 		</property>
diff --git a/spring-batch-integration/src/test/resources/org/springframework/integration/batch/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml
similarity index 85%
rename from spring-batch-integration/src/test/resources/org/springframework/integration/batch/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml
rename to spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml
index a30b456c5..057a88a1f 100644
--- a/spring-batch-integration/src/test/resources/org/springframework/integration/batch/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml
+++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml
@@ -21,12 +21,12 @@
 	
 	<integration:handler-endpoint input-channel="requests" handler="jobLaunchingHandler" method="handle"/>
 	
-	<bean id="jobLaunchingHandler" class="org.springframework.integration.batch.launch.JobLaunchingMessageHandler">
+	<bean id="jobLaunchingHandler" class="org.springframework.batch.integration.launch.JobLaunchingMessageHandler">
 		<constructor-arg ref="jobLauncher"/>
 		<constructor-arg ref="messageToJobStrategy"/>
 	</bean>
 	
-	<bean id="messageToJobStrategy" class="org.springframework.integration.batch.launch.StringPayloadAsJobNameStrategy">
+	<bean id="messageToJobStrategy" class="org.springframework.batch.integration.launch.StringPayloadAsJobNameStrategy">
 		<constructor-arg ref="jobRegistry" />
 	</bean>
 	
@@ -36,7 +36,7 @@
 	
 	<bean id="step" class="org.springframework.batch.core.step.tasklet.TaskletStep">
 		<property name="tasklet">
-				<bean class="org.springframework.integration.batch.job.TestTasklet"/>
+				<bean class="org.springframework.batch.integration.job.TestTasklet"/>
 		</property>
 		<property name="jobRepository" ref="jobRepository"/>
 	</bean>