diff --git a/archiva-plexus-application/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml
similarity index 100%
rename from archiva-plexus-application/pom.xml
rename to archiva-web/archiva-standalone/archiva-plexus-application/pom.xml
diff --git a/archiva-plexus-application/src/conf/application.xml b/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml
similarity index 100%
rename from archiva-plexus-application/src/conf/application.xml
rename to archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml
diff --git a/archiva-plexus-application/src/conf/plexus.xml b/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/plexus.xml
similarity index 100%
rename from archiva-plexus-application/src/conf/plexus.xml
rename to archiva-web/archiva-standalone/archiva-plexus-application/src/conf/plexus.xml
diff --git a/archiva-plexus-application/src/plexus.properties b/archiva-web/archiva-standalone/archiva-plexus-application/src/plexus.properties
similarity index 100%
rename from archiva-plexus-application/src/plexus.properties
rename to archiva-web/archiva-standalone/archiva-plexus-application/src/plexus.properties
diff --git a/archiva-plexus-runtime/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
similarity index 100%
rename from archiva-plexus-runtime/pom.xml
rename to archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
diff --git a/archiva-plexus-runtime/src/conf/plexus.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml
similarity index 100%
rename from archiva-plexus-runtime/src/conf/plexus.xml
rename to archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml
diff --git a/archiva-plexus-runtime/src/main/appserver/conf/archiva.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/appserver/conf/archiva.xml
similarity index 100%
rename from archiva-plexus-runtime/src/main/appserver/conf/archiva.xml
rename to archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/appserver/conf/archiva.xml
diff --git a/archiva-plexus-runtime/src/main/appserver/conf/shared.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/appserver/conf/shared.xml
similarity index 100%
rename from archiva-plexus-runtime/src/main/appserver/conf/shared.xml
rename to archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/appserver/conf/shared.xml
diff --git a/archiva-plexus-runtime/src/main/assembly/bin.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml
similarity index 100%
rename from archiva-plexus-runtime/src/main/assembly/bin.xml
rename to archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml
diff --git a/archiva-plexus-runtime/src/plexus.properties b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/plexus.properties
similarity index 100%
rename from archiva-plexus-runtime/src/plexus.properties
rename to archiva-web/archiva-standalone/archiva-plexus-runtime/src/plexus.properties
diff --git a/archiva-webapp-test/pom.xml b/archiva-web/archiva-webapp-test/pom.xml
similarity index 100%
rename from archiva-webapp-test/pom.xml
rename to archiva-web/archiva-webapp-test/pom.xml
diff --git a/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java b/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java
similarity index 100%
rename from archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java
rename to archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java
diff --git a/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/LoginTest.java b/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/LoginTest.java
similarity index 100%
rename from archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/LoginTest.java
rename to archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/LoginTest.java
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
similarity index 100%
rename from archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
rename to archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml
similarity index 100%
rename from archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml
rename to archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml
similarity index 100%
rename from archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml
rename to archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy
similarity index 100%
rename from archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy
rename to archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties
similarity index 100%
rename from archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties
rename to archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/context.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/context.xml
similarity index 100%
rename from archiva-webapp-test/src/test/tomcat5x/conf/context.xml
rename to archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/context.xml
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/logging.properties b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/logging.properties
similarity index 100%
rename from archiva-webapp-test/src/test/tomcat5x/conf/logging.properties
rename to archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/logging.properties
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml
similarity index 100%
rename from archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml
rename to archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/server.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server.xml
similarity index 100%
rename from archiva-webapp-test/src/test/tomcat5x/conf/server.xml
rename to archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server.xml
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml
similarity index 100%
rename from archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml
rename to archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/web.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/web.xml
similarity index 100%
rename from archiva-webapp-test/src/test/tomcat5x/conf/web.xml
rename to archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/web.xml