diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/ListenerMulticaster.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java
similarity index 90%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/ListenerMulticaster.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java
index 7f0545a3b..8af539826 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/ListenerMulticaster.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.listener;
 
 import org.springframework.batch.core.BatchListener;
 import org.springframework.batch.core.ChunkListener;
@@ -21,10 +21,6 @@ import org.springframework.batch.core.ItemReadListener;
 import org.springframework.batch.core.ItemWriteListener;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.StepListener;
-import org.springframework.batch.core.listener.CompositeChunkListener;
-import org.springframework.batch.core.listener.CompositeItemReadListener;
-import org.springframework.batch.core.listener.CompositeItemWriteListener;
-import org.springframework.batch.core.listener.CompositeStepListener;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.repeat.ExitStatus;
 
@@ -32,7 +28,7 @@ import org.springframework.batch.repeat.ExitStatus;
  * @author Dave Syer
  * 
  */
-public class ListenerMulticaster implements StepListener, ChunkListener, ItemReadListener,
+public class MulticasterBatchListener implements StepListener, ChunkListener, ItemReadListener,
 		ItemWriteListener {
 
 	private CompositeStepListener stepListener = new CompositeStepListener();
@@ -46,13 +42,13 @@ public class ListenerMulticaster implements StepListener, ChunkListener, ItemRea
 	/**
 	 * Initialise the listener instance.
 	 */
-	public ListenerMulticaster() {
+	public MulticasterBatchListener() {
 		super();
 	}
 
 	/**
 	 * Register each of the objects as listeners. Once registered, calls to the
-	 * {@link ListenerMulticaster} broadcast to the individual listeners.
+	 * {@link MulticasterBatchListener} broadcast to the individual listeners.
 	 * 
 	 * @param listeners an array of listener objects of types known to the
 	 * multicaster.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/AbstractStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStepFactoryBean.java
similarity index 97%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/AbstractStepFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStepFactoryBean.java
index 274dd9c8b..07e2ac0d7 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/AbstractStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStepFactoryBean.java
@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.step.ItemOrientedStep;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.beans.factory.BeanNameAware;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/AlwaysSkipItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AlwaysSkipItemSkipPolicy.java
similarity index 94%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/AlwaysSkipItemSkipPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/AlwaysSkipItemSkipPolicy.java
index 89ad0eb0c..3bad4bcee 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/AlwaysSkipItemSkipPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AlwaysSkipItemSkipPolicy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.ItemSkipPolicy;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/BatchListenerFactoryHelper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/BatchListenerFactoryHelper.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/BatchListenerFactoryHelper.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/BatchListenerFactoryHelper.java
index a0bc12e00..a7c182054 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/BatchListenerFactoryHelper.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/BatchListenerFactoryHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/DefaultItemFailureHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/DefaultItemFailureHandler.java
similarity index 97%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/DefaultItemFailureHandler.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/DefaultItemFailureHandler.java
index f3d8efe6e..5fa91c070 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/DefaultItemFailureHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/DefaultItemFailureHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/DefaultStepExecutionSynchronizer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/DefaultStepExecutionSynchronizer.java
similarity index 96%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/DefaultStepExecutionSynchronizer.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/DefaultStepExecutionSynchronizer.java
index 6c08d842e..ba8b61e88 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/DefaultStepExecutionSynchronizer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/DefaultStepExecutionSynchronizer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.StepExecution;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/DefaultStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/DefaultStepFactoryBean.java
similarity index 96%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/DefaultStepFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/DefaultStepFactoryBean.java
index 45adc3824..b06270515 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/DefaultStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/DefaultStepFactoryBean.java
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.BatchListener;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepListener;
-import org.springframework.batch.core.step.ItemHandler;
-import org.springframework.batch.core.step.ItemOrientedStep;
+import org.springframework.batch.core.listener.MulticasterBatchListener;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
@@ -47,7 +46,7 @@ public class DefaultStepFactoryBean extends AbstractStepFactoryBean {
 
 	private BatchListener[] listeners = new BatchListener[0];
 
-	private ListenerMulticaster listener = new ListenerMulticaster();
+	private MulticasterBatchListener listener = new MulticasterBatchListener();
 
 	private TaskExecutor taskExecutor;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/ItemOrientedStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/ItemOrientedStep.java
index eaca4e22c..388d8cd27 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/ItemOrientedStep.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/ItemOrientedStep.java
@@ -28,11 +28,6 @@ import org.springframework.batch.core.UnexpectedJobExecutionException;
 import org.springframework.batch.core.listener.CompositeStepListener;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier;
-import org.springframework.batch.core.step.support.DefaultStepExecutionSynchronizer;
-import org.springframework.batch.core.step.support.SimpleExitStatusExceptionClassifier;
-import org.springframework.batch.core.step.support.StepExecutionSynchronizer;
-import org.springframework.batch.core.step.support.StepInterruptionPolicy;
-import org.springframework.batch.core.step.support.ThreadStepInterruptionPolicy;
 import org.springframework.batch.core.tasklet.Tasklet;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/ItemSkipPolicyItemHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/ItemSkipPolicyItemHandler.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/ItemSkipPolicyItemHandler.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/ItemSkipPolicyItemHandler.java
index f7441a616..da0aa10ad 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/ItemSkipPolicyItemHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/ItemSkipPolicyItemHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.ItemSkipPolicy;
 import org.springframework.batch.core.StepContribution;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/LimitCheckingItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/LimitCheckingItemSkipPolicy.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/LimitCheckingItemSkipPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/LimitCheckingItemSkipPolicy.java
index 8f9e8ab56..3d013a91d 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/LimitCheckingItemSkipPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/LimitCheckingItemSkipPolicy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/NeverSkipItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/NeverSkipItemSkipPolicy.java
similarity index 94%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/NeverSkipItemSkipPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/NeverSkipItemSkipPolicy.java
index a1b2693c3..56b81b82b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/NeverSkipItemSkipPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/NeverSkipItemSkipPolicy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.ItemSkipPolicy;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/RepeatOperationsStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/RepeatOperationsStepFactoryBean.java
similarity index 97%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/RepeatOperationsStepFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/RepeatOperationsStepFactoryBean.java
index f499320b3..a70d69b55 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/RepeatOperationsStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/RepeatOperationsStepFactoryBean.java
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.BatchListener;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepListener;
-import org.springframework.batch.core.step.ItemOrientedStep;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/SimpleExitStatusExceptionClassifier.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleExitStatusExceptionClassifier.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/SimpleExitStatusExceptionClassifier.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleExitStatusExceptionClassifier.java
index 524e9a432..c64fede1e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/SimpleExitStatusExceptionClassifier.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleExitStatusExceptionClassifier.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/SimpleItemHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleItemHandler.java
similarity index 96%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/SimpleItemHandler.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleItemHandler.java
index bd12868b6..0a1797c48 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/SimpleItemHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleItemHandler.java
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.step.ItemHandler;
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;
 import org.springframework.batch.item.ItemReader;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/SimpleRetryExceptionHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleRetryExceptionHandler.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/SimpleRetryExceptionHandler.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleRetryExceptionHandler.java
index 78ea3494e..3721fbd9b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/SimpleRetryExceptionHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleRetryExceptionHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.exception.ExceptionHandler;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/SkipLimitExceededException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/SkipLimitExceededException.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/SkipLimitExceededException.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/SkipLimitExceededException.java
index 59ec95883..7f10e6184 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/SkipLimitExceededException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/SkipLimitExceededException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.UnexpectedJobExecutionException;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/StatefulRetryStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StatefulRetryStepFactoryBean.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/StatefulRetryStepFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/StatefulRetryStepFactoryBean.java
index 1bf4b3e8a..f65256d13 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/StatefulRetryStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StatefulRetryStepFactoryBean.java
@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.step.ItemOrientedStep;
 import org.springframework.batch.item.ItemKeyGenerator;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemRecoverer;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/StepExecutionSynchronizer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepExecutionSynchronizer.java
similarity index 96%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/StepExecutionSynchronizer.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/StepExecutionSynchronizer.java
index ec5ff4d93..29c7ec3cd 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/StepExecutionSynchronizer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepExecutionSynchronizer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.StepExecution;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/StepInterruptionPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepInterruptionPolicy.java
similarity index 96%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/StepInterruptionPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/StepInterruptionPolicy.java
index e756bfd66..de3fbd31f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/StepInterruptionPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepInterruptionPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.JobInterruptedException;
 import org.springframework.batch.core.Step;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/ThreadStepInterruptionPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicy.java
similarity index 97%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/support/ThreadStepInterruptionPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicy.java
index f03d68bc9..07889ea93 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/ThreadStepInterruptionPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/package.html b/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/package.html
deleted file mode 100644
index 654cd2178..000000000
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/support/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-Specific implementations of simple concerns.
-</p>
-</body>
-</html>
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java
index 06b0d7f52..8bbed42b4 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java
@@ -42,7 +42,7 @@ import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
 import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
 import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
 import org.springframework.batch.core.step.AbstractStep;
-import org.springframework.batch.core.step.support.NeverSkipItemSkipPolicy;
+import org.springframework.batch.core.step.NeverSkipItemSkipPolicy;
 import org.springframework.batch.item.AbstractItemReader;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/DefaultStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/DefaultStepFactoryBeanTests.java
similarity index 98%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/support/DefaultStepFactoryBeanTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/DefaultStepFactoryBeanTests.java
index fa77ca86b..274d47bf2 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/DefaultStepFactoryBeanTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/DefaultStepFactoryBeanTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,8 +34,8 @@ import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
 import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
 import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
 import org.springframework.batch.core.step.AbstractStep;
+import org.springframework.batch.core.step.DefaultStepFactoryBean;
 import org.springframework.batch.core.step.ItemOrientedStep;
-import org.springframework.batch.core.step.support.DefaultStepFactoryBean;
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/ItemOrientedStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/ItemOrientedStepTests.java
index eef1c203e..96ca331ad 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/ItemOrientedStepTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/ItemOrientedStepTests.java
@@ -39,9 +39,6 @@ import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
 import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
 import org.springframework.batch.core.step.AbstractStep;
 import org.springframework.batch.core.step.ItemOrientedStep;
-import org.springframework.batch.core.step.support.JobRepositorySupport;
-import org.springframework.batch.core.step.support.SimpleItemHandler;
-import org.springframework.batch.core.step.support.StepInterruptionPolicy;
 import org.springframework.batch.item.AbstractItemReader;
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ExecutionContext;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/JobRepositorySupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/JobRepositorySupport.java
similarity index 97%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/support/JobRepositorySupport.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/JobRepositorySupport.java
index e4f6fe4f2..585b6367a 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/JobRepositorySupport.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/JobRepositorySupport.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/MockItemReader.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/MockItemReader.java
similarity index 96%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/support/MockItemReader.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/MockItemReader.java
index 9a2cb7e8e..6b65dd0d8 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/MockItemReader.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/MockItemReader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.MarkFailedException;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/RepeatOperationsStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/RepeatOperationsStepFactoryBeanTests.java
similarity index 95%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/support/RepeatOperationsStepFactoryBeanTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/RepeatOperationsStepFactoryBeanTests.java
index d1fb563d1..76ec684e0 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/RepeatOperationsStepFactoryBeanTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/RepeatOperationsStepFactoryBeanTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,7 +27,7 @@ import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.job.JobSupport;
 import org.springframework.batch.core.launch.EmptyItemWriter;
-import org.springframework.batch.core.step.support.RepeatOperationsStepFactoryBean;
+import org.springframework.batch.core.step.RepeatOperationsStepFactoryBean;
 import org.springframework.batch.item.reader.ListItemReader;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatCallback;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/SimpleExitStatusExceptionClassifierTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/SimpleExitStatusExceptionClassifierTests.java
similarity index 95%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/support/SimpleExitStatusExceptionClassifierTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/SimpleExitStatusExceptionClassifierTests.java
index 36ad41f29..782b873fe 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/SimpleExitStatusExceptionClassifierTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/SimpleExitStatusExceptionClassifierTests.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 
 import org.springframework.batch.core.JobInterruptedException;
 import org.springframework.batch.core.launch.support.ExitCodeMapper;
 import org.springframework.batch.core.repository.NoSuchJobException;
 import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier;
-import org.springframework.batch.core.step.support.SimpleExitStatusExceptionClassifier;
 import org.springframework.batch.repeat.ExitStatus;
 
 import junit.framework.TestCase;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/SimpleRetryExceptionHandlerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/SimpleRetryExceptionHandlerTests.java
similarity index 87%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/support/SimpleRetryExceptionHandlerTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/SimpleRetryExceptionHandlerTests.java
index 7e3318b4f..51cc17c90 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/SimpleRetryExceptionHandlerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/SimpleRetryExceptionHandlerTests.java
@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.core.step.support.SimpleRetryExceptionHandler;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
 import org.springframework.batch.repeat.exception.SimpleLimitExceptionHandler;
@@ -52,7 +51,7 @@ public class SimpleRetryExceptionHandlerTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.core.step.support.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
+	 * {@link org.springframework.batch.core.step.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
 	 */
 	public void testRethrowWhenRetryExhausted() {
 
@@ -77,7 +76,7 @@ public class SimpleRetryExceptionHandlerTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.core.step.support.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
+	 * {@link org.springframework.batch.core.step.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
 	 */
 	public void testNoRethrowWhenRetryNotExhausted() {
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/SkipLimitReadFailurePolicyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/SkipLimitReadFailurePolicyTests.java
similarity index 88%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/support/SkipLimitReadFailurePolicyTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/SkipLimitReadFailurePolicyTests.java
index 1820d6c27..c1e8ea7ed 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/SkipLimitReadFailurePolicyTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/SkipLimitReadFailurePolicyTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -21,8 +21,6 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.core.step.support.LimitCheckingItemSkipPolicy;
-import org.springframework.batch.core.step.support.SkipLimitExceededException;
 import org.springframework.batch.item.file.FlatFileParseException;
 
 /**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/StatefulRetryStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/StatefulRetryStepFactoryBeanTests.java
similarity index 97%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/support/StatefulRetryStepFactoryBeanTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/StatefulRetryStepFactoryBeanTests.java
index 70a79c769..66c6ee5c0 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/StatefulRetryStepFactoryBeanTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/StatefulRetryStepFactoryBeanTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,7 +33,7 @@ import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
 import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
 import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
 import org.springframework.batch.core.step.ItemOrientedStep;
-import org.springframework.batch.core.step.support.StatefulRetryStepFactoryBean;
+import org.springframework.batch.core.step.StatefulRetryStepFactoryBean;
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemRecoverer;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/StepExecutorInterruptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepExecutorInterruptionTests.java
similarity index 96%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/support/StepExecutorInterruptionTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/StepExecutorInterruptionTests.java
index 39e92d3e5..db733446d 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/StepExecutorInterruptionTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepExecutorInterruptionTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import junit.framework.TestCase;
 
@@ -30,8 +30,7 @@ import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
 import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
 import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
 import org.springframework.batch.core.step.ItemOrientedStep;
-import org.springframework.batch.core.step.support.SimpleItemHandler;
-import org.springframework.batch.core.step.support.StepExecutionSynchronizer;
+import org.springframework.batch.core.step.SimpleItemHandler;
 import org.springframework.batch.item.AbstractItemReader;
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/TaskletStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/TaskletStepTests.java
index 486d0b6d5..ff725b97e 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/TaskletStepTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/TaskletStepTests.java
@@ -16,7 +16,6 @@ import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.job.JobSupport;
 import org.springframework.batch.core.listener.StepListenerSupport;
 import org.springframework.batch.core.step.TaskletStep;
-import org.springframework.batch.core.step.support.JobRepositorySupport;
 import org.springframework.batch.core.tasklet.Tasklet;
 import org.springframework.batch.repeat.ExitStatus;
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/ThreadStepInterruptionPolicyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicyTests.java
similarity index 97%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/support/ThreadStepInterruptionPolicyTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicyTests.java
index 453ca3fb3..8bc19f2b6 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/support/ThreadStepInterruptionPolicyTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicyTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import junit.framework.TestCase;
 
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/test-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/test-context.xml
index bf1c5fde3..9a59ee0bc 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/test-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/test-context.xml
@@ -20,7 +20,7 @@
 	<bean id="test-job"
 		class="org.springframework.batch.core.job.JobSupport">
 		<property name="steps">
-			<bean id="step1" class="org.springframework.batch.core.step.support.DefaultStepFactoryBean">
+			<bean id="step1" class="org.springframework.batch.core.step.DefaultStepFactoryBean">
 				<property name="itemReader" ref="itemReader" />
 				<property name="itemWriter" ref="itemWriter" />
 				<property name="jobRepository" ref="jobRepository" />
@@ -38,7 +38,7 @@
 		class="org.springframework.batch.core.launch.EmptyItemWriter" />
 
 	<bean id="jobRepository"
-		class="org.springframework.batch.core.step.support.JobRepositorySupport" />
+		class="org.springframework.batch.core.step.JobRepositorySupport" />
 
 	<bean id="transactionManager"
 		class="org.springframework.batch.support.transaction.ResourcelessTransactionManager" />
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/launch/support/job.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/launch/support/job.xml
index f2515475a..4a728f1fd 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/launch/support/job.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/launch/support/job.xml
@@ -15,7 +15,7 @@
 		class="org.springframework.batch.core.job.JobSupport">
 		<property name="steps">
 			<bean id="step1"
-				class="org.springframework.batch.core.step.support.DefaultStepFactoryBean">
+				class="org.springframework.batch.core.step.DefaultStepFactoryBean">
 				<property name="itemReader">
 					<bean
 						class="org.springframework.batch.item.reader.ListItemReader">
@@ -28,7 +28,7 @@
 				</property>
 				<property name="jobRepository">
 					<bean
-						class="org.springframework.batch.core.step.support.JobRepositorySupport" />
+						class="org.springframework.batch.core.step.JobRepositorySupport" />
 				</property>
 				<property name="transactionManager">
 					<bean
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/step/support/NoopStepInterruptionPolicy.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/step/support/NoopStepInterruptionPolicy.java
index 7e0ac5a46..9d30326c8 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/step/support/NoopStepInterruptionPolicy.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/step/support/NoopStepInterruptionPolicy.java
@@ -1,7 +1,7 @@
 package org.springframework.batch.sample.step.support;
 
 import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.step.support.StepInterruptionPolicy;
+import org.springframework.batch.core.step.StepInterruptionPolicy;
 import org.springframework.batch.repeat.RepeatContext;
 
 public class NoopStepInterruptionPolicy implements StepInterruptionPolicy {
diff --git a/spring-batch-samples/src/main/resources/jobs/retrySample.xml b/spring-batch-samples/src/main/resources/jobs/retrySample.xml
index 9b9705241..e2c17c527 100644
--- a/spring-batch-samples/src/main/resources/jobs/retrySample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/retrySample.xml
@@ -10,7 +10,7 @@
 	<bean id="retrySample" parent="simpleJob">
 		<property name="steps">
 			<bean id="step1" parent="simpleStep"
-				class="org.springframework.batch.core.step.support.StatefulRetryStepFactoryBean">
+				class="org.springframework.batch.core.step.StatefulRetryStepFactoryBean">
 				<property name="itemReader" ref="itemGenerator" />
 				<property name="itemWriter" ref="itemWriter" />
 				<property name="retryLimit" value="3" />
diff --git a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
index ca46d8077..993e42b49 100644
--- a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
@@ -58,7 +58,7 @@
 		<property name="allowStartIfComplete" value="true" />
 	</bean>
 
-	<bean id="simpleStep" class="org.springframework.batch.core.step.support.DefaultStepFactoryBean"
+	<bean id="simpleStep" class="org.springframework.batch.core.step.DefaultStepFactoryBean"
 		abstract="true">
 		<property name="transactionManager" ref="transactionManager" />
 		<property name="jobRepository" ref="jobRepository" />