diff --git a/achetypes/pom.xml b/achetypes/pom.xml
new file mode 100644
index 000000000..2399e304d
--- /dev/null
+++ b/achetypes/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * $Id: pom.xml 820737 2009-10-01 18:03:21Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-parent</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-archetypes</artifactId>
+    <packaging>pom</packaging>
+    <name>Struts 2 Maven Archetypes</name>
+
+   <scm>
+     <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/</connection>
+     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/</developerConnection>
+     <url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/</url>
+   </scm>
+
+    <modules>
+        <module>struts2-archetype-blank</module>
+        <module>struts2-archetype-convention</module>
+        <module>struts2-archetype-dbportlet</module>
+        <module>struts2-archetype-plugin</module>
+        <module>struts2-archetype-portlet</module>
+        <module>struts2-archetype-starter</module>
+    </modules>
+
+</project>
diff --git a/achetypes/struts2-archetype-blank/pom.xml b/achetypes/struts2-archetype-blank/pom.xml
index 6dc8b4a94..40b05c1aa 100644
--- a/achetypes/struts2-archetype-blank/pom.xml
+++ b/achetypes/struts2-archetype-blank/pom.xml
@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.apache.struts</groupId>
-        <artifactId>struts2-parent</artifactId>
+        <artifactId>struts2-archetypes</artifactId>
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
@@ -13,9 +13,9 @@
     <name>Struts 2 Archetypes - Blank</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-blank/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-blank/</developerConnection>
-        <url>http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-blank/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-blank/</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-blank/</url>
     </scm>
 
     <profiles>
diff --git a/achetypes/struts2-archetype-convention/pom.xml b/achetypes/struts2-archetype-convention/pom.xml
index b1897e5a0..8eb6a6ae9 100644
--- a/achetypes/struts2-archetype-convention/pom.xml
+++ b/achetypes/struts2-archetype-convention/pom.xml
@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.apache.struts</groupId>
-        <artifactId>struts2-parent</artifactId>
+        <artifactId>struts2-archetypes</artifactId>
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
@@ -13,11 +13,9 @@
     <name>Struts 2 Archetypes - Blank Convention</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-convention/</connection>
-        <developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-convention/
-        </developerConnection>
-        <url>http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-convention/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/</url>
     </scm>
 
     <profiles>
diff --git a/achetypes/struts2-archetype-dbportlet/pom.xml b/achetypes/struts2-archetype-dbportlet/pom.xml
index cd84947a8..ed2bd02af 100644
--- a/achetypes/struts2-archetype-dbportlet/pom.xml
+++ b/achetypes/struts2-archetype-dbportlet/pom.xml
@@ -3,7 +3,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.struts</groupId>
-    <artifactId>struts2-parent</artifactId>
+    <artifactId>struts2-archetypes</artifactId>
     <version>2.2.0-SNAPSHOT</version>
   </parent>
 
@@ -13,9 +13,9 @@
     <name>Struts 2 Archetypes - Database Portlet</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-dbportlet/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-dbportlet/</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/maven/trunk/struts2-archetype-dbportlet/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/</developerConnection>
+        <url>svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/</url>
     </scm>
 
     <profiles>
diff --git a/achetypes/struts2-archetype-plugin/pom.xml b/achetypes/struts2-archetype-plugin/pom.xml
index 93527c145..21e4dfd60 100644
--- a/achetypes/struts2-archetype-plugin/pom.xml
+++ b/achetypes/struts2-archetype-plugin/pom.xml
@@ -3,7 +3,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.struts</groupId>
-    <artifactId>struts2-parent</artifactId>
+    <artifactId>struts2-archetypes</artifactId>
     <version>2.2.0-SNAPSHOT</version>
   </parent>
 
@@ -14,9 +14,9 @@
   <name>Struts 2 Archetypes - Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-plugin/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-plugin/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/maven/trunk/struts2-archetype-plugin/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/</developerConnection>
+       <url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/</url>
     </scm>
 
   <profiles>
diff --git a/achetypes/struts2-archetype-portlet/pom.xml b/achetypes/struts2-archetype-portlet/pom.xml
index 95bd23a96..a99e14392 100644
--- a/achetypes/struts2-archetype-portlet/pom.xml
+++ b/achetypes/struts2-archetype-portlet/pom.xml
@@ -25,7 +25,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.apache.struts</groupId>
-        <artifactId>struts2-parent</artifactId>
+        <artifactId>struts2-archetypes</artifactId>
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
@@ -36,9 +36,9 @@
     <name>Struts 2 Archetypes - Portlet</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-portlet/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-portlet/</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/maven/trunk/struts2-archetype-portlet/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/</url>
     </scm>
 
     <profiles>
diff --git a/achetypes/struts2-archetype-starter/pom.xml b/achetypes/struts2-archetype-starter/pom.xml
index cce890a90..4fc42856b 100644
--- a/achetypes/struts2-archetype-starter/pom.xml
+++ b/achetypes/struts2-archetype-starter/pom.xml
@@ -3,7 +3,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.struts</groupId>
-    <artifactId>struts2-parent</artifactId>
+    <artifactId>struts2-archetypes</artifactId>
     <version>2.2.0-SNAPSHOT</version>
   </parent>
 
@@ -14,9 +14,9 @@
   <name>Struts 2 Archetypes - Starter</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-starter/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-starter/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/maven/trunk/struts2-archetype-starter/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-starter/</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-starter/</developerConnection>
+       <url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-starter/</url>
     </scm>
 
   <profiles>