diff --git a/build.xml b/build.xml
index 5779cec9f9..cdea129607 100644
--- a/build.xml
+++ b/build.xml
@@ -232,7 +232,7 @@ under the License.
     <modello file="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo"/>
     <modello file="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo"/>
     <modello file="maven-profile/profiles.mdo"/>
-    <modello file="maven-repository-metadata/src/main/mdo/metadata.mdo"/>
+    <modello file="maven-artifact/src/main/mdo/metadata.mdo"/>
     <modello file="maven-settings/src/main/mdo/settings.mdo"/>
   </target>
 
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index c9a1dd200e..5e8ed8f0b5 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -40,4 +40,17 @@ under the License.
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <configuration>
+          <version>1.0.0</version>
+          <model>src/main/mdo/metadata.mdo</model>
+        </configuration>
+      </plugin>    
+    </plugins>
+  </build>
 </project>
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java b/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java b/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java b/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java b/maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java b/maven-artifact/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java b/maven-artifact/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java b/maven-artifact/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java b/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java b/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
similarity index 100%
rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
rename to maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
diff --git a/maven-repository-metadata/src/main/mdo/metadata.mdo b/maven-artifact/src/main/mdo/metadata.mdo
similarity index 100%
rename from maven-repository-metadata/src/main/mdo/metadata.mdo
rename to maven-artifact/src/main/mdo/metadata.mdo
diff --git a/maven-artifact/src/main/resources/META-INF/plexus/components.xml b/maven-artifact/src/main/resources/META-INF/plexus/components.xml
index 7e5dbfbf64..c7a6b0778b 100644
--- a/maven-artifact/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-artifact/src/main/resources/META-INF/plexus/components.xml
@@ -205,5 +205,181 @@ under the License.
       <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
       <implementation>org.apache.maven.artifact.resolver.DefaultArtifactCollector</implementation>
     </component>
+    
+    <!-- From maven-artifact-manager -->
+    
+    <!--
+     |
+     | WagonManager
+     |
+     -->
+    <component>
+      <role>org.apache.maven.artifact.manager.WagonManager</role>
+      <implementation>org.apache.maven.artifact.manager.DefaultWagonManager</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+      <implementation>org.apache.maven.artifact.repository.metadata.DefaultRepositoryMetadataManager</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <!--
+     |
+     | Transformations
+     |
+     -->
+    <component>
+      <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
+      <role-hint>snapshot</role-hint>
+      <implementation>org.apache.maven.artifact.transform.SnapshotTransformation</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
+      <role-hint>release</role-hint>
+      <implementation>org.apache.maven.artifact.transform.ReleaseArtifactTransformation</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
+      <role-hint>latest</role-hint>
+      <implementation>org.apache.maven.artifact.transform.LatestArtifactTransformation</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <!--
+    |
+    | ArtifactTransformationManager
+    |
+    -->
+    <component>
+      <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
+      <implementation>org.apache.maven.artifact.transform.DefaultArtifactTransformationManager</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
+          <field-name>artifactTransformations</field-name>
+        </requirement>
+      </requirements>
+    </component>
+
+    <!--
+     |
+     | Resolver
+     |
+     -->
+    <component>
+      <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+      <implementation>org.apache.maven.artifact.resolver.DefaultArtifactResolver</implementation>
+      <role-hint>default</role-hint>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <!--
+     |
+     | ArtifactInstaller
+     |
+     -->
+    <component>
+      <role>org.apache.maven.artifact.installer.ArtifactInstaller</role>
+      <implementation>org.apache.maven.artifact.installer.DefaultArtifactInstaller</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <!--
+     |
+     | ArtifactDeployer
+     |
+     -->
+    <component>
+      <role>org.apache.maven.artifact.deployer.ArtifactDeployer</role>
+      <implementation>org.apache.maven.artifact.deployer.DefaultArtifactDeployer</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+      <implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
+    </component>
+
+    <component>
+      <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataBuilder</role>
+      <role-hint>default</role-hint>
+      <implementation>org.apache.maven.artifact.repository.metadata.DefaultRepositoryMetadataBuilder</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+      <implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
+    </component>    
+    
   </components>
 </component-set>
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-artifact/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
similarity index 100%
rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
similarity index 100%
rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
similarity index 100%
rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
similarity index 100%
rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonA.java b/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonA.java
similarity index 100%
rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonA.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonA.java
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonB.java b/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonB.java
similarity index 100%
rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonB.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonB.java
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonC.java b/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonC.java
similarity index 100%
rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonC.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonC.java
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonMock.java b/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonMock.java
similarity index 100%
rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonMock.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonMock.java
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java
similarity index 100%
rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
similarity index 100%
rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/MockManager.java b/maven-artifact/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
similarity index 100%
rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java b/maven-artifact/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
similarity index 100%
rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
diff --git a/maven-artifact-manager/src/test/resources/artifact-install/artifact-1.0.jar b/maven-artifact/src/test/resources/artifact-install/artifact-1.0.jar
similarity index 100%
rename from maven-artifact-manager/src/test/resources/artifact-install/artifact-1.0.jar
rename to maven-artifact/src/test/resources/artifact-install/artifact-1.0.jar
diff --git a/maven-artifact-manager/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml b/maven-artifact/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml
similarity index 100%
rename from maven-artifact-manager/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml
rename to maven-artifact/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml
diff --git a/maven-artifact-manager/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml b/maven-artifact/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml
similarity index 100%
rename from maven-artifact-manager/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml
rename to maven-artifact/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml
diff --git a/maven-artifact-manager/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml b/maven-artifact/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml
similarity index 100%
rename from maven-artifact-manager/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml
rename to maven-artifact/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml
diff --git a/maven-artifact-manager/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml b/maven-artifact/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml
similarity index 100%
rename from maven-artifact-manager/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml
rename to maven-artifact/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml
diff --git a/maven-artifact-manager/src/test/resources/pom.xml b/maven-artifact/src/test/resources/pom.xml
similarity index 100%
rename from maven-artifact-manager/src/test/resources/pom.xml
rename to maven-artifact/src/test/resources/pom.xml
diff --git a/pom.xml b/pom.xml
index df1ae5a004..9c92433757 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,6 @@ under the License.
   </build>
   <modules>
     <module>maven-artifact</module>
-    <module>maven-artifact-manager</module>
     <module>maven-build-context</module>
     <module>maven-core</module>
     <module>maven-error-diagnostics</module>
@@ -130,7 +129,6 @@ under the License.
     <module>maven-profile</module>
     <module>maven-project</module>
     <module>maven-reporting</module>
-    <module>maven-repository-metadata</module>
     <module>maven-script</module>
     <module>maven-settings</module>
     <module>maven-embedder</module>