diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunner.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java
similarity index 99%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunner.java
rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java
index 45449cd2e..f0b2b553f 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunner.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 import java.util.Properties;
 
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactory.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java
similarity index 98%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactory.java
rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java
index 1bfb5a5bc..65b70acfd 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactory.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 import java.text.DateFormat;
 import java.text.DecimalFormat;
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExitCodeMapper.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExitCodeMapper.java
similarity index 91%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExitCodeMapper.java
rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExitCodeMapper.java
index 38fe44e03..14bde3e0e 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExitCodeMapper.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExitCodeMapper.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 
 /**
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExportedJobLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java
similarity index 93%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExportedJobLauncher.java
rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java
index d1452ba96..9c81360db 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExportedJobLauncher.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 import java.util.Properties;
 
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/JvmSystemExiter.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/JvmSystemExiter.java
similarity index 86%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/JvmSystemExiter.java
rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/JvmSystemExiter.java
index 142df2413..fd1329d9c 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/JvmSystemExiter.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/JvmSystemExiter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 /**
  * Implementation of the {@link SystemExiter} interface that calls the standards
@@ -31,7 +31,7 @@ public class JvmSystemExiter implements SystemExiter {
 	 * Delegate call to System.exit() with the argument provided. Do not use
 	 * this at home children!
 	 * 
-	 * @see org.springframework.batch.execution.bootstrap.SystemExiter#exit(int)
+	 * @see org.springframework.batch.execution.launch.support.SystemExiter#exit(int)
 	 */
 	public void exit(int status) {
 		System.exit(status);
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactory.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java
similarity index 98%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactory.java
rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java
index 00f16e2c8..2b4792793 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactory.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 import java.text.DateFormat;
 import java.text.ParseException;
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java
similarity index 98%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncher.java
rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java
index 2ae497168..e2d2263ed 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncher.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapper.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapper.java
similarity index 94%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapper.java
rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapper.java
index 20ae329ef..cfea7de70 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapper.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SystemExiter.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SystemExiter.java
similarity index 92%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SystemExiter.java
rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SystemExiter.java
index fe4cbdf59..7f4d8bb32 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SystemExiter.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SystemExiter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 /**
  * Interface for exiting the JVM.  This abstraction is only
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/package.html
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/package.html
rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/package.html
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java
index d262dee97..54c02ff93 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java
@@ -30,7 +30,7 @@ import org.springframework.batch.core.domain.StepExecution;
 import org.springframework.batch.core.domain.StepListener;
 import org.springframework.batch.core.listener.StepListenerSupport;
 import org.springframework.batch.core.runtime.JobParametersFactory;
-import org.springframework.batch.execution.bootstrap.DefaultJobParametersFactory;
+import org.springframework.batch.execution.launch.support.DefaultJobParametersFactory;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.FileSystemResourceLoader;
 import org.springframework.core.io.Resource;
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunnerTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java
similarity index 95%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunnerTests.java
rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java
index 3905a22d4..f0041c908 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunnerTests.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 import junit.framework.TestCase;
 
@@ -22,9 +22,9 @@ import org.springframework.batch.core.domain.JobExecution;
 import org.springframework.batch.core.domain.JobParameters;
 import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
 import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier;
-import org.springframework.batch.execution.bootstrap.CommandLineJobRunner;
-import org.springframework.batch.execution.bootstrap.SystemExiter;
 import org.springframework.batch.execution.launch.JobLauncher;
+import org.springframework.batch.execution.launch.support.CommandLineJobRunner;
+import org.springframework.batch.execution.launch.support.SystemExiter;
 import org.springframework.batch.repeat.ExitStatus;
 
 /**
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactoryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java
similarity index 97%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactoryTests.java
rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java
index 002676382..c36bc1e6e 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactoryTests.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 import java.text.DateFormat;
 import java.text.DecimalFormat;
@@ -25,7 +25,7 @@ import junit.framework.TestCase;
 
 import org.springframework.batch.core.domain.JobParameters;
 import org.springframework.batch.core.domain.JobParametersBuilder;
-import org.springframework.batch.execution.bootstrap.DefaultJobParametersFactory;
+import org.springframework.batch.execution.launch.support.DefaultJobParametersFactory;
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactoryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java
similarity index 95%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactoryTests.java
rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java
index 3cbb34045..b6c96a202 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactoryTests.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
 
 import org.springframework.batch.core.domain.JobParameters;
 import org.springframework.batch.core.domain.JobParametersBuilder;
-import org.springframework.batch.execution.bootstrap.ScheduledJobParametersFactory;
+import org.springframework.batch.execution.launch.support.ScheduledJobParametersFactory;
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncherTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java
similarity index 84%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncherTests.java
rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java
index a6e70951a..7fb34d854 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncherTests.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,11 +28,11 @@ import org.springframework.batch.core.domain.JobParametersBuilder;
 import org.springframework.batch.core.domain.StepExecution;
 import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
 import org.springframework.batch.core.runtime.JobParametersFactory;
-import org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher;
 import org.springframework.batch.execution.configuration.MapJobRegistry;
 import org.springframework.batch.execution.configuration.ReferenceJobFactory;
 import org.springframework.batch.execution.job.JobSupport;
 import org.springframework.batch.execution.launch.JobLauncher;
+import org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher;
 import org.springframework.batch.execution.step.StepSupport;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.support.PropertiesConverter;
@@ -66,7 +66,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#afterPropertiesSet()}.
+	 * {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#afterPropertiesSet()}.
 	 * @throws Exception
 	 */
 	public void testAfterPropertiesSet() throws Exception {
@@ -83,7 +83,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#afterPropertiesSet()}.
+	 * {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#afterPropertiesSet()}.
 	 * @throws Exception
 	 */
 	public void testAfterPropertiesSetWithLauncher() throws Exception {
@@ -105,7 +105,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#getStatistics()}.
+	 * {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#getStatistics()}.
 	 */
 	public void testGetStatistics() {
 		Properties props = launcher.getStatistics();
@@ -115,7 +115,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#getStatistics()}.
+	 * {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#getStatistics()}.
 	 * @throws Exception
 	 */
 	public void testGetStatisticsWithContent() throws Exception {
@@ -128,7 +128,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#isRunning()}.
+	 * {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#isRunning()}.
 	 * @throws Exception
 	 */
 	public void testIsRunning() throws Exception {
@@ -139,7 +139,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#isRunning()}.
+	 * {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#isRunning()}.
 	 * @throws Exception
 	 */
 	public void testAlreadyRunning() throws Exception {
@@ -155,7 +155,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#run(java.lang.String)}.
+	 * {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#run(java.lang.String)}.
 	 */
 	public void testRunNonExistentJob() {
 		String value = launcher.run("foo");
@@ -164,7 +164,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#run(java.lang.String)}.
+	 * {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#run(java.lang.String)}.
 	 * @throws Exception 
 	 */
 	public void testRunJobWithParameters() throws Exception {
@@ -176,7 +176,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#run(java.lang.String)}.
+	 * {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#run(java.lang.String)}.
 	 * @throws Exception 
 	 */
 	public void testRunJobWithParametersAndFactory() throws Exception {
@@ -196,7 +196,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#stop()}.
+	 * {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#stop()}.
 	 * @throws Exception 
 	 */
 	public void testStop() throws Exception {
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapperTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapperTests.java
similarity index 89%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapperTests.java
rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapperTests.java
index b70ec33fc..4d0600aae 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapperTests.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapperTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.execution.bootstrap.ExitCodeMapper;
-import org.springframework.batch.execution.bootstrap.SimpleJvmExitCodeMapper;
+import org.springframework.batch.execution.launch.support.ExitCodeMapper;
+import org.springframework.batch.execution.launch.support.SimpleJvmExitCodeMapper;
 import org.springframework.batch.repeat.ExitStatus;
 
 public class SimpleJvmExitCodeMapperTests extends TestCase {
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/StubJobLauncher.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java
similarity index 92%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/StubJobLauncher.java
rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java
index 595a6aaa3..9c817ef79 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/StubJobLauncher.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.execution.bootstrap;
+package org.springframework.batch.execution.launch.support;
 
 import org.springframework.batch.core.domain.Job;
 import org.springframework.batch.core.domain.JobExecution;
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml
index 40053e7b1..905ea37f3 100644
--- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml
+++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml
@@ -7,14 +7,14 @@
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
-	<bean id="simpleContainerLauncher" class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubJobLauncher" />
+	<bean id="simpleContainerLauncher" class="org.springframework.batch.execution.launch.support.CommandLineJobRunnerTests$StubJobLauncher" />
 
-	<bean class="org.springframework.batch.execution.bootstrap.SimpleJvmExitCodeMapper" />
+	<bean class="org.springframework.batch.execution.launch.support.SimpleJvmExitCodeMapper" />
 
 	<bean
-		class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubSystemExiter" />
+		class="org.springframework.batch.execution.launch.support.CommandLineJobRunnerTests$StubSystemExiter" />
 		
 	<bean
-		class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubExceptionClassifier" />
+		class="org.springframework.batch.execution.launch.support.CommandLineJobRunnerTests$StubExceptionClassifier" />
 
 </beans>
diff --git a/spring-batch-execution/src/test/resources/simple-container-definition.xml b/spring-batch-execution/src/test/resources/simple-container-definition.xml
index 81ba33472..350706ec0 100644
--- a/spring-batch-execution/src/test/resources/simple-container-definition.xml
+++ b/spring-batch-execution/src/test/resources/simple-container-definition.xml
@@ -62,7 +62,7 @@
 	<!-- init-method="clear"/-->
 
 	<bean
-		class="org.springframework.batch.execution.bootstrap.SimpleJvmExitCodeMapper" />
+		class="org.springframework.batch.execution.launch.support.SimpleJvmExitCodeMapper" />
 
 	<bean
 		class="org.springframework.beans.factory.config.CustomEditorConfigurer">
@@ -93,6 +93,6 @@
 	</bean>
 
 	<bean
-		class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubSystemExiter" />
+		class="org.springframework.batch.execution.launch.support.CommandLineJobRunnerTests$StubSystemExiter" />
 
 </beans>