diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index c0cbc16f8c..2b7160f039 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -40,7 +40,7 @@ import org.apache.maven.lifecycle.TaskValidationResult;
 import org.apache.maven.monitor.event.DefaultEventDispatcher;
 import org.apache.maven.monitor.event.EventDispatcher;
 import org.apache.maven.monitor.event.MavenEvents;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.manager.ProfileManager;
 import org.apache.maven.profiles.activation.ProfileActivationException;
 import org.apache.maven.project.DuplicateProjectException;
 import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index ada000dc42..8d25fc07f5 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -21,7 +21,7 @@ package org.apache.maven.execution;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.manager.ProfileManager;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.wagon.events.TransferListener;
 
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
index 75d84cfc4e..78153652ea 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
@@ -22,7 +22,7 @@ package org.apache.maven.execution;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.manager.ProfileManager;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.wagon.events.TransferListener;
 import org.codehaus.plexus.logging.Logger;
diff --git a/maven-core/src/main/java/org/apache/maven/extension/BuildExtensionScanner.java b/maven-core/src/main/java/org/apache/maven/extension/BuildExtensionScanner.java
index c3906e24a7..3a6f09b694 100644
--- a/maven-core/src/main/java/org/apache/maven/extension/BuildExtensionScanner.java
+++ b/maven-core/src/main/java/org/apache/maven/extension/BuildExtensionScanner.java
@@ -20,7 +20,7 @@ package org.apache.maven.extension;
  */
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.manager.ProfileManager;
 
 import java.io.File;
 import java.util.List;
diff --git a/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java b/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
index 9273ecf75f..1d9bdbdc01 100644
--- a/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
+++ b/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
@@ -28,7 +28,7 @@ import org.apache.maven.model.Build;
 import org.apache.maven.model.Extension;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Parent;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.manager.ProfileManager;
 import org.apache.maven.profiles.activation.CustomActivatorAdvice;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
index 44aff80c10..eea715aeb8 100644
--- a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
+++ b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
@@ -54,8 +54,8 @@ import org.apache.maven.plugin.PluginNotFoundException;
 import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
 import org.apache.maven.plugin.version.PluginVersionNotFoundException;
 import org.apache.maven.plugin.version.PluginVersionResolutionException;
-import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.manager.DefaultProfileManager;
+import org.apache.maven.profiles.manager.ProfileManager;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.MavenProjectBuildingResult;
diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
index 98e0d3ac9f..86cf4e3ea9 100644
--- a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
+++ b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
@@ -30,8 +30,8 @@ import org.apache.maven.embedder.MavenEmbedderException;
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.monitor.event.DefaultEventMonitor;
 import org.apache.maven.plugin.Mojo;
-import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.manager.DefaultProfileManager;
+import org.apache.maven.profiles.manager.ProfileManager;
 import org.apache.maven.settings.Mirror;
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Server;
diff --git a/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml b/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml
index a29821cde1..0a7c7ddd58 100644
--- a/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml
@@ -53,9 +53,9 @@ under the License.
     </component>
 
     <component>
-      <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+      <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
       <role-hint>default</role-hint>
-      <implementation>org.apache.maven.project.build.profile.DefaultProfileAdvisor</implementation>
+      <implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
       <requirements>
         <requirement>
           <role>org.apache.maven.MavenTools</role>
@@ -64,7 +64,7 @@ under the License.
           <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
         </requirement>
         <requirement>
-          <role>org.apache.maven.project.injection.ProfileInjector</role>
+          <role>org.apache.maven.profiles.injection.ProfileInjector</role>
         </requirement>
       </requirements>
     </component>
@@ -78,7 +78,7 @@ under the License.
       <implementation>org.apache.maven.project.build.model.DefaultModelLineageBuilder</implementation>
       <requirements>
         <requirement>
-          <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+          <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
@@ -135,8 +135,8 @@ under the License.
      |
      -->
     <component>
-      <role>org.apache.maven.project.injection.ProfileInjector</role>
-      <implementation>org.apache.maven.project.injection.DefaultProfileInjector</implementation>
+      <role>org.apache.maven.profiles.injection.ProfileInjector</role>
+      <implementation>org.apache.maven.profiles.injection.DefaultProfileInjector</implementation>
     </component>
 <!--
      |
@@ -152,7 +152,7 @@ under the License.
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
-          <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+          <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
diff --git a/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml b/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
index ecb2de7f00..6f16c273b7 100644
--- a/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
+++ b/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
@@ -34,14 +34,14 @@ under the License.
     </component>
     -->
     <component>
-      <role>org.apache.maven.project.injection.ProfileInjector</role>
+      <role>org.apache.maven.profiles.injection.ProfileInjector</role>
       <role-hint>test</role-hint>
       <implementation>org.apache.maven.project.injection.TestProfileInjector</implementation>
     </component>
     <component>
-      <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+      <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
       <role-hint>default</role-hint>
-      <implementation>org.apache.maven.project.build.profile.DefaultProfileAdvisor</implementation>
+      <implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
       <requirements>
         <requirement>
           <role>org.apache.maven.MavenTools</role>
@@ -50,7 +50,7 @@ under the License.
           <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
         </requirement>
         <requirement>
-          <role>org.apache.maven.project.injection.ProfileInjector</role>
+          <role>org.apache.maven.profiles.injection.ProfileInjector</role>
           <role-hint>test</role-hint>
         </requirement>
       </requirements>
@@ -85,7 +85,7 @@ under the License.
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
-          <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+          <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
diff --git a/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml b/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
index 99e367931c..a8ec65c2ad 100644
--- a/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
+++ b/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
@@ -34,7 +34,7 @@ under the License.
     </component>
     -->
     <component>
-      <role>org.apache.maven.project.injection.ProfileInjector</role>
+      <role>org.apache.maven.profiles.injection.ProfileInjector</role>
       <role-hint>test</role-hint>
       <implementation>org.apache.maven.project.injection.TestProfileInjector</implementation>
     </component>
@@ -57,9 +57,9 @@ under the License.
       </requirements>
     </component>
     <component>
-      <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+      <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
       <role-hint>default</role-hint>
-      <implementation>org.apache.maven.project.build.profile.DefaultProfileAdvisor</implementation>
+      <implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
       <requirements>
         <requirement>
           <role>org.apache.maven.MavenTools</role>
@@ -68,7 +68,7 @@ under the License.
           <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
         </requirement>
         <requirement>
-          <role>org.apache.maven.project.injection.ProfileInjector</role>
+          <role>org.apache.maven.profiles.injection.ProfileInjector</role>
           <role-hint>test</role-hint>
         </requirement>
       </requirements>
@@ -83,7 +83,7 @@ under the License.
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
-          <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+          <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
diff --git a/maven-project/src/main/java/org/apache/maven/project/build/profile/DefaultProfileAdvisor.java b/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
similarity index 97%
rename from maven-project/src/main/java/org/apache/maven/project/build/profile/DefaultProfileAdvisor.java
rename to maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
index 0b94a2728a..1638377e03 100644
--- a/maven-project/src/main/java/org/apache/maven/project/build/profile/DefaultProfileAdvisor.java
+++ b/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
@@ -1,4 +1,4 @@
-package org.apache.maven.project.build.profile;
+package org.apache.maven.profiles.build;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,14 +26,14 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.Repository;
-import org.apache.maven.profiles.DefaultProfileManager;
+import org.apache.maven.profiles.manager.DefaultProfileManager;
 import org.apache.maven.profiles.MavenProfilesBuilder;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.manager.ProfileManager;
 import org.apache.maven.profiles.ProfilesConversionUtils;
 import org.apache.maven.profiles.ProfilesRoot;
 import org.apache.maven.profiles.activation.ProfileActivationException;
 import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.project.injection.ProfileInjector;
+import org.apache.maven.profiles.injection.ProfileInjector;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.context.Context;
diff --git a/maven-project/src/main/java/org/apache/maven/project/build/profile/ProfileAdvisor.java b/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java
similarity index 94%
rename from maven-project/src/main/java/org/apache/maven/project/build/profile/ProfileAdvisor.java
rename to maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java
index 900a46f7b3..9c85fd85ab 100644
--- a/maven-project/src/main/java/org/apache/maven/project/build/profile/ProfileAdvisor.java
+++ b/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java
@@ -1,4 +1,4 @@
-package org.apache.maven.project.build.profile;
+package org.apache.maven.profiles.build;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,7 @@ package org.apache.maven.project.build.profile;
  */
 
 import org.apache.maven.model.Model;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.manager.ProfileManager;
 import org.apache.maven.project.ProjectBuildingException;
 
 import java.io.File;
diff --git a/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java b/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java
similarity index 99%
rename from maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
rename to maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java
index 44e7f2ce75..3d7b1db8b6 100644
--- a/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
+++ b/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java
@@ -1,4 +1,4 @@
-package org.apache.maven.project.injection;
+package org.apache.maven.profiles.injection;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/maven-project/src/main/java/org/apache/maven/project/injection/ProfileInjector.java b/maven-project/src/main/java/org/apache/maven/profiles/injection/ProfileInjector.java
similarity index 95%
rename from maven-project/src/main/java/org/apache/maven/project/injection/ProfileInjector.java
rename to maven-project/src/main/java/org/apache/maven/profiles/injection/ProfileInjector.java
index 65f8e31394..b2ba7a8daf 100644
--- a/maven-project/src/main/java/org/apache/maven/project/injection/ProfileInjector.java
+++ b/maven-project/src/main/java/org/apache/maven/profiles/injection/ProfileInjector.java
@@ -1,4 +1,4 @@
-package org.apache.maven.project.injection;
+package org.apache.maven.profiles.injection;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java b/maven-project/src/main/java/org/apache/maven/profiles/manager/DefaultProfileManager.java
similarity index 88%
rename from maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
rename to maven-project/src/main/java/org/apache/maven/profiles/manager/DefaultProfileManager.java
index cac8efc489..3e1259a03f 100644
--- a/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
+++ b/maven-project/src/main/java/org/apache/maven/profiles/manager/DefaultProfileManager.java
@@ -1,4 +1,4 @@
-package org.apache.maven.profiles;
+package org.apache.maven.profiles.manager;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -49,19 +49,7 @@ public class DefaultProfileManager
     private List defaultIds = new ArrayList();
 
     private Map profilesById = new LinkedHashMap();
-    
-    // default fallback..
-    private Properties systemProperties = System.getProperties();
 
-    /**
-     * @deprecated without passing in the system properties, the SystemPropertiesProfileActivator will not work correctly
-     * in embedded envirnments.
-     */
-    public DefaultProfileManager( PlexusContainer container )
-    {
-        this( container, (Settings)null);
-    }
-    
     /**
      * the properties passed to the profile manager are the props that
      * are passed to maven, possibly containing profile activator properties
@@ -94,24 +82,15 @@ public class DefaultProfileManager
         this.container = container;
 
         loadSettingsProfiles( settings );
-        
-        if ( props != null )
-        {
-            systemProperties = props;
-        }
     }
     
-    public Properties getSystemProperties() {
-        return systemProperties;
-    }
-
     public Map getProfilesById()
     {
         return profilesById;
     }
 
     /* (non-Javadoc)
-    * @see org.apache.maven.profiles.ProfileManager#addProfile(org.apache.maven.model.Profile)
+    * @see org.apache.maven.profiles.manager.ProfileManager#addProfile(org.apache.maven.model.Profile)
     */
     public void addProfile( Profile profile )
     {
@@ -135,7 +114,7 @@ public class DefaultProfileManager
     }
 
     /* (non-Javadoc)
-    * @see org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.lang.String)
+    * @see org.apache.maven.profiles.manager.ProfileManager#explicitlyActivate(java.lang.String)
     */
     public void explicitlyActivate( String profileId )
     {
@@ -148,7 +127,7 @@ public class DefaultProfileManager
     }
 
     /* (non-Javadoc)
-    * @see org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.util.List)
+    * @see org.apache.maven.profiles.manager.ProfileManager#explicitlyActivate(java.util.List)
     */
     public void explicitlyActivate( List profileIds )
     {
@@ -161,7 +140,7 @@ public class DefaultProfileManager
     }
 
     /* (non-Javadoc)
-    * @see org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.lang.String)
+    * @see org.apache.maven.profiles.manager.ProfileManager#explicitlyDeactivate(java.lang.String)
     */
     public void explicitlyDeactivate( String profileId )
     {
@@ -174,7 +153,7 @@ public class DefaultProfileManager
     }
 
     /* (non-Javadoc)
-    * @see org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.util.List)
+    * @see org.apache.maven.profiles.manager.ProfileManager#explicitlyDeactivate(java.util.List)
     */
     public void explicitlyDeactivate( List profileIds )
     {
@@ -187,7 +166,7 @@ public class DefaultProfileManager
     }
 
     /* (non-Javadoc)
-    * @see org.apache.maven.profiles.ProfileManager#getActiveProfiles()
+    * @see org.apache.maven.profiles.manager.ProfileManager#getActiveProfiles()
     */
     public List getActiveProfiles()
         throws ProfileActivationException
@@ -295,7 +274,7 @@ public class DefaultProfileManager
     }
 
     /* (non-Javadoc)
-     * @see org.apache.maven.profiles.ProfileManager#addProfiles(java.util.List)
+     * @see org.apache.maven.profiles.manager.ProfileManager#addProfiles(java.util.List)
      */
     public void addProfiles( List profiles )
     {
diff --git a/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java b/maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java
similarity index 97%
rename from maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java
rename to maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java
index f6e9d9654a..d30fd28ade 100644
--- a/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java
+++ b/maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java
@@ -1,4 +1,4 @@
-package org.apache.maven.profiles;
+package org.apache.maven.profiles.manager;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,7 +28,6 @@ import java.util.Map;
 
 public interface ProfileManager
 {
-
     void addProfile( Profile profile );
 
     void explicitlyActivate( String profileId );
diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
index 95ad3b8f46..52cba951cc 100644
--- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
+++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
@@ -49,9 +49,8 @@ import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.ReportPlugin;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.profiles.DefaultProfileManager;
 import org.apache.maven.profiles.MavenProfilesBuilder;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.manager.ProfileManager;
 import org.apache.maven.profiles.activation.ProfileActivationException;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.project.build.ProjectBuildCache;
@@ -60,7 +59,7 @@ import org.apache.maven.project.build.model.DefaultModelLineage;
 import org.apache.maven.project.build.model.ModelLineage;
 import org.apache.maven.project.build.model.ModelLineageBuilder;
 import org.apache.maven.project.build.model.ModelLineageIterator;
-import org.apache.maven.project.build.profile.ProfileAdvisor;
+import org.apache.maven.profiles.build.ProfileAdvisor;
 import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
 import org.apache.maven.project.injection.ModelDefaultsInjector;
 import org.apache.maven.project.interpolation.ModelInterpolationException;
diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
index 3fcc70a2dc..b6c1212abc 100644
--- a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
+++ b/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
@@ -40,9 +40,7 @@ package org.apache.maven.project;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.manager.ProfileManager;
 import org.apache.maven.wagon.events.TransferListener;
 
 import java.io.File;
diff --git a/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java b/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
index 508757cce3..4ae33c8b82 100644
--- a/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
+++ b/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
@@ -31,10 +31,10 @@ import org.apache.maven.context.BuildContextManager;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.manager.ProfileManager;
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.project.build.ProjectBuildCache;
-import org.apache.maven.project.build.profile.ProfileAdvisor;
+import org.apache.maven.profiles.build.ProfileAdvisor;
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
diff --git a/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java b/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java
index df1fdc2a54..f2af103c1d 100644
--- a/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java
+++ b/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java
@@ -20,7 +20,7 @@ package org.apache.maven.project.build.model;
  */
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.manager.ProfileManager;
 import org.apache.maven.project.ProjectBuildingException;
 
 import java.io.File;
diff --git a/maven-project/src/main/resources/META-INF/plexus/components.xml b/maven-project/src/main/resources/META-INF/plexus/components.xml
index a29821cde1..0a7c7ddd58 100644
--- a/maven-project/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-project/src/main/resources/META-INF/plexus/components.xml
@@ -53,9 +53,9 @@ under the License.
     </component>
 
     <component>
-      <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+      <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
       <role-hint>default</role-hint>
-      <implementation>org.apache.maven.project.build.profile.DefaultProfileAdvisor</implementation>
+      <implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
       <requirements>
         <requirement>
           <role>org.apache.maven.MavenTools</role>
@@ -64,7 +64,7 @@ under the License.
           <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
         </requirement>
         <requirement>
-          <role>org.apache.maven.project.injection.ProfileInjector</role>
+          <role>org.apache.maven.profiles.injection.ProfileInjector</role>
         </requirement>
       </requirements>
     </component>
@@ -78,7 +78,7 @@ under the License.
       <implementation>org.apache.maven.project.build.model.DefaultModelLineageBuilder</implementation>
       <requirements>
         <requirement>
-          <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+          <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
@@ -135,8 +135,8 @@ under the License.
      |
      -->
     <component>
-      <role>org.apache.maven.project.injection.ProfileInjector</role>
-      <implementation>org.apache.maven.project.injection.DefaultProfileInjector</implementation>
+      <role>org.apache.maven.profiles.injection.ProfileInjector</role>
+      <implementation>org.apache.maven.profiles.injection.DefaultProfileInjector</implementation>
     </component>
 <!--
      |
@@ -152,7 +152,7 @@ under the License.
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
-          <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+          <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
diff --git a/maven-project/src/test/java/org/apache/maven/project/injection/DefaultProfileInjectorTest.java b/maven-project/src/test/java/org/apache/maven/profiles/injection/DefaultProfileInjectorTest.java
similarity index 99%
rename from maven-project/src/test/java/org/apache/maven/project/injection/DefaultProfileInjectorTest.java
rename to maven-project/src/test/java/org/apache/maven/profiles/injection/DefaultProfileInjectorTest.java
index 0bb0aee858..c7ed057e79 100644
--- a/maven-project/src/test/java/org/apache/maven/project/injection/DefaultProfileInjectorTest.java
+++ b/maven-project/src/test/java/org/apache/maven/profiles/injection/DefaultProfileInjectorTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.project.injection;
+package org.apache.maven.profiles.injection;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,6 +28,7 @@ import org.apache.maven.model.PluginContainer;
 import org.apache.maven.model.PluginExecution;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.Repository;
+import org.apache.maven.profiles.injection.DefaultProfileInjector;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.util.Collections;
diff --git a/maven-project/src/test/java/org/apache/maven/profiles/DefaultProfileManagerTest.java b/maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
similarity index 97%
rename from maven-project/src/test/java/org/apache/maven/profiles/DefaultProfileManagerTest.java
rename to maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
index 3eb5766850..9eab5b5414 100644
--- a/maven-project/src/test/java/org/apache/maven/profiles/DefaultProfileManagerTest.java
+++ b/maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.profiles;
+package org.apache.maven.profiles.manager;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,6 +27,8 @@ import org.apache.maven.model.ActivationOS;
 import org.apache.maven.model.ActivationProperty;
 import org.apache.maven.model.Profile;
 import org.apache.maven.profiles.activation.ProfileActivationException;
+import org.apache.maven.profiles.manager.ProfileManager;
+import org.apache.maven.profiles.manager.DefaultProfileManager;
 import org.codehaus.plexus.PlexusTestCase;
 
 import java.util.List;
diff --git a/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
index d21454a481..bd202d48ab 100644
--- a/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
+++ b/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
@@ -22,7 +22,7 @@ package org.apache.maven.project;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.profiles.DefaultProfileManager;
+import org.apache.maven.profiles.manager.DefaultProfileManager;
 import org.codehaus.plexus.PlexusTestCase;
 
 import java.io.File;
diff --git a/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
index 8a95511933..1a2c808e48 100644
--- a/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
@@ -22,18 +22,12 @@ package org.apache.maven.project;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.model.Profile;
-import org.apache.maven.model.Repository;
-import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.ProfileManager;
-import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Properties;
 
 public class DefaultMavenProjectBuilderTest
     extends AbstractMavenProjectTestCase
diff --git a/maven-project/src/test/java/org/apache/maven/project/injection/TestProfileInjector.java b/maven-project/src/test/java/org/apache/maven/project/injection/TestProfileInjector.java
index 8d6d730d6a..dc7218d300 100644
--- a/maven-project/src/test/java/org/apache/maven/project/injection/TestProfileInjector.java
+++ b/maven-project/src/test/java/org/apache/maven/project/injection/TestProfileInjector.java
@@ -21,6 +21,7 @@ package org.apache.maven.project.injection;
 
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Profile;
+import org.apache.maven.profiles.injection.ProfileInjector;
 
 public class TestProfileInjector
     implements ProfileInjector
diff --git a/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml b/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
index ecb2de7f00..6f16c273b7 100644
--- a/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
+++ b/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
@@ -34,14 +34,14 @@ under the License.
     </component>
     -->
     <component>
-      <role>org.apache.maven.project.injection.ProfileInjector</role>
+      <role>org.apache.maven.profiles.injection.ProfileInjector</role>
       <role-hint>test</role-hint>
       <implementation>org.apache.maven.project.injection.TestProfileInjector</implementation>
     </component>
     <component>
-      <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+      <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
       <role-hint>default</role-hint>
-      <implementation>org.apache.maven.project.build.profile.DefaultProfileAdvisor</implementation>
+      <implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
       <requirements>
         <requirement>
           <role>org.apache.maven.MavenTools</role>
@@ -50,7 +50,7 @@ under the License.
           <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
         </requirement>
         <requirement>
-          <role>org.apache.maven.project.injection.ProfileInjector</role>
+          <role>org.apache.maven.profiles.injection.ProfileInjector</role>
           <role-hint>test</role-hint>
         </requirement>
       </requirements>
@@ -85,7 +85,7 @@ under the License.
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
-          <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+          <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
diff --git a/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml b/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
index 99e367931c..a8ec65c2ad 100644
--- a/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
+++ b/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
@@ -34,7 +34,7 @@ under the License.
     </component>
     -->
     <component>
-      <role>org.apache.maven.project.injection.ProfileInjector</role>
+      <role>org.apache.maven.profiles.injection.ProfileInjector</role>
       <role-hint>test</role-hint>
       <implementation>org.apache.maven.project.injection.TestProfileInjector</implementation>
     </component>
@@ -57,9 +57,9 @@ under the License.
       </requirements>
     </component>
     <component>
-      <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+      <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
       <role-hint>default</role-hint>
-      <implementation>org.apache.maven.project.build.profile.DefaultProfileAdvisor</implementation>
+      <implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
       <requirements>
         <requirement>
           <role>org.apache.maven.MavenTools</role>
@@ -68,7 +68,7 @@ under the License.
           <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
         </requirement>
         <requirement>
-          <role>org.apache.maven.project.injection.ProfileInjector</role>
+          <role>org.apache.maven.profiles.injection.ProfileInjector</role>
           <role-hint>test</role-hint>
         </requirement>
       </requirements>
@@ -83,7 +83,7 @@ under the License.
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
-          <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+          <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
           <role-hint>default</role-hint>
         </requirement>
         <requirement>