diff --git a/alfresco-lifecycle-aggregator/DOCS.txt b/DOCS.txt
similarity index 100%
rename from alfresco-lifecycle-aggregator/DOCS.txt
rename to DOCS.txt
diff --git a/alfresco-lifecycle-aggregator/README.txt b/README.txt
similarity index 100%
rename from alfresco-lifecycle-aggregator/README.txt
rename to README.txt
diff --git a/alfresco-lifecycle-aggregator/TODO.txt b/TODO.txt
similarity index 100%
rename from alfresco-lifecycle-aggregator/TODO.txt
rename to TODO.txt
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/pom.xml
rename to archetypes/alfresco-allinone-archetype/pom.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/README.txt b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/README.txt
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/README.txt
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/README.txt
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/properties/local/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/properties/local/alfresco-global.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/properties/local/alfresco-global.properties
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/properties/local/alfresco-global.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/resources/alfresco/extension/dev-log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/resources/alfresco/extension/dev-log4j.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/resources/alfresco/extension/dev-log4j.properties
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/resources/alfresco/extension/dev-log4j.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/resources/log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/resources/log4j.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/resources/log4j.properties
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/resources/log4j.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/faces-config-custom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/faces-config-custom.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/faces-config-custom.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/faces-config-custom.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/web.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/web.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/web.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/jetty/jetty.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/jetty/jetty.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/jetty/jetty.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/jetty/jetty.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/pom.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/pom.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/pom.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/config/alfresco/module/amp/context/service-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/config/alfresco/module/amp/context/service-context.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/config/alfresco/module/amp/context/service-context.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/config/alfresco/module/amp/context/service-context.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/config/alfresco/module/amp/module-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/config/alfresco/module/amp/module-context.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/config/alfresco/module/amp/module-context.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/config/alfresco/module/amp/module-context.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/module.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/module.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/module.properties
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/module.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/css/demoamp.css b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/css/demoamp.css
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/css/demoamp.css
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/css/demoamp.css
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/jsp/demoamp.jsp b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/jsp/demoamp.jsp
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/jsp/demoamp.jsp
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/jsp/demoamp.jsp
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/licenses/README-licenses.txt b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/licenses/README-licenses.txt
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/licenses/README-licenses.txt
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/licenses/README-licenses.txt
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/scripts/demoamp.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/scripts/demoamp.js
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/scripts/demoamp.js
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/amp/web/scripts/demoamp.js
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/java/org/alfresco/demoamp/Demo.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/java/org/alfresco/demoamp/Demo.java
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/java/org/alfresco/demoamp/Demo.java
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/java/org/alfresco/demoamp/Demo.java
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/java/org/alfresco/demoamp/DemoComponent.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/java/org/alfresco/demoamp/DemoComponent.java
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/java/org/alfresco/demoamp/DemoComponent.java
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/main/java/org/alfresco/demoamp/DemoComponent.java
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/test/properties/local/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/test/properties/local/alfresco-global.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/test/properties/local/alfresco-global.properties
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/test/properties/local/alfresco-global.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/test/resources/test-log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/test/resources/test-log4j.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/test/resources/test-log4j.properties
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/src/test/resources/test-log4j.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/jetty/jetty.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/jetty/jetty.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/jetty/jetty.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/jetty/jetty.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/jetty/root-web.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/jetty/root-web.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/jetty/root-web.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/jetty/root-web.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/properties/local/application.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/properties/local/application.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/properties/local/application.properties
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/properties/local/application.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/log4j.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/log4j.properties
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/log4j.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/webapp/WEB-INF/web.xml.sample b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/webapp/WEB-INF/web.xml.sample
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/webapp/WEB-INF/web.xml.sample
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/webapp/WEB-INF/web.xml.sample
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/resources/log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/resources/log4j.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/resources/log4j.properties
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/resources/log4j.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrconfig.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrconfig.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrconfig.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrconfig.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrcore.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrcore.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrcore.properties
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrcore.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrconfig.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrconfig.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrconfig.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrconfig.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrcore.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrcore.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrcore.properties
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrcore.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/webapp/WEB-INF/web.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/webapp/WEB-INF/web.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/webapp/WEB-INF/web.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/wcmqs/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/wcmqs/pom.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/wcmqs/pom.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/wcmqs/pom.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/wcmqs/src/main/resources/log4j.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/wcmqs/src/main/resources/log4j.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/wcmqs/src/main/resources/log4j.xml
rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/wcmqs/src/main/resources/log4j.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/pom.xml
rename to archetypes/alfresco-amp-archetype/pom.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
rename to archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/jetty/jetty.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/jetty/jetty.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/jetty/jetty.xml
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/jetty/jetty.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/log4j.properties b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/log4j.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/log4j.properties
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/log4j.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/log4j.properties b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/log4j.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/log4j.properties
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/log4j.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/module.properties b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/module.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/module.properties
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/module.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/css/demoamp.css b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/css/demoamp.css
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/css/demoamp.css
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/css/demoamp.css
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/jsp/demoamp.jsp b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/jsp/demoamp.jsp
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/jsp/demoamp.jsp
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/jsp/demoamp.jsp
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/licenses/README-licenses.txt b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/licenses/README-licenses.txt
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/licenses/README-licenses.txt
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/licenses/README-licenses.txt
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/scripts/demoamp.js b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/scripts/demoamp.js
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/scripts/demoamp.js
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/web/scripts/demoamp.js
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/org/alfresco/demoamp/Demo.java b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/org/alfresco/demoamp/Demo.java
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/org/alfresco/demoamp/Demo.java
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/org/alfresco/demoamp/Demo.java
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/org/alfresco/demoamp/DemoComponent.java b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/org/alfresco/demoamp/DemoComponent.java
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/org/alfresco/demoamp/DemoComponent.java
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/org/alfresco/demoamp/DemoComponent.java
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/java/org/alfresco/demoamp/test/DemoComponentTest.java b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/java/org/alfresco/demoamp/test/DemoComponentTest.java
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/java/org/alfresco/demoamp/test/DemoComponentTest.java
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/java/org/alfresco/demoamp/test/DemoComponentTest.java
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties
rename to archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties b/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties
rename to archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties
diff --git a/alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/goal.txt b/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/goal.txt
similarity index 100%
rename from alfresco-lifecycle-aggregator/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/goal.txt
rename to archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/goal.txt
diff --git a/alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/README.txt b/plugins/alfresco-maven-plugin/README.txt
similarity index 100%
rename from alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/README.txt
rename to plugins/alfresco-maven-plugin/README.txt
diff --git a/alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/ROADMAP.txt b/plugins/alfresco-maven-plugin/ROADMAP.txt
similarity index 100%
rename from alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/ROADMAP.txt
rename to plugins/alfresco-maven-plugin/ROADMAP.txt
diff --git a/alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/pom.xml
rename to plugins/alfresco-maven-plugin/pom.xml
diff --git a/alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpModel.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpModel.java
similarity index 100%
rename from alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpModel.java
rename to plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpModel.java
diff --git a/alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpMojo.java
similarity index 100%
rename from alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpMojo.java
rename to plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpMojo.java
diff --git a/alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java
similarity index 100%
rename from alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java
rename to plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java
diff --git a/alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/VersionMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/VersionMojo.java
similarity index 100%
rename from alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/VersionMojo.java
rename to plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/VersionMojo.java
diff --git a/alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/archiver/AmpArchiver.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/archiver/AmpArchiver.java
similarity index 100%
rename from alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/archiver/AmpArchiver.java
rename to plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/archiver/AmpArchiver.java
diff --git a/alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/archiver/AmpUnArchiver.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/archiver/AmpUnArchiver.java
similarity index 100%
rename from alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/archiver/AmpUnArchiver.java
rename to plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/archiver/AmpUnArchiver.java
diff --git a/alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/resources/META-INF/maven/lifecycle.xml b/plugins/alfresco-maven-plugin/src/main/resources/META-INF/maven/lifecycle.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/resources/META-INF/maven/lifecycle.xml
rename to plugins/alfresco-maven-plugin/src/main/resources/META-INF/maven/lifecycle.xml
diff --git a/alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/plugins/alfresco-maven-plugin/src/main/resources/META-INF/plexus/components.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/main/resources/META-INF/plexus/components.xml
rename to plugins/alfresco-maven-plugin/src/main/resources/META-INF/plexus/components.xml
diff --git a/alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/site/apt/usage.apt.vm b/plugins/alfresco-maven-plugin/src/site/apt/usage.apt.vm
similarity index 100%
rename from alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/site/apt/usage.apt.vm
rename to plugins/alfresco-maven-plugin/src/site/apt/usage.apt.vm
diff --git a/alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/site/site.xml b/plugins/alfresco-maven-plugin/src/site/site.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/plugins/alfresco-maven-plugin/src/site/site.xml
rename to plugins/alfresco-maven-plugin/src/site/site.xml
diff --git a/alfresco-lifecycle-aggregator/pom.xml b/pom.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/pom.xml
rename to pom.xml
diff --git a/alfresco-lifecycle-aggregator/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
similarity index 100%
rename from alfresco-lifecycle-aggregator/poms/alfresco-sdk-parent/pom.xml
rename to poms/alfresco-sdk-parent/pom.xml