diff --git a/spring-batch-infrastructure/.springBeans b/spring-batch-infrastructure/.springBeans
index 63d1f8c14..15db1a370 100644
--- a/spring-batch-infrastructure/.springBeans
+++ b/spring-batch-infrastructure/.springBeans
@@ -10,9 +10,6 @@
 		<config>src/test/resources/org/springframework/batch/retry/aop/retry-transaction-test.xml</config>
 		<config>src/test/resources/org/springframework/batch/item/database/data-source-context.xml</config>
 		<config>src/test/resources/org/springframework/batch/item/file/mapping/bean-wrapper.xml</config>
-		<config>src/test/resources/org/springframework/batch/item/reader/delegating-item-provider.xml</config>
-		<config>src/test/resources/org/springframework/batch/item/writer/delegating-item-writer.xml</config>
-		<config>src/test/resources/org/springframework/batch/item/writer/pe-delegating-item-writer.xml</config>
 	</configs>
 	<configSets>
 	</configSets>
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ItemReaderAdapter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemReaderAdapter.java
similarity index 97%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ItemReaderAdapter.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemReaderAdapter.java
index 2a73d74cf..136ea9360 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ItemReaderAdapter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemReaderAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.reader;
+package org.springframework.batch.item.adapter;
 
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemReader;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/ItemWriterAdapter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemWriterAdapter.java
similarity index 96%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/ItemWriterAdapter.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemWriterAdapter.java
index cded85919..e9dbd2494 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/ItemWriterAdapter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemWriterAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.writer;
+package org.springframework.batch.item.adapter;
 
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java
similarity index 98%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemWriter.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java
index 2e8d9626e..17dd0c2e4 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.writer;
+package org.springframework.batch.item.adapter;
 
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/package.html
new file mode 100644
index 000000000..a8e90f1ca
--- /dev/null
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+Adapters for Plain Old Java Objects.
+</p>
+</body>
+</html>
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/ResourceLineReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/ResourceLineReader.java
index 8130fa093..326abe109 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/ResourceLineReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/ResourceLineReader.java
@@ -113,7 +113,7 @@ public class ResourceLineReader extends ItemStreamSupport implements LineReader,
 	 * 
 	 * @return a String.
 	 * 
-	 * @see org.springframework.batch.item.reader.support.ItemReader#read()
+	 * @see org.springframework.batch.item.adapter.support.ItemReader#read()
 	 */
 	public synchronized Object read() {
 		// Make a copy of the recordSeparatorPolicy reference, in case it is
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/DelegatingItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemReaderAdapterTests.java
similarity index 84%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/DelegatingItemReaderIntegrationTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemReaderAdapterTests.java
index 4d6659674..55303441e 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/DelegatingItemReaderIntegrationTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemReaderAdapterTests.java
@@ -1,9 +1,10 @@
-package org.springframework.batch.item.reader;
+package org.springframework.batch.item.adapter;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.batch.io.sample.domain.FooService;
+import org.springframework.batch.item.adapter.ItemReaderAdapter;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**
@@ -11,7 +12,7 @@ import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
  * 
  * @author Robert Kasanicky
  */
-public class DelegatingItemReaderIntegrationTests extends AbstractDependencyInjectionSpringContextTests {
+public class ItemReaderAdapterTests extends AbstractDependencyInjectionSpringContextTests {
 
 	private ItemReaderAdapter provider;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/ItemWriterAdapterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemWriterAdapterTests.java
similarity index 92%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/ItemWriterAdapterTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemWriterAdapterTests.java
index dda6031eb..2887edb70 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/ItemWriterAdapterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemWriterAdapterTests.java
@@ -1,10 +1,11 @@
-package org.springframework.batch.item.writer;
+package org.springframework.batch.item.adapter;
 
 import java.util.List;
 
 import org.springframework.batch.io.sample.domain.Foo;
 import org.springframework.batch.io.sample.domain.FooService;
 import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.item.adapter.ItemWriterAdapter;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemProccessorIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemProccessorIntegrationTests.java
similarity index 92%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemProccessorIntegrationTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemProccessorIntegrationTests.java
index 991aab329..2d0ff581a 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemProccessorIntegrationTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemProccessorIntegrationTests.java
@@ -1,9 +1,10 @@
-package org.springframework.batch.item.writer;
+package org.springframework.batch.item.adapter;
 
 import java.util.List;
 
 import org.springframework.batch.io.sample.domain.Foo;
 import org.springframework.batch.io.sample.domain.FooService;
+import org.springframework.batch.item.adapter.PropertyExtractingDelegatingItemWriter;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**
diff --git a/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/reader/delegating-item-provider.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/adapter/delegating-item-provider.xml
similarity index 85%
rename from spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/reader/delegating-item-provider.xml
rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/adapter/delegating-item-provider.xml
index 0738be8a7..7d678ac84 100644
--- a/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/reader/delegating-item-provider.xml
+++ b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/adapter/delegating-item-provider.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<bean id="provider" class="org.springframework.batch.item.reader.ItemReaderAdapter">
+	<bean id="provider" class="org.springframework.batch.item.adapter.ItemReaderAdapter">
 		<property name="targetObject" ref="fooService" />
 		<property name="targetMethod" value="generateFoo" />
 	</bean>
diff --git a/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/writer/delegating-item-writer.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/adapter/delegating-item-writer.xml
similarity index 85%
rename from spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/writer/delegating-item-writer.xml
rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/adapter/delegating-item-writer.xml
index f6b903332..c94d0902a 100644
--- a/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/writer/delegating-item-writer.xml
+++ b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/adapter/delegating-item-writer.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<bean id="processor" class="org.springframework.batch.item.writer.ItemWriterAdapter">
+	<bean id="processor" class="org.springframework.batch.item.adapter.ItemWriterAdapter">
 		<property name="targetObject" ref="fooService" />
 		<property name="targetMethod" value="processFoo" />
 	</bean>
diff --git a/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/writer/pe-delegating-item-writer.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/adapter/pe-delegating-item-writer.xml
similarity index 84%
rename from spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/writer/pe-delegating-item-writer.xml
rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/adapter/pe-delegating-item-writer.xml
index b6ae21c15..6393eb28a 100644
--- a/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/writer/pe-delegating-item-writer.xml
+++ b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/adapter/pe-delegating-item-writer.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<bean id="processor" class="org.springframework.batch.item.writer.PropertyExtractingDelegatingItemWriter">
+	<bean id="processor" class="org.springframework.batch.item.adapter.PropertyExtractingDelegatingItemWriter">
 		<property name="targetObject" ref="fooService" />
 		<property name="targetMethod" value="processNameValuePair" />
 		<property name="fieldsUsedAsTargetMethodArguments" value="name,value" />