diff --git a/maven-alfresco-amp-archetype/pom.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml
similarity index 100%
rename from maven-alfresco-amp-archetype/pom.xml
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml
diff --git a/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype.xml
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype.xml
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype.xml
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/TODO.txt b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/TODO.txt
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/TODO.txt
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/TODO.txt
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/module.properties b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/module.properties
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/module.properties
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/module.properties
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/context/service-context.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/context/service-context.xml
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/context/service-context.xml
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/context/service-context.xml
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/log4j.properties b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/log4j.properties
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/log4j.properties
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/log4j.properties
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/module-context.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/module-context.xml
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/module-context.xml
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/module-context.xml
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/com/sourcesense/demoamp/Demo.java b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/com/sourcesense/demoamp/Demo.java
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/com/sourcesense/demoamp/Demo.java
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/com/sourcesense/demoamp/Demo.java
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/com/sourcesense/demoamp/DemoComponent.java b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/com/sourcesense/demoamp/DemoComponent.java
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/com/sourcesense/demoamp/DemoComponent.java
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/com/sourcesense/demoamp/DemoComponent.java
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/context/service-context.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/context/service-context.xml
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/context/service-context.xml
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/context/service-context.xml
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/log4j.properties b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/log4j.properties
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/log4j.properties
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/log4j.properties
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/module-context.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/module-context.xml
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/module-context.xml
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/module-context.xml
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/css/demoamp.css b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/css/demoamp.css
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/css/demoamp.css
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/css/demoamp.css
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/images/sourcesense.gif b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/images/sourcesense.gif
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/images/sourcesense.gif
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/images/sourcesense.gif
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/jsp/demoamp.jsp b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/jsp/demoamp.jsp
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/jsp/demoamp.jsp
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/jsp/demoamp.jsp
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/licenses/README-licenses.txt b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/licenses/README-licenses.txt
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/licenses/README-licenses.txt
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/licenses/README-licenses.txt
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/scripts/demoamp.js b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/scripts/demoamp.js
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/scripts/demoamp.js
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/webapp/scripts/demoamp.js
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/application.properties b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/application.properties
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/application.properties
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/application.properties
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/custom-repository-context.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/custom-repository-context.xml
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/custom-repository-context.xml
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/custom-repository-context.xml
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/file-servers-custom.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/file-servers-custom.xml
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/file-servers-custom.xml
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/file-servers-custom.xml
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties
similarity index 100%
rename from maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties
diff --git a/maven-alfresco-amp-archetype/src/site/apt/index.apt.vm b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/index.apt.vm
similarity index 100%
rename from maven-alfresco-amp-archetype/src/site/apt/index.apt.vm
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/index.apt.vm
diff --git a/maven-alfresco-amp-archetype/src/site/apt/readme.apt.vm b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/readme.apt.vm
similarity index 100%
rename from maven-alfresco-amp-archetype/src/site/apt/readme.apt.vm
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/readme.apt.vm
diff --git a/maven-alfresco-amp-archetype/src/site/fml/faq.fml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/fml/faq.fml
similarity index 100%
rename from maven-alfresco-amp-archetype/src/site/fml/faq.fml
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/fml/faq.fml
diff --git a/maven-alfresco-amp-archetype/src/site/resources/images/logo_noclaim.png b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/resources/images/logo_noclaim.png
similarity index 100%
rename from maven-alfresco-amp-archetype/src/site/resources/images/logo_noclaim.png
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/resources/images/logo_noclaim.png
diff --git a/maven-alfresco-amp-archetype/src/site/site.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/site.xml
similarity index 100%
rename from maven-alfresco-amp-archetype/src/site/site.xml
rename to maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/site.xml