diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStepFactoryBean.java
index 07e2ac0d7..7a84d8f49 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStepFactoryBean.java
@@ -17,6 +17,8 @@ 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.item.ItemOrientedStep;
+import org.springframework.batch.core.step.item.SimpleItemHandler;
 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/TaskletStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/TaskletStep.java
index c30ce878d..5c99d7e16 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/TaskletStep.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/TaskletStep.java
@@ -27,7 +27,7 @@ import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.listener.CompositeStepListener;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.tasklet.Tasklet;
+import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AlwaysSkipItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AlwaysSkipItemSkipPolicy.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/AlwaysSkipItemSkipPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AlwaysSkipItemSkipPolicy.java
index 3bad4bcee..927b6d17e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AlwaysSkipItemSkipPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/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;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.ItemSkipPolicy;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/BackportConcurrentStepExecutionSynchronizer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BackportConcurrentStepExecutionSynchronizer.java
similarity index 96%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/BackportConcurrentStepExecutionSynchronizer.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BackportConcurrentStepExecutionSynchronizer.java
index 5eb8a4df1..ab4328027 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/BackportConcurrentStepExecutionSynchronizer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BackportConcurrentStepExecutionSynchronizer.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;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.StepExecution;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/BatchListenerFactoryHelper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchListenerFactoryHelper.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/BatchListenerFactoryHelper.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchListenerFactoryHelper.java
index 6f89c7830..26307f14e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/BatchListenerFactoryHelper.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/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;
+package org.springframework.batch.core.step.item;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/DefaultItemFailureHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/DefaultItemFailureHandler.java
similarity index 97%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/DefaultItemFailureHandler.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/DefaultItemFailureHandler.java
index 5fa91c070..46c8abc6b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/DefaultItemFailureHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/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;
+package org.springframework.batch.core.step.item;
 
 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/ExitStatusExceptionClassifier.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ExitStatusExceptionClassifier.java
similarity index 96%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/ExitStatusExceptionClassifier.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ExitStatusExceptionClassifier.java
index ba9c9d592..86b7395e8 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/ExitStatusExceptionClassifier.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ExitStatusExceptionClassifier.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;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.support.ExceptionClassifier;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/ItemHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemHandler.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/ItemHandler.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemHandler.java
index 7c7e6be5f..94aaf11ee 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/ItemHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemHandler.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;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.item.ClearFailedException;
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/item/ItemOrientedStep.java
similarity index 99%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/ItemOrientedStep.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemOrientedStep.java
index d599fbbfd..631d859a3 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/item/ItemOrientedStep.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;
+package org.springframework.batch.core.step.item;
 
 import java.util.Date;
 
@@ -27,7 +27,8 @@ import org.springframework.batch.core.StepListener;
 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.tasklet.Tasklet;
+import org.springframework.batch.core.step.AbstractStep;
+import org.springframework.batch.core.step.tasklet.Tasklet;
 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/ItemSkipPolicyItemHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemSkipPolicyItemHandler.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/ItemSkipPolicyItemHandler.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemSkipPolicyItemHandler.java
index 4b499b59d..c985df50c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/ItemSkipPolicyItemHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/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;
+package org.springframework.batch.core.step.item;
 
 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/JdkConcurrentStepExecutionSynchronizer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/JdkConcurrentStepExecutionSynchronizer.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/JdkConcurrentStepExecutionSynchronizer.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/JdkConcurrentStepExecutionSynchronizer.java
index 442103107..677154818 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/JdkConcurrentStepExecutionSynchronizer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/JdkConcurrentStepExecutionSynchronizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.concurrent.Semaphore;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/LimitCheckingItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/LimitCheckingItemSkipPolicy.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/LimitCheckingItemSkipPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/LimitCheckingItemSkipPolicy.java
index 94cad8d21..a83ac7d34 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/LimitCheckingItemSkipPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/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;
+package org.springframework.batch.core.step.item;
 
 import java.io.FileNotFoundException;
 import java.util.Collections;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/NeverSkipItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/NeverSkipItemSkipPolicy.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/NeverSkipItemSkipPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/NeverSkipItemSkipPolicy.java
index 56b81b82b..3584db30b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/NeverSkipItemSkipPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/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;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.ItemSkipPolicy;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/RepeatOperationsStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBean.java
similarity index 97%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/RepeatOperationsStepFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBean.java
index a70d69b55..a1bae9ff1 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/RepeatOperationsStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBean.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.BatchListener;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.step.AbstractStepFactoryBean;
 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/SimpleExitStatusExceptionClassifier.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleExitStatusExceptionClassifier.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleExitStatusExceptionClassifier.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleExitStatusExceptionClassifier.java
index 1347d2d9a..279a2be8e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleExitStatusExceptionClassifier.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/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;
+package org.springframework.batch.core.step.item;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleItemHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleItemHandler.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleItemHandler.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleItemHandler.java
index 24d5b6896..ad630e4ef 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleItemHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleItemHandler.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;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.item.ClearFailedException;
@@ -72,7 +72,7 @@ public class SimpleItemHandler implements ItemHandler {
 	 * Get the next item from {@link #read(StepContribution)} and if not null
 	 * pass the item to {@link #write(Object, StepContribution)}.
 	 * 
-	 * @see org.springframework.batch.core.step.ItemHandler#handle(org.springframework.batch.core.StepContribution)
+	 * @see org.springframework.batch.core.step.item.ItemHandler#handle(org.springframework.batch.core.StepContribution)
 	 */
 	public ExitStatus handle(StepContribution contribution) throws Exception {
 		Object item = read(contribution);
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleRetryExceptionHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandler.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleRetryExceptionHandler.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandler.java
index 3721fbd9b..2a37fbf96 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleRetryExceptionHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/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;
+package org.springframework.batch.core.step.item;
 
 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/SimpleStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleStepFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java
index e789e0bc6..6e5a86331 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/SimpleStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.BatchListener;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.listener.MulticasterBatchListener;
+import org.springframework.batch.core.step.AbstractStepFactoryBean;
 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/SkipLimitExceededException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SkipLimitExceededException.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/SkipLimitExceededException.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SkipLimitExceededException.java
index 7f10e6184..870fc1c5c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/SkipLimitExceededException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/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;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.UnexpectedJobExecutionException;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/SkipLimitStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBean.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/SkipLimitStepFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBean.java
index 88335a758..bfe92d457 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/SkipLimitStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBean.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.Arrays;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StatefulRetryStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBean.java
similarity index 99%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/StatefulRetryStepFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBean.java
index f862cad20..ce03916f5 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StatefulRetryStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBean.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;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepContribution;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepExecutionSynchronizer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepExecutionSynchronizer.java
similarity index 96%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/StepExecutionSynchronizer.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepExecutionSynchronizer.java
index 29c7ec3cd..8d65c1513 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepExecutionSynchronizer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/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;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.StepExecution;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepExecutionSyncronizerFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepExecutionSyncronizerFactory.java
similarity index 97%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/StepExecutionSyncronizerFactory.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepExecutionSyncronizerFactory.java
index 9f457dce7..1c0f3fb9a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepExecutionSyncronizerFactory.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepExecutionSyncronizerFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.core.JdkVersion;
 import org.springframework.util.ClassUtils;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepInterruptionPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepInterruptionPolicy.java
similarity index 96%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/StepInterruptionPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepInterruptionPolicy.java
index de3fbd31f..ec8a394ee 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepInterruptionPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepInterruptionPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 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/ThreadStepInterruptionPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ThreadStepInterruptionPolicy.java
similarity index 97%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ThreadStepInterruptionPolicy.java
index 07889ea93..e2ba09359 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicy.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ThreadStepInterruptionPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 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/item/package.html b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/package.html
new file mode 100644
index 000000000..7ef763400
--- /dev/null
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+Specific implementations of step concerns for item-oriented approach.
+</p>
+</body>
+</html>
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/Tasklet.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/Tasklet.java
similarity index 97%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/Tasklet.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/Tasklet.java
index c53adad59..87dba452a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/Tasklet.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/Tasklet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.tasklet;
+package org.springframework.batch.core.step.tasklet;
 
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/TaskletAdapter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletAdapter.java
similarity index 94%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/TaskletAdapter.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletAdapter.java
index 6dff96ac8..dd2bfb481 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/TaskletAdapter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.tasklet;
+package org.springframework.batch.core.step.tasklet;
 
 import org.springframework.batch.item.adapter.AbstractMethodInvokingDelegator;
 import org.springframework.batch.repeat.ExitStatus;
@@ -38,7 +38,7 @@ public class TaskletAdapter extends AbstractMethodInvokingDelegator implements T
 	 * delegate method should not be void, otherwise there is no way to
 	 * determine when the result indicates a finished job.
 	 * 
-	 * @see org.springframework.batch.core.tasklet.Tasklet#execute()
+	 * @see org.springframework.batch.core.step.tasklet.Tasklet#execute()
 	 */
 	public ExitStatus execute() throws Exception {
 		return mapResult(invokeDelegateMethod());
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/package.html b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/package.html
similarity index 100%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/package.html
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/package.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 8e276e8c1..b90810c3e 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.NeverSkipItemSkipPolicy;
+import org.springframework.batch.core.step.item.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/repository/support/dao/AbstractStepDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/AbstractStepDaoTests.java
index 9b518504e..42912d638 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/AbstractStepDaoTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/AbstractStepDaoTests.java
@@ -29,8 +29,8 @@ import org.springframework.batch.core.job.JobSupport;
 import org.springframework.batch.core.repository.support.dao.JobExecutionDao;
 import org.springframework.batch.core.repository.support.dao.JobInstanceDao;
 import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
-import org.springframework.batch.core.step.ExitStatusExceptionClassifier;
 import org.springframework.batch.core.step.StepSupport;
+import org.springframework.batch.core.step.item.ExitStatusExceptionClassifier;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.dao.OptimisticLockingFailureException;
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 33bb1bae7..ab5ccb211 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,7 @@ 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.tasklet.Tasklet;
+import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.repeat.ExitStatus;
 
 public class TaskletStepTests extends TestCase {
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/item/ItemOrientedStepTests.java
similarity index 98%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/ItemOrientedStepTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java
index 0d3e0207b..e90d92d56 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/item/ItemOrientedStepTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,7 +38,10 @@ 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.ItemOrientedStep;
+import org.springframework.batch.core.step.JobRepositorySupport;
+import org.springframework.batch.core.step.item.ItemOrientedStep;
+import org.springframework.batch.core.step.item.SimpleItemHandler;
+import org.springframework.batch.core.step.item.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/MockItemReader.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/MockItemReader.java
similarity index 96%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/MockItemReader.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/item/MockItemReader.java
index 6b65dd0d8..549b64604 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/MockItemReader.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/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;
+package org.springframework.batch.core.step.item;
 
 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/RepeatOperationsStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java
similarity index 93%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/RepeatOperationsStepFactoryBeanTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java
index aeca8f40a..8293e397c 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/RepeatOperationsStepFactoryBeanTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/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;
+package org.springframework.batch.core.step.item;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,7 +27,8 @@ 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.RepeatOperationsStepFactoryBean;
+import org.springframework.batch.core.step.JobRepositorySupport;
+import org.springframework.batch.core.step.item.RepeatOperationsStepFactoryBean;
 import org.springframework.batch.item.support.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/SimpleExitStatusExceptionClassifierTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleExitStatusExceptionClassifierTests.java
similarity index 93%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/SimpleExitStatusExceptionClassifierTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleExitStatusExceptionClassifierTests.java
index ab7058628..b6e2d3cbd 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/SimpleExitStatusExceptionClassifierTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleExitStatusExceptionClassifierTests.java
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 
 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.step.item.ExitStatusExceptionClassifier;
+import org.springframework.batch.core.step.item.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/SimpleRetryExceptionHandlerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandlerTests.java
similarity index 88%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/SimpleRetryExceptionHandlerTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandlerTests.java
index 51cc17c90..62a78e14d 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/SimpleRetryExceptionHandlerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandlerTests.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.core.step.item.SimpleRetryExceptionHandler;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
 import org.springframework.batch.repeat.exception.SimpleLimitExceptionHandler;
@@ -51,7 +52,7 @@ public class SimpleRetryExceptionHandlerTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.core.step.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
+	 * {@link org.springframework.batch.core.step.item.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
 	 */
 	public void testRethrowWhenRetryExhausted() {
 
@@ -76,7 +77,7 @@ public class SimpleRetryExceptionHandlerTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.core.step.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
+	 * {@link org.springframework.batch.core.step.item.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/SimpleStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java
similarity index 98%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/SimpleStepFactoryBeanTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java
index a8e351854..ee8dcb326 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/SimpleStepFactoryBeanTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,6 +34,7 @@ import org.springframework.batch.core.repository.support.SimpleJobRepository;
 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.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/SkipLimitReadFailurePolicyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitReadFailurePolicyTests.java
similarity index 88%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/SkipLimitReadFailurePolicyTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitReadFailurePolicyTests.java
index c1e8ea7ed..8a8a6ca19 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/SkipLimitReadFailurePolicyTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/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;
+package org.springframework.batch.core.step.item;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -21,6 +21,8 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.core.step.item.LimitCheckingItemSkipPolicy;
+import org.springframework.batch.core.step.item.SkipLimitExceededException;
 import org.springframework.batch.item.file.FlatFileParseException;
 
 /**
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/SkipLimitStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanTests.java
similarity index 91%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/SkipLimitStepFactoryBeanTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanTests.java
index 7b655948b..bd86583cd 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/SkipLimitStepFactoryBeanTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11,6 +11,9 @@ import org.springframework.batch.core.JobInstance;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.job.JobSupport;
+import org.springframework.batch.core.step.JobRepositorySupport;
+import org.springframework.batch.core.step.item.ItemOrientedStep;
+import org.springframework.batch.core.step.item.SkipLimitStepFactoryBean;
 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/test/java/org/springframework/batch/core/step/StatefulRetryStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java
similarity index 95%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/StatefulRetryStepFactoryBeanTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java
index 0ecd427c5..74214706a 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/StatefulRetryStepFactoryBeanTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/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;
+package org.springframework.batch.core.step.item;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,8 +32,8 @@ import org.springframework.batch.core.repository.support.SimpleJobRepository;
 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.StatefulRetryStepFactoryBean;
+import org.springframework.batch.core.step.item.ItemOrientedStep;
+import org.springframework.batch.core.step.item.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/StepExecutorInterruptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepExecutorInterruptionTests.java
similarity index 95%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/StepExecutorInterruptionTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepExecutorInterruptionTests.java
index db733446d..a9244b3e2 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepExecutorInterruptionTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepExecutorInterruptionTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import junit.framework.TestCase;
 
@@ -29,8 +29,9 @@ import org.springframework.batch.core.repository.support.SimpleJobRepository;
 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.SimpleItemHandler;
+import org.springframework.batch.core.step.item.ItemOrientedStep;
+import org.springframework.batch.core.step.item.SimpleItemHandler;
+import org.springframework.batch.core.step.item.StepExecutionSynchronizer;
 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/ThreadStepInterruptionPolicyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ThreadStepInterruptionPolicyTests.java
similarity index 93%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicyTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ThreadStepInterruptionPolicyTests.java
index 8bc19f2b6..0750e1c48 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicyTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ThreadStepInterruptionPolicyTests.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import junit.framework.TestCase;
 
 import org.springframework.batch.core.JobInterruptedException;
+import org.springframework.batch.core.step.item.ThreadStepInterruptionPolicy;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/tasklet/TaskletAdapterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletAdapterTests.java
similarity index 78%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/tasklet/TaskletAdapterTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletAdapterTests.java
index 452fede14..0998a1cb8 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/tasklet/TaskletAdapterTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletAdapterTests.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.tasklet;
+package org.springframework.batch.core.step.tasklet;
 
-import org.springframework.batch.core.tasklet.TaskletAdapter;
+import org.springframework.batch.core.step.tasklet.TaskletAdapter;
 import org.springframework.batch.repeat.ExitStatus;
 
 import junit.framework.TestCase;
@@ -46,7 +46,7 @@ public class TaskletAdapterTests extends TestCase {
 	}
 
 	/**
-	 * Test method for {@link org.springframework.batch.core.tasklet.TaskletAdapter#execute()}.
+	 * Test method for {@link org.springframework.batch.core.step.tasklet.TaskletAdapter#execute()}.
 	 * @throws Exception 
 	 */
 	public void testExecuteWithExitStatus() throws Exception {
@@ -54,7 +54,7 @@ public class TaskletAdapterTests extends TestCase {
 	}
 
 	/**
-	 * Test method for {@link org.springframework.batch.core.tasklet.TaskletAdapter#mapResult(java.lang.Object)}.
+	 * Test method for {@link org.springframework.batch.core.step.tasklet.TaskletAdapter#mapResult(java.lang.Object)}.
 	 */
 	public void testMapResultWithNull() throws Exception {
 		tasklet.setTargetMethod("process");
@@ -62,7 +62,7 @@ public class TaskletAdapterTests extends TestCase {
 	}
 
 	/**
-	 * Test method for {@link org.springframework.batch.core.tasklet.TaskletAdapter#mapResult(java.lang.Object)}.
+	 * Test method for {@link org.springframework.batch.core.step.tasklet.TaskletAdapter#mapResult(java.lang.Object)}.
 	 */
 	public void testMapResultWithNonNull() throws Exception {
 		tasklet.setTargetMethod("process");
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 d3758a293..3f1666672 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.SimpleStepFactoryBean">
+			<bean id="step1" class="org.springframework.batch.core.step.item.SimpleStepFactoryBean">
 				<property name="itemReader" ref="itemReader" />
 				<property name="itemWriter" ref="itemWriter" />
 				<property name="jobRepository" ref="jobRepository" />
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 0c64b02eb..c2281b93c 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.SimpleJob">
 		<property name="steps">
 			<bean id="step1"
-				class="org.springframework.batch.core.step.SimpleStepFactoryBean">
+				class="org.springframework.batch.core.step.item.SimpleStepFactoryBean">
 				<property name="itemReader">
 					<bean
 						class="org.springframework.batch.item.support.ListItemReader">
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 9d30326c8..2541d8e56 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.StepInterruptionPolicy;
+import org.springframework.batch.core.step.item.StepInterruptionPolicy;
 import org.springframework.batch.repeat.RepeatContext;
 
 public class NoopStepInterruptionPolicy implements StepInterruptionPolicy {
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java
index 6d7d0f9a5..1b76b5617 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java
@@ -20,7 +20,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.listener.StepListenerSupport;
-import org.springframework.batch.core.tasklet.Tasklet;
+import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.repeat.ExitStatus;
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeWriter.java
index ef5e012a0..949453075 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeWriter.java
@@ -16,7 +16,7 @@
 
 package org.springframework.batch.sample.tasklet;
 
-import org.springframework.batch.core.tasklet.Tasklet;
+import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStream;
diff --git a/spring-batch-samples/src/main/resources/jobs/retrySample.xml b/spring-batch-samples/src/main/resources/jobs/retrySample.xml
index e2c17c527..836c742e9 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.StatefulRetryStepFactoryBean">
+				class="org.springframework.batch.core.step.item.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 26e960df5..315315f88 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.SimpleStepFactoryBean"
+	<bean id="simpleStep" class="org.springframework.batch.core.step.item.SimpleStepFactoryBean"
 		abstract="true">
 		<property name="transactionManager" ref="transactionManager" />
 		<property name="jobRepository" ref="jobRepository" />
@@ -66,7 +66,7 @@
 		<property name="commitInterval" value="1" />
 	</bean>
 	
-	<bean id="skipLimitStep" class="org.springframework.batch.core.step.SkipLimitStepFactoryBean"
+	<bean id="skipLimitStep" class="org.springframework.batch.core.step.item.SkipLimitStepFactoryBean"
 		parent="simpleStep" abstract="true">
 		<property name="skipLimit" value="0" />
 	</bean>