diff --git a/maven-core-integration-tests/src/test/resources/it0036/src/main/java/org/apache/maven/it0000/Person.java b/maven-core-integration-tests/src/test/resources/it0000/src/main/java/org/apache/maven/it0000/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0036/src/main/java/org/apache/maven/it0000/Person.java
rename to maven-core-integration-tests/src/test/resources/it0000/src/main/java/org/apache/maven/it0000/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0000/src/test/java/org/apache/maven/it0000/IT0000PersonTest.java b/maven-core-integration-tests/src/test/resources/it0000/src/test/java/org/apache/maven/it0000/PersonTest.java
similarity index 90%
rename from maven-core-integration-tests/src/test/resources/it0000/src/test/java/org/apache/maven/it0000/IT0000PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0000/src/test/java/org/apache/maven/it0000/PersonTest.java
index f4db0414c1..69f1a6c1ce 100644
--- a/maven-core-integration-tests/src/test/resources/it0000/src/test/java/org/apache/maven/it0000/IT0000PersonTest.java
+++ b/maven-core-integration-tests/src/test/resources/it0000/src/test/java/org/apache/maven/it0000/PersonTest.java
@@ -2,7 +2,7 @@ package org.apache.maven.it0000;
 
 import junit.framework.TestCase;
 
-public class IT0000PersonTest
+public class PersonTest
     extends TestCase
 {
     public void testPerson()
diff --git a/maven-core-integration-tests/src/test/resources/it0002/src/main/resources/it0001.properties b/maven-core-integration-tests/src/test/resources/it0002/src/main/resources/it0001.properties
deleted file mode 100644
index f54f8ab106..0000000000
--- a/maven-core-integration-tests/src/test/resources/it0002/src/main/resources/it0001.properties
+++ /dev/null
@@ -1 +0,0 @@
-name = jason
diff --git a/maven-core-integration-tests/src/test/resources/it0007/maven-it-support-parent-1.0.pom b/maven-core-integration-tests/src/test/resources/it0007/maven-it-support-parent-1.0.pom
deleted file mode 100644
index 9d90c4b878..0000000000
--- a/maven-core-integration-tests/src/test/resources/it0007/maven-it-support-parent-1.0.pom
+++ /dev/null
@@ -1,13 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven</groupId>
-  <artifactId>maven-core-it-support-parent</artifactId>
-  <version>1.0</version>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core-it-support</artifactId>
-      <version>1.0</version>
-    </dependency>
-  </dependencies>  
-</project>
diff --git a/maven-core-integration-tests/src/test/resources/it0007/src/main/java/org/apache/maven/it0002/Person.java b/maven-core-integration-tests/src/test/resources/it0007/src/main/java/org/apache/maven/it0007/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0007/src/main/java/org/apache/maven/it0002/Person.java
rename to maven-core-integration-tests/src/test/resources/it0007/src/main/java/org/apache/maven/it0007/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0008/pom.xml b/maven-core-integration-tests/src/test/resources/it0008/pom.xml
index 8592d1a4c2..600053c4e9 100644
--- a/maven-core-integration-tests/src/test/resources/it0008/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0008/pom.xml
@@ -21,9 +21,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-core-it-plugin</artifactId>
-        <version>1.0</version>
+        <groupId>org.apache.maven.it.plugins</groupId>
+        <artifactId>maven-it-plugin-touch</artifactId>
+        <version>1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>
diff --git a/maven-core-integration-tests/src/test/resources/it0014/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0014/src/main/java/org/apache/maven/it0014/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0014/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0014/src/main/java/org/apache/maven/it0014/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0002/src/test/java/org/apache/maven/it0001/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0014/src/test/java/org/apache/maven/it0014/PersonTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0002/src/test/java/org/apache/maven/it0001/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0014/src/test/java/org/apache/maven/it0014/PersonTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0016/src/main/java/org/apache/maven/it0016/Person.java b/maven-core-integration-tests/src/test/resources/it0016/src/main/java/org/apache/maven/it0016/IT0016Person.java
similarity index 89%
rename from maven-core-integration-tests/src/test/resources/it0016/src/main/java/org/apache/maven/it0016/Person.java
rename to maven-core-integration-tests/src/test/resources/it0016/src/main/java/org/apache/maven/it0016/IT0016Person.java
index 349355ad05..6e26610f1e 100644
--- a/maven-core-integration-tests/src/test/resources/it0016/src/main/java/org/apache/maven/it0016/Person.java
+++ b/maven-core-integration-tests/src/test/resources/it0016/src/main/java/org/apache/maven/it0016/IT0016Person.java
@@ -1,6 +1,6 @@
 package org.apache.maven.it0016;
 
-public class Person
+public class IT0016Person
 {
     private String name;
     
diff --git a/maven-core-integration-tests/src/test/resources/it0024/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0024/src/main/java/org/apache/maven/it0024/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0024/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0024/src/main/java/org/apache/maven/it0024/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0014/src/test/java/org/apache/maven/it0001/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0024/src/test/java/org/apache/maven/it0024/PersonTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0014/src/test/java/org/apache/maven/it0001/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0024/src/test/java/org/apache/maven/it0024/PersonTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0023/Person.java b/maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0026/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0023/Person.java
rename to maven-core-integration-tests/src/test/resources/it0026/src/main/java/org/apache/maven/it0026/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0028/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0028/src/main/java/org/apache/maven/it0028/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0028/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0028/src/main/java/org/apache/maven/it0028/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0024/src/test/java/org/apache/maven/it0001/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0028/src/test/java/org/apache/maven/it0028/PersonTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0024/src/test/java/org/apache/maven/it0001/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0028/src/test/java/org/apache/maven/it0028/PersonTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0029/child-project/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0029/child-project/src/main/java/org/apache/maven/it0029/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0029/child-project/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0029/child-project/src/main/java/org/apache/maven/it0029/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0030/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0030/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0037/src/main/java/org/apache/maven/it0000/Person.java b/maven-core-integration-tests/src/test/resources/it0036/src/main/java/org/apache/maven/it0036/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0037/src/main/java/org/apache/maven/it0000/Person.java
rename to maven-core-integration-tests/src/test/resources/it0036/src/main/java/org/apache/maven/it0036/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0036/src/test/java/org/apache/maven/it0000/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0036/src/test/java/org/apache/maven/it0036/PersonTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0036/src/test/java/org/apache/maven/it0000/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0036/src/test/java/org/apache/maven/it0036/PersonTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0038/project/src/main/java/org/apache/maven/it0000/Person.java b/maven-core-integration-tests/src/test/resources/it0037/src/main/java/org/apache/maven/it0037/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0038/project/src/main/java/org/apache/maven/it0000/Person.java
rename to maven-core-integration-tests/src/test/resources/it0037/src/main/java/org/apache/maven/it0037/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project/src/main/java/org/apache/maven/it0000/Person.java b/maven-core-integration-tests/src/test/resources/it0038/project/src/main/java/org/apache/maven/it0038/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0039/project/src/main/java/org/apache/maven/it0000/Person.java
rename to maven-core-integration-tests/src/test/resources/it0038/project/src/main/java/org/apache/maven/it0038/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project2/src/main/java/org/apache/maven/it0000/Person.java b/maven-core-integration-tests/src/test/resources/it0039/project/src/main/java/org/apache/maven/it0039/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0039/project2/src/main/java/org/apache/maven/it0000/Person.java
rename to maven-core-integration-tests/src/test/resources/it0039/project/src/main/java/org/apache/maven/it0039/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project/src/test/java/org/apache/maven/it0000/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0039/project/src/test/java/org/apache/maven/it0039/PersonTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0039/project/src/test/java/org/apache/maven/it0000/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0039/project/src/test/java/org/apache/maven/it0039/PersonTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0000/src/main/java/org/apache/maven/it0000/IT0000Person.java b/maven-core-integration-tests/src/test/resources/it0039/project2/src/main/java/org/apache/maven/it0039/Person2.java
similarity index 89%
rename from maven-core-integration-tests/src/test/resources/it0000/src/main/java/org/apache/maven/it0000/IT0000Person.java
rename to maven-core-integration-tests/src/test/resources/it0039/project2/src/main/java/org/apache/maven/it0039/Person2.java
index fb3ebe8e5f..75a6704aea 100644
--- a/maven-core-integration-tests/src/test/resources/it0000/src/main/java/org/apache/maven/it0000/IT0000Person.java
+++ b/maven-core-integration-tests/src/test/resources/it0039/project2/src/main/java/org/apache/maven/it0039/Person2.java
@@ -1,6 +1,6 @@
 package org.apache.maven.it0000;
 
-public class IT0000Person
+public class Person2
 {
     private String name;
     
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0000/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0039/Person2Test.java
similarity index 71%
rename from maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0000/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0039/Person2Test.java
index 354f917f46..cce3404608 100644
--- a/maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0000/PersonTest.java
+++ b/maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0039/Person2Test.java
@@ -1,16 +1,16 @@
-package org.apache.maven.it0000;
+package it0039.project2.src.test.java.org.apache.maven.it0039;
 
 import junit.framework.TestCase;
 
-public class PersonTest
+public class Person2Test
     extends TestCase
 {
     public void testPerson()
     {
         Person person = new Person();
-        
+
         person.setName( "foo" );
-        
+
         assertEquals( "foo", person.getName() );
     }
 }
diff --git a/maven-core-integration-tests/src/test/resources/it0044/src/main/java/org/apache/maven/it0023/Person.java b/maven-core-integration-tests/src/test/resources/it0044/src/main/java/org/apache/maven/it0044/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0044/src/main/java/org/apache/maven/it0023/Person.java
rename to maven-core-integration-tests/src/test/resources/it0044/src/main/java/org/apache/maven/it0044/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0047/src/main/java/org/apache/maven/it0047/Person.java b/maven-core-integration-tests/src/test/resources/it0047/src/main/java/org/apache/maven/it0047/Person.java
index 45f2f35ead..ce8320bf4d 100644
--- a/maven-core-integration-tests/src/test/resources/it0047/src/main/java/org/apache/maven/it0047/Person.java
+++ b/maven-core-integration-tests/src/test/resources/it0047/src/main/java/org/apache/maven/it0047/Person.java
@@ -3,7 +3,7 @@ package org.apache.maven.it0047;
 import org.codehaus.plexus.PlexusTestCase;
 
 public class Person
-  extends PlexusTestCase
+    extends PlexusTestCase
 {
     private String name;
     
diff --git a/maven-core-integration-tests/src/test/resources/it0002/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0048/src/main/java/org/apache/maven/it0048/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0002/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0048/src/main/java/org/apache/maven/it0048/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0048/src/test/java/org/apache/maven/it0001/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0048/src/test/java/org/apache/maven/it0048/PersonTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0048/src/test/java/org/apache/maven/it0001/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0048/src/test/java/org/apache/maven/it0048/PersonTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0048/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0051/src/main/java/org/apache/maven/it0051/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0048/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0051/src/main/java/org/apache/maven/it0051/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0028/src/test/java/org/apache/maven/it0001/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0051/src/test/java/org/apache/maven/it0051/PersonTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0028/src/test/java/org/apache/maven/it0001/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0051/src/test/java/org/apache/maven/it0051/PersonTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0051/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0052/src/main/java/org/apache/maven/it0052/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0051/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0052/src/main/java/org/apache/maven/it0052/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0052/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0053/src/main/java/org/apache/maven/it0053/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0052/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0053/src/main/java/org/apache/maven/it0053/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0053/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0055/src/main/java/org/apache/maven/it0055/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0053/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0055/src/main/java/org/apache/maven/it0055/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0055/src/main/java/org/apache/maven/it0001/PersonTwo.java b/maven-core-integration-tests/src/test/resources/it0055/src/main/java/org/apache/maven/it0055/PersonTwo.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0055/src/main/java/org/apache/maven/it0001/PersonTwo.java
rename to maven-core-integration-tests/src/test/resources/it0055/src/main/java/org/apache/maven/it0055/PersonTwo.java
diff --git a/maven-core-integration-tests/src/test/resources/it0051/src/test/java/org/apache/maven/it0001/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0055/src/test/java/org/apache/maven/it0055/PersonTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0051/src/test/java/org/apache/maven/it0001/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0055/src/test/java/org/apache/maven/it0055/PersonTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0055/src/test/java/org/apache/maven/it0001/PersonTwoTest.java b/maven-core-integration-tests/src/test/resources/it0055/src/test/java/org/apache/maven/it0055/PersonTwoTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0055/src/test/java/org/apache/maven/it0001/PersonTwoTest.java
rename to maven-core-integration-tests/src/test/resources/it0055/src/test/java/org/apache/maven/it0055/PersonTwoTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0055/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0056/src/main/java/org/apache/maven/it0056/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0055/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0056/src/main/java/org/apache/maven/it0056/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0056/src/main/java/org/apache/maven/it0001/PersonThree.java b/maven-core-integration-tests/src/test/resources/it0056/src/main/java/org/apache/maven/it0056/PersonThree.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0056/src/main/java/org/apache/maven/it0001/PersonThree.java
rename to maven-core-integration-tests/src/test/resources/it0056/src/main/java/org/apache/maven/it0056/PersonThree.java
diff --git a/maven-core-integration-tests/src/test/resources/it0056/src/main/java/org/apache/maven/it0001/PersonTwo.java b/maven-core-integration-tests/src/test/resources/it0056/src/main/java/org/apache/maven/it0056/PersonTwo.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0056/src/main/java/org/apache/maven/it0001/PersonTwo.java
rename to maven-core-integration-tests/src/test/resources/it0056/src/main/java/org/apache/maven/it0056/PersonTwo.java
diff --git a/maven-core-integration-tests/src/test/resources/it0055/src/test/java/org/apache/maven/it0001/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0056/src/test/java/org/apache/maven/it0056/PersonTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0055/src/test/java/org/apache/maven/it0001/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0056/src/test/java/org/apache/maven/it0056/PersonTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0056/src/test/java/org/apache/maven/it0001/PersonThreeTest.java b/maven-core-integration-tests/src/test/resources/it0056/src/test/java/org/apache/maven/it0056/PersonThreeTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0056/src/test/java/org/apache/maven/it0001/PersonThreeTest.java
rename to maven-core-integration-tests/src/test/resources/it0056/src/test/java/org/apache/maven/it0056/PersonThreeTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0056/src/test/java/org/apache/maven/it0001/PersonTwoTest.java b/maven-core-integration-tests/src/test/resources/it0056/src/test/java/org/apache/maven/it0056/PersonTwoTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0056/src/test/java/org/apache/maven/it0001/PersonTwoTest.java
rename to maven-core-integration-tests/src/test/resources/it0056/src/test/java/org/apache/maven/it0056/PersonTwoTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0056/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0057/src/main/java/org/apache/maven/it0057/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0056/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0057/src/main/java/org/apache/maven/it0057/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0056/src/test/java/org/apache/maven/it0001/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0057/src/test/java/org/apache/maven/it0057/PersonTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0056/src/test/java/org/apache/maven/it0001/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0057/src/test/java/org/apache/maven/it0057/PersonTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0057/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0058/subproject/src/main/java/org/apache/maven/it0058/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0057/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0058/subproject/src/main/java/org/apache/maven/it0058/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0057/src/test/java/org/apache/maven/it0001/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0058/subproject/src/test/java/org/apache/maven/it0058/PersonTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0057/src/test/java/org/apache/maven/it0001/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0058/subproject/src/test/java/org/apache/maven/it0058/PersonTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0058/subproject/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0059/src/main/java/org/apache/maven/it0059/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0058/subproject/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0059/src/main/java/org/apache/maven/it0059/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0059/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0060/subproject/src/main/java/org/apache/maven/it0060/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0059/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0060/subproject/src/main/java/org/apache/maven/it0060/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0060/PersonTest.java
similarity index 88%
rename from maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0060/PersonTest.java
index 80014fa03b..fcce1be311 100644
--- a/maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java
+++ b/maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0060/PersonTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.it0001;
+package org.apache.maven.it0060;
 
 import junit.framework.TestCase;
 
diff --git a/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0001/PersonThreeTest.java b/maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0060/PersonThreeTest.java
similarity index 89%
rename from maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0001/PersonThreeTest.java
rename to maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0060/PersonThreeTest.java
index f1b23a1f41..bfaf68277c 100644
--- a/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0001/PersonThreeTest.java
+++ b/maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0060/PersonThreeTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.it0001;
+package org.apache.maven.it0060;
 
 import junit.framework.TestCase;
 
diff --git a/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0001/PersonTwoTest.java b/maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0060/PersonTwoTest.java
similarity index 88%
rename from maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0001/PersonTwoTest.java
rename to maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0060/PersonTwoTest.java
index ccec93c557..9492f599f8 100644
--- a/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0001/PersonTwoTest.java
+++ b/maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0060/PersonTwoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.it0001;
+package org.apache.maven.it0060;
 
 import junit.framework.TestCase;
 
diff --git a/maven-core-integration-tests/src/test/resources/it0060/subproject/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0061/src/main/java/org/apache/maven/it0061/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0060/subproject/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0061/src/main/java/org/apache/maven/it0061/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0063/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0063/src/main/java/org/apache/maven/it0063/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0063/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0063/src/main/java/org/apache/maven/it0063/Person.java
diff --git a/maven-core-integration-tests/src/test/resources/it0063/src/test/java/org/apache/maven/it0001/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0063/src/test/java/org/apache/maven/it0001/PersonTest.java
deleted file mode 100644
index 80014fa03b..0000000000
--- a/maven-core-integration-tests/src/test/resources/it0063/src/test/java/org/apache/maven/it0001/PersonTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.maven.it0001;
-
-import junit.framework.TestCase;
-
-public class PersonTest
-    extends TestCase
-{
-    public void testPerson()
-    {
-        Person person = new Person();
-        
-        person.setName( "foo" );
-        
-        assertEquals( "foo", person.getName() );
-    }
-}
diff --git a/maven-core-integration-tests/src/test/resources/it0058/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0063/src/test/java/org/apache/maven/it0063/PersonTest.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0058/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0063/src/test/java/org/apache/maven/it0063/PersonTest.java
diff --git a/maven-core-integration-tests/src/test/resources/it0065/subproject/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0065/subproject/src/main/java/org/apache/maven/it0001/Person.java
deleted file mode 100644
index 613e499ae0..0000000000
--- a/maven-core-integration-tests/src/test/resources/it0065/subproject/src/main/java/org/apache/maven/it0001/Person.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.maven.it0001;
-
-public class Person
-{
-    private String name;
-    
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-    
-    public String getName()
-    {
-        return name;
-    }
-}
diff --git a/maven-core-integration-tests/src/test/resources/it0061/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-integration-tests/src/test/resources/it0065/subproject/src/main/java/org/apache/maven/it0065/Person.java
similarity index 85%
rename from maven-core-integration-tests/src/test/resources/it0061/src/main/java/org/apache/maven/it0001/Person.java
rename to maven-core-integration-tests/src/test/resources/it0065/subproject/src/main/java/org/apache/maven/it0065/Person.java
index 613e499ae0..af13ac20c0 100644
--- a/maven-core-integration-tests/src/test/resources/it0061/src/main/java/org/apache/maven/it0001/Person.java
+++ b/maven-core-integration-tests/src/test/resources/it0065/subproject/src/main/java/org/apache/maven/it0065/Person.java
@@ -1,4 +1,4 @@
-package org.apache.maven.it0001;
+package org.apache.maven.it0065;
 
 public class Person
 {
diff --git a/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTest.java
similarity index 88%
rename from maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java
rename to maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTest.java
index 80014fa03b..de5487b859 100644
--- a/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java
+++ b/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.it0001;
+package org.apache.maven.it0065;
 
 import junit.framework.TestCase;
 
diff --git a/maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonThreeTest.java b/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonThreeTest.java
similarity index 89%
rename from maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonThreeTest.java
rename to maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonThreeTest.java
index f1b23a1f41..aaa095d51e 100644
--- a/maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonThreeTest.java
+++ b/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonThreeTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.it0001;
+package org.apache.maven.it0065;
 
 import junit.framework.TestCase;
 
diff --git a/maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTwoTest.java b/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTwoTest.java
similarity index 88%
rename from maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTwoTest.java
rename to maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTwoTest.java
index ccec93c557..eb1aa6aff3 100644
--- a/maven-core-integration-tests/src/test/resources/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTwoTest.java
+++ b/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTwoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.it0001;
+package org.apache.maven.it00065;
 
 import junit.framework.TestCase;
 
diff --git a/maven-core-integration-tests/src/test/resources/it0067/src/main/java/org/apache/maven/it0021/Person.java b/maven-core-integration-tests/src/test/resources/it0067/src/main/java/org/apache/maven/it0067/Person.java
similarity index 100%
rename from maven-core-integration-tests/src/test/resources/it0067/src/main/java/org/apache/maven/it0021/Person.java
rename to maven-core-integration-tests/src/test/resources/it0067/src/main/java/org/apache/maven/it0067/Person.java