diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/LogAdvice.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/LogAdvice.java
similarity index 97%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/LogAdvice.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/common/LogAdvice.java
index 9d33669f3..21522e929 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/LogAdvice.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/LogAdvice.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.advice;
+package org.springframework.batch.sample.common;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/DummyItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/DummyItemWriter.java
similarity index 94%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/DummyItemWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/support/DummyItemWriter.java
index 77479cc70..e28de2623 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/DummyItemWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/DummyItemWriter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.common;
+package org.springframework.batch.sample.support;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxy.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/ExceptionThrowingItemReaderProxy.java
similarity index 97%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxy.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/support/ExceptionThrowingItemReaderProxy.java
index 033466625..a194553bf 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxy.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/ExceptionThrowingItemReaderProxy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.common;
+package org.springframework.batch.sample.support;
 
 
 import org.springframework.batch.core.UnexpectedJobExecutionException;
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ItemTrackingItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/ItemTrackingItemWriter.java
similarity index 89%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ItemTrackingItemWriter.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/support/ItemTrackingItemWriter.java
index 1335dd460..3b23f59a6 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ItemTrackingItemWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/ItemTrackingItemWriter.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.common;
+package org.springframework.batch.sample.support;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
index bf52a21b4..d3f60ff79 100644
--- a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
@@ -30,7 +30,7 @@
 					</bean>
 				</property>
 				<property name="itemWriter">
-					<bean id="writer" class="org.springframework.batch.sample.common.DummyItemWriter" />
+					<bean id="writer" class="org.springframework.batch.sample.support.DummyItemWriter" />
 				</property>
 			</bean>
 		</property>
diff --git a/spring-batch-samples/src/main/resources/jobs/restartSample.xml b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
index 4f2ceeafc..70c85f657 100644
--- a/spring-batch-samples/src/main/resources/jobs/restartSample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
@@ -34,7 +34,7 @@
 	<!-- INFRASTRUCTURE SETUP -->
 
 	<bean id="itemReader"
-		class="org.springframework.batch.sample.common.ExceptionThrowingItemReaderProxy">
+		class="org.springframework.batch.sample.support.ExceptionThrowingItemReaderProxy">
 		<property name="itemReader" ref="fileItemReader" />
 	</bean>
 
diff --git a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
index 09396341e..aef5600ce 100644
--- a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
@@ -47,7 +47,7 @@
 	</bean>
 
 	<bean id="itemTrackingWriter"
-		class="org.springframework.batch.sample.common.ItemTrackingItemWriter"
+		class="org.springframework.batch.sample.support.ItemTrackingItemWriter"
 		p:validationFailure="2" />
 
 	<bean id="tradeSqlItemReader"
diff --git a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
index 88535cbcc..6d2ce028c 100644
--- a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
@@ -24,7 +24,7 @@
 		<property name="dataSource" ref="dataSource" />
 	</bean>
 
-	<bean id="logAdvice" class="org.springframework.batch.sample.advice.LogAdvice" />
+	<bean id="logAdvice" class="org.springframework.batch.sample.common.LogAdvice" />
 
 	<bean id="eventAdvice" class="org.springframework.batch.sample.advice.StepExecutionApplicationEventAdvice" />
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java
index 2ef20550d..2ce2a30f5 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java
@@ -6,7 +6,7 @@ import javax.sql.DataSource;
 
 import org.junit.Before;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.common.ItemTrackingItemWriter;
+import org.springframework.batch.sample.support.ItemTrackingItemWriter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java
index a2df9309b..603b94748 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java
@@ -11,7 +11,7 @@ import org.springframework.batch.core.UnexpectedJobExecutionException;
 import org.springframework.batch.item.support.ListItemReader;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
 import org.springframework.batch.repeat.support.RepeatSynchronizationManager;
-import org.springframework.batch.sample.common.ExceptionThrowingItemReaderProxy;
+import org.springframework.batch.sample.support.ExceptionThrowingItemReaderProxy;
 
 public class ExceptionThrowingItemReaderProxyTests {