diff --git a/spring-batch-execution/src/test/resources/simple-container-definition.xml b/spring-batch-execution/src/test/resources/simple-container-definition.xml
index de31bda04..b8049c9e2 100644
--- a/spring-batch-execution/src/test/resources/simple-container-definition.xml
+++ b/spring-batch-execution/src/test/resources/simple-container-definition.xml
@@ -94,8 +94,8 @@
 					<bean
 						class="org.springframework.batch.support.IntArrayPropertyEditor" />
 				</entry>
-				<entry key="org.springframework.batch.io.file.support.transform.Range[]">
-					<bean class="org.springframework.batch.io.file.support.transform.RangeArrayPropertyEditor" />
+				<entry key="org.springframework.batch.io.file.transform.Range[]">
+					<bean class="org.springframework.batch.io.file.transform.RangeArrayPropertyEditor" />
 				</entry>
         <entry key="java.util.Date">
 					<bean
diff --git a/spring-batch-infrastructure/.springBeans b/spring-batch-infrastructure/.springBeans
index 29e2bef61..67c29fdd4 100644
--- a/spring-batch-infrastructure/.springBeans
+++ b/spring-batch-infrastructure/.springBeans
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
-	<configExtensions>
-		<configExtension>xml</configExtension>
-	</configExtensions>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.0.2.v200712142013]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
 	<configs>
-		<config>src/test/resources/org/springframework/batch/io/file/support/mapping/bean-wrapper.xml</config>
 		<config>src/test/resources/org/springframework/batch/io/sql/data-source-context.xml</config>
 		<config>src/test/resources/org/springframework/batch/item/processor/delegating-item-processor.xml</config>
 		<config>src/test/resources/org/springframework/batch/item/processor/pe-delegating-item-processor.xml</config>
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/DefaultFlatFileItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/DefaultFlatFileItemReader.java
similarity index 99%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/DefaultFlatFileItemReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/DefaultFlatFileItemReader.java
index 5cb0adffa..c823c5aa4 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/DefaultFlatFileItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/DefaultFlatFileItemReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support;
+package org.springframework.batch.io.file;
 
 import java.util.HashSet;
 import java.util.Properties;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/FlatFileItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java
similarity index 95%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/FlatFileItemWriter.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java
index 73bd03300..ba92a996a 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/FlatFileItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support;
+package org.springframework.batch.io.file;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -28,11 +28,11 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.springframework.batch.io.ItemWriter;
 import org.springframework.batch.io.exception.BatchCriticalException;
 import org.springframework.batch.io.exception.BatchEnvironmentException;
-import org.springframework.batch.io.file.support.transform.Converter;
+import org.springframework.batch.io.file.transform.Converter;
 import org.springframework.batch.io.support.AbstractTransactionalIoSource;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.ResourceLifecycle;
 import org.springframework.batch.restart.GenericRestartData;
 import org.springframework.batch.restart.RestartData;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/ResourceLineReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/ResourceLineReader.java
similarity index 94%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/ResourceLineReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/ResourceLineReader.java
index f4824be85..4a0f39803 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/ResourceLineReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/ResourceLineReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support;
+package org.springframework.batch.io.file;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -26,8 +26,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 
 import org.springframework.batch.io.exception.BatchEnvironmentException;
-import org.springframework.batch.io.file.support.separator.DefaultRecordSeparatorPolicy;
-import org.springframework.batch.io.file.support.separator.RecordSeparatorPolicy;
+import org.springframework.batch.io.file.separator.DefaultRecordSeparatorPolicy;
+import org.springframework.batch.io.file.separator.RecordSeparatorPolicy;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ResourceLifecycle;
 import org.springframework.batch.item.provider.AbstractItemReader;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/SimpleFlatFileItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/SimpleFlatFileItemReader.java
similarity index 91%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/SimpleFlatFileItemReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/SimpleFlatFileItemReader.java
index f7eacf99e..c2300d730 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/SimpleFlatFileItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/SimpleFlatFileItemReader.java
@@ -14,17 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support;
+package org.springframework.batch.io.file;
 
 import java.io.IOException;
 
 import org.springframework.batch.io.exception.FlatFileParsingException;
-import org.springframework.batch.io.file.FieldSet;
-import org.springframework.batch.io.file.FieldSetMapper;
-import org.springframework.batch.io.file.support.separator.RecordSeparatorPolicy;
-import org.springframework.batch.io.file.support.transform.AbstractLineTokenizer;
-import org.springframework.batch.io.file.support.transform.DelimitedLineTokenizer;
-import org.springframework.batch.io.file.support.transform.LineTokenizer;
+import org.springframework.batch.io.file.separator.RecordSeparatorPolicy;
+import org.springframework.batch.io.file.transform.AbstractLineTokenizer;
+import org.springframework.batch.io.file.transform.DelimitedLineTokenizer;
+import org.springframework.batch.io.file.transform.LineTokenizer;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ResourceLifecycle;
 import org.springframework.batch.item.provider.AbstractItemReader;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/BeanWrapperFieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/mapping/BeanWrapperFieldSetMapper.java
similarity index 99%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/BeanWrapperFieldSetMapper.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/mapping/BeanWrapperFieldSetMapper.java
index a92ff6f09..8964aa894 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/BeanWrapperFieldSetMapper.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/mapping/BeanWrapperFieldSetMapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.mapping;
+package org.springframework.batch.io.file.mapping;
 
 import java.beans.PropertyEditor;
 import java.util.ArrayList;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/BindingException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/mapping/BindingException.java
similarity index 93%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/BindingException.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/mapping/BindingException.java
index a0cc37b8b..758bc35c8 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/BindingException.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/mapping/BindingException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.io.file.support.mapping;
+package org.springframework.batch.io.file.mapping;
 
 /**
  * @author Dave Syer
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/PropertyMatches.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/mapping/PropertyMatches.java
similarity index 98%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/PropertyMatches.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/mapping/PropertyMatches.java
index b54d4c0c3..b6dec50db 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/PropertyMatches.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/mapping/PropertyMatches.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.mapping;
+package org.springframework.batch.io.file.mapping;
 
 import java.beans.PropertyDescriptor;
 import java.util.ArrayList;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/mapping/package.html
similarity index 100%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/package.html
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/mapping/package.html
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/DefaultRecordSeparatorPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/DefaultRecordSeparatorPolicy.java
similarity index 92%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/DefaultRecordSeparatorPolicy.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/DefaultRecordSeparatorPolicy.java
index 76b8f8f4f..9db8776aa 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/DefaultRecordSeparatorPolicy.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/DefaultRecordSeparatorPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.separator;
+package org.springframework.batch.io.file.separator;
 
 import org.springframework.util.StringUtils;
 
@@ -83,7 +83,7 @@ public class DefaultRecordSeparatorPolicy extends SimpleRecordSeparatorPolicy {
 	 * "), and does not end with a continuation marker ('\'). The test for the
 	 * continuation marker ignores whitespace at the end of the line.
 	 * 
-	 * @see org.springframework.batch.io.file.support.separator.RecordSeparatorPolicy#isEndOfRecord(java.lang.String)
+	 * @see org.springframework.batch.io.file.separator.RecordSeparatorPolicy#isEndOfRecord(java.lang.String)
 	 */
 	public boolean isEndOfRecord(String line) {
 		return !isQuoteUnterminated(line) && !isContinued(line);
@@ -94,7 +94,7 @@ public class DefaultRecordSeparatorPolicy extends SimpleRecordSeparatorPolicy {
 	 * remove the continuation marker (plus whitespace at the end) if it is
 	 * there.
 	 * 
-	 * @see org.springframework.batch.io.file.support.separator.SimpleRecordSeparatorPolicy#preProcess(java.lang.String)
+	 * @see org.springframework.batch.io.file.separator.SimpleRecordSeparatorPolicy#preProcess(java.lang.String)
 	 */
 	public String preProcess(String line) {
 		if (isQuoteUnterminated(line)) {
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/RecordSeparatorPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/RecordSeparatorPolicy.java
similarity index 96%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/RecordSeparatorPolicy.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/RecordSeparatorPolicy.java
index c1f5851ef..fefefa7e9 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/RecordSeparatorPolicy.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/RecordSeparatorPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.separator;
+package org.springframework.batch.io.file.separator;
 
 import java.io.BufferedReader;
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/SimpleRecordSeparatorPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/SimpleRecordSeparatorPolicy.java
similarity index 74%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/SimpleRecordSeparatorPolicy.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/SimpleRecordSeparatorPolicy.java
index 7214fed80..5251a14a6 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/SimpleRecordSeparatorPolicy.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/SimpleRecordSeparatorPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.separator;
+package org.springframework.batch.io.file.separator;
 
 
 /**
@@ -29,7 +29,7 @@ public class SimpleRecordSeparatorPolicy implements RecordSeparatorPolicy {
 	/**
 	 * Always returns true.
 	 * 
-	 * @see org.springframework.batch.io.file.support.separator.RecordSeparatorPolicy#isEndOfRecord(java.lang.String)
+	 * @see org.springframework.batch.io.file.separator.RecordSeparatorPolicy#isEndOfRecord(java.lang.String)
 	 */
 	public boolean isEndOfRecord(String line) {
 		return true;
@@ -37,7 +37,7 @@ public class SimpleRecordSeparatorPolicy implements RecordSeparatorPolicy {
 
 	/**
 	 * Pass the record through. Do nothing.
-	 * @see org.springframework.batch.io.file.support.separator.RecordSeparatorPolicy#postProcess(java.lang.String)
+	 * @see org.springframework.batch.io.file.separator.RecordSeparatorPolicy#postProcess(java.lang.String)
 	 */
 	public String postProcess(String record) {
 		return record;
@@ -45,7 +45,7 @@ public class SimpleRecordSeparatorPolicy implements RecordSeparatorPolicy {
 	
 	/**
 	 * Pass the line through.  Do nothing.
-	 * @see org.springframework.batch.io.file.support.separator.RecordSeparatorPolicy#preProcess(java.lang.String)
+	 * @see org.springframework.batch.io.file.separator.RecordSeparatorPolicy#preProcess(java.lang.String)
 	 */
 	public String preProcess(String line) {
 		return line;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/SuffixRecordSeparatorPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/SuffixRecordSeparatorPolicy.java
similarity index 87%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/SuffixRecordSeparatorPolicy.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/SuffixRecordSeparatorPolicy.java
index 3925d5840..54f22a14c 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/SuffixRecordSeparatorPolicy.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/SuffixRecordSeparatorPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.separator;
+package org.springframework.batch.io.file.separator;
 
 
 /**
@@ -59,7 +59,7 @@ public class SuffixRecordSeparatorPolicy extends DefaultRecordSeparatorPolicy {
 	 * whitespace is trimmed before the comparison. Also returns true if the
 	 * line is null, but not if it is empty.
 	 * 
-	 * @see org.springframework.batch.io.file.support.separator.RecordSeparatorPolicy#isEndOfRecord(java.lang.String)
+	 * @see org.springframework.batch.io.file.separator.RecordSeparatorPolicy#isEndOfRecord(java.lang.String)
 	 */
 	public boolean isEndOfRecord(String line) {
 		if (line == null) {
@@ -72,7 +72,7 @@ public class SuffixRecordSeparatorPolicy extends DefaultRecordSeparatorPolicy {
 	/**
 	 * Remove the suffix from the end of the record.
 	 * 
-	 * @see org.springframework.batch.io.file.support.separator.SimpleRecordSeparatorPolicy#postProcess(java.lang.String)
+	 * @see org.springframework.batch.io.file.separator.SimpleRecordSeparatorPolicy#postProcess(java.lang.String)
 	 */
 	public String postProcess(String record) {
 		if (record==null) {
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/package.html
similarity index 100%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/package.html
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/separator/package.html
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/AbstractLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/AbstractLineTokenizer.java
similarity index 93%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/AbstractLineTokenizer.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/AbstractLineTokenizer.java
index e1f943140..49d9371db 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/AbstractLineTokenizer.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/AbstractLineTokenizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/Converter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/Converter.java
similarity index 91%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/Converter.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/Converter.java
index bcc0c84c4..71c7eea03 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/Converter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/Converter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 /**
  * Generic converter interface for transforming an object into another form for
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/DelimitedLineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/DelimitedLineAggregator.java
similarity index 96%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/DelimitedLineAggregator.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/DelimitedLineAggregator.java
index 87ad6db39..749e134c9 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/DelimitedLineAggregator.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/DelimitedLineAggregator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 
 /**
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/DelimitedLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/DelimitedLineTokenizer.java
similarity index 95%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/DelimitedLineTokenizer.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/DelimitedLineTokenizer.java
index a1e816c32..a674c3818 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/DelimitedLineTokenizer.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/DelimitedLineTokenizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/FixedLengthLineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/FixedLengthLineAggregator.java
similarity index 95%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/FixedLengthLineAggregator.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/FixedLengthLineAggregator.java
index 285d30876..372c9ca16 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/FixedLengthLineAggregator.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/FixedLengthLineAggregator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 import java.util.Arrays;
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/FixedLengthTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/FixedLengthTokenizer.java
similarity index 93%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/FixedLengthTokenizer.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/FixedLengthTokenizer.java
index 308045e31..1cbe97a4d 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/FixedLengthTokenizer.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/FixedLengthTokenizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/LineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/LineAggregator.java
similarity index 94%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/LineAggregator.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/LineAggregator.java
index 6bc2bc68a..a3511809d 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/LineAggregator.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/LineAggregator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 
 /**
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/LineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/LineTokenizer.java
similarity index 94%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/LineTokenizer.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/LineTokenizer.java
index 967c401b0..e12303840 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/LineTokenizer.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/LineTokenizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 import org.springframework.batch.io.file.FieldSet;
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/PrefixMatchingCompositeLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/PrefixMatchingCompositeLineTokenizer.java
similarity index 96%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/PrefixMatchingCompositeLineTokenizer.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/PrefixMatchingCompositeLineTokenizer.java
index 6cd6f452a..86c29ddec 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/PrefixMatchingCompositeLineTokenizer.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/PrefixMatchingCompositeLineTokenizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/Range.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/Range.java
similarity index 91%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/Range.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/Range.java
index 90dd46030..3718d9b90 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/Range.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/Range.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 import org.springframework.util.Assert;
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/RangeArrayPropertyEditor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/RangeArrayPropertyEditor.java
similarity index 95%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/RangeArrayPropertyEditor.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/RangeArrayPropertyEditor.java
index 4e056ca7e..a802eeb32 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/RangeArrayPropertyEditor.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/RangeArrayPropertyEditor.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 import java.beans.PropertyEditorSupport;
 import java.util.Arrays;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/package.html
similarity index 100%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/package.html
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/package.html
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/AbstractTransactionalIoSource.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/AbstractTransactionalIoSource.java
index b4d88cd85..0353c3710 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/AbstractTransactionalIoSource.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/AbstractTransactionalIoSource.java
@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.io.support;
 
-import org.springframework.batch.io.ItemWriter;
 import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.repeat.synch.BatchTransactionSynchronizationManager;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.transaction.support.TransactionSynchronization;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/HibernateAwareItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/HibernateAwareItemWriter.java
index 0740568e6..902b4533b 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/HibernateAwareItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/HibernateAwareItemWriter.java
@@ -19,7 +19,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.hibernate.SessionFactory;
-import org.springframework.batch.io.ItemWriter;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.RepeatInterceptor;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/StaxEventReaderItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventReaderItemReader.java
similarity index 92%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/StaxEventReaderItemReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventReaderItemReader.java
index 29eccba6f..5f50595b0 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/StaxEventReaderItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventReaderItemReader.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support;
+package org.springframework.batch.io.xml;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -13,11 +13,11 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.StartElement;
 
 import org.springframework.batch.io.Skippable;
-import org.springframework.batch.io.file.support.stax.DefaultFragmentEventReader;
-import org.springframework.batch.io.file.support.stax.DefaultTransactionalEventReader;
-import org.springframework.batch.io.file.support.stax.FragmentDeserializer;
-import org.springframework.batch.io.file.support.stax.FragmentEventReader;
-import org.springframework.batch.io.file.support.stax.TransactionalEventReader;
+import org.springframework.batch.io.xml.stax.DefaultFragmentEventReader;
+import org.springframework.batch.io.xml.stax.DefaultTransactionalEventReader;
+import org.springframework.batch.io.xml.stax.FragmentDeserializer;
+import org.springframework.batch.io.xml.stax.FragmentEventReader;
+import org.springframework.batch.io.xml.stax.TransactionalEventReader;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ResourceLifecycle;
 import org.springframework.batch.item.provider.AbstractItemReader;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/StaxEventWriterItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventWriterItemWriter.java
similarity index 94%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/StaxEventWriterItemWriter.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventWriterItemWriter.java
index f1f38ae49..5e483540f 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/StaxEventWriterItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventWriterItemWriter.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support;
+package org.springframework.batch.io.xml;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -14,10 +14,10 @@ import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 
-import org.springframework.batch.io.ItemWriter;
-import org.springframework.batch.io.file.support.stax.NoStartEndDocumentStreamWriter;
-import org.springframework.batch.io.file.support.stax.ObjectToXmlSerializer;
 import org.springframework.batch.io.support.FileUtils;
+import org.springframework.batch.io.xml.stax.NoStartEndDocumentStreamWriter;
+import org.springframework.batch.io.xml.stax.ObjectToXmlSerializer;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.ResourceLifecycle;
 import org.springframework.batch.repeat.synch.BatchTransactionSynchronizationManager;
 import org.springframework.batch.restart.GenericRestartData;
@@ -367,7 +367,7 @@ public class StaxEventWriterItemWriter implements ItemWriter, ResourceLifecycle,
 	 * Write the value object to XML stream.
 	 *
 	 * @param output the value object
-	 * @see org.springframework.batch.io.ItemWriter#write(java.lang.Object)
+	 * @see org.springframework.batch.item.ItemWriter#write(java.lang.Object)
 	 */
 	public void write(Object output) {
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/oxm/MarshallingObjectToXmlSerializer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializer.java
similarity index 84%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/oxm/MarshallingObjectToXmlSerializer.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializer.java
index a60d00eb4..04f040b52 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/oxm/MarshallingObjectToXmlSerializer.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializer.java
@@ -1,11 +1,11 @@
-package org.springframework.batch.io.file.support.oxm;
+package org.springframework.batch.io.xml.oxm;
 
 import java.io.IOException;
 
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.transform.Result;
 
-import org.springframework.batch.io.file.support.stax.ObjectToXmlSerializer;
+import org.springframework.batch.io.xml.stax.ObjectToXmlSerializer;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.oxm.Marshaller;
 import org.springframework.xml.transform.StaxResult;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/oxm/UnmarshallingFragmentDeserializer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializer.java
similarity index 85%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/oxm/UnmarshallingFragmentDeserializer.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializer.java
index 6543027a6..25ac31a31 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/oxm/UnmarshallingFragmentDeserializer.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializer.java
@@ -1,10 +1,10 @@
-package org.springframework.batch.io.file.support.oxm;
+package org.springframework.batch.io.xml.oxm;
 
 import java.io.IOException;
 
 import javax.xml.stream.XMLEventReader;
 
-import org.springframework.batch.io.file.support.stax.FragmentDeserializer;
+import org.springframework.batch.io.xml.stax.FragmentDeserializer;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.oxm.Unmarshaller;
 import org.springframework.util.Assert;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/package.html
similarity index 100%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/package.html
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/package.html
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/AbstractEventReaderWrapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/AbstractEventReaderWrapper.java
similarity index 92%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/AbstractEventReaderWrapper.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/AbstractEventReaderWrapper.java
index 4d8bcfa4d..630e16710 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/AbstractEventReaderWrapper.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/AbstractEventReaderWrapper.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/AbstractEventWriterWrapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/AbstractEventWriterWrapper.java
similarity index 93%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/AbstractEventWriterWrapper.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/AbstractEventWriterWrapper.java
index 506853242..57464e91d 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/AbstractEventWriterWrapper.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/AbstractEventWriterWrapper.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.stream.XMLEventReader;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/DefaultFragmentEventReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/DefaultFragmentEventReader.java
similarity index 95%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/DefaultFragmentEventReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/DefaultFragmentEventReader.java
index 5a87b5c5b..996d71f8e 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/DefaultFragmentEventReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/DefaultFragmentEventReader.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import java.util.NoSuchElementException;
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/DefaultTransactionalEventReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/DefaultTransactionalEventReader.java
similarity index 93%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/DefaultTransactionalEventReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/DefaultTransactionalEventReader.java
index 81c990672..101e3df29 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/DefaultTransactionalEventReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/DefaultTransactionalEventReader.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import java.util.NoSuchElementException;
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/EventSequence.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/EventSequence.java
similarity index 91%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/EventSequence.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/EventSequence.java
index f6e6ad57c..de75e88fd 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/EventSequence.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/EventSequence.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/FragmentDeserializer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/FragmentDeserializer.java
similarity index 81%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/FragmentDeserializer.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/FragmentDeserializer.java
index 72d34a261..49d90b949 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/FragmentDeserializer.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/FragmentDeserializer.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import javax.xml.stream.XMLEventReader;
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/FragmentEventReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/FragmentEventReader.java
similarity index 90%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/FragmentEventReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/FragmentEventReader.java
index a3db4058b..1edcc837d 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/FragmentEventReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/FragmentEventReader.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import javax.xml.stream.XMLEventReader;
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/NoStartEndDocumentStreamWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/NoStartEndDocumentStreamWriter.java
similarity index 89%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/NoStartEndDocumentStreamWriter.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/NoStartEndDocumentStreamWriter.java
index 75c6fdb99..39f4da37a 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/NoStartEndDocumentStreamWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/NoStartEndDocumentStreamWriter.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLStreamException;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/ObjectToXmlSerializer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/ObjectToXmlSerializer.java
similarity index 86%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/ObjectToXmlSerializer.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/ObjectToXmlSerializer.java
index 7b951d19a..fec350b4e 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/ObjectToXmlSerializer.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/ObjectToXmlSerializer.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import javax.xml.stream.XMLEventWriter;
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/TransactionalEventReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/TransactionalEventReader.java
similarity index 83%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/TransactionalEventReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/TransactionalEventReader.java
index 001634e75..22e69cc57 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/TransactionalEventReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/stax/TransactionalEventReader.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import javax.xml.stream.XMLEventReader;
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/ItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemWriter.java
similarity index 96%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/ItemWriter.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemWriter.java
index 69b5c5be2..f8fc982b5 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/ItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io;
+package org.springframework.batch.item;
 
 /**
  * Basic interface for generic output operations. Class implementing this
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/ItemWriterItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/ItemWriterItemProcessor.java
index e670b4c42..9a736f07f 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/ItemWriterItemProcessor.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/ItemWriterItemProcessor.java
@@ -2,9 +2,9 @@ package org.springframework.batch.item.processor;
 
 import java.util.Properties;
 
-import org.springframework.batch.io.ItemWriter;
 import org.springframework.batch.io.Skippable;
 import org.springframework.batch.item.ItemProcessor;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.restart.GenericRestartData;
 import org.springframework.batch.restart.RestartData;
 import org.springframework.batch.restart.Restartable;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/TransformerWriterItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/TransformerWriterItemProcessor.java
index f1446c45e..d0d560c9a 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/TransformerWriterItemProcessor.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/TransformerWriterItemProcessor.java
@@ -1,6 +1,6 @@
 package org.springframework.batch.item.processor;
 
-import org.springframework.batch.io.ItemWriter;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/DefaultFlatFileItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/DefaultFlatFileItemReaderTests.java
similarity index 96%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/DefaultFlatFileItemReaderTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/DefaultFlatFileItemReaderTests.java
index 43bdd7a0e..4950c481f 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/DefaultFlatFileItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/DefaultFlatFileItemReaderTests.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support;
+package org.springframework.batch.io.file;
 
 import java.io.IOException;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.io.file.DefaultFlatFileItemReader;
 import org.springframework.batch.io.file.FieldSet;
 import org.springframework.batch.io.file.FieldSetMapper;
-import org.springframework.batch.io.file.support.DefaultFlatFileItemReader;
-import org.springframework.batch.io.file.support.transform.LineTokenizer;
+import org.springframework.batch.io.file.transform.LineTokenizer;
 import org.springframework.batch.restart.RestartData;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/FlatFileItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java
similarity index 98%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/FlatFileItemWriterTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java
index e0a2cdeb8..5018eaf68 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/FlatFileItemWriterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support;
+package org.springframework.batch.io.file;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -24,7 +24,8 @@ import java.util.Collections;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.file.support.transform.Converter;
+import org.springframework.batch.io.file.FlatFileItemWriter;
+import org.springframework.batch.io.file.transform.Converter;
 import org.springframework.batch.restart.RestartData;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.transaction.support.TransactionSynchronization;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/ResourceLineReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/ResourceLineReaderTests.java
similarity index 93%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/ResourceLineReaderTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/ResourceLineReaderTests.java
index 80ccffabc..1284c5577 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/ResourceLineReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/ResourceLineReaderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support;
+package org.springframework.batch.io.file;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,8 +22,8 @@ import java.io.InputStream;
 import junit.framework.TestCase;
 
 import org.springframework.batch.io.exception.BatchEnvironmentException;
-import org.springframework.batch.io.file.support.ResourceLineReader;
-import org.springframework.batch.io.file.support.separator.SuffixRecordSeparatorPolicy;
+import org.springframework.batch.io.file.ResourceLineReader;
+import org.springframework.batch.io.file.separator.SuffixRecordSeparatorPolicy;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/SimpleFlatFileItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/SimpleFlatFileItemReaderTests.java
similarity index 92%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/SimpleFlatFileItemReaderTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/SimpleFlatFileItemReaderTests.java
index 896e9e10b..9fbdc8193 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/SimpleFlatFileItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/SimpleFlatFileItemReaderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support;
+package org.springframework.batch.io.file;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -24,11 +24,13 @@ import junit.framework.TestCase;
 
 import org.springframework.batch.io.exception.BatchEnvironmentException;
 import org.springframework.batch.io.exception.FlatFileParsingException;
+import org.springframework.batch.io.file.DefaultFlatFileItemReader;
 import org.springframework.batch.io.file.FieldSet;
 import org.springframework.batch.io.file.FieldSetMapper;
-import org.springframework.batch.io.file.support.separator.DefaultRecordSeparatorPolicy;
-import org.springframework.batch.io.file.support.transform.DelimitedLineTokenizer;
-import org.springframework.batch.io.file.support.transform.LineTokenizer;
+import org.springframework.batch.io.file.SimpleFlatFileItemReader;
+import org.springframework.batch.io.file.separator.DefaultRecordSeparatorPolicy;
+import org.springframework.batch.io.file.transform.DelimitedLineTokenizer;
+import org.springframework.batch.io.file.transform.LineTokenizer;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/BeanWrapperFieldSetMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/mapping/BeanWrapperFieldSetMapperTests.java
similarity index 98%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/BeanWrapperFieldSetMapperTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/mapping/BeanWrapperFieldSetMapperTests.java
index 64219bfe8..8190b2a8a 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/BeanWrapperFieldSetMapperTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/mapping/BeanWrapperFieldSetMapperTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.mapping;
+package org.springframework.batch.io.file.mapping;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;
@@ -25,6 +25,8 @@ import java.util.Properties;
 import junit.framework.TestCase;
 
 import org.springframework.batch.io.file.FieldSet;
+import org.springframework.batch.io.file.mapping.BeanWrapperFieldSetMapper;
+import org.springframework.batch.io.file.mapping.BindingException;
 import org.springframework.batch.support.IntArrayPropertyEditor;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.NotWritablePropertyException;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/PropertyMatchesTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/mapping/PropertyMatchesTests.java
similarity index 94%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/PropertyMatchesTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/mapping/PropertyMatchesTests.java
index 2769492f0..db6bfdaeb 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/PropertyMatchesTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/mapping/PropertyMatchesTests.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.mapping;
+package org.springframework.batch.io.file.mapping;
 
-import org.springframework.batch.io.file.support.mapping.PropertyMatches;
+import org.springframework.batch.io.file.mapping.PropertyMatches;
 
 import junit.framework.TestCase;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/TestObject.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/mapping/TestObject.java
similarity index 92%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/TestObject.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/mapping/TestObject.java
index 83c54f8a5..4f3d87b72 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/TestObject.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/mapping/TestObject.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.mapping;
+package org.springframework.batch.io.file.mapping;
 
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/DefaultRecordSeparatorPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/DefaultRecordSeparatorPolicyTests.java
similarity index 93%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/DefaultRecordSeparatorPolicyTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/DefaultRecordSeparatorPolicyTests.java
index 3ada41564..d319975c8 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/DefaultRecordSeparatorPolicyTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/DefaultRecordSeparatorPolicyTests.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.separator;
+package org.springframework.batch.io.file.separator;
 
-import org.springframework.batch.io.file.support.separator.DefaultRecordSeparatorPolicy;
+import org.springframework.batch.io.file.separator.DefaultRecordSeparatorPolicy;
 
 import junit.framework.TestCase;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/SimpleRecordSeparatorPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/SimpleRecordSeparatorPolicyTests.java
similarity index 90%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/SimpleRecordSeparatorPolicyTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/SimpleRecordSeparatorPolicyTests.java
index 620005bd3..444008ba4 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/SimpleRecordSeparatorPolicyTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/SimpleRecordSeparatorPolicyTests.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.separator;
+package org.springframework.batch.io.file.separator;
 
-import org.springframework.batch.io.file.support.separator.SimpleRecordSeparatorPolicy;
+import org.springframework.batch.io.file.separator.SimpleRecordSeparatorPolicy;
 
 import junit.framework.TestCase;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/SuffixRecordSeparatorPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/SuffixRecordSeparatorPolicyTests.java
similarity index 93%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/SuffixRecordSeparatorPolicyTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/SuffixRecordSeparatorPolicyTests.java
index 1384bcbff..af455832b 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/SuffixRecordSeparatorPolicyTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/SuffixRecordSeparatorPolicyTests.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.separator;
+package org.springframework.batch.io.file.separator;
 
-import org.springframework.batch.io.file.support.separator.SuffixRecordSeparatorPolicy;
+import org.springframework.batch.io.file.separator.SuffixRecordSeparatorPolicy;
 
 import junit.framework.TestCase;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/CommonLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/CommonLineTokenizerTests.java
similarity index 82%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/CommonLineTokenizerTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/CommonLineTokenizerTests.java
index 2de6a2f49..0804bb156 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/CommonLineTokenizerTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/CommonLineTokenizerTests.java
@@ -1,7 +1,9 @@
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 import java.util.List;
 
+import org.springframework.batch.io.file.transform.AbstractLineTokenizer;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/DelimitedLineAggregatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/DelimitedLineAggregatorTests.java
similarity index 88%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/DelimitedLineAggregatorTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/DelimitedLineAggregatorTests.java
index 2fe31d53c..9b4a159da 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/DelimitedLineAggregatorTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/DelimitedLineAggregatorTests.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
-import org.springframework.batch.io.file.support.transform.DelimitedLineAggregator;
+import org.springframework.batch.io.file.transform.DelimitedLineAggregator;
 
 import junit.framework.TestCase;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/DelimitedLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/DelimitedLineTokenizerTests.java
similarity index 95%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/DelimitedLineTokenizerTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/DelimitedLineTokenizerTests.java
index 0b2bad999..dfe9be666 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/DelimitedLineTokenizerTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/DelimitedLineTokenizerTests.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 import junit.framework.TestCase;
 
 import org.springframework.batch.io.file.FieldSet;
-import org.springframework.batch.io.file.support.transform.AbstractLineTokenizer;
-import org.springframework.batch.io.file.support.transform.DelimitedLineTokenizer;
+import org.springframework.batch.io.file.transform.AbstractLineTokenizer;
+import org.springframework.batch.io.file.transform.DelimitedLineTokenizer;
 
 public class DelimitedLineTokenizerTests extends TestCase {
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/FixedLengthLineAggregatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/FixedLengthLineAggregatorTests.java
similarity index 92%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/FixedLengthLineAggregatorTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/FixedLengthLineAggregatorTests.java
index d5df34d6f..b92917939 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/FixedLengthLineAggregatorTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/FixedLengthLineAggregatorTests.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
-import org.springframework.batch.io.file.support.transform.FixedLengthLineAggregator;
+import org.springframework.batch.io.file.transform.FixedLengthLineAggregator;
+import org.springframework.batch.io.file.transform.Range;
 
 import junit.framework.TestCase;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/FixedLengthTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/FixedLengthTokenizerTests.java
similarity index 93%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/FixedLengthTokenizerTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/FixedLengthTokenizerTests.java
index 7496105ee..dcb80576e 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/FixedLengthTokenizerTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/FixedLengthTokenizerTests.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 import junit.framework.TestCase;
 
 import org.springframework.batch.io.file.FieldSet;
-import org.springframework.batch.io.file.support.transform.FixedLengthTokenizer;
+import org.springframework.batch.io.file.transform.FixedLengthTokenizer;
+import org.springframework.batch.io.file.transform.Range;
 
 public class FixedLengthTokenizerTests extends TestCase {
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/LineAggregatorStub.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/LineAggregatorStub.java
similarity index 88%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/LineAggregatorStub.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/LineAggregatorStub.java
index 849753aae..d4a46dfbb 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/LineAggregatorStub.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/LineAggregatorStub.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
-import org.springframework.batch.io.file.support.transform.LineAggregator;
+import org.springframework.batch.io.file.transform.LineAggregator;
 
 
 /**
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/PrefixMatchingCompositeLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/PrefixMatchingCompositeLineTokenizerTests.java
similarity index 90%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/PrefixMatchingCompositeLineTokenizerTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/PrefixMatchingCompositeLineTokenizerTests.java
index 07fe1ef19..1a8f3e17e 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/PrefixMatchingCompositeLineTokenizerTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/PrefixMatchingCompositeLineTokenizerTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -24,9 +24,9 @@ import java.util.Map;
 import junit.framework.TestCase;
 
 import org.springframework.batch.io.file.FieldSet;
-import org.springframework.batch.io.file.support.transform.DelimitedLineTokenizer;
-import org.springframework.batch.io.file.support.transform.LineTokenizer;
-import org.springframework.batch.io.file.support.transform.PrefixMatchingCompositeLineTokenizer;
+import org.springframework.batch.io.file.transform.DelimitedLineTokenizer;
+import org.springframework.batch.io.file.transform.LineTokenizer;
+import org.springframework.batch.io.file.transform.PrefixMatchingCompositeLineTokenizer;
 
 public class PrefixMatchingCompositeLineTokenizerTests extends TestCase {
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/RangeArrayPropertyEditorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/RangeArrayPropertyEditorTests.java
similarity index 88%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/RangeArrayPropertyEditorTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/RangeArrayPropertyEditorTests.java
index 538df9aff..02863ad4d 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/RangeArrayPropertyEditorTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/RangeArrayPropertyEditorTests.java
@@ -1,7 +1,7 @@
-package org.springframework.batch.io.file.support.transform;
+package org.springframework.batch.io.file.transform;
 
-import org.springframework.batch.io.file.support.transform.Range;
-import org.springframework.batch.io.file.support.transform.RangeArrayPropertyEditor;
+import org.springframework.batch.io.file.transform.Range;
+import org.springframework.batch.io.file.transform.RangeArrayPropertyEditor;
 
 import junit.framework.TestCase;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/HibernateAwareItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/HibernateAwareItemWriterTests.java
index f4540d167..05f4475cd 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/HibernateAwareItemWriterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/HibernateAwareItemWriterTests.java
@@ -22,7 +22,7 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.ItemWriter;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.RepeatInterceptor;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/EventHelper.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/EventHelper.java
similarity index 89%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/EventHelper.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/EventHelper.java
index e35e440ec..ae6f66471 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/EventHelper.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/EventHelper.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support;
+package org.springframework.batch.io.xml;
 
 import javax.xml.stream.events.EndElement;
 import javax.xml.stream.events.StartElement;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/StaxEventReaderItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventReaderItemReaderTests.java
similarity index 94%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/StaxEventReaderItemReaderTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventReaderItemReaderTests.java
index 2e80a74fa..d27dedcca 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/StaxEventReaderItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventReaderItemReaderTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support;
+package org.springframework.batch.io.xml;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -15,8 +15,8 @@ import javax.xml.stream.events.XMLEvent;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.file.support.StaxEventReaderItemReader;
-import org.springframework.batch.io.file.support.stax.FragmentDeserializer;
+import org.springframework.batch.io.xml.StaxEventReaderItemReader;
+import org.springframework.batch.io.xml.stax.FragmentDeserializer;
 import org.springframework.batch.restart.GenericRestartData;
 import org.springframework.batch.restart.RestartData;
 import org.springframework.core.io.AbstractResource;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/StaxEventWriterItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventWriterItemWriterTests.java
similarity index 93%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/StaxEventWriterItemWriterTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventWriterItemWriterTests.java
index 1fd64c30f..9cf0e92da 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/StaxEventWriterItemWriterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventWriterItemWriterTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support;
+package org.springframework.batch.io.xml;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,8 +11,8 @@ import javax.xml.transform.Result;
 import junit.framework.TestCase;
 
 import org.apache.commons.io.FileUtils;
-import org.springframework.batch.io.file.support.StaxEventWriterItemWriter;
-import org.springframework.batch.io.file.support.oxm.MarshallingObjectToXmlSerializer;
+import org.springframework.batch.io.xml.StaxEventWriterItemWriter;
+import org.springframework.batch.io.xml.oxm.MarshallingObjectToXmlSerializer;
 import org.springframework.batch.restart.RestartData;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/oxm/MarshallingObjectToXmlSerializerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializerTests.java
similarity index 92%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/oxm/MarshallingObjectToXmlSerializerTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializerTests.java
index b9ae18f6d..af6a91fc1 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/oxm/MarshallingObjectToXmlSerializerTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializerTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.io.file.support.oxm;
+package org.springframework.batch.io.xml.oxm;
 
 import java.io.IOException;
 
@@ -26,7 +26,7 @@ import javax.xml.transform.Result;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.file.support.oxm.MarshallingObjectToXmlSerializer;
+import org.springframework.batch.io.xml.oxm.MarshallingObjectToXmlSerializer;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.oxm.Marshaller;
 import org.springframework.oxm.XmlMappingException;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/oxm/UnmarshallingFragmentDeserializerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializerTests.java
similarity index 91%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/oxm/UnmarshallingFragmentDeserializerTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializerTests.java
index 2e73dd3cb..83becaf6d 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/oxm/UnmarshallingFragmentDeserializerTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializerTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.oxm;
+package org.springframework.batch.io.xml.oxm;
 
 import java.io.IOException;
 
@@ -8,7 +8,7 @@ import javax.xml.stream.XMLInputFactory;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.batch.io.file.support.oxm.UnmarshallingFragmentDeserializer;
+import org.springframework.batch.io.xml.oxm.UnmarshallingFragmentDeserializer;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 import org.springframework.dao.DataAccessException;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/AbstractEventReaderWrapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/AbstractEventReaderWrapperTests.java
similarity index 93%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/AbstractEventReaderWrapperTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/AbstractEventReaderWrapperTests.java
index e0358f6c7..d81892bda 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/AbstractEventReaderWrapperTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/AbstractEventReaderWrapperTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
@@ -22,7 +22,7 @@ import javax.xml.stream.events.XMLEvent;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.batch.io.file.support.stax.AbstractEventReaderWrapper;
+import org.springframework.batch.io.xml.stax.AbstractEventReaderWrapper;
 
 import com.bea.xml.stream.events.StartDocumentEvent;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/AbstractEventWriterWrapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/AbstractEventWriterWrapperTests.java
similarity index 93%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/AbstractEventWriterWrapperTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/AbstractEventWriterWrapperTests.java
index 5140e1194..2279aee81 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/AbstractEventWriterWrapperTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/AbstractEventWriterWrapperTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.stream.XMLEventReader;
@@ -24,7 +24,7 @@ import javax.xml.stream.events.XMLEvent;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.batch.io.file.support.stax.AbstractEventWriterWrapper;
+import org.springframework.batch.io.xml.stax.AbstractEventWriterWrapper;
 
 import com.bea.xml.stream.events.StartDocumentEvent;
 import com.bea.xml.stream.util.NamespaceContextImpl;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/DefaultFragmentEventReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/DefaultFragmentEventReaderTests.java
similarity index 90%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/DefaultFragmentEventReaderTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/DefaultFragmentEventReaderTests.java
index f6fbfc1ea..d49a80468 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/DefaultFragmentEventReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/DefaultFragmentEventReaderTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import java.util.NoSuchElementException;
 
@@ -9,10 +9,10 @@ import javax.xml.stream.events.XMLEvent;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.file.support.EventHelper;
-import org.springframework.batch.io.file.support.stax.DefaultFragmentEventReader;
-import org.springframework.batch.io.file.support.stax.DefaultTransactionalEventReader;
-import org.springframework.batch.io.file.support.stax.FragmentEventReader;
+import org.springframework.batch.io.xml.EventHelper;
+import org.springframework.batch.io.xml.stax.DefaultFragmentEventReader;
+import org.springframework.batch.io.xml.stax.DefaultTransactionalEventReader;
+import org.springframework.batch.io.xml.stax.FragmentEventReader;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/DefaultTransactionalEventReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/DefaultTransactionalEventReaderTests.java
similarity index 84%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/DefaultTransactionalEventReaderTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/DefaultTransactionalEventReaderTests.java
index 00fd301d7..f15868289 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/DefaultTransactionalEventReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/DefaultTransactionalEventReaderTests.java
@@ -1,13 +1,13 @@
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.file.support.EventHelper;
-import org.springframework.batch.io.file.support.stax.DefaultTransactionalEventReader;
-import org.springframework.batch.io.file.support.stax.TransactionalEventReader;
+import org.springframework.batch.io.xml.EventHelper;
+import org.springframework.batch.io.xml.stax.DefaultTransactionalEventReader;
+import org.springframework.batch.io.xml.stax.TransactionalEventReader;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/EventSequenceTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/EventSequenceTests.java
similarity index 83%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/EventSequenceTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/EventSequenceTests.java
index c86ae5d59..eb29832b7 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/EventSequenceTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/EventSequenceTests.java
@@ -1,9 +1,9 @@
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import javax.xml.stream.XMLEventFactory;
 import javax.xml.stream.events.XMLEvent;
 
-import org.springframework.batch.io.file.support.stax.EventSequence;
+import org.springframework.batch.io.xml.stax.EventSequence;
 
 import junit.framework.TestCase;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/NoStartEndDocumentWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/NoStartEndDocumentWriterTests.java
similarity index 87%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/NoStartEndDocumentWriterTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/NoStartEndDocumentWriterTests.java
index 3c787f643..b012e1f7c 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/NoStartEndDocumentWriterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/NoStartEndDocumentWriterTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.io.file.support.stax;
+package org.springframework.batch.io.xml.stax;
 
 import javax.xml.stream.XMLEventFactory;
 import javax.xml.stream.XMLEventWriter;
@@ -7,7 +7,7 @@ import javax.xml.stream.events.XMLEvent;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.batch.io.file.support.stax.NoStartEndDocumentStreamWriter;
+import org.springframework.batch.io.xml.stax.NoStartEndDocumentStreamWriter;
 
 /**
  * Tests for {@link NoStartEndDocumentStreamWriter}
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/ItemWriterItemProcessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/ItemWriterItemProcessorTests.java
index f04b9b3c4..10dd0e0b8 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/ItemWriterItemProcessorTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/ItemWriterItemProcessorTests.java
@@ -21,8 +21,8 @@ import java.util.Properties;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.ItemWriter;
 import org.springframework.batch.io.Skippable;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.processor.ItemWriterItemProcessor;
 import org.springframework.batch.restart.GenericRestartData;
 import org.springframework.batch.restart.RestartData;
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/TransformerWriterItemProcessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/TransformerWriterItemProcessorTests.java
index e92cbe374..21290b5ea 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/TransformerWriterItemProcessorTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/TransformerWriterItemProcessorTests.java
@@ -3,7 +3,7 @@ package org.springframework.batch.item.processor;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.batch.io.ItemWriter;
+import org.springframework.batch.item.ItemWriter;
 
 /**
  * Tests for {@link TransformerWriterItemProcessor}.
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java
index a0ee5eacd..f6c92e6c0 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java
@@ -20,7 +20,7 @@ import junit.framework.TestCase;
 
 import org.springframework.batch.io.file.FieldSet;
 import org.springframework.batch.io.file.FieldSetMapper;
-import org.springframework.batch.io.file.support.SimpleFlatFileItemReader;
+import org.springframework.batch.io.file.SimpleFlatFileItemReader;
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.provider.DelegatingItemReader;
 import org.springframework.core.io.ClassPathResource;
diff --git a/spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/file/support/mapping/bean-wrapper.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/file/mapping/bean-wrapper.xml
similarity index 68%
rename from spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/file/support/mapping/bean-wrapper.xml
rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/file/mapping/bean-wrapper.xml
index 7a58d250d..29f0dda25 100644
--- a/spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/file/support/mapping/bean-wrapper.xml
+++ b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/file/mapping/bean-wrapper.xml
@@ -5,10 +5,10 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 	<bean id="fieldSetMapper"
-		class="org.springframework.batch.io.file.support.mapping.BeanWrapperFieldSetMapper">
+		class="org.springframework.batch.io.file.mapping.BeanWrapperFieldSetMapper">
 		<property name="prototypeBeanName" value="prototype"/>
 	</bean>
 
-	<bean id="prototype" class="org.springframework.batch.io.file.support.mapping.TestObject" scope="prototype" />
+	<bean id="prototype" class="org.springframework.batch.io.file.mapping.TestObject" scope="prototype" />
 
 </beans>
\ No newline at end of file
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java
index 3e98dc376..8f5c37d00 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java
@@ -6,9 +6,9 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.file.support.StaxEventReaderItemReader;
-import org.springframework.batch.io.file.support.oxm.UnmarshallingFragmentDeserializer;
 import org.springframework.batch.io.oxm.domain.Trade;
+import org.springframework.batch.io.xml.StaxEventReaderItemReader;
+import org.springframework.batch.io.xml.oxm.UnmarshallingFragmentDeserializer;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.oxm.Unmarshaller;
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java
index 5753e14b8..c10a637d3 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java
@@ -11,9 +11,9 @@ import junit.framework.TestCase;
 
 import org.custommonkey.xmlunit.XMLAssert;
 import org.custommonkey.xmlunit.XMLUnit;
-import org.springframework.batch.io.file.support.StaxEventWriterItemWriter;
-import org.springframework.batch.io.file.support.oxm.MarshallingObjectToXmlSerializer;
 import org.springframework.batch.io.oxm.domain.Trade;
+import org.springframework.batch.io.xml.StaxEventWriterItemWriter;
+import org.springframework.batch.io.xml.oxm.MarshallingObjectToXmlSerializer;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerCreditWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerCreditWriter.java
index 914247052..38b96d04a 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerCreditWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerCreditWriter.java
@@ -16,7 +16,7 @@
 
 package org.springframework.batch.sample.dao;
 
-import org.springframework.batch.io.ItemWriter;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.sample.domain.CustomerCredit;
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriter.java
index 7defee28c..374c0884c 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriter.java
@@ -16,7 +16,7 @@
 
 package org.springframework.batch.sample.dao;
 
-import org.springframework.batch.io.ItemWriter;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.ResourceLifecycle;
 import org.springframework.batch.sample.domain.CustomerCredit;
 import org.springframework.beans.factory.DisposableBean;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java
index 2bd141759..69e361a0d 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java
@@ -16,8 +16,8 @@
 
 package org.springframework.batch.sample.dao;
 
-import org.springframework.batch.io.ItemWriter;
-import org.springframework.batch.io.file.support.transform.Converter;
+import org.springframework.batch.io.file.transform.Converter;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.sample.domain.Order;
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditWriter.java
index 73ebe5df1..de051d6f5 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditWriter.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.sample.dao;
 
-import org.springframework.batch.io.ItemWriter;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.sample.domain.CustomerCredit;
 import org.springframework.orm.ibatis.support.SqlMapClientDaoSupport;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java
index a4fff13ba..cbe253a39 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java
@@ -1,6 +1,6 @@
 package org.springframework.batch.sample.dao;
 
-import org.springframework.batch.io.ItemWriter;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.sample.domain.Game;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 import org.springframework.util.Assert;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java
index d45535479..56f8e604a 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java
@@ -1,6 +1,6 @@
 package org.springframework.batch.sample.dao;
 
-import org.springframework.batch.io.ItemWriter;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.sample.domain.PlayerSummary;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 import org.springframework.util.Assert;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderConverter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderConverter.java
index fd090972d..ab74f7f57 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderConverter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderConverter.java
@@ -21,8 +21,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.batch.io.file.support.transform.Converter;
-import org.springframework.batch.io.file.support.transform.LineAggregator;
+import org.springframework.batch.io.file.transform.Converter;
+import org.springframework.batch.io.file.transform.LineAggregator;
 import org.springframework.batch.sample.domain.Address;
 import org.springframework.batch.sample.domain.BillingInfo;
 import org.springframework.batch.sample.domain.Customer;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/TradeWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/TradeWriter.java
index cfd7888d4..7a685fa09 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/TradeWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/TradeWriter.java
@@ -16,7 +16,7 @@
 
 package org.springframework.batch.sample.dao;
 
-import org.springframework.batch.io.ItemWriter;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.sample.domain.Trade;
 
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessor.java
index a01b8e6b9..6b73db19f 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessor.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessor.java
@@ -2,8 +2,8 @@ package org.springframework.batch.sample.item.processor;
 
 import java.math.BigDecimal;
 
-import org.springframework.batch.io.ItemWriter;
 import org.springframework.batch.item.ItemProcessor;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.sample.domain.CustomerCredit;
 
 /**
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessor.java
index 175febf15..18306d4ec 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessor.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessor.java
@@ -1,6 +1,6 @@
 package org.springframework.batch.sample.item.processor;
 
-import org.springframework.batch.io.file.support.FlatFileItemWriter;
+import org.springframework.batch.io.file.FlatFileItemWriter;
 import org.springframework.batch.item.ItemProcessor;
 
 public class DefaultFlatFileProcessor implements ItemProcessor{
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeTasklet.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeTasklet.java
index c2d49fe2c..a7de38394 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeTasklet.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeTasklet.java
@@ -20,7 +20,7 @@ import java.util.Properties;
 
 import org.springframework.batch.core.tasklet.Tasklet;
 import org.springframework.batch.execution.tasklet.ItemOrientedTasklet;
-import org.springframework.batch.io.file.support.DefaultFlatFileItemReader;
+import org.springframework.batch.io.file.DefaultFlatFileItemReader;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.sample.dao.TradeWriter;
 import org.springframework.batch.sample.domain.Trade;
diff --git a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
index 91675fa37..a56009d4b 100644
--- a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
@@ -50,7 +50,7 @@
 
 	<!-- INFRASTRUCTURE SETUP -->
 
-	<bean id="fileInputTemplate" class="org.springframework.batch.io.file.support.DefaultFlatFileItemReader"
+	<bean id="fileInputTemplate" class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
 		scope="step" >
 		<aop:scoped-proxy />
 		<property name="resource" ref="fileLocator" />
@@ -58,7 +58,7 @@
 		<property name="fieldSetMapper" ref="fieldSetMapper" />
 	</bean>
 
-	<bean id="fileInputTemplate2" class="org.springframework.batch.io.file.support.DefaultFlatFileItemReader"
+	<bean id="fileInputTemplate2" class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
 		scope="step">
 		<aop:scoped-proxy />
 		<property name="resource" ref="fileLocator2" />
@@ -68,13 +68,13 @@
 	</bean>
 
 	<bean id="fixedFileDescriptor"
-		class="org.springframework.batch.io.file.support.transform.FixedLengthTokenizer">
+		class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
 		<property name="names" value="ISIN,Quantity,price, CUSTOMER" />
 		<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
 	</bean>
 
 	<bean id="fixedFileDescriptor2"
-		class="org.springframework.batch.io.file.support.transform.FixedLengthTokenizer">
+		class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
 		<property name="names" value="Title, FirstName, LastName, Age, Address.AddrLine1, children[0].name, children[1].name" />
 		<property name="columns" value="1-5, 6-20, 21-40, 41-45, 46-55, 56-65, 66-75" />
 	</bean>
@@ -114,11 +114,11 @@
 			value="data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportPersonDataStep.txt" />
 	</bean>
 
-	<bean id="fieldSetMapper" class="org.springframework.batch.io.file.support.mapping.BeanWrapperFieldSetMapper">
+	<bean id="fieldSetMapper" class="org.springframework.batch.io.file.mapping.BeanWrapperFieldSetMapper">
 		<property name="prototypeBeanName" value="trade"/>
 	</bean>
 
-	<bean id="fieldSetMapper2" class="org.springframework.batch.io.file.support.mapping.BeanWrapperFieldSetMapper">
+	<bean id="fieldSetMapper2" class="org.springframework.batch.io.file.mapping.BeanWrapperFieldSetMapper">
 		<property name="prototypeBeanName" value="person"/>
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
index 80333c678..310090154 100644
--- a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
@@ -46,7 +46,7 @@
 
 	<!-- INFRASTRUCTURE SETUP -->
 
-	<bean id="fileInputTemplate" class="org.springframework.batch.io.file.support.DefaultFlatFileItemReader"
+	<bean id="fileInputTemplate" class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
 		scope="step">
 		<aop:scoped-proxy />
 		<property name="resource" ref="fileLocator" />
@@ -54,7 +54,7 @@
 		<property name="fieldSetMapper" ref="fieldSetMapper" />
 	</bean>
 
-	<bean id="fixedFileDescriptor" class="org.springframework.batch.io.file.support.transform.FixedLengthTokenizer">
+	<bean id="fixedFileDescriptor" class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
 		<property name="names" value="ISIN, Quantity, Price, Customer" />
 		<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
 	</bean>
@@ -83,7 +83,7 @@
 		</property>
 	</bean>
 
-	<bean class="org.springframework.batch.io.file.support.FlatFileItemWriter" id="flatFileOutputSource">
+	<bean class="org.springframework.batch.io.file.FlatFileItemWriter" id="flatFileOutputSource">
 		<property name="resource" ref="customerFileLocator" />
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
index 1c2f61f55..836a4fd7f 100644
--- a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
@@ -37,7 +37,7 @@
 	<!-- INFRASTRUCTURE SETUP -->
 
 	<!-- This input source is injected into the test case to verify the output - not used by the job at all -->
-	<bean id="testInputTemplate" class="org.springframework.batch.io.file.support.DefaultFlatFileItemReader">
+	<bean id="testInputTemplate" class="org.springframework.batch.io.file.DefaultFlatFileItemReader">
 		<property name="resource" ref="fileLocator" />
 		<property name="tokenizer" ref="fixedFileDescriptor" />
 		<property name="fieldSetMapper" ref="fieldSetMapper" />
@@ -47,7 +47,7 @@
 		<aop:scoped-proxy/>
 	</bean>
 
-	<bean id="fixedFileDescriptor" class="org.springframework.batch.io.file.support.transform.FixedLengthTokenizer">
+	<bean id="fixedFileDescriptor" class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
 		<property name="names" value="ISIN, Quantity, Price, Customer" />
 		<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
 	</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
index b60684019..2a9927d03 100644
--- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
@@ -96,12 +96,12 @@
 	</bean>
 
 	<bean id="playerFileItemReader"
-		class="org.springframework.batch.io.file.support.DefaultFlatFileItemReader" scope="step">
+		class="org.springframework.batch.io.file.DefaultFlatFileItemReader" scope="step">
 		<aop:scoped-proxy/>		
 		<property name="resource" value="classpath:data/footballjob/input/player.csv" />
 		<property name="tokenizer">
 			<bean
-				class="org.springframework.batch.io.file.support.transform.DelimitedLineTokenizer">
+				class="org.springframework.batch.io.file.transform.DelimitedLineTokenizer">
 				<property name="names"
 					value="ID,lastName,firstName,position,birthYear,debutYear" />
 			</bean>
@@ -113,12 +113,12 @@
 	</bean>
 
 	<bean id="gameFileItemReader"
-		class="org.springframework.batch.io.file.support.DefaultFlatFileItemReader" scope="step">
+		class="org.springframework.batch.io.file.DefaultFlatFileItemReader" scope="step">
 		<aop:scoped-proxy/>
 		<property name="resource" value="classpath:data/footballjob/input/games.csv"/>
 		<property name="tokenizer">
 			<bean
-				class="org.springframework.batch.io.file.support.transform.DelimitedLineTokenizer">
+				class="org.springframework.batch.io.file.transform.DelimitedLineTokenizer">
 				<property name="names"
 					value="id,year,team,week,opponent,completes,attempts,passingYards,passingTd,interceptions,rushes,rushYards,receptions,receptionYards,totalTd" />
 			</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
index c5cbebfbd..4fc6b01c5 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
@@ -28,7 +28,7 @@
 								class="org.springframework.batch.sample.item.processor.DefaultFlatFileProcessor">
 								<property name="flatFileOutputSource">
 									<bean
-										class="org.springframework.batch.io.file.support.FlatFileItemWriter"
+										class="org.springframework.batch.io.file.FlatFileItemWriter"
 										scope="step">
 										<aop:scoped-proxy />
 										<property name="resource"
@@ -44,7 +44,7 @@
 	</bean>
 
 	<bean id="fileItemReader"
-		class="org.springframework.batch.io.file.support.DefaultFlatFileItemReader"
+		class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
 		scope="step">
 		<aop:scoped-proxy />
 		<property name="resource"
@@ -58,7 +58,7 @@
 		class="org.springframework.batch.sample.mapping.TradeFieldSetMapper" />
 
 	<bean id="fixedFileDescriptor"
-		class="org.springframework.batch.io.file.support.transform.PrefixMatchingCompositeLineTokenizer">
+		class="org.springframework.batch.io.file.transform.PrefixMatchingCompositeLineTokenizer">
 		<property name="tokenizers">
 			<map>
 				<entry key="BEGIN" value-ref="beginRecordDescriptor" />
@@ -69,17 +69,17 @@
 	</bean>
 
 	<bean id="beginRecordDescriptor"
-		class="org.springframework.batch.io.file.support.transform.FixedLengthTokenizer">
+		class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
 		<property name="columns" value="1-5" />
 	</bean>
 
 	<bean id="endRecordDescriptor"
-		class="org.springframework.batch.io.file.support.transform.FixedLengthTokenizer">
+		class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
 		<property name="columns" value="1-3" />
 	</bean>
 
 	<bean id="tradeRecordDescriptor"
-		class="org.springframework.batch.io.file.support.transform.FixedLengthTokenizer">
+		class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
 		<property name="names" value="ISIN,Quantity,Price,Customer" />
 		<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
 	</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderInputDescriptors.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderInputDescriptors.xml
index fac0e2dd2..d3d9a1a00 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineOrderInputDescriptors.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderInputDescriptors.xml
@@ -4,7 +4,7 @@
        	http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 	<bean id="orderFileDescriptor"
-		class="org.springframework.batch.io.file.support.transform.PrefixMatchingCompositeLineTokenizer">
+		class="org.springframework.batch.io.file.transform.PrefixMatchingCompositeLineTokenizer">
 		<property name="tokenizers">
 			<map>
 				<entry key="HEA" value-ref="headerRecordDescriptor" />
@@ -22,12 +22,12 @@
 	</bean>
 
 	<bean id="defaultLineDescriptor"
-		class="org.springframework.batch.io.file.support.transform.FixedLengthTokenizer">
+		class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
 		<property name="columns" value="1-120" />
 	</bean>
 
 	<bean id="parentLineDescriptor" abstract="true"
-		class="org.springframework.batch.io.file.support.transform.DelimitedLineTokenizer">
+		class="org.springframework.batch.io.file.transform.DelimitedLineTokenizer">
 		<property name="delimiter" value=";"/>
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml
index 283717cec..9e1c237c0 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml
@@ -8,7 +8,7 @@
        	http://www.springframework.org/schema/aop
  		http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
-	<bean id="fileInputTemplate" class="org.springframework.batch.io.file.support.DefaultFlatFileItemReader"
+	<bean id="fileInputTemplate" class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
 		scope="step">
 		<aop:scoped-proxy />
 		<property name="resource" ref="fileInputLocator" />
@@ -18,14 +18,14 @@
 		</property>
 	</bean>
 
-	<bean id="flatFileOutputSource" class="org.springframework.batch.io.file.support.FlatFileItemWriter"
+	<bean id="flatFileOutputSource" class="org.springframework.batch.io.file.FlatFileItemWriter"
 		scope="step" >
 		<aop:scoped-proxy />
 		<property name="resource" ref="fileOutputLocator" />
 	</bean>
 
-	<bean id="delimitedLineAggregator" class="org.springframework.batch.io.file.support.transform.DelimitedLineTokenizer" />
+	<bean id="delimitedLineAggregator" class="org.springframework.batch.io.file.transform.DelimitedLineTokenizer" />
 
-	<bean id="fixedLineAggregator" class="org.springframework.batch.io.file.support.transform.FixedLengthLineAggregator" />
+	<bean id="fixedLineAggregator" class="org.springframework.batch.io.file.transform.FixedLengthLineAggregator" />
 
 </beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderOutputDescriptors.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderOutputDescriptors.xml
index cd45c001f..45799d193 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineOrderOutputDescriptors.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderOutputDescriptors.xml
@@ -14,26 +14,26 @@
 		<entry key="item" value-ref="outputLineItem" />
 	</util:map>
 
-	<bean id="outputHeader" class="org.springframework.batch.io.file.support.transform.FixedLengthLineAggregator"
+	<bean id="outputHeader" class="org.springframework.batch.io.file.transform.FixedLengthLineAggregator"
 				p:columns="1-12,13-22,23-52" />
 
 	<bean id="outputFooter"
-		class="org.springframework.batch.io.file.support.transform.FixedLengthLineAggregator"
+		class="org.springframework.batch.io.file.transform.FixedLengthLineAggregator"
 				p:columns="1-10,11-30" />
 
-	<bean id="outputCustomer" class="org.springframework.batch.io.file.support.transform.FixedLengthLineAggregator"
+	<bean id="outputCustomer" class="org.springframework.batch.io.file.transform.FixedLengthLineAggregator"
 				p:columns="1-9,10-19,20-29,30-39,40-49" />
 
 	<bean id="outputAddress"
-		class="org.springframework.batch.io.file.support.transform.FixedLengthLineAggregator"
+		class="org.springframework.batch.io.file.transform.FixedLengthLineAggregator"
 				p:columns="1-8,9-28,29-38,39-48" />
 
 	<bean id="outputBilling"
-		class="org.springframework.batch.io.file.support.transform.FixedLengthLineAggregator"
+		class="org.springframework.batch.io.file.transform.FixedLengthLineAggregator"
 				p:columns="1-8,9-18,19-38" />
 
 	<bean id="outputLineItem"
-		class="org.springframework.batch.io.file.support.transform.FixedLengthLineAggregator"
+		class="org.springframework.batch.io.file.transform.FixedLengthLineAggregator"
 				p:columns="1-5,6-15,16-25" />
 
 </beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
index cb4349506..e176983ad 100644
--- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
@@ -104,7 +104,7 @@
 
 	<!-- This input source is injected into the test case to verify the output - not used by the job at all -->
 	<bean id="testInputTemplate"
-		class="org.springframework.batch.io.file.support.DefaultFlatFileItemReader">
+		class="org.springframework.batch.io.file.DefaultFlatFileItemReader">
 		<property name="resource" ref="fileLocator" />
 		<property name="tokenizer" ref="fixedFileDescriptor" />
 		<property name="fieldSetMapper" ref="fieldSetMapper" />
@@ -116,7 +116,7 @@
 	</bean>
 
 	<bean id="fixedFileDescriptor"
-		class="org.springframework.batch.io.file.support.transform.FixedLengthTokenizer">
+		class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
 		<property name="names" value="ISIN, Quantity, Price, Customer" />
 		<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
 	</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/restartSample.xml b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
index c88ee4903..294deff58 100644
--- a/spring-batch-samples/src/main/resources/jobs/restartSample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
@@ -38,7 +38,7 @@
 
 	<!-- INFRASTRUCTURE SETUP -->
 
-	<bean id="fileItemReader" class="org.springframework.batch.io.file.support.DefaultFlatFileItemReader"
+	<bean id="fileItemReader" class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
 		scope="step" >
 		<aop:scoped-proxy />
 		<property name="resource" ref="fileLocator" />
@@ -46,7 +46,7 @@
 		<property name="fieldSetMapper" ref="fieldSetMapper" />
 	</bean>
 
-	<bean id="fixedFileDescriptor" class="org.springframework.batch.io.file.support.transform.FixedLengthTokenizer">
+	<bean id="fixedFileDescriptor" class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
 		<property name="names" value="ISIN, Quantity, Price, Customer" />
 		<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
 	</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/simpleTaskletJob.xml b/spring-batch-samples/src/main/resources/jobs/simpleTaskletJob.xml
index a119137d8..a46694205 100644
--- a/spring-batch-samples/src/main/resources/jobs/simpleTaskletJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/simpleTaskletJob.xml
@@ -39,7 +39,7 @@
 	</bean>
 
 	<!-- This input source is injected into the test case to verify the output - not used by the job at all -->
-	<bean id="testInputTemplate" class="org.springframework.batch.io.file.support.DefaultFlatFileItemReader">
+	<bean id="testInputTemplate" class="org.springframework.batch.io.file.DefaultFlatFileItemReader">
 		<property name="resource" ref="fileLocator" />
 		<property name="tokenizer" ref="tradeTokenizer" />
 		<property name="fieldSetMapper" ref="tradeMapper" />
@@ -60,7 +60,7 @@
 	</bean>
 
 	<bean id="tradeTokenizer"
-		class="org.springframework.batch.io.file.support.transform.FixedLengthTokenizer">
+		class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
 		<property name="names" value="ISIN, Quantity, Price, Customer" />
 		<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
 	</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
index baf0e447e..fbe0ddca5 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
@@ -28,7 +28,7 @@
 		<aop:scoped-proxy />
 		<property name="outputSource">
 			<bean
-				class="org.springframework.batch.io.file.support.FlatFileItemWriter"
+				class="org.springframework.batch.io.file.FlatFileItemWriter"
 				id="customerFlatFileOutputSource">
 				<property name="resource" ref="customerFileLocator" />
 			</bean>
@@ -36,7 +36,7 @@
 	</bean>
 
 	<bean
-		class="org.springframework.batch.io.file.support.DefaultFlatFileItemReader"
+		class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
 		id="fileInputTemplate" scope="step">
 		<aop:scoped-proxy />
 		<property name="resource" ref="fileLocator" />
@@ -48,7 +48,7 @@
 	</bean>
 
 	<bean id="tradeFileDescriptor"
-		class="org.springframework.batch.io.file.support.transform.DelimitedLineTokenizer">
+		class="org.springframework.batch.io.file.transform.DelimitedLineTokenizer">
 		<property name="names" value="ISIN, Quantity, Price, Customer" />
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
index 8d35a7644..2b4829352 100644
--- a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
@@ -22,7 +22,7 @@
 						class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
 						<property name="itemReader">
 							<bean
-								class="org.springframework.batch.io.file.support.StaxEventReaderItemReader"
+								class="org.springframework.batch.io.xml.StaxEventReaderItemReader"
 								scope="step">
 								<aop:scoped-proxy />
 								<property name="fragmentRootElementName"
@@ -31,7 +31,7 @@
 									value="data/staxJob/input/20070918.testStream.xmlFileStep.xml" />
 								<property name="fragmentDeserializer">
 									<bean
-										class="org.springframework.batch.io.file.support.oxm.UnmarshallingFragmentDeserializer">
+										class="org.springframework.batch.io.xml.oxm.UnmarshallingFragmentDeserializer">
 										<constructor-arg>
 											<bean
 												class="org.springframework.oxm.xstream.XStreamMarshaller">
@@ -56,7 +56,7 @@
 	</bean>
 
 	<bean
-		class="org.springframework.batch.io.file.support.StaxEventWriterItemWriter"
+		class="org.springframework.batch.io.xml.StaxEventWriterItemWriter"
 		id="tradeStaxWriter">
 		<property name="resource"
 			value="file:target/test-outputs/20070918.testStream.xmlFileStep.output.xml" />
@@ -66,7 +66,7 @@
 	</bean>
 
 	<bean
-		class="org.springframework.batch.io.file.support.oxm.MarshallingObjectToXmlSerializer"
+		class="org.springframework.batch.io.xml.oxm.MarshallingObjectToXmlSerializer"
 		id="tradeMarshallingSerializer">
 		<constructor-arg>
 			<bean
diff --git a/spring-batch-samples/src/main/resources/simple-container-definition.xml b/spring-batch-samples/src/main/resources/simple-container-definition.xml
index b0a27e1b4..88ad62f62 100644
--- a/spring-batch-samples/src/main/resources/simple-container-definition.xml
+++ b/spring-batch-samples/src/main/resources/simple-container-definition.xml
@@ -133,9 +133,9 @@
 						class="org.springframework.batch.support.IntArrayPropertyEditor" />
 				</entry>
 				<entry
-					key="org.springframework.batch.io.file.support.transform.Range[]">
+					key="org.springframework.batch.io.file.transform.Range[]">
 					<bean
-						class="org.springframework.batch.io.file.support.transform.RangeArrayPropertyEditor" />
+						class="org.springframework.batch.io.file.transform.RangeArrayPropertyEditor" />
 				</entry>
 				<entry key="java.util.Date">
 					<bean
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
index fce1b0f7d..fb881760c 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
@@ -21,7 +21,7 @@ import java.io.FileReader;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.springframework.batch.io.file.support.DefaultFlatFileItemReader;
+import org.springframework.batch.io.file.DefaultFlatFileItemReader;
 import org.springframework.batch.sample.domain.Trade;
 import org.springframework.core.io.Resource;
 import org.springframework.jdbc.core.JdbcOperations;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/LineAggregatorStub.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/LineAggregatorStub.java
index ccadc0ef9..e5b423fa7 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/LineAggregatorStub.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/LineAggregatorStub.java
@@ -16,7 +16,7 @@
 
 package org.springframework.batch.sample;
 
-import org.springframework.batch.io.file.support.transform.LineAggregator;
+import org.springframework.batch.io.file.transform.LineAggregator;
 
 
 /**
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriterTests.java
index b8d4845cf..c5826da3d 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriterTests.java
@@ -2,7 +2,7 @@ package org.springframework.batch.sample.dao;
 
 import java.math.BigDecimal;
 
-import org.springframework.batch.io.ItemWriter;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.ResourceLifecycle;
 import org.springframework.batch.sample.domain.CustomerCredit;
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java
index df63ef4b2..d3b2c2816 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java
@@ -9,8 +9,8 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.ItemWriter;
-import org.springframework.batch.io.file.support.transform.LineAggregator;
+import org.springframework.batch.io.file.transform.LineAggregator;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.sample.LineAggregatorStub;
 import org.springframework.batch.sample.domain.Address;
 import org.springframework.batch.sample.domain.BillingInfo;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderConverterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderConverterTests.java
index 84eb3dc54..700003fd0 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderConverterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderConverterTests.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.file.support.transform.DelimitedLineAggregator;
+import org.springframework.batch.io.file.transform.DelimitedLineAggregator;
 import org.springframework.batch.sample.domain.Address;
 import org.springframework.batch.sample.domain.BillingInfo;
 import org.springframework.batch.sample.domain.Customer;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessorTests.java
index a2f9d9039..b2929807d 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessorTests.java
@@ -5,7 +5,7 @@ import java.math.BigDecimal;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.batch.io.ItemWriter;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.sample.domain.CustomerCredit;
 
 /**
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessorTests.java
index 4e03cf794..c828899bf 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessorTests.java
@@ -2,7 +2,7 @@ package org.springframework.batch.sample.item.processor;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.file.support.FlatFileItemWriter;
+import org.springframework.batch.io.file.FlatFileItemWriter;
 import org.springframework.batch.sample.item.processor.DefaultFlatFileProcessor;
 
 public class DefaultFlatFileProcessorTests extends TestCase {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleTradeTaskletTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleTradeTaskletTests.java
index efb2f23f6..a6bb98dce 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleTradeTaskletTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleTradeTaskletTests.java
@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.file.support.DefaultFlatFileItemReader;
+import org.springframework.batch.io.file.DefaultFlatFileItemReader;
 import org.springframework.batch.sample.dao.TradeWriter;
 import org.springframework.batch.sample.domain.Trade;