diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/AbstractJobLauncher.java b/execution/src/main/java/org/springframework/batch/execution/bootstrap/AbstractJobLauncher.java
index b690d4e0a..107212df4 100644
--- a/execution/src/main/java/org/springframework/batch/execution/bootstrap/AbstractJobLauncher.java
+++ b/execution/src/main/java/org/springframework/batch/execution/bootstrap/AbstractJobLauncher.java
@@ -28,8 +28,8 @@ import org.springframework.batch.core.configuration.JobConfiguration;
 import org.springframework.batch.core.configuration.NoSuchJobConfigurationException;
 import org.springframework.batch.core.runtime.JobIdentifier;
 import org.springframework.batch.core.runtime.JobIdentifierFactory;
-import org.springframework.batch.execution.JobExecutorFacade;
-import org.springframework.batch.execution.NoSuchJobExecutionException;
+import org.springframework.batch.execution.facade.JobExecutorFacade;
+import org.springframework.batch.execution.facade.NoSuchJobExecutionException;
 import org.springframework.batch.execution.runtime.ScheduledJobIdentifierFactory;
 import org.springframework.batch.io.exception.BatchConfigurationException;
 import org.springframework.batch.repeat.ExitStatus;
diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/JobLauncher.java b/execution/src/main/java/org/springframework/batch/execution/bootstrap/JobLauncher.java
index 8e8713881..bb06d899b 100644
--- a/execution/src/main/java/org/springframework/batch/execution/bootstrap/JobLauncher.java
+++ b/execution/src/main/java/org/springframework/batch/execution/bootstrap/JobLauncher.java
@@ -17,7 +17,7 @@ package org.springframework.batch.execution.bootstrap;
 
 import org.springframework.batch.core.configuration.NoSuchJobConfigurationException;
 import org.springframework.batch.core.runtime.JobIdentifier;
-import org.springframework.batch.execution.JobExecutorFacade;
+import org.springframework.batch.execution.facade.JobExecutorFacade;
 import org.springframework.batch.repeat.ExitStatus;
 
 /**
diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleJobLauncher.java b/execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleJobLauncher.java
index 9537ceb17..73325c2ee 100644
--- a/execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleJobLauncher.java
+++ b/execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleJobLauncher.java
@@ -22,7 +22,7 @@ import org.springframework.batch.core.configuration.JobConfiguration;
 import org.springframework.batch.core.configuration.NoSuchJobConfigurationException;
 import org.springframework.batch.core.runtime.JobIdentifier;
 import org.springframework.batch.core.runtime.JobIdentifierFactory;
-import org.springframework.batch.execution.JobExecutorFacade;
+import org.springframework.batch.execution.facade.JobExecutorFacade;
 import org.springframework.batch.execution.runtime.ScheduledJobIdentifierFactory;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.util.Assert;
diff --git a/execution/src/main/java/org/springframework/batch/execution/JobExecutorFacade.java b/execution/src/main/java/org/springframework/batch/execution/facade/JobExecutorFacade.java
similarity index 97%
rename from execution/src/main/java/org/springframework/batch/execution/JobExecutorFacade.java
rename to execution/src/main/java/org/springframework/batch/execution/facade/JobExecutorFacade.java
index c711cea4f..ff7a51b14 100644
--- a/execution/src/main/java/org/springframework/batch/execution/JobExecutorFacade.java
+++ b/execution/src/main/java/org/springframework/batch/execution/facade/JobExecutorFacade.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.execution;
+package org.springframework.batch.execution.facade;
 
 import org.springframework.batch.core.configuration.NoSuchJobConfigurationException;
 import org.springframework.batch.core.runtime.JobIdentifier;
diff --git a/execution/src/main/java/org/springframework/batch/execution/NoSuchJobExecutionException.java b/execution/src/main/java/org/springframework/batch/execution/facade/NoSuchJobExecutionException.java
similarity index 90%
rename from execution/src/main/java/org/springframework/batch/execution/NoSuchJobExecutionException.java
rename to execution/src/main/java/org/springframework/batch/execution/facade/NoSuchJobExecutionException.java
index 7abcfe544..3fb6eeae8 100644
--- a/execution/src/main/java/org/springframework/batch/execution/NoSuchJobExecutionException.java
+++ b/execution/src/main/java/org/springframework/batch/execution/facade/NoSuchJobExecutionException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution;
+package org.springframework.batch.execution.facade;
 
 /**
  * @author Dave Syer
diff --git a/execution/src/main/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacade.java b/execution/src/main/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacade.java
index 510f14fd5..5fae84ebe 100644
--- a/execution/src/main/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacade.java
+++ b/execution/src/main/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacade.java
@@ -28,8 +28,6 @@ import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.runtime.JobExecutionContext;
 import org.springframework.batch.core.runtime.JobExecutionRegistry;
 import org.springframework.batch.core.runtime.JobIdentifier;
-import org.springframework.batch.execution.JobExecutorFacade;
-import org.springframework.batch.execution.NoSuchJobExecutionException;
 import org.springframework.batch.execution.job.DefaultJobExecutor;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatContext;
@@ -102,7 +100,7 @@ public class SimpleJobExecutorFacade implements JobExecutorFacade, StatisticsPro
 	 * Locates a {@link JobConfiguration} by using the name of the provided
 	 * {@link JobIdentifier} and the {@link JobConfigurationLocator}.
 	 * 
-	 * @see org.springframework.batch.execution.JobExecutorFacade#start(org.springframework.batch.execution.common.domain.JobConfiguration,
+	 * @see org.springframework.batch.execution.facade.JobExecutorFacade#start(org.springframework.batch.execution.common.domain.JobConfiguration,
 	 * org.springframework.batch.core.runtime.JobIdentifier)
 	 * 
 	 * @throws IllegalArgumentException if the runtime information is null or
diff --git a/execution/src/test/java/org/springframework/batch/execution/bootstrap/TaskExecutorJobLauncherTests.java b/execution/src/test/java/org/springframework/batch/execution/bootstrap/TaskExecutorJobLauncherTests.java
index 901e0cbd8..543ba7fba 100644
--- a/execution/src/test/java/org/springframework/batch/execution/bootstrap/TaskExecutorJobLauncherTests.java
+++ b/execution/src/test/java/org/springframework/batch/execution/bootstrap/TaskExecutorJobLauncherTests.java
@@ -30,7 +30,7 @@ import org.springframework.batch.core.configuration.NoSuchJobConfigurationExcept
 import org.springframework.batch.core.runtime.JobIdentifier;
 import org.springframework.batch.core.runtime.SimpleJobIdentifier;
 import org.springframework.batch.core.runtime.SimpleJobIdentifierFactory;
-import org.springframework.batch.execution.JobExecutorFacade;
+import org.springframework.batch.execution.facade.JobExecutorFacade;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.interceptor.RepeatOperationsApplicationEvent;
 import org.springframework.batch.statistics.StatisticsProvider;
diff --git a/execution/src/test/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacaderTests.java b/execution/src/test/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacaderTests.java
index 1c9bd774f..b24edb650 100644
--- a/execution/src/test/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacaderTests.java
+++ b/execution/src/test/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacaderTests.java
@@ -34,7 +34,6 @@ import org.springframework.batch.core.runtime.JobExecutionContext;
 import org.springframework.batch.core.runtime.JobExecutionRegistry;
 import org.springframework.batch.core.runtime.SimpleJobIdentifier;
 import org.springframework.batch.core.runtime.StepExecutionContext;
-import org.springframework.batch.execution.NoSuchJobExecutionException;
 import org.springframework.batch.io.exception.BatchCriticalException;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.context.RepeatContextSupport;