diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItem.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItem.java
similarity index 97%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItem.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItem.java
index 961f555e0..7c7726870 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItem.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItem.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.item.support;
+package org.springframework.batch.sample.domain.multiline;
 
 import org.springframework.batch.item.ItemReaderException;
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItemFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java
similarity index 98%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItemFieldSetMapper.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java
index 89c6989fd..9c05c2fd5 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItemFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.item.support;
+package org.springframework.batch.sample.domain.multiline;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemReader.java
similarity index 98%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItemReader.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemReader.java
index ef6331c6e..2b12ced75 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItemReader.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.support;
+package org.springframework.batch.sample.domain.multiline;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
index c86aea556..7950e5d1a 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
@@ -13,7 +13,7 @@
 				<property name="streams" ref="fileItemReader"/>
 				<property name="itemReader">
 					<bean
-						class="org.springframework.batch.item.support.AggregateItemReader">
+						class="org.springframework.batch.sample.domain.multiline.AggregateItemReader">
 						<property name="itemReader"
 							ref="fileItemReader" />
 					</bean>
@@ -40,7 +40,7 @@
 			<bean class="org.springframework.batch.item.file.mapping.DefaultLineMapper">
 				<property name="lineTokenizer" ref="fixedFileDescriptor" />
 				<property name="fieldSetMapper">
-					<bean class="org.springframework.batch.item.support.AggregateItemFieldSetMapper">
+					<bean class="org.springframework.batch.sample.domain.multiline.AggregateItemFieldSetMapper">
 						<property name="delegate" ref="tradeLineMapper" />
 					</bean>
 				</property>
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java
similarity index 92%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemFieldSetMapperTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java
index 2cd52ced3..b527c5163 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemFieldSetMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.item.support;
+package org.springframework.batch.sample.domain.multiline;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -9,6 +9,7 @@ import org.junit.Test;
 import org.springframework.batch.item.file.mapping.DefaultFieldSet;
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.sample.domain.multiline.AggregateItemFieldSetMapper;
 
 public class AggregateItemFieldSetMapperTests {
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java
similarity index 86%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java
index 35996366b..d7c8423c2 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.item.support;
+package org.springframework.batch.sample.domain.multiline;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -9,6 +9,8 @@ import java.util.Collection;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.sample.domain.multiline.AggregateItem;
+import org.springframework.batch.sample.domain.multiline.AggregateItemReader;
 
 public class AggregateItemReaderTests {
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemTests.java
similarity index 82%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemTests.java
index 808ba530c..58669e847 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemTests.java
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.item.support;
+package org.springframework.batch.sample.domain.multiline;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import org.junit.Test;
+import org.springframework.batch.sample.domain.multiline.AggregateItem;
 
 /**
  * @author Dave Syer
@@ -28,7 +29,7 @@ import org.junit.Test;
 public class AggregateItemTests {
 
 	/**
-	 * Test method for {@link org.springframework.batch.item.support.AggregateItem#getFooter()}.
+	 * Test method for {@link org.springframework.batch.sample.domain.multiline.AggregateItem#getFooter()}.
 	 */
 	@Test
 	public void testGetFooter() {
@@ -37,7 +38,7 @@ public class AggregateItemTests {
 	}
 
 	/**
-	 * Test method for {@link org.springframework.batch.item.support.AggregateItem#getHeader()}.
+	 * Test method for {@link org.springframework.batch.sample.domain.multiline.AggregateItem#getHeader()}.
 	 */
 	@Test
 	public void testGetHeader() {