Keep same groupID across AAF repo

Issue-ID: AAF-215
Change-Id: I1f4b9627702aa8438f8745a2ba6a8ec8efe407a8
Signed-off-by: Sai Gandham <sg481n@att.com>

26 files changed, 166 insertions, 161 deletions

diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index 8d97f105..1364fe02 100644
--- a/auth/auth-batch/pom.xml
+++ b/auth/auth-batch/pom.xml
@@ -23,8 +23,8 @@
 	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.onap.aaf.authz.auth</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>authparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
@@ -89,37 +89,37 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<dependencies>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.misc</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-misc-env</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.misc</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-misc-rosetta</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-cass</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml
index 88f49b63..7fc6db4a 100644
--- a/auth/auth-cass/pom.xml
+++ b/auth/auth-cass/pom.xml
@@ -15,8 +15,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.authz.auth</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>authparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
@@ -81,18 +81,18 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index e1a40cdf..a50adb5b 100644
--- a/auth/auth-certman/pom.xml
+++ b/auth/auth-certman/pom.xml
@@ -15,8 +15,8 @@
 	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.onap.aaf.authz.auth</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>authparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
@@ -41,24 +41,24 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-cass</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml
index 4368e6b6..df870a82 100644
--- a/auth/auth-client/pom.xml
+++ b/auth/auth-client/pom.xml
@@ -22,12 +22,17 @@
 <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.onap.aaf.authz</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.1.0-SNAPSHOT</version>
+    </parent>
+	
 	<!-- No Parent on Purpose!!! -->
 	<artifactId>aaf-auth-client</artifactId>
 	<name>AAF Auth Client</name>
 	<description>XSD Generated classes for AAF Auth</description>
-	<groupId>org.onap.aaf.authz.auth</groupId>
+	<groupId>org.onap.aaf.authz</groupId>
 	<version>2.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
@@ -48,7 +53,7 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<developers>
diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml
index 956094b8..77a8a9d2 100644
--- a/auth/auth-cmd/pom.xml
+++ b/auth/auth-cmd/pom.xml
@@ -16,8 +16,8 @@
 	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.onap.aaf.authz.auth</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>authparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
@@ -44,7 +44,7 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<developers>
@@ -170,13 +170,13 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml
index ef6ac493..936f7b0e 100644
--- a/auth/auth-core/pom.xml
+++ b/auth/auth-core/pom.xml
@@ -23,8 +23,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.authz.auth</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>authparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
@@ -85,17 +85,17 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 	
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.misc</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-misc-env</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -106,13 +106,13 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.misc</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-misc-log4j</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index 738f5f87..f7ec9b13 100644
--- a/auth/auth-deforg/pom.xml
+++ b/auth/auth-deforg/pom.xml
@@ -23,9 +23,9 @@
 	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>
-		<artifactId>parent</artifactId>
+		<artifactId>authparent</artifactId>
 		<relativePath>../pom.xml</relativePath>
-		<groupId>org.onap.aaf.authz.auth</groupId>
+		<groupId>org.onap.aaf.authz</groupId>
 		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
@@ -87,19 +87,19 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml
index c0bbf45f..9f5c6aa6 100644
--- a/auth/auth-fs/pom.xml
+++ b/auth/auth-fs/pom.xml
@@ -15,8 +15,8 @@
 	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.onap.aaf.authz.auth</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>authparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
@@ -42,7 +42,7 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 
 	</properties>
 
@@ -84,13 +84,13 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml
index 774aa04a..8c33812f 100644
--- a/auth/auth-gui/pom.xml
+++ b/auth/auth-gui/pom.xml
@@ -15,8 +15,8 @@
 	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.onap.aaf.authz.auth</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>authparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
@@ -42,25 +42,25 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-client</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-cmd</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -69,25 +69,25 @@
 			you have something else Match with Property Entry: Organization.<root ns>, 
 			i.e. Organization.onap.org=org.onap.org.DefaultOrg -->
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-deforg</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-client</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.misc</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-misc-xgen</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml
index 6ebd7b8a..1f710bc4 100644
--- a/auth/auth-hello/pom.xml
+++ b/auth/auth-hello/pom.xml
@@ -15,8 +15,8 @@
 	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.onap.aaf.authz.auth</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>authparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
@@ -42,18 +42,18 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml
index 0a94a9d0..f5129bf5 100644
--- a/auth/auth-locate/pom.xml
+++ b/auth/auth-locate/pom.xml
@@ -15,8 +15,8 @@
 	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.onap.aaf.authz.auth</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>authparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
@@ -42,24 +42,24 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-cass</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml
index ce51d0b7..19f5caae 100644
--- a/auth/auth-oauth/pom.xml
+++ b/auth/auth-oauth/pom.xml
@@ -15,8 +15,8 @@
 	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.onap.aaf.authz.auth</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>authparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
@@ -42,24 +42,24 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-cass</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml
index 87b723ad..ae79c80d 100644
--- a/auth/auth-service/pom.xml
+++ b/auth/auth-service/pom.xml
@@ -15,8 +15,8 @@
 	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.onap.aaf.authz.auth</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>authparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
@@ -42,19 +42,19 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-client</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -63,31 +63,31 @@
 			you have something else Match with Property Entry: Organization.<root ns>, 
 			i.e. Organization.onap.org=org.onap.org.DefaultOrg -->
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-deforg</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-cass</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-oauth</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.misc</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-misc-rosetta</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/auth/pom.xml b/auth/pom.xml
index 410e88b2..fc4c8e0a 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -24,12 +24,12 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-    <groupId>org.onap.aaf.authz</groupId>
-    <artifactId>super-pom</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
-	<groupId>org.onap.aaf.authz.auth</groupId>
-	<artifactId>parent</artifactId>
+	<groupId>org.onap.aaf.authz</groupId>
+	<artifactId>authparent</artifactId>
 	<version>2.1.0-SNAPSHOT</version>
 	<name>AAF Auth Parent</name>
 	<packaging>pom</packaging>
@@ -55,7 +55,7 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<developers>
@@ -382,43 +382,43 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.onap.aaf.authz.misc</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-misc-env</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.misc</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-misc-log4j</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.misc</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-misc-rosetta</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.misc</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-misc-xgen</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-core</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-client</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-aaf</artifactId>
 				<version>${project.version}</version>
 				<exclusions>
@@ -430,37 +430,37 @@
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-client</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-core</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-cass</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-cmd</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-oauth</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-deforg</artifactId>
 				<version>${project.version}</version>
 			</dependency>
diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml
index 25ae5eed..d02cb5ae 100644
--- a/cadi/aaf/pom.xml
+++ b/cadi/aaf/pom.xml
@@ -22,8 +22,8 @@
 <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/xsd/maven-4.0.0.xsd">
 	<parent>
-		<groupId>org.onap.aaf.authz.cadi</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>cadiparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
@@ -48,7 +48,7 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/cadi/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 	<developers>
 		<developer>
@@ -89,25 +89,25 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-client</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-client</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.misc</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-misc-env</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml
index 9d596854..20fd84cc 100644
--- a/cadi/client/pom.xml
+++ b/cadi/client/pom.xml
@@ -20,8 +20,8 @@
 -->
 <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/xsd/maven-4.0.0.xsd">
 	<parent>
-		<groupId>org.onap.aaf.authz.cadi</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>cadiparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
@@ -47,7 +47,7 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/cadi/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<developers>
@@ -88,13 +88,13 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.misc</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-misc-rosetta</artifactId>
 			<version>${project.version}</version>
 
 		</dependency>
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml
index b2f03be8..b810e123 100644
--- a/cadi/core/pom.xml
+++ b/cadi/core/pom.xml
@@ -13,8 +13,8 @@
 <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/xsd/maven-4.0.0.xsd">
 	<parent>
-		<groupId>org.onap.aaf.authz.cadi</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>cadiparent</artifactId>
 		<relativePath>..</relativePath>
 		<version>2.1.0-SNAPSHOT</version>
 	</parent>
@@ -38,7 +38,7 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/cadi/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<developers>
diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml
index 976c7e0e..81a3fe6a 100644
--- a/cadi/oauth-enduser/pom.xml
+++ b/cadi/oauth-enduser/pom.xml
@@ -23,14 +23,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.authz.cadi</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>cadiparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	
 	<name>AAF CADI Sample OAuth EndUser</name>
-	<groupId>org.onap.aaf.authz.cadi</groupId>
+	<groupId>org.onap.aaf.authz</groupId>
 	<version>2.1.0-SNAPSHOT</version>
 	<artifactId>aaf-cadi-oauth-enduser</artifactId>
 	<packaging>jar</packaging>
@@ -50,7 +50,7 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/cadi/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 	
 	<developers>
@@ -83,12 +83,12 @@
 	
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/cadi/pom.xml b/cadi/pom.xml
index 74773676..25ed1d04 100644
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -23,11 +23,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
     <groupId>org.onap.aaf.authz</groupId>
-    <artifactId>super-pom</artifactId>
+    <artifactId>parent</artifactId>
     <version>2.1.0-SNAPSHOT</version>
     </parent>
-	<groupId>org.onap.aaf.authz.cadi</groupId>
-	<artifactId>parent</artifactId>
+	<groupId>org.onap.aaf.authz</groupId>
+	<artifactId>cadiparent</artifactId>
 	<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
 	<version>2.1.0-SNAPSHOT</version>
 	<inceptionYear>2015-07-20</inceptionYear>
@@ -55,7 +55,7 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/cadi/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<!-- ============================================================== -->
@@ -144,19 +144,19 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-client</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-core</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-oauth</artifactId>
 				<version>${project.version}</version>
 			</dependency>
@@ -164,57 +164,57 @@
 
 			<!-- Prevent Cycles in Testing  -->
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-core</artifactId>
 				<version>${project.version}</version>
 				<classifier>tests</classifier>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-jetty</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-cass</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-aaf</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-aaf</artifactId>
 				<version>${project.version}</version>
 				<classifier>full</classifier>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.cadi</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-client</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.misc</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-misc-env</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.misc</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-misc-rosetta</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.misc</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-misc-log4j</artifactId>
 				<version>${project.version}</version>
 			</dependency>
diff --git a/cadi/shiro/pom.xml b/cadi/shiro/pom.xml
index 9fc3c145..76ec2e60 100644
--- a/cadi/shiro/pom.xml
+++ b/cadi/shiro/pom.xml
@@ -22,8 +22,8 @@
 <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/xsd/maven-4.0.0.xsd">
 	<parent>
-		<groupId>org.onap.aaf.authz.cadi</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>cadiparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
@@ -48,7 +48,7 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/cadi/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<developers>
@@ -89,7 +89,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/misc/env/pom.xml b/misc/env/pom.xml
index cc169819..0cd5bc61 100644
--- a/misc/env/pom.xml
+++ b/misc/env/pom.xml
@@ -22,8 +22,8 @@
 <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/xsd/maven-4.0.0.xsd">
 	<parent>
-		<groupId>org.onap.aaf.authz.misc</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>miscparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
@@ -85,7 +85,7 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/misc/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<!-- ============================================================== -->
diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml
index 0d286ead..f9398d26 100644
--- a/misc/log4j/pom.xml
+++ b/misc/log4j/pom.xml
@@ -22,8 +22,8 @@
 <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/xsd/maven-4.0.0.xsd">
 	<parent>
-		<groupId>org.onap.aaf.authz.misc</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>miscparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
@@ -85,12 +85,12 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/misc/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.misc</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-misc-env</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/misc/pom.xml b/misc/pom.xml
index 5af823c4..2ca3b0a4 100644
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -24,11 +24,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
     <groupId>org.onap.aaf.authz</groupId>
-    <artifactId>super-pom</artifactId>
+    <artifactId>parent</artifactId>
     <version>2.1.0-SNAPSHOT</version>
     </parent>
-	<groupId>org.onap.aaf.authz.misc</groupId>
-	<artifactId>parent</artifactId>
+	<groupId>org.onap.aaf.authz</groupId>
+	<artifactId>miscparent</artifactId>
 	<name>AAF Misc Parent</name>
 	<version>2.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
@@ -52,7 +52,7 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/misc/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 
diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml
index d2e8b09b..50f02a57 100644
--- a/misc/rosetta/pom.xml
+++ b/misc/rosetta/pom.xml
@@ -22,8 +22,8 @@
 <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/xsd/maven-4.0.0.xsd">
 	<parent>
-		<groupId>org.onap.aaf.authz.misc</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>miscparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
@@ -86,12 +86,12 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/misc/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.misc</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-misc-env</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml
index 0eebe036..0dedf11d 100644
--- a/misc/xgen/pom.xml
+++ b/misc/xgen/pom.xml
@@ -22,8 +22,8 @@
 <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/xsd/maven-4.0.0.xsd">
 	<parent>
-		<groupId>org.onap.aaf.authz.misc</groupId>
-		<artifactId>parent</artifactId>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>miscparent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
@@ -85,12 +85,12 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/misc/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 	
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.authz.misc</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-misc-env</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/pom.xml b/pom.xml
index e9584f1f..23a1e94b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.aaf.authz</groupId>
-	<artifactId>super-pom</artifactId>
+	<artifactId>parent</artifactId>
 	<version>2.1.0-SNAPSHOT</version>
 	<name>AAF Overall Parent</name>
 	<packaging>pom</packaging>