diff --git a/archiva-api/pom.xml b/archiva-api/pom.xml
index a1cec5ad3..ffbd086bb 100644
--- a/archiva-api/pom.xml
+++ b/archiva-api/pom.xml
@@ -21,13 +21,13 @@
 <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>archiva</artifactId>
     <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>archiva-core</artifactId>
-  <name>Archiva Core</name>
+  <artifactId>archiva-api</artifactId>
+  <name>Archiva API</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
diff --git a/archiva-base/archiva-common/pom.xml b/archiva-base/archiva-common/pom.xml
index 47d3c6223..263206850 100644
--- a/archiva-base/archiva-common/pom.xml
+++ b/archiva-base/archiva-common/pom.xml
@@ -21,13 +21,13 @@
 <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>archiva</artifactId>
     <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-base</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-common</artifactId>
-  <name>Archiva Common</name>
+  <name>Archiva Base :: Common</name>
   <dependencies>
     <!-- TO OTHER DEVELOPERS:
          This module should depend on NO OTHER ARCHIVA MODULES.
diff --git a/archiva-base/archiva-configuration/pom.xml b/archiva-base/archiva-configuration/pom.xml
index 4a502130b..790d0cfa4 100644
--- a/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-base/archiva-configuration/pom.xml
@@ -21,13 +21,13 @@
 <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>archiva</artifactId>
     <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-base</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-configuration</artifactId>
-  <name>Archiva Configuration</name>
+  <name>Archiva Base :: Configuration</name>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
new file mode 100644
index 000000000..d5665dbd2
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed 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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-consumers</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>archiva-consumer-api</artifactId>
+  <name>Archiva Consumer API</name>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    
+  </dependencies>
+</project>
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
new file mode 100644
index 000000000..7054e549d
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed 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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-consumers</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>archiva-core-consumers</artifactId>
+  <name>Archiva Consumers :: Core Consumers</name>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    
+  </dependencies>
+</project>
diff --git a/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
new file mode 100644
index 000000000..b708f6641
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed 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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-consumers</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>archiva-database-consumers</artifactId>
+  <name>Archiva Consumers :: Database Consumers</name>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    
+  </dependencies>
+</project>
diff --git a/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
new file mode 100644
index 000000000..3ed2a36bf
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed 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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-consumers</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>archiva-lucene-consumers</artifactId>
+  <name>Archiva Consumers :: Lucene Consumers</name>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    
+  </dependencies>
+</project>
diff --git a/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
new file mode 100644
index 000000000..8aef25467
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed 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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-consumers</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>archiva-signature-consumers</artifactId>
+  <name>Archiva Consumers :: GPG Signature Consumers</name>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    
+  </dependencies>
+</project>
diff --git a/archiva-base/archiva-consumers/pom.xml b/archiva-base/archiva-consumers/pom.xml
new file mode 100644
index 000000000..8f1ab174f
--- /dev/null
+++ b/archiva-base/archiva-consumers/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed 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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-base</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>archiva-consumers</artifactId>
+  <name>Archiva Consumers</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>archiva-consumer-api</module>
+    <module>archiva-core-consumers</module>
+    <module>archiva-database-consumers</module>
+    <module>archiva-lucene-consumers</module>
+    <module>archiva-signature-consumers</module>
+  </modules>
+</project>
diff --git a/archiva-base/archiva-converter/pom.xml b/archiva-base/archiva-converter/pom.xml
index a8fefa798..c2932ad29 100644
--- a/archiva-base/archiva-converter/pom.xml
+++ b/archiva-base/archiva-converter/pom.xml
@@ -27,7 +27,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-converter</artifactId>
-  <name>Archiva Repository Converter</name>
+  <name>Archiva Base :: Repository Converter</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
diff --git a/archiva-base/archiva-indexer/pom.xml b/archiva-base/archiva-indexer/pom.xml
index 10d2c366e..9b514134a 100644
--- a/archiva-base/archiva-indexer/pom.xml
+++ b/archiva-base/archiva-indexer/pom.xml
@@ -22,12 +22,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
+    <artifactId>archiva-base</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-indexer</artifactId>
-  <name>Archiva Indexer</name>
+  <name>Archiva Base :: Indexer</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/archiva-base/archiva-model/pom.xml b/archiva-base/archiva-model/pom.xml
index 3fcb6843f..f0a4acd2a 100755
--- a/archiva-base/archiva-model/pom.xml
+++ b/archiva-base/archiva-model/pom.xml
@@ -22,12 +22,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
+    <artifactId>archiva-base</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-model</artifactId>
-  <name>Archiva Model</name>
+  <name>Archiva Base :: Model</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
diff --git a/archiva-base/archiva-proxy/pom.xml b/archiva-base/archiva-proxy/pom.xml
index 23488ee0a..7d2bdb3bb 100644
--- a/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-base/archiva-proxy/pom.xml
@@ -22,12 +22,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
+    <artifactId>archiva-base</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-proxy</artifactId>
-  <name>Archiva Proxy</name>
+  <name>Archiva Base :: Proxy</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
diff --git a/archiva-base/archiva-repository-layer/pom.xml b/archiva-base/archiva-repository-layer/pom.xml
index 210563124..7b4db106a 100644
--- a/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-base/archiva-repository-layer/pom.xml
@@ -21,8 +21,8 @@
 <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>archiva</artifactId>
     <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-base</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/archiva-base/pom.xml b/archiva-base/pom.xml
new file mode 100644
index 000000000..32dc9f7ff
--- /dev/null
+++ b/archiva-base/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed 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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>archiva-base</artifactId>
+  <name>Archiva Base</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>archiva-common</module>
+    <module>archiva-configuration</module>
+    <module>archiva-consumers</module>
+    <module>archiva-indexer</module>
+    <module>archiva-model</module>
+    <module>archiva-proxy</module>
+    <module>archiva-repository-layer</module>
+  </modules>
+</project>
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 17a2b9e59..24242e435 100644
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -20,13 +20,13 @@
 
 <project>
   <parent>
-    <artifactId>archiva</artifactId>
     <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-cli</artifactId>
-  <name>Archiva CLI</name>
+  <name>Archiva Command Line Client</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
diff --git a/archiva-database/pom.xml b/archiva-database/pom.xml
index e3f1be31c..99b24f701 100755
--- a/archiva-database/pom.xml
+++ b/archiva-database/pom.xml
@@ -22,7 +22,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
+    <artifactId>archiva-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -32,7 +32,6 @@
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-model</artifactId>
-      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/archiva-reporting/archiva-report-manager/pom.xml b/archiva-reporting/archiva-report-manager/pom.xml
index 9d02313dc..336e57877 100755
--- a/archiva-reporting/archiva-report-manager/pom.xml
+++ b/archiva-reporting/archiva-report-manager/pom.xml
@@ -22,12 +22,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
+    <artifactId>archiva-reporting</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>archiva-reports-standard</artifactId>
-  <name>Archiva Standard Reports</name>
+  <artifactId>archiva-report-manager</artifactId>
+  <name>Archiva Reporting :: Report Manager</name>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/archiva-reporting/pom.xml b/archiva-reporting/pom.xml
new file mode 100644
index 000000000..1b4f443da
--- /dev/null
+++ b/archiva-reporting/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed 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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>archiva-reporting</artifactId>
+  <name>Archiva Reporting</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>archiva-report-manager</module>
+  </modules>
+</project>
diff --git a/archiva-web/archiva-applet/pom.xml b/archiva-web/archiva-applet/pom.xml
index d48ebf7a8..e16baaacd 100644
--- a/archiva-web/archiva-applet/pom.xml
+++ b/archiva-web/archiva-applet/pom.xml
@@ -23,11 +23,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
+    <artifactId>archiva-web</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-applet</artifactId>
-  <name>Archiva Applet</name>
+  <name>Archiva Web :: Applet</name>
   <description>
     Applet for performing local operations on files such as creating a checksum of an artifact
     before uploading it.
diff --git a/archiva-web/archiva-security/pom.xml b/archiva-web/archiva-security/pom.xml
index c00645553..78e14a42d 100644
--- a/archiva-web/archiva-security/pom.xml
+++ b/archiva-web/archiva-security/pom.xml
@@ -21,13 +21,13 @@
 <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>archiva</artifactId>
     <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-web</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-security</artifactId>
-  <name>Archiva Security Configuration</name>
+  <name>Archiva Web :: Security Configuration</name>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus.security</groupId>
diff --git a/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml
index 29e01dd28..1e0cd3bdf 100644
--- a/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml
+++ b/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml
@@ -21,14 +21,14 @@
 <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>archiva</artifactId>
     <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-web-standalone</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-plexus-application</artifactId>
   <packaging>plexus-application</packaging>
-  <name>Archiva Plexus Application</name>
+  <name>Archiva Web :: Plexus Application</name>
   <build>
     <plugins>
       <plugin>
diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
index 3e93c782d..937a5ab4f 100644
--- a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
+++ b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
@@ -22,12 +22,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
+    <artifactId>archiva-web-standalone</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-plexus-runtime</artifactId>
-  <name>Archiva Runtime Generator</name>
+  <name>Archiva Web :: Runtime Generator</name>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/archiva-web/archiva-standalone/pom.xml b/archiva-web/archiva-standalone/pom.xml
new file mode 100644
index 000000000..412f55bc8
--- /dev/null
+++ b/archiva-web/archiva-standalone/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed 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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-web</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>archiva-web-standalone</artifactId>
+  <name>Archiva Web :: Standalone</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>archiva-plexus-application</module>
+    <module>archiva-plexus-runtime</module>
+  </modules>
+</project>
diff --git a/archiva-web/archiva-webapp-test/pom.xml b/archiva-web/archiva-webapp-test/pom.xml
index 264f6eff3..bfaf14816 100644
--- a/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-web/archiva-webapp-test/pom.xml
@@ -23,12 +23,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
+    <artifactId>archiva-web</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-webapp-test</artifactId>
   <packaging>pom</packaging>
-  <name>Archiva Web Application Tests</name>
+  <name>Archiva Web :: Application Tests</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
@@ -238,4 +238,4 @@
     </profile>
   </profiles>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/archiva-web/archiva-webapp/pom.xml b/archiva-web/archiva-webapp/pom.xml
index ac94a47e9..ed13c3fb5 100644
--- a/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-web/archiva-webapp/pom.xml
@@ -23,12 +23,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
+    <artifactId>archiva-web</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-webapp</artifactId>
   <packaging>war</packaging>
-  <name>Archiva Web Application</name>
+  <name>Archiva Web :: Application</name>
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/archiva-web/pom.xml b/archiva-web/pom.xml
new file mode 100644
index 000000000..7d2e825d6
--- /dev/null
+++ b/archiva-web/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed 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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>archiva-web</artifactId>
+  <name>Archiva Web</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>archiva-applet</module>
+    <module>archiva-security</module>
+    <module>archiva-webapp</module>
+    <module>archiva-standalone</module>
+  </modules>
+</project>
diff --git a/maven-meeper/pom.xml b/maven-meeper/pom.xml
index af343cbdc..7843c9e46 100644
--- a/maven-meeper/pom.xml
+++ b/maven-meeper/pom.xml
@@ -18,8 +18,8 @@
 <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>archiva</artifactId>
     <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index b3acaa8a0..db60e0488 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.maven.archiva</groupId>
-  <artifactId>archiva</artifactId>
+  <artifactId>archiva-parent</artifactId>
   <packaging>pom</packaging>
   <name>Archiva</name>
   <version>1.0-SNAPSHOT</version>
@@ -118,21 +118,13 @@
     </pluginManagement>
   </build>
   <modules>
-    <module>archiva-applet</module>
-    <module>archiva-converter</module>
-    <module>archiva-common</module>
-    <module>archiva-reports-standard</module>
-    <module>archiva-indexer</module>
-    <module>archiva-webapp</module>
-    <module>archiva-proxy</module>
-    <module>archiva-core</module>
-    <module>archiva-configuration</module>
-    <module>maven-meeper</module>
-    <module>archiva-repository-layer</module>
-    <module>archiva-plexus-application</module>
-    <module>archiva-plexus-runtime</module>
-    <module>archiva-security</module>
+    <module>archiva-api</module>
+    <module>archiva-base</module>
+    <module>archiva-database</module>
+    <module>archiva-reporting</module>
+    <module>archiva-web</module>
     <module>archiva-cli</module>
+    <module>maven-meeper</module>
   </modules>
   <dependencies>
     <dependency>
@@ -229,15 +221,6 @@
         <artifactId>archiva-common</artifactId>
         <version>${archiva.version}</version>
       </dependency>
-      <!--
-      <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
-        <artifactId>archiva-common</artifactId>
-        <version>${archiva.version}</version>
-        <classifier>tests</classifier>
-        <scope>test</scope>
-      </dependency>
-       -->
       <dependency>
         <groupId>org.apache.maven.archiva</groupId>
         <artifactId>archiva-core</artifactId>