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/item/AbstractStepFactoryBean.java
similarity index 96%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStepFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AbstractStepFactoryBean.java
index 7a84d8f49..5bb9ec9c9 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/item/AbstractStepFactoryBean.java
@@ -13,12 +13,10 @@
  * 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.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/item/RepeatOperationsStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBean.java
index a1bae9ff1..949fe5897 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBean.java
@@ -18,7 +18,6 @@ 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/item/SimpleStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java
index 6e5a86331..2bb4af35f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java
@@ -19,7 +19,6 @@ 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/TaskletStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/TaskletStep.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java
index 5c99d7e16..c725bc0af 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/tasklet/TaskletStep.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.tasklet;
 
 import java.util.Date;
 
@@ -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.step.tasklet.Tasklet;
+import org.springframework.batch.core.step.AbstractStep;
 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/test/java/org/springframework/batch/core/step/TaskletStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java
similarity index 96%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/step/TaskletStepTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java
index ab5ccb211..49c0a0c71 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/tasklet/TaskletStepTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.tasklet;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,8 +15,10 @@ import org.springframework.batch.core.StepExecution;
 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.JobRepositorySupport;
+import org.springframework.batch.core.step.StepSupport;
 import org.springframework.batch.core.step.tasklet.Tasklet;
+import org.springframework.batch.core.step.tasklet.TaskletStep;
 import org.springframework.batch.repeat.ExitStatus;
 
 public class TaskletStepTests extends TestCase {
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 315315f88..ff32159f7 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
@@ -53,7 +53,7 @@
 		<property name="restartable" value="true" />
 	</bean>
 
-	<bean id="taskletStep" class="org.springframework.batch.core.step.TaskletStep" abstract="true">
+	<bean id="taskletStep" class="org.springframework.batch.core.step.tasklet.TaskletStep" abstract="true">
 		<property name="jobRepository" ref="jobRepository" />
 		<property name="allowStartIfComplete" value="true" />
 	</bean>