diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/AbstractJdbcBatchMetadataDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/AbstractJdbcBatchMetadataDao.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/AbstractJdbcBatchMetadataDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/AbstractJdbcBatchMetadataDao.java
index f4247ba2d..22cd58b60 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/AbstractJdbcBatchMetadataDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/AbstractJdbcBatchMetadataDao.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jdbc.core.JdbcOperations;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JdbcJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java
similarity index 99%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JdbcJobExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java
index 29c3c31c1..a7317ef8a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JdbcJobExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JdbcJobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java
similarity index 99%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JdbcJobInstanceDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java
index 0c8f6b4bc..3e89adb6a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JdbcJobInstanceDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JdbcStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
similarity index 99%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JdbcStepExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
index 3bfc4db73..8cd0b5a92 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JdbcStepExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.io.Serializable;
 import java.sql.PreparedStatement;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobExecutionDao.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JobExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobExecutionDao.java
index 31cc3de95..4e4df06c8 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JobExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobExecutionDao.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.util.List;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobInstanceDao.java
similarity index 94%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JobInstanceDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobInstanceDao.java
index 8ae323b6d..23fe75bc3 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/JobInstanceDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobInstanceDao.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobInstance;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/MapJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java
similarity index 97%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/MapJobExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java
index 9599262aa..47f1b6cfe 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/MapJobExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/MapJobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobInstanceDao.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/MapJobInstanceDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobInstanceDao.java
index dd0aab3ea..8cf3dc846 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/MapJobInstanceDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobInstanceDao.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/MapStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/MapStepExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java
index c6e93617b..7813b96d0 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/MapStepExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.util.Map;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/NoSuchObjectException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/NoSuchObjectException.java
similarity index 94%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/NoSuchObjectException.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/NoSuchObjectException.java
index d1ae2985a..98dcdbecf 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/NoSuchObjectException.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/NoSuchObjectException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 /**
  * This exception identifies that a batch domain object is invalid, which
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/StepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/StepExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java
index 7fc916966..89b5f2b00 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/StepExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.Step;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/package.html b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/package.html
similarity index 100%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/dao/package.html
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/package.html
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBean.java
index c51d0ac25..8a625ac23 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBean.java
@@ -18,12 +18,12 @@ package org.springframework.batch.core.repository.support;
 
 import javax.sql.DataSource;
 
-import org.springframework.batch.core.repository.support.dao.JdbcJobExecutionDao;
-import org.springframework.batch.core.repository.support.dao.JdbcJobInstanceDao;
-import org.springframework.batch.core.repository.support.dao.JdbcStepExecutionDao;
-import org.springframework.batch.core.repository.support.dao.JobExecutionDao;
-import org.springframework.batch.core.repository.support.dao.JobInstanceDao;
-import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
+import org.springframework.batch.core.repository.dao.JdbcJobExecutionDao;
+import org.springframework.batch.core.repository.dao.JdbcJobInstanceDao;
+import org.springframework.batch.core.repository.dao.JdbcStepExecutionDao;
+import org.springframework.batch.core.repository.dao.JobExecutionDao;
+import org.springframework.batch.core.repository.dao.JobInstanceDao;
+import org.springframework.batch.core.repository.dao.StepExecutionDao;
 import org.springframework.batch.item.database.support.DataFieldMaxValueIncrementerFactory;
 import org.springframework.batch.item.database.support.DefaultDataFieldMaxValueIncrementerFactory;
 import org.springframework.beans.factory.FactoryBean;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
index a0853eb8c..8f7f18574 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
@@ -29,9 +29,9 @@ import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.repository.JobRestartException;
 import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.support.dao.JobExecutionDao;
-import org.springframework.batch.core.repository.support.dao.JobInstanceDao;
-import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
+import org.springframework.batch.core.repository.dao.JobExecutionDao;
+import org.springframework.batch.core.repository.dao.JobInstanceDao;
+import org.springframework.batch.core.repository.dao.StepExecutionDao;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.util.Assert;
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java
index b90810c3e..d75fbe375 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java
@@ -34,13 +34,13 @@ import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.UnexpectedJobExecutionException;
 import org.springframework.batch.core.listener.JobListenerSupport;
 import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.dao.JobExecutionDao;
+import org.springframework.batch.core.repository.dao.JobInstanceDao;
+import org.springframework.batch.core.repository.dao.MapJobExecutionDao;
+import org.springframework.batch.core.repository.dao.MapJobInstanceDao;
+import org.springframework.batch.core.repository.dao.MapStepExecutionDao;
+import org.springframework.batch.core.repository.dao.StepExecutionDao;
 import org.springframework.batch.core.repository.support.SimpleJobRepository;
-import org.springframework.batch.core.repository.support.dao.JobExecutionDao;
-import org.springframework.batch.core.repository.support.dao.JobInstanceDao;
-import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
-import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
-import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
-import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
 import org.springframework.batch.core.step.AbstractStep;
 import org.springframework.batch.core.step.item.NeverSkipItemSkipPolicy;
 import org.springframework.batch.item.AbstractItemReader;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/AbstractJobDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java
similarity index 97%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/AbstractJobDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java
index 9cfc88138..8afc8fcdd 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/AbstractJobDaoTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.util.Date;
 import java.util.List;
@@ -27,9 +27,9 @@ import org.springframework.batch.core.JobInstance;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.JobParametersBuilder;
 import org.springframework.batch.core.job.JobSupport;
-import org.springframework.batch.core.repository.support.dao.JobExecutionDao;
-import org.springframework.batch.core.repository.support.dao.JobInstanceDao;
-import org.springframework.batch.core.repository.support.dao.NoSuchObjectException;
+import org.springframework.batch.core.repository.dao.JobExecutionDao;
+import org.springframework.batch.core.repository.dao.JobInstanceDao;
+import org.springframework.batch.core.repository.dao.NoSuchObjectException;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
 import org.springframework.util.ClassUtils;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/AbstractStepDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractStepDaoTests.java
similarity index 96%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/AbstractStepDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractStepDaoTests.java
index 42912d638..86211ee87 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/AbstractStepDaoTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractStepDaoTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.util.Date;
 
@@ -26,9 +26,9 @@ import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.job.JobSupport;
-import org.springframework.batch.core.repository.support.dao.JobExecutionDao;
-import org.springframework.batch.core.repository.support.dao.JobInstanceDao;
-import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
+import org.springframework.batch.core.repository.dao.JobExecutionDao;
+import org.springframework.batch.core.repository.dao.JobInstanceDao;
+import org.springframework.batch.core.repository.dao.StepExecutionDao;
 import org.springframework.batch.core.step.StepSupport;
 import org.springframework.batch.core.step.item.ExitStatusExceptionClassifier;
 import org.springframework.batch.item.ExecutionContext;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcJobDaoQueryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoQueryTests.java
similarity index 94%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcJobDaoQueryTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoQueryTests.java
index 1bd30f15a..45f06160b 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcJobDaoQueryTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoQueryTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +24,7 @@ import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobInstance;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.job.JobSupport;
-import org.springframework.batch.core.repository.support.dao.JdbcJobExecutionDao;
+import org.springframework.batch.core.repository.dao.JdbcJobExecutionDao;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcJobDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoTests.java
similarity index 81%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcJobDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoTests.java
index 635e5bcae..f332ea02e 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcJobDaoTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoTests.java
@@ -1,11 +1,11 @@
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.batch.core.repository.support.dao.AbstractJdbcBatchMetadataDao;
-import org.springframework.batch.core.repository.support.dao.JdbcJobExecutionDao;
-import org.springframework.batch.core.repository.support.dao.JdbcJobInstanceDao;
+import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
+import org.springframework.batch.core.repository.dao.JdbcJobExecutionDao;
+import org.springframework.batch.core.repository.dao.JdbcJobInstanceDao;
 import org.springframework.batch.repeat.ExitStatus;
 
 public class JdbcJobDaoTests extends AbstractJobDaoTests {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcStepDaoPrefixTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcStepDaoPrefixTests.java
similarity index 96%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcStepDaoPrefixTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcStepDaoPrefixTests.java
index 82807cded..5303cd838 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcStepDaoPrefixTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcStepDaoPrefixTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.util.List;
 
@@ -11,7 +11,7 @@ import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.job.JobSupport;
-import org.springframework.batch.core.repository.support.dao.JdbcStepExecutionDao;
+import org.springframework.batch.core.repository.dao.JdbcStepExecutionDao;
 import org.springframework.batch.core.step.StepSupport;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcStepDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcStepDaoTests.java
similarity index 84%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcStepDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcStepDaoTests.java
index 8dd04c28c..105f15cba 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/JdbcStepDaoTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcStepDaoTests.java
@@ -1,10 +1,10 @@
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.batch.core.repository.support.dao.AbstractJdbcBatchMetadataDao;
-import org.springframework.batch.core.repository.support.dao.JdbcStepExecutionDao;
+import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
+import org.springframework.batch.core.repository.dao.JdbcStepExecutionDao;
 import org.springframework.batch.repeat.ExitStatus;
 
 public class JdbcStepDaoTests extends AbstractStepDaoTests {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/MapJobExecutionDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapJobExecutionDaoTests.java
similarity index 92%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/MapJobExecutionDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapJobExecutionDaoTests.java
index 0e4113b15..38778ba5a 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/MapJobExecutionDaoTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapJobExecutionDaoTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.util.Date;
 import java.util.List;
@@ -10,8 +10,8 @@ import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobInstance;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.job.JobSupport;
-import org.springframework.batch.core.repository.support.dao.JobExecutionDao;
-import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
+import org.springframework.batch.core.repository.dao.JobExecutionDao;
+import org.springframework.batch.core.repository.dao.MapJobExecutionDao;
 
 public class MapJobExecutionDaoTests extends TestCase {
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/MapJobInstanceDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapJobInstanceDaoTests.java
similarity index 89%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/MapJobInstanceDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapJobInstanceDaoTests.java
index dc90d9f8c..296c9d6d4 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/MapJobInstanceDaoTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapJobInstanceDaoTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import junit.framework.TestCase;
 
@@ -7,8 +7,8 @@ import org.springframework.batch.core.JobInstance;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.JobParametersBuilder;
 import org.springframework.batch.core.job.JobSupport;
-import org.springframework.batch.core.repository.support.dao.JobInstanceDao;
-import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
+import org.springframework.batch.core.repository.dao.JobInstanceDao;
+import org.springframework.batch.core.repository.dao.MapJobInstanceDao;
 
 public class MapJobInstanceDaoTests extends TestCase {
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/MapStepExecutionDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapStepExecutionDaoTests.java
similarity index 96%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/MapStepExecutionDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapStepExecutionDaoTests.java
index e37c10f94..911bc26dc 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/MapStepExecutionDaoTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapStepExecutionDaoTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
 import java.util.HashMap;
 
@@ -27,8 +27,8 @@ import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.job.JobSupport;
-import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
-import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
+import org.springframework.batch.core.repository.dao.MapStepExecutionDao;
+import org.springframework.batch.core.repository.dao.StepExecutionDao;
 import org.springframework.batch.core.step.StepSupport;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.dao.OptimisticLockingFailureException;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/NoSuchBatchDomainObjectExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/NoSuchBatchDomainObjectExceptionTests.java
similarity index 86%
rename from spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/NoSuchBatchDomainObjectExceptionTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/NoSuchBatchDomainObjectExceptionTests.java
index c9816bd98..f0b353430 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/NoSuchBatchDomainObjectExceptionTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/NoSuchBatchDomainObjectExceptionTests.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.repository.support.dao;
+package org.springframework.batch.core.repository.dao;
 
-import org.springframework.batch.core.repository.support.dao.NoSuchObjectException;
+import org.springframework.batch.core.repository.dao.NoSuchObjectException;
 
 import junit.framework.TestCase;
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/MockStepDao.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/MockStepDao.java
index 60fd4be4e..6c776298d 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/MockStepDao.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/MockStepDao.java
@@ -22,7 +22,7 @@ import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobInstance;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
+import org.springframework.batch.core.repository.dao.StepExecutionDao;
 import org.springframework.batch.item.ExecutionContext;
 
 public class MockStepDao implements StepExecutionDao {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java
index 422f58327..6725b2fcf 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java
@@ -12,11 +12,9 @@ import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.job.JobSupport;
 import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
 import org.springframework.batch.core.repository.JobRestartException;
-import org.springframework.batch.core.repository.support.SimpleJobRepository;
 import org.springframework.batch.core.step.StepSupport;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
-import org.springframework.util.ClassUtils;
 
 /**
  * Repository tests using JDBC DAOs (rather than mocks).
@@ -26,7 +24,7 @@ import org.springframework.util.ClassUtils;
 public class SimpleJobRepositoryIntegrationTests extends AbstractTransactionalDataSourceSpringContextTests {
 
 	protected String[] getConfigLocations() {
-		return new String[] { ClassUtils.addResourcePathToPackagePath(getClass(), "dao/sql-dao-test.xml") };
+		return new String[] { "classpath:org/springframework/batch/core/repository/dao/sql-dao-test.xml" };
 	}
 
 	private SimpleJobRepository jobRepository;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java
index 155efb054..951a82c51 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java
@@ -29,10 +29,10 @@ import org.springframework.batch.core.JobParametersBuilder;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.job.JobSupport;
+import org.springframework.batch.core.repository.dao.JobExecutionDao;
+import org.springframework.batch.core.repository.dao.JobInstanceDao;
+import org.springframework.batch.core.repository.dao.StepExecutionDao;
 import org.springframework.batch.core.repository.support.SimpleJobRepository;
-import org.springframework.batch.core.repository.support.dao.JobExecutionDao;
-import org.springframework.batch.core.repository.support.dao.JobInstanceDao;
-import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
 import org.springframework.batch.core.step.StepSupport;
 import org.springframework.batch.item.ExecutionContext;
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java
index e90d92d56..a06793def 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java
@@ -33,10 +33,10 @@ import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.job.JobSupport;
 import org.springframework.batch.core.listener.StepListenerSupport;
+import org.springframework.batch.core.repository.dao.MapJobExecutionDao;
+import org.springframework.batch.core.repository.dao.MapJobInstanceDao;
+import org.springframework.batch.core.repository.dao.MapStepExecutionDao;
 import org.springframework.batch.core.repository.support.SimpleJobRepository;
-import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
-import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
-import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
 import org.springframework.batch.core.step.AbstractStep;
 import org.springframework.batch.core.step.JobRepositorySupport;
 import org.springframework.batch.core.step.item.ItemOrientedStep;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java
index ee8dcb326..89afa3479 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java
@@ -30,10 +30,10 @@ import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.job.SimpleJob;
 import org.springframework.batch.core.listener.ItemListenerSupport;
+import org.springframework.batch.core.repository.dao.MapJobExecutionDao;
+import org.springframework.batch.core.repository.dao.MapJobInstanceDao;
+import org.springframework.batch.core.repository.dao.MapStepExecutionDao;
 import org.springframework.batch.core.repository.support.SimpleJobRepository;
-import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
-import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
-import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
 import org.springframework.batch.core.step.AbstractStep;
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ItemReader;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java
index 74214706a..d5d77e206 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java
@@ -28,10 +28,10 @@ import org.springframework.batch.core.JobParametersBuilder;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.job.JobSupport;
+import org.springframework.batch.core.repository.dao.MapJobExecutionDao;
+import org.springframework.batch.core.repository.dao.MapJobInstanceDao;
+import org.springframework.batch.core.repository.dao.MapStepExecutionDao;
 import org.springframework.batch.core.repository.support.SimpleJobRepository;
-import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
-import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
-import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
 import org.springframework.batch.core.step.item.ItemOrientedStep;
 import org.springframework.batch.core.step.item.StatefulRetryStepFactoryBean;
 import org.springframework.batch.item.AbstractItemWriter;
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepExecutorInterruptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepExecutorInterruptionTests.java
index a9244b3e2..5490479d8 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepExecutorInterruptionTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepExecutorInterruptionTests.java
@@ -25,10 +25,10 @@ import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.job.JobSupport;
 import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.dao.MapJobExecutionDao;
+import org.springframework.batch.core.repository.dao.MapJobInstanceDao;
+import org.springframework.batch.core.repository.dao.MapStepExecutionDao;
 import org.springframework.batch.core.repository.support.SimpleJobRepository;
-import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
-import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
-import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
 import org.springframework.batch.core.step.item.ItemOrientedStep;
 import org.springframework.batch.core.step.item.SimpleItemHandler;
 import org.springframework.batch.core.step.item.StepExecutionSynchronizer;
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/support/dao/data-source-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/data-source-context.xml
similarity index 95%
rename from spring-batch-core/src/test/resources/org/springframework/batch/core/repository/support/dao/data-source-context.xml
rename to spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/data-source-context.xml
index 3af145cf3..231f997c0 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/support/dao/data-source-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/data-source-context.xml
@@ -9,8 +9,8 @@
 				<property name="url" value="jdbc:hsqldb:mem:testdb;sql.enforce_strict_size=true"/>
 			</bean>
 		</property>
-		<property name="initScript" value="org/springframework/batch/core/repository/support/dao/init.sql" />
-		<property name="destroyScript" value="org/springframework/batch/core/repository/support/dao/destroy.sql" />
+		<property name="initScript" value="org/springframework/batch/core/repository/dao/init.sql" />
+		<property name="destroyScript" value="org/springframework/batch/core/repository/dao/destroy.sql" />
 	</bean>
 
 	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/support/dao/destroy.sql b/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/destroy.sql
similarity index 100%
rename from spring-batch-core/src/test/resources/org/springframework/batch/core/repository/support/dao/destroy.sql
rename to spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/destroy.sql
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/support/dao/init.sql b/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/init.sql
similarity index 100%
rename from spring-batch-core/src/test/resources/org/springframework/batch/core/repository/support/dao/init.sql
rename to spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/init.sql
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/support/dao/sql-dao-test.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/sql-dao-test.xml
similarity index 89%
rename from spring-batch-core/src/test/resources/org/springframework/batch/core/repository/support/dao/sql-dao-test.xml
rename to spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/sql-dao-test.xml
index c0d3f0075..ed2a5d432 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/support/dao/sql-dao-test.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/sql-dao-test.xml
@@ -11,17 +11,17 @@
 		<constructor-arg ref="stepExecutionDao" />
 	</bean>
 
-	<bean id="jobInstanceDao" class="org.springframework.batch.core.repository.support.dao.JdbcJobInstanceDao" >
+	<bean id="jobInstanceDao" class="org.springframework.batch.core.repository.dao.JdbcJobInstanceDao" >
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="jobIncrementer" ref="jobIncrementer" />
 	</bean>
 	
-	<bean id="jobExecutionDao" class="org.springframework.batch.core.repository.support.dao.JdbcJobExecutionDao" >
+	<bean id="jobExecutionDao" class="org.springframework.batch.core.repository.dao.JdbcJobExecutionDao" >
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="jobExecutionIncrementer" ref="jobExecutionIncrementer" />
 	</bean>
 	
-	<bean id="stepExecutionDao" class="org.springframework.batch.core.repository.support.dao.JdbcStepExecutionDao" >
+	<bean id="stepExecutionDao" class="org.springframework.batch.core.repository.dao.JdbcStepExecutionDao" >
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="stepExecutionIncrementer" ref="stepExecutionIncrementer" />
 	</bean>