diff --git a/execution/src/main/java/org/springframework/batch/execution/resource/BatchResourceFactoryBean.java b/execution/src/main/java/org/springframework/batch/execution/resource/BatchResourceFactoryBean.java
index e0d76e354..96717ae32 100644
--- a/execution/src/main/java/org/springframework/batch/execution/resource/BatchResourceFactoryBean.java
+++ b/execution/src/main/java/org/springframework/batch/execution/resource/BatchResourceFactoryBean.java
@@ -20,7 +20,6 @@ import java.io.File;
 
 import org.springframework.batch.core.domain.JobIdentifier;
 import org.springframework.batch.core.domain.StepExecution;
-import org.springframework.batch.execution.resource.support.DefaultJobIdentifierLabelGenerator;
 import org.springframework.batch.execution.scope.StepContext;
 import org.springframework.batch.execution.scope.StepContextAware;
 import org.springframework.beans.factory.FactoryBean;
diff --git a/execution/src/main/java/org/springframework/batch/execution/resource/support/DefaultJobIdentifierLabelGenerator.java b/execution/src/main/java/org/springframework/batch/execution/resource/DefaultJobIdentifierLabelGenerator.java
similarity index 91%
rename from execution/src/main/java/org/springframework/batch/execution/resource/support/DefaultJobIdentifierLabelGenerator.java
rename to execution/src/main/java/org/springframework/batch/execution/resource/DefaultJobIdentifierLabelGenerator.java
index 54334c7c8..ed5d34960 100644
--- a/execution/src/main/java/org/springframework/batch/execution/resource/support/DefaultJobIdentifierLabelGenerator.java
+++ b/execution/src/main/java/org/springframework/batch/execution/resource/DefaultJobIdentifierLabelGenerator.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.resource.support;
+package org.springframework.batch.execution.resource;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
 import org.springframework.batch.core.domain.JobIdentifier;
 import org.springframework.batch.core.runtime.SimpleJobIdentifier;
-import org.springframework.batch.execution.resource.JobIdentifierLabelGenerator;
 import org.springframework.batch.execution.runtime.ScheduledJobIdentifier;
 
 /**
diff --git a/execution/src/test/java/org/springframework/batch/execution/resource/support/DefaultJobIdentifierLabelGeneratorTests.java b/execution/src/test/java/org/springframework/batch/execution/resource/DefaultJobIdentifierLabelGeneratorTests.java
similarity index 77%
rename from execution/src/test/java/org/springframework/batch/execution/resource/support/DefaultJobIdentifierLabelGeneratorTests.java
rename to execution/src/test/java/org/springframework/batch/execution/resource/DefaultJobIdentifierLabelGeneratorTests.java
index edad7f36f..46bac6bbb 100644
--- a/execution/src/test/java/org/springframework/batch/execution/resource/support/DefaultJobIdentifierLabelGeneratorTests.java
+++ b/execution/src/test/java/org/springframework/batch/execution/resource/DefaultJobIdentifierLabelGeneratorTests.java
@@ -1,10 +1,11 @@
-package org.springframework.batch.execution.resource.support;
+package org.springframework.batch.execution.resource;
 
 import java.text.SimpleDateFormat;
 
 import junit.framework.TestCase;
 
 import org.springframework.batch.core.runtime.SimpleJobIdentifier;
+import org.springframework.batch.execution.resource.DefaultJobIdentifierLabelGenerator;
 import org.springframework.batch.execution.runtime.ScheduledJobIdentifier;
 
 public class DefaultJobIdentifierLabelGeneratorTests extends TestCase {
@@ -12,28 +13,28 @@ public class DefaultJobIdentifierLabelGeneratorTests extends TestCase {
 	DefaultJobIdentifierLabelGenerator instance = new DefaultJobIdentifierLabelGenerator();
 	
 	/**
-	 * Test method for {@link org.springframework.batch.execution.resource.support.DefaultJobIdentifierLabelGenerator#getLabel()}.
+	 * Test method for {@link org.springframework.batch.execution.resource.DefaultJobIdentifierLabelGenerator#getLabel()}.
 	 */
 	public void testGetLabelFromNull() {
 		assertEquals(null, instance.getLabel(null));
 	}
 
 	/**
-	 * Test method for {@link org.springframework.batch.execution.resource.support.DefaultJobIdentifierLabelGenerator#getLabel()}.
+	 * Test method for {@link org.springframework.batch.execution.resource.DefaultJobIdentifierLabelGenerator#getLabel()}.
 	 */
 	public void testGetLabel() {
 		assertEquals("foo", instance.getLabel(new SimpleJobIdentifier("foo")));
 	}
 	
 	/**
-	 * Test method for {@link org.springframework.batch.execution.resource.support.DefaultJobIdentifierLabelGenerator#getLabel()}.
+	 * Test method for {@link org.springframework.batch.execution.resource.DefaultJobIdentifierLabelGenerator#getLabel()}.
 	 */
 	public void testDefaultGetLabel() throws Exception {
 		assertEquals("null--0-19700101", instance.getLabel(new ScheduledJobIdentifier(null)));
 	}
 
 	/**
-	 * Test method for {@link org.springframework.batch.execution.resource.support.DefaultJobIdentifierLabelGenerator#getLabel()}.
+	 * Test method for {@link org.springframework.batch.execution.resource.DefaultJobIdentifierLabelGenerator#getLabel()}.
 	 */
 	public void testGetLabelWithAllProperties() throws Exception {
 		ScheduledJobIdentifier identifier = new ScheduledJobIdentifier(null);