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 40159217bf..ad5e683b52 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -24,10 +24,6 @@ import org.apache.maven.execution.MavenExecutionResponse;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.lifecycle.LifecycleExecutionException;
 import org.apache.maven.lifecycle.LifecycleExecutor;
-import org.apache.maven.model.settings.Mirror;
-import org.apache.maven.model.settings.Proxy;
-import org.apache.maven.model.settings.Server;
-import org.apache.maven.model.settings.Settings;
 import org.apache.maven.monitor.event.EventDispatcher;
 import org.apache.maven.monitor.event.MavenEvents;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -36,6 +32,10 @@ import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.project.ProjectSorter;
 import org.apache.maven.reactor.ReactorException;
+import org.apache.maven.settings.Mirror;
+import org.apache.maven.settings.Proxy;
+import org.apache.maven.settings.Server;
+import org.apache.maven.settings.Settings;
 import org.apache.maven.usability.ErrorDiagnoser;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
diff --git a/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
index 8ae03dc676..4f89bd432a 100644
--- a/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -33,13 +33,13 @@ import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionResponse;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.model.settings.MavenSettingsBuilder;
-import org.apache.maven.model.settings.Settings;
 import org.apache.maven.monitor.event.DefaultEventDispatcher;
 import org.apache.maven.monitor.event.DefaultEventMonitor;
 import org.apache.maven.monitor.event.EventDispatcher;
 import org.apache.maven.plugin.Mojo;
 import org.apache.maven.reactor.ReactorException;
+import org.apache.maven.settings.MavenSettingsBuilder;
+import org.apache.maven.settings.Settings;
 import org.codehaus.classworlds.ClassWorld;
 import org.codehaus.plexus.PlexusContainerException;
 import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
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 6bf59b1ced..1918b3aecd 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
@@ -17,9 +17,9 @@ package org.apache.maven.execution;
  */
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.settings.Settings;
 import org.apache.maven.monitor.event.EventDispatcher;
 import org.apache.maven.monitor.event.EventMonitor;
+import org.apache.maven.settings.Settings;
 
 import java.util.List;
 
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 5e8201e461..f63980df07 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
@@ -17,9 +17,9 @@ package org.apache.maven.execution;
  */
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.settings.Settings;
 import org.apache.maven.monitor.event.EventDispatcher;
 import org.apache.maven.monitor.event.EventMonitor;
+import org.apache.maven.settings.Settings;
 
 import java.util.List;
 
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
index 23d1ff5eda..f20caebf24 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
@@ -17,9 +17,9 @@ package org.apache.maven.execution;
  */
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.settings.Settings;
 import org.apache.maven.monitor.event.EventDispatcher;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.context.Context;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
index c6e24f97a5..f1e749eac6 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
@@ -25,7 +25,6 @@ import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Goal;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginManagement;
-import org.apache.maven.model.settings.Settings;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.PluginManager;
 import org.apache.maven.plugin.PluginManagerException;
@@ -34,6 +33,7 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.injection.ModelDefaultsInjector;
+import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 
 import java.util.ArrayList;
diff --git a/maven-core/src/main/java/org/apache/maven/model/profiles/DefaultMavenProfilesBuilder.java b/maven-core/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
similarity index 92%
rename from maven-core/src/main/java/org/apache/maven/model/profiles/DefaultMavenProfilesBuilder.java
rename to maven-core/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
index ceeea60c2d..dbedd26549 100644
--- a/maven-core/src/main/java/org/apache/maven/model/profiles/DefaultMavenProfilesBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
@@ -1,6 +1,7 @@
-package org.apache.maven.model.profiles;
+package org.apache.maven.profiles;
 
-import org.apache.maven.model.profiles.io.xpp3.ProfilesXpp3Reader;
+import org.apache.maven.profiles.ProfilesRoot;
+import org.apache.maven.profiles.io.xpp3.ProfilesXpp3Reader;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
diff --git a/maven-core/src/main/java/org/apache/maven/model/profiles/MavenProfilesBuilder.java b/maven-core/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
similarity index 92%
rename from maven-core/src/main/java/org/apache/maven/model/profiles/MavenProfilesBuilder.java
rename to maven-core/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
index 0892051c9c..5a5d301ba9 100644
--- a/maven-core/src/main/java/org/apache/maven/model/profiles/MavenProfilesBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
@@ -1,4 +1,4 @@
-package org.apache.maven.model.profiles;
+package org.apache.maven.profiles;
 
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
@@ -16,6 +16,7 @@ package org.apache.maven.model.profiles;
  * limitations under the License.
  */
 
+import org.apache.maven.profiles.ProfilesRoot;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;
diff --git a/maven-core/src/main/java/org/apache/maven/model/profiles/ModelNormalizationUtils.java b/maven-core/src/main/java/org/apache/maven/profiles/ModelNormalizationUtils.java
similarity index 86%
rename from maven-core/src/main/java/org/apache/maven/model/profiles/ModelNormalizationUtils.java
rename to maven-core/src/main/java/org/apache/maven/profiles/ModelNormalizationUtils.java
index 9346014b3a..5dfe142c2f 100644
--- a/maven-core/src/main/java/org/apache/maven/model/profiles/ModelNormalizationUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/profiles/ModelNormalizationUtils.java
@@ -1,4 +1,4 @@
-package org.apache.maven.model.profiles;
+package org.apache.maven.profiles;
 
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.Repository;
@@ -29,7 +29,7 @@ public final class ModelNormalizationUtils
     {
     }
     
-    public static Profile convertFromSettingsProfile( org.apache.maven.model.settings.Profile settingsProfile )
+    public static Profile convertFromSettingsProfile( org.apache.maven.settings.Profile settingsProfile )
     {
         Profile profile = new Profile();
         profile.setConfiguration( settingsProfile.getConfiguration() );
@@ -39,7 +39,7 @@ public final class ModelNormalizationUtils
         {
             for ( Iterator it = repos.iterator(); it.hasNext(); )
             {
-                 profile.addRepository( convertFromSettingsRepository( (org.apache.maven.model.settings.Repository) it.next() ) );
+                 profile.addRepository( convertFromSettingsRepository( (org.apache.maven.settings.Repository) it.next() ) );
             }
         }
         
@@ -48,14 +48,14 @@ public final class ModelNormalizationUtils
         {
             for ( Iterator it = pluginRepos.iterator(); it.hasNext(); )
             {
-                 profile.addPluginRepository( convertFromSettingsRepository( (org.apache.maven.model.settings.Repository) it.next() ) );
+                 profile.addPluginRepository( convertFromSettingsRepository( (org.apache.maven.settings.Repository) it.next() ) );
             }
         }
         
         return profile;
     }
     
-    public static Profile convertFromProfileXmlProfile( org.apache.maven.model.profiles.Profile profileXmlProfile )
+    public static Profile convertFromProfileXmlProfile( org.apache.maven.profiles.Profile profileXmlProfile )
     {
         Profile profile = new Profile();
         profile.setConfiguration( profileXmlProfile.getConfiguration() );
@@ -65,7 +65,7 @@ public final class ModelNormalizationUtils
         {
             for ( Iterator it = repos.iterator(); it.hasNext(); )
             {
-                 profile.addRepository( convertFromSettingsRepository( (org.apache.maven.model.settings.Repository) it.next() ) );
+                 profile.addRepository( convertFromSettingsRepository( (org.apache.maven.settings.Repository) it.next() ) );
             }
         }
         
@@ -74,14 +74,14 @@ public final class ModelNormalizationUtils
         {
             for ( Iterator it = pluginRepos.iterator(); it.hasNext(); )
             {
-                 profile.addPluginRepository( convertFromSettingsRepository( (org.apache.maven.model.settings.Repository) it.next() ) );
+                 profile.addPluginRepository( convertFromSettingsRepository( (org.apache.maven.settings.Repository) it.next() ) );
             }
         }
         
         return profile;
     }
     
-    private static Repository convertFromSettingsRepository( org.apache.maven.model.settings.Repository settingsRepo )
+    private static Repository convertFromSettingsRepository( org.apache.maven.settings.Repository settingsRepo )
     {
         Repository repo = new Repository();
         
@@ -94,7 +94,7 @@ public final class ModelNormalizationUtils
         return repo;
     }
 
-    private static Repository convertFromProfileXmlRepository( org.apache.maven.model.profiles.Repository profileXmlRepo )
+    private static Repository convertFromProfileXmlRepository( org.apache.maven.profiles.Repository profileXmlRepo )
     {
         Repository repo = new Repository();
 
diff --git a/maven-core/src/main/java/org/apache/maven/model/settings/DefaultMavenSettingsBuilder.java b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
similarity index 96%
rename from maven-core/src/main/java/org/apache/maven/model/settings/DefaultMavenSettingsBuilder.java
rename to maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index c35c25902c..19fbcbd911 100644
--- a/maven-core/src/main/java/org/apache/maven/model/settings/DefaultMavenSettingsBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -1,4 +1,4 @@
-package org.apache.maven.model.settings;
+package org.apache.maven.settings;
 
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.apache.maven.model.settings;
  * limitations under the License.
  */
 
-import org.apache.maven.model.settings.Settings;
-import org.apache.maven.model.settings.io.xpp3.SettingsXpp3Reader;
+import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.util.IOUtil;
diff --git a/maven-core/src/main/java/org/apache/maven/model/settings/MavenSettingsBuilder.java b/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
similarity index 91%
rename from maven-core/src/main/java/org/apache/maven/model/settings/MavenSettingsBuilder.java
rename to maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
index b5b44d186f..f2a53d1d46 100644
--- a/maven-core/src/main/java/org/apache/maven/model/settings/MavenSettingsBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
@@ -1,4 +1,4 @@
-package org.apache.maven.model.settings;
+package org.apache.maven.settings;
 
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.maven.model.settings;
  * limitations under the License.
  */
 
-import org.apache.maven.model.settings.Settings;
+import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.IOException;
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 c3491c5b8b..e0dc1f141b 100644
--- a/maven-core/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
@@ -164,8 +164,8 @@
     </component>
 
     <component>
-      <role>org.apache.maven.model.settings.MavenSettingsBuilder</role>
-      <implementation>org.apache.maven.model.settings.DefaultMavenSettingsBuilder</implementation>
+      <role>org.apache.maven.settings.MavenSettingsBuilder</role>
+      <implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>
       <configuration>
         <settingsPath>${user.home}/.m2/settings.xml</settingsPath>
       </configuration>
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
index 9b687e8b25..914caa1a4d 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
@@ -21,9 +21,9 @@ import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Model;
-import org.apache.maven.model.settings.Settings;
 import org.apache.maven.monitor.event.DefaultEventDispatcher;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
diff --git a/maven-profile/profiles.mdo b/maven-profile/profiles.mdo
index bca5def69a..fdf93549cf 100644
--- a/maven-profile/profiles.mdo
+++ b/maven-profile/profiles.mdo
@@ -8,7 +8,7 @@
   <defaults>
     <default>
       <key>package</key>
-      <value>org.apache.maven.model.profiles</value>
+      <value>org.apache.maven.profiles</value>
     </default>
   </defaults>
   <classes>
diff --git a/maven-settings/settings.mdo b/maven-settings/settings.mdo
index 768c3ec050..8658c0bc7f 100644
--- a/maven-settings/settings.mdo
+++ b/maven-settings/settings.mdo
@@ -8,7 +8,7 @@
   <defaults>
     <default>
       <key>package</key>
-      <value>org.apache.maven.model.settings</value>
+      <value>org.apache.maven.settings</value>
     </default>
   </defaults>
   <classes>