diff --git a/maven-alfresco-extension-archetype/README.txt b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/README.txt
similarity index 100%
rename from maven-alfresco-extension-archetype/README.txt
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/README.txt
diff --git a/maven-alfresco-extension-archetype/ROADMAP.txt b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/ROADMAP.txt
similarity index 100%
rename from maven-alfresco-extension-archetype/ROADMAP.txt
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/ROADMAP.txt
diff --git a/maven-alfresco-extension-archetype/pom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/pom.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml
diff --git a/maven-alfresco-extension-archetype/src/changes/changes.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/changes/changes.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/changes/changes.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/changes/changes.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/PRESS.txt b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/PRESS.txt
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/PRESS.txt
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/PRESS.txt
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/README-ANT.txt b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/README-ANT.txt
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/README-ANT.txt
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/README-ANT.txt
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/README-m2.txt b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/README-m2.txt
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/README-m2.txt
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/README-m2.txt
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/build.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/build.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/build.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/build.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/books/manual.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/books/manual.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/books/manual.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/books/manual.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/properties/local/README-properties.txt b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/properties/local/README-properties.txt
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/properties/local/README-properties.txt
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/properties/local/README-properties.txt
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/properties/local/application.properties b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/properties/local/application.properties
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/properties/local/application.properties
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/properties/local/application.properties
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/custom-model-context.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/custom-model-context.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/custom-model-context.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/custom-model-context.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/custom-model.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/custom-model.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/custom-model.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/custom-model.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/custom-repository-context.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/custom-repository-context.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/custom-repository-context.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/custom-repository-context.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/file-servers-custom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/file-servers-custom.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/file-servers-custom.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/file-servers-custom.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/ldap-authentication-context.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/ldap-authentication-context.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/ldap-authentication-context.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/ldap-authentication-context.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/ldap-synchronisation-context.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/ldap-synchronisation-context.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/ldap-synchronisation-context.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/ldap-synchronisation-context.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/restore-context.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/restore-context.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/restore-context.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/restore-context.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/web-client-config-custom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/web-client-config-custom.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/web-client-config-custom.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/web-client-config-custom.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/webclient.properties b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/webclient.properties
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/webclient.properties
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/webclient.properties
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/README-WEB-INF.txt b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/README-WEB-INF.txt
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/README-WEB-INF.txt
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/README-WEB-INF.txt
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config-custom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config-custom.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config-custom.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config-custom.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/apt/book-index.apt b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/apt/book-index.apt
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/apt/book-index.apt
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/apt/book-index.apt
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/fml/faq.fml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/fml/faq.fml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/fml/faq.fml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/fml/faq.fml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/site.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/site.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/site.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/site.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/book-index.html b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/book-index.html
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/book-index.html
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/book-index.html
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/pdf/manual/manual.pdf b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/pdf/manual/manual.pdf
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/pdf/manual/manual.pdf
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/pdf/manual/manual.pdf
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/pdf/manual/manual.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/pdf/manual/manual.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/pdf/manual/manual.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/pdf/manual/manual.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/rtf/manual/manual.rtf b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/rtf/manual/manual.rtf
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/rtf/manual/manual.rtf
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/rtf/manual/manual.rtf
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/rtf/manual/manual.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/rtf/manual/manual.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/rtf/manual/manual.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/rtf/manual/manual.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/xdoc/manual/book-index.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/xdoc/manual/book-index.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/xdoc/manual/book-index.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/xdoc/manual/book-index.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/xdoc/manual/index.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/xdoc/manual/index.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/xdoc/manual/index.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/xdoc/manual/index.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/xdoc/manual/introduction.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/xdoc/manual/introduction.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/xdoc/manual/introduction.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/books/xdoc/manual/introduction.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/maven-base.css b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/maven-base.css
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/maven-base.css
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/maven-base.css
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/maven-theme.css b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/maven-theme.css
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/maven-theme.css
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/maven-theme.css
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/print.css b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/print.css
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/print.css
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/print.css
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/site.css b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/site.css
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/site.css
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/css/site.css
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/dependencies.html b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/dependencies.html
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/dependencies.html
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/dependencies.html
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/faq.html b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/faq.html
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/faq.html
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/faq.html
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/collapsed.gif b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/collapsed.gif
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/collapsed.gif
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/collapsed.gif
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/expanded.gif b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/expanded.gif
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/expanded.gif
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/expanded.gif
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/external.png b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/external.png
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/external.png
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/external.png
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_error_sml.gif b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_error_sml.gif
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_error_sml.gif
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_error_sml.gif
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_info_sml.gif b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_info_sml.gif
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_info_sml.gif
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_info_sml.gif
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_success_sml.gif b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_success_sml.gif
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_success_sml.gif
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_success_sml.gif
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_warning_sml.gif b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_warning_sml.gif
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_warning_sml.gif
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/icon_warning_sml.gif
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/logos/build-by-maven-black.png b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/logos/build-by-maven-black.png
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/logos/build-by-maven-black.png
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/logos/build-by-maven-black.png
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/logos/build-by-maven-white.png b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/logos/build-by-maven-white.png
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/logos/build-by-maven-white.png
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/logos/build-by-maven-white.png
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/logos/maven-feather.png b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/logos/maven-feather.png
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/logos/maven-feather.png
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/logos/maven-feather.png
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/newwindow.png b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/newwindow.png
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/newwindow.png
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/images/newwindow.png
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/index.html b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/index.html
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/index.html
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/index.html
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/integration.html b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/integration.html
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/integration.html
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/integration.html
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/issue-tracking.html b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/issue-tracking.html
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/issue-tracking.html
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/issue-tracking.html
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/jxr.html b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/jxr.html
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/jxr.html
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/jxr.html
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/license.html b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/license.html
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/license.html
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/license.html
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/mail-lists.html b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/mail-lists.html
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/mail-lists.html
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/mail-lists.html
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/project-info.html b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/project-info.html
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/project-info.html
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/project-info.html
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/project-reports.html b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/project-reports.html
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/project-reports.html
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/project-reports.html
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/project-summary.html b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/project-summary.html
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/project-summary.html
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/project-summary.html
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/source-repository.html b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/source-repository.html
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/source-repository.html
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/source-repository.html
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/team-list.html b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/team-list.html
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/team-list.html
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/target/site/team-list.html
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/ant/ant-bootstrap.sh b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/ant/ant-bootstrap.sh
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/ant/ant-bootstrap.sh
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/ant/ant-bootstrap.sh
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/ant/tasks/tomcat-tasks.properties b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/ant/tasks/tomcat-tasks.properties
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/ant/tasks/tomcat-tasks.properties
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/ant/tasks/tomcat-tasks.properties
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/ant/tasks/tomcat-tasks.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/ant/tasks/tomcat-tasks.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/ant/tasks/tomcat-tasks.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/ant/tasks/tomcat-tasks.xml
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/export/testRestoreVersion/README-restore.txt b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/export/testRestoreVersion/README-restore.txt
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/export/testRestoreVersion/README-restore.txt
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/export/testRestoreVersion/README-restore.txt
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/m2/m2-bootstrap.sh b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/m2/m2-bootstrap.sh
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/m2/m2-bootstrap.sh
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/m2/m2-bootstrap.sh
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/mysql/db_remove.sql b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/mysql/db_remove.sql
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/mysql/db_remove.sql
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/mysql/db_remove.sql
diff --git a/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/mysql/db_setup.sql b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/mysql/db_setup.sql
similarity index 100%
rename from maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/mysql/db_setup.sql
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/tools/mysql/db_setup.sql
diff --git a/maven-alfresco-extension-archetype/src/site/apt/index.apt.vm b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/index.apt.vm
similarity index 100%
rename from maven-alfresco-extension-archetype/src/site/apt/index.apt.vm
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/index.apt.vm
diff --git a/maven-alfresco-extension-archetype/src/site/apt/readme.apt.vm b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/readme.apt.vm
similarity index 100%
rename from maven-alfresco-extension-archetype/src/site/apt/readme.apt.vm
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/readme.apt.vm
diff --git a/maven-alfresco-extension-archetype/src/site/fml/faq.fml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/fml/faq.fml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/site/fml/faq.fml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/fml/faq.fml
diff --git a/maven-alfresco-extension-archetype/src/site/resources/images/logo_noclaim.png b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/resources/images/logo_noclaim.png
similarity index 100%
rename from maven-alfresco-extension-archetype/src/site/resources/images/logo_noclaim.png
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/resources/images/logo_noclaim.png
diff --git a/maven-alfresco-extension-archetype/src/site/site.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/site.xml
similarity index 100%
rename from maven-alfresco-extension-archetype/src/site/site.xml
rename to maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/site.xml