diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index e378d4f337..2656d87591 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -40,11 +40,6 @@ under the License.
       <artifactId>maven-build-context</artifactId>
       <version>2.1-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-settings</artifactId>
-      <version>2.1-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
@@ -136,14 +131,28 @@ under the License.
       <artifactId>easymock</artifactId>
       <version>1.2_Java1.3</version>
       <scope>test</scope>
-    </dependency>      
+    </dependency>
   </dependencies>
-  
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <configuration>
+          <version>1.0.0</version>
+          <model>src/main/mdo/settings.mdo</model>
+        </configuration>
+        <executions>
+          <execution>
+            <id>jdom</id>
+            <goals>
+              <goal>jdom-writer</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        
         <configuration>
           <excludes>
             <exclude>**/testutils/**</exclude>
diff --git a/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
similarity index 100%
rename from maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
rename to maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
diff --git a/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java b/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
similarity index 100%
rename from maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
rename to maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
diff --git a/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java b/maven-core/src/main/java/org/apache/maven/settings/RuntimeInfo.java
similarity index 100%
rename from maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java
rename to maven-core/src/main/java/org/apache/maven/settings/RuntimeInfo.java
diff --git a/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java b/maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java
similarity index 98%
rename from maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java
rename to maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java
index 82af5a4797..6bc19b73a1 100644
--- a/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java
+++ b/maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java
@@ -1,4 +1,4 @@
-package org.apache.maven;
+package org.apache.maven.settings;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java b/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java
similarity index 100%
rename from maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java
rename to maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java
diff --git a/maven-settings/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java b/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
similarity index 100%
rename from maven-settings/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
rename to maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
diff --git a/maven-settings/src/main/java/org/apache/maven/settings/validation/SettingsValidationResult.java b/maven-core/src/main/java/org/apache/maven/settings/validation/SettingsValidationResult.java
similarity index 100%
rename from maven-settings/src/main/java/org/apache/maven/settings/validation/SettingsValidationResult.java
rename to maven-core/src/main/java/org/apache/maven/settings/validation/SettingsValidationResult.java
diff --git a/maven-settings/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java b/maven-core/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java
similarity index 100%
rename from maven-settings/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java
rename to maven-core/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java
diff --git a/maven-settings/src/main/mdo/settings.mdo b/maven-core/src/main/mdo/settings.mdo
similarity index 100%
rename from maven-settings/src/main/mdo/settings.mdo
rename to maven-core/src/main/mdo/settings.mdo
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 40492030b0..e46ac274ac 100644
--- a/maven-core/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
@@ -43,7 +43,7 @@ under the License.
         </requirement>
       </requirements>
     </component>
-    
+
     <component>
       <role>org.apache.maven.ArtifactFilterManager</role>
       <implementation>org.apache.maven.DefaultArtifactFilterManager</implementation>
@@ -110,8 +110,8 @@ under the License.
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
-	      <role>org.apache.maven.artifact.manager.WagonManager</role>
-    	  <role-hint>default</role-hint>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+          <role-hint>default</role-hint>
         </requirement>
       </requirements>
     </component>
@@ -538,7 +538,7 @@ under the License.
         </requirement>
       </requirements>
     </component>
-    
+
     <component>
       <role>org.codehaus.plexus.collections.ActiveMap</role>
       <role-hint>lifecycle-loaders-by-packaging</role-hint>
@@ -547,7 +547,7 @@ under the License.
         <role>org.apache.maven.lifecycle.LifecycleBindingLoader</role>
       </configuration>
     </component>
-    
+
     <component>
       <role>org.codehaus.plexus.collections.ActiveMap</role>
       <role-hint>legacy-lifecycle-mappings-by-packaging</role-hint>
@@ -556,7 +556,7 @@ under the License.
         <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
       </configuration>
     </component>
-    
+
     <component>
       <role>org.apache.maven.plugin.loader.PluginLoader</role>
       <role-hint>default</role-hint>
@@ -576,7 +576,7 @@ under the License.
         </requirement>
       </requirements>
     </component>
-    
+
     <component>
       <role>org.apache.maven.lifecycle.binding.LifecycleBindingManager</role>
       <role-hint>default</role-hint>
@@ -675,7 +675,7 @@ under the License.
         <!-- END SNIPPET: default-reports -->
       </configuration>
     </component>
-    
+
     <component>
       <role>org.apache.maven.lifecycle.plan.BuildPlanner</role>
       <role-hint>default</role-hint>
@@ -692,7 +692,7 @@ under the License.
         </requirement>
       </requirements>
     </component>
-    
+
     <component>
       <role>org.apache.maven.lifecycle.binding.MojoBindingFactory</role>
       <role-hint>default</role-hint>
@@ -703,7 +703,7 @@ under the License.
         </requirement>
       </requirements>
     </component>
-    
+
     <component>
       <role>org.apache.maven.lifecycle.binding.LegacyLifecycleMappingParser</role>
       <role-hint>default</role-hint>
@@ -714,6 +714,22 @@ under the License.
         </requirement>
       </requirements>
     </component>
-    
+
+    <component>
+      <role>org.apache.maven.settings.validation.SettingsValidator</role>
+      <implementation>org.apache.maven.settings.validation.DefaultSettingsValidator</implementation>
+    </component>
+    <component>
+      <role>org.apache.maven.settings.MavenSettingsBuilder</role>
+      <implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.settings.validation.SettingsValidator</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.context.BuildContextManager</role>
+        </requirement>
+      </requirements>
+    </component>
   </components>
 </component-set>
diff --git a/maven-settings/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java b/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
similarity index 100%
rename from maven-settings/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
rename to maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
diff --git a/maven-settings/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java b/maven-core/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
similarity index 100%
rename from maven-settings/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
rename to maven-core/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
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 dad5a2fb3f..f77791a83e 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
@@ -20,7 +20,7 @@ package org.apache.maven.embedder;
  */
 
 import org.apache.maven.Maven;
-import org.apache.maven.SettingsConfigurationException;
+import org.apache.maven.settings.SettingsConfigurationException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.handler.ArtifactHandler;
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 0fc9920699..820e8ed86f 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
@@ -20,7 +20,7 @@ package org.apache.maven.embedder.execution;
  */
 
 import org.apache.maven.Maven;
-import org.apache.maven.SettingsConfigurationException;
+import org.apache.maven.settings.SettingsConfigurationException;
 import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
diff --git a/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java b/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
index 6689c275b0..9df329cbfa 100644
--- a/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
@@ -20,9 +20,8 @@ package org.apache.maven.embedder;
  */
 
 import junit.framework.TestCase;
-import org.apache.maven.SettingsConfigurationException;
+import org.apache.maven.settings.SettingsConfigurationException;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionResult;
diff --git a/maven-project/pom.xml b/maven-project/pom.xml
index c6175295c1..f8aed70f2b 100644
--- a/maven-project/pom.xml
+++ b/maven-project/pom.xml
@@ -42,11 +42,6 @@ under the License.
       <artifactId>maven-profile</artifactId>
       <version>2.1-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-settings</artifactId>
-      <version>2.1-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
diff --git a/maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java b/maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java
index af94640c4c..53b28f8a2b 100644
--- a/maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java
+++ b/maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java
@@ -21,7 +21,6 @@ package org.apache.maven.profiles.manager;
 
 import org.apache.maven.model.Profile;
 import org.apache.maven.profiles.activation.ProfileActivationException;
-import org.apache.maven.settings.Settings;
 
 import java.util.List;
 import java.util.Map;
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
deleted file mode 100644
index b730060ea4..0000000000
--- a/maven-settings/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.1-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-settings</artifactId>
-  <name>Maven Local Settings Model</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>1.0.0</version>
-          <model>src/main/mdo/settings.mdo</model>
-        </configuration>
-        <executions>
-          <execution>
-            <id>jdom</id>
-            <goals>
-              <goal>jdom-writer</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-build-context</artifactId>
-      <version>2.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <!-- Generated model code -->
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jdom</groupId>
-      <artifactId>jdom</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/maven-settings/src/main/resources/META-INF/plexus/components.xml b/maven-settings/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index a1f7011af1..0000000000
--- a/maven-settings/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.settings.validation.SettingsValidator</role>
-      <implementation>org.apache.maven.settings.validation.DefaultSettingsValidator</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.settings.MavenSettingsBuilder</role>
-      <implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.settings.validation.SettingsValidator</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.context.BuildContextManager</role>
-        </requirement>
-      </requirements>
-    </component>
-  </components>
-</component-set>
diff --git a/pom.xml b/pom.xml
index 140efbc464..d1ebbcdc68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,6 @@ under the License.
     <module>maven-profile</module>
     <module>maven-project</module>
     <module>maven-reporting-api</module>
-    <module>maven-settings</module>
     <module>maven-embedder</module>
   </modules>
   <properties>