diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
index c9cb4d3bf5..d7055a48b8 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
@@ -31,6 +31,7 @@
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
+import org.apache.maven.project.injection.ProjectDefaultsInjector;
 import org.apache.maven.project.interpolation.ProjectInterpolator;
 import org.apache.maven.project.path.PathTranslator;
 import org.apache.maven.project.validation.ModelValidationResult;
diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index 70f8d9d9fa..dea9ef55c7 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -17,7 +17,6 @@
  * ====================================================================
  */
 
-import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Build;
 import org.apache.maven.model.CiManagement;
 import org.apache.maven.model.Contributor;
@@ -34,7 +33,6 @@
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -203,6 +201,7 @@ public List getTestCompileSourceRootsList()
         return list;
     }
 
+/* TODO: remove - should be using a type handler
     public String[] getClasspathElements()
     {
         int size = getArtifacts().size();
@@ -238,6 +237,7 @@ public boolean isAddedToClasspath( Artifact artifact )
         return false;
     }
 
+*/
     // ----------------------------------------------------------------------
     // Delegate to the model
     // ----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDefaultsInjector.java b/maven-core/src/main/java/org/apache/maven/project/injection/DefaultProjectDefaultsInjector.java
similarity index 95%
rename from maven-core/src/main/java/org/apache/maven/project/DefaultProjectDefaultsInjector.java
rename to maven-core/src/main/java/org/apache/maven/project/injection/DefaultProjectDefaultsInjector.java
index 3512e749f4..1ea2fc3b0c 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDefaultsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/project/injection/DefaultProjectDefaultsInjector.java
@@ -1,4 +1,4 @@
-package org.apache.maven.project;
+package org.apache.maven.project.injection;
 
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
@@ -18,6 +18,7 @@
 
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.project.MavenProject;
 
 import java.util.Iterator;
 import java.util.List;
@@ -29,7 +30,7 @@
  * @author jdcasey Created on Feb 1, 2005
  */
 public class DefaultProjectDefaultsInjector
-implements ProjectDefaultsInjector
+    implements ProjectDefaultsInjector
 {
 
     public void injectDefaults( MavenProject project )
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectDefaultsInjector.java b/maven-core/src/main/java/org/apache/maven/project/injection/ProjectDefaultsInjector.java
similarity index 89%
rename from maven-core/src/main/java/org/apache/maven/project/ProjectDefaultsInjector.java
rename to maven-core/src/main/java/org/apache/maven/project/injection/ProjectDefaultsInjector.java
index 49ffdac84a..0e9e5254f6 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectDefaultsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/project/injection/ProjectDefaultsInjector.java
@@ -1,4 +1,4 @@
-package org.apache.maven.project;
+package org.apache.maven.project.injection;
 
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-/**
+import org.apache.maven.project.MavenProject; /**
  * @author jdcasey Created on Feb 1, 2005
  */
 public interface ProjectDefaultsInjector
diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-core/src/main/resources/META-INF/plexus/components.xml
index 0d5abcfe34..e369efdef6 100644
--- a/maven-core/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
@@ -86,8 +86,8 @@
      |
      -->
     <component>
-      <role>org.apache.maven.project.ProjectDefaultsInjector</role>
-      <implementation>org.apache.maven.project.DefaultProjectDefaultsInjector</implementation>
+      <role>org.apache.maven.project.injection.ProjectDefaultsInjector</role>
+      <implementation>org.apache.maven.project.injection.DefaultProjectDefaultsInjector</implementation>
     </component>
     <!--
      |
@@ -99,7 +99,7 @@
       <implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
       <requirements>
         <requirement>
-          <role>org.apache.maven.project.ProjectDefaultsInjector</role>
+          <role>org.apache.maven.project.injection.ProjectDefaultsInjector</role>
         </requirement>
         <requirement>
           <role>org.apache.maven.project.interpolation.ProjectInterpolator</role>
@@ -255,12 +255,12 @@
           <!-- 14 -->
           <phase>
             <id>install</id>
-            <goal>install:install</goal>
+            <goal>jar:install</goal>
           </phase>
           <!-- 15 -->
           <phase>
             <id>deploy</id>
-            <goal>deploy:deploy</goal>
+            <goal>jar:deploy</goal>
           </phase>
         </phases>
         <!-- END SNIPPET: lifecycle -->
diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultProjectDefaultsInjectorTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultProjectDefaultsInjectorTest.java
index 79c2d2199e..6fd5c564c0 100644
--- a/maven-core/src/test/java/org/apache/maven/project/DefaultProjectDefaultsInjectorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/DefaultProjectDefaultsInjectorTest.java
@@ -20,6 +20,7 @@
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.Model;
+import org.apache.maven.project.injection.DefaultProjectDefaultsInjector;
 
 import java.util.List;
 import java.util.Properties;