125 files changed, 433 insertions, 500 deletions

diff --git a/pom.xml b/pom.xml
index a26425e..644c9a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,11 +24,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
 	<artifactId>msgrtr</artifactId>
-	<version>0.0.5</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Message Router</name>
 	<description>Message Router - Restful interface built for kafka</description>
-	<url>https://github.com/att/dmaap-framework</url>
+	
+	<parent>
+		<groupId>org.onap.oparent</groupId>
+		<artifactId>oparent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	
 	<properties>
 		<spring.version>3.2.14.RELEASE</spring.version>
 		<cxf.version>3.0.4</cxf.version>
@@ -38,11 +44,6 @@
 		<maven.compiler.target>1.7</maven.compiler.target>
 		<maven.compiler.source>1.7</maven.compiler.source>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
-		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/datarouter/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<!-- Distribution management -->
@@ -53,7 +54,7 @@
 
 	 <licenses>
 	  <license>
-	    <name>Apache  License 2.0</name>
+	    <name>Apache License Version 2.0</name>
 	  </license>
 	</licenses>
 
@@ -71,29 +72,6 @@
 	     <organizationUrl>www.att.com</organizationUrl>
 	   </developer>
 	 </developers>
-	 <distributionManagement>
-    	<repository>
-			<id>ecomp-releases</id>
-			<name>AAF Release Repository</name>
-			<url>${nexusproxy}${releaseNexusPath}</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<name>AAF Snapshot Repository</name>
-			<url>${nexusproxy}${snapshotNexusPath}</url>
-		</snapshotRepository>
-		<site>
-			<id>ecomp-site</id>
-			<url>dav:${nexusproxy}${sitePath}</url>
-		</site>
-	</distributionManagement>
-	
-	  <pluginRepositories>
-        <pluginRepository>
-            <id>onap-plugin-snapshots</id>
-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-        </pluginRepository>
-    </pluginRepositories>
 
 	<dependencies>
 
@@ -303,17 +281,6 @@
 			<!-- <phase>package</phase> bind to the packaging phase <goals> <goal>single</goal> 
 				</goals> </execution> </executions> </plugin> -->
 			<!-- -->
-			  <plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
-					<configuration>
-						<nexusUrl>${nexusproxy}</nexusUrl>
-						<stagingProfileId>176c31dfe190a</stagingProfileId>
-						<serverId>ecomp-staging</serverId>
-					</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
@@ -355,41 +322,17 @@
 					<!-- <skipTests>true</skipTests> -->
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<formats>
-						<format>html</format>
-						<format>xml</format>
-					</formats>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.6.2.201302030002</version>
-				<configuration>
-					<destfile>${basedir}/target/coverage-reports/jacoco-unit.exec</destfile>
-					<datafile>${basedir}/target/coverage-reports/jacoco-unit.exec</datafile>
-				</configuration>
-			</plugin>
- 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-gpg-plugin</artifactId>
-				<version>1.5</version>
-				<executions>
-					<execution>
-						<id>sign-artifacts</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin> 	 
-
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>cobertura-maven-plugin</artifactId>
+					<version>2.7</version>
+					<configuration>
+					    <formats>
+					    <format>html</format>
+					    <format>xml</format>
+					  </formats>
+					</configuration>
+			   </plugin>			
 		</plugins>
 	</build>
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/apiServer/metrics/cambria/DMaaPMetricsSender.java b/src/main/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSender.java
index b8e5212..431163e 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/apiServer/metrics/cambria/DMaaPMetricsSender.java
+++ b/src/main/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSender.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.apiServer.metrics.cambria;
+package com.att.nsa.apiServer.metrics.cambria;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -34,13 +34,12 @@ import org.json.JSONException;
 import org.json.JSONObject;
 //import org.slf4j.Logger;
 //import org.slf4j.LoggerFactory;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher.CambriaPublisher;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher.DMaaPCambriaClientFactory;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import com.att.nsa.apiServer.metrics.cambria.MetricsSender;
+import com.att.nsa.cambria.constants.CambriaConstants;
+import com.att.nsa.cambria.metrics.publisher.CambriaPublisher;
+import com.att.nsa.cambria.metrics.publisher.DMaaPCambriaClientFactory;
 import com.att.nsa.drumlin.till.nv.rrNvReadable;
 import com.att.nsa.metrics.CdmMetricsRegistry;
 import com.att.nsa.metrics.impl.CdmConstant;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/CambriaApiException.java b/src/main/java/com/att/nsa/cambria/CambriaApiException.java
index e627f23..1f8f705 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/CambriaApiException.java
+++ b/src/main/java/com/att/nsa/cambria/CambriaApiException.java
@@ -19,12 +19,12 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria;
+package com.att.nsa.cambria;
 
 import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.ErrorResponse;
 
 import com.att.nsa.apiServer.NsaAppException;
+import com.att.nsa.cambria.exception.ErrorResponse;
 
 public class CambriaApiException extends NsaAppException
 {
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/CambriaApiVersionInfo.java b/src/main/java/com/att/nsa/cambria/CambriaApiVersionInfo.java
index ec9e43f..117f8ab 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/CambriaApiVersionInfo.java
+++ b/src/main/java/com/att/nsa/cambria/CambriaApiVersionInfo.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria;
+package com.att.nsa.cambria;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/Consumer.java b/src/main/java/com/att/nsa/cambria/backends/Consumer.java
index 8e5aa76..f1b43c2 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/Consumer.java
+++ b/src/main/java/com/att/nsa/cambria/backends/Consumer.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends;
+package com.att.nsa.cambria.backends;
 
 /**
  * A consumer interface. Consumers pull the next message from a given topic.
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/ConsumerFactory.java b/src/main/java/com/att/nsa/cambria/backends/ConsumerFactory.java
index dddca63..1597c07 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/ConsumerFactory.java
+++ b/src/main/java/com/att/nsa/cambria/backends/ConsumerFactory.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends;
+package com.att.nsa.cambria.backends;
 
 import java.util.Collection;
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/MetricsSet.java b/src/main/java/com/att/nsa/cambria/backends/MetricsSet.java
index f0900ff..ce104ac 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/MetricsSet.java
+++ b/src/main/java/com/att/nsa/cambria/backends/MetricsSet.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends;
+package com.att.nsa.cambria.backends;
 
 import com.att.nsa.metrics.CdmMetricsRegistry;
 /**
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/Publisher.java b/src/main/java/com/att/nsa/cambria/backends/Publisher.java
index 2557980..696e78f 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/Publisher.java
+++ b/src/main/java/com/att/nsa/cambria/backends/Publisher.java
@@ -19,16 +19,16 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends;
+package com.att.nsa.cambria.backends;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.LogDetails;
-
 import kafka.producer.KeyedMessage;
 
+import com.att.nsa.cambria.beans.LogDetails;
+
 /**
  * A publisher interface. Publishers receive messages and post them to a topic.
  * @author author
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/kafka/KafkaConsumer.java b/src/main/java/com/att/nsa/cambria/backends/kafka/KafkaConsumer.java
index 1ea7c0d..44c74a6 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/kafka/KafkaConsumer.java
+++ b/src/main/java/com/att/nsa/cambria/backends/kafka/KafkaConsumer.java
@@ -19,14 +19,12 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.kafka;
+package com.att.nsa.cambria.backends.kafka;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Consumer;
-
 import kafka.consumer.ConsumerIterator;
 import kafka.consumer.KafkaStream;
 import kafka.javaapi.consumer.ConsumerConnector;
@@ -38,6 +36,8 @@ import kafka.message.MessageAndMetadata;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
+import com.att.nsa.cambria.backends.Consumer;
+
 /**
  * A consumer instance that's created per-request. These are stateless so that
  * clients can connect to this service as a proxy.
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/kafka/KafkaConsumerCache.java b/src/main/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCache.java
index 4cf7f3a..5f38443 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/kafka/KafkaConsumerCache.java
+++ b/src/main/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCache.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.kafka;
+package com.att.nsa.cambria.backends.kafka;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -46,16 +46,15 @@ import org.apache.curator.utils.ZKPaths;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.NoNodeException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Consumer;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.MetricsSet;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.ConfigurationReader;
-
 //import org.slf4j.Logger;
 //import org.slf4j.LoggerFactory;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.ajsc.filemonitor.AJSCPropertiesMap;
+import com.att.nsa.cambria.backends.Consumer;
+import com.att.nsa.cambria.backends.MetricsSet;
+import com.att.nsa.cambria.constants.CambriaConstants;
+import com.att.nsa.cambria.utils.ConfigurationReader;
 import com.att.nsa.drumlin.till.nv.rrNvReadable;
 
 /**
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/kafka/KafkaPublisher.java b/src/main/java/com/att/nsa/cambria/backends/kafka/KafkaPublisher.java
index 90e5ce0..42a6bb9 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/kafka/KafkaPublisher.java
+++ b/src/main/java/com/att/nsa/cambria/backends/kafka/KafkaPublisher.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.kafka;
+package com.att.nsa.cambria.backends.kafka;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -33,15 +33,14 @@ import kafka.producer.KeyedMessage;
 import kafka.producer.ProducerConfig;
 
 import org.json.JSONException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-
 //import org.slf4j.Logger;
 //import org.slf4j.LoggerFactory;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.springframework.beans.factory.annotation.Qualifier;
 
+import com.att.nsa.cambria.backends.Publisher;
+import com.att.nsa.cambria.constants.CambriaConstants;
 import com.att.nsa.drumlin.till.nv.rrNvReadable;
 
 /**
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/memory/MemoryConsumerFactory.java b/src/main/java/com/att/nsa/cambria/backends/memory/MemoryConsumerFactory.java
index b42a22b..f0982a9 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/memory/MemoryConsumerFactory.java
+++ b/src/main/java/com/att/nsa/cambria/backends/memory/MemoryConsumerFactory.java
@@ -19,13 +19,13 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.memory;
+package com.att.nsa.cambria.backends.memory;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Consumer;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.ConsumerFactory;
+import com.att.nsa.cambria.backends.Consumer;
+import com.att.nsa.cambria.backends.ConsumerFactory;
 /**
  * 
  * @author author
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/memory/MemoryMetaBroker.java b/src/main/java/com/att/nsa/cambria/backends/memory/MemoryMetaBroker.java
index 221e58a..87e59c2 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/memory/MemoryMetaBroker.java
+++ b/src/main/java/com/att/nsa/cambria/backends/memory/MemoryMetaBroker.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.memory;
+package com.att.nsa.cambria.backends.memory;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -27,9 +27,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Broker;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Topic;
-
+import com.att.nsa.cambria.metabroker.Broker;
+import com.att.nsa.cambria.metabroker.Topic;
 import com.att.nsa.configs.ConfigDb;
 import com.att.nsa.drumlin.till.nv.rrNvReadable;
 import com.att.nsa.security.NsaAcl;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/memory/MemoryQueue.java b/src/main/java/com/att/nsa/cambria/backends/memory/MemoryQueue.java
index e6b98b3..a0dc8b8 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/memory/MemoryQueue.java
+++ b/src/main/java/com/att/nsa/cambria/backends/memory/MemoryQueue.java
@@ -19,13 +19,13 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.memory;
+package com.att.nsa.cambria.backends.memory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Consumer;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher.message;
+import com.att.nsa.cambria.backends.Consumer;
+import com.att.nsa.cambria.backends.Publisher.message;
 
 /**
  * When broker type is memory, then this class is doing all the topic related
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/memory/MemoryQueuePublisher.java b/src/main/java/com/att/nsa/cambria/backends/memory/MemoryQueuePublisher.java
index bf94b9c..d653f6e 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/memory/MemoryQueuePublisher.java
+++ b/src/main/java/com/att/nsa/cambria/backends/memory/MemoryQueuePublisher.java
@@ -19,14 +19,14 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.memory;
+package com.att.nsa.cambria.backends.memory;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Broker.TopicExistsException;
+import com.att.nsa.cambria.backends.Publisher;
+import com.att.nsa.cambria.metabroker.Broker.TopicExistsException;
 
 import kafka.producer.KeyedMessage;
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/memory/MessageDropper.java b/src/main/java/com/att/nsa/cambria/backends/memory/MessageDropper.java
index 0414e41..c49ac4f 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/memory/MessageDropper.java
+++ b/src/main/java/com/att/nsa/cambria/backends/memory/MessageDropper.java
@@ -19,13 +19,13 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.memory;
+package com.att.nsa.cambria.backends.memory;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher;
+import com.att.nsa.cambria.backends.Publisher;
 
 import kafka.producer.KeyedMessage;
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/memory/MessageLogger.java b/src/main/java/com/att/nsa/cambria/backends/memory/MessageLogger.java
index 63ea3b6..9ff8bd6 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/backends/memory/MessageLogger.java
+++ b/src/main/java/com/att/nsa/cambria/backends/memory/MessageLogger.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.memory;
+package com.att.nsa.cambria.backends.memory;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -28,7 +28,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher;
+import com.att.nsa.cambria.backends.Publisher;
 
 import kafka.producer.KeyedMessage;
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/ApiKeyBean.java b/src/main/java/com/att/nsa/cambria/beans/ApiKeyBean.java
index 43bc584..df4a2ed 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/ApiKeyBean.java
+++ b/src/main/java/com/att/nsa/cambria/beans/ApiKeyBean.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans;
+package com.att.nsa.cambria.beans;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPCambriaLimiter.java b/src/main/java/com/att/nsa/cambria/beans/DMaaPCambriaLimiter.java
index f4855b9..1b609b0 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPCambriaLimiter.java
+++ b/src/main/java/com/att/nsa/cambria/beans/DMaaPCambriaLimiter.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans;
+package com.att.nsa.cambria.beans;
 
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
@@ -30,14 +30,14 @@ import java.util.concurrent.TimeUnit;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.DMaaPResponseCode;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.ErrorResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.constants.CambriaConstants;
+import com.att.nsa.cambria.exception.DMaaPResponseCode;
+import com.att.nsa.cambria.exception.ErrorResponse;
 import com.att.nsa.drumlin.service.standards.HttpStatusCodes;
 import com.att.nsa.drumlin.till.nv.rrNvReadable;
 import com.att.nsa.drumlin.till.nv.rrNvReadable.invalidSettingValue;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPContext.java b/src/main/java/com/att/nsa/cambria/beans/DMaaPContext.java
index 5f132b7..79a8e1f 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPContext.java
+++ b/src/main/java/com/att/nsa/cambria/beans/DMaaPContext.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans;
+package com.att.nsa.cambria.beans;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.ConfigurationReader;
+import com.att.nsa.cambria.utils.ConfigurationReader;
 
 /**
  * DMaaPContext provide and maintain all the configurations , Http request/response
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPKafkaConsumerFactory.java b/src/main/java/com/att/nsa/cambria/beans/DMaaPKafkaConsumerFactory.java
index 1b62ec8..28d48fa 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPKafkaConsumerFactory.java
+++ b/src/main/java/com/att/nsa/cambria/beans/DMaaPKafkaConsumerFactory.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans;
+package com.att.nsa.cambria.beans;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -31,21 +31,20 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.locks.InterProcessMutex;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Consumer;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.ConsumerFactory;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.MetricsSet;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.kafka.KafkaConsumer;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.kafka.KafkaConsumerCache;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.ConfigurationReader;
-
 //import org.slf4j.Logger;
 //import org.slf4j.LoggerFactory;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.springframework.beans.factory.annotation.Qualifier;
 
+import com.att.nsa.cambria.backends.Consumer;
+import com.att.nsa.cambria.backends.ConsumerFactory;
+import com.att.nsa.cambria.backends.MetricsSet;
+import com.att.nsa.cambria.backends.kafka.KafkaConsumer;
+import com.att.nsa.cambria.backends.kafka.KafkaConsumerCache;
+import com.att.nsa.cambria.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException;
+import com.att.nsa.cambria.constants.CambriaConstants;
+import com.att.nsa.cambria.utils.ConfigurationReader;
 import com.att.nsa.drumlin.till.nv.rrNvReadable;
 import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;
 import com.att.ajsc.filemonitor.AJSCPropertiesMap;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPKafkaMetaBroker.java b/src/main/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBroker.java
index aad992c..9d53ef2 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPKafkaMetaBroker.java
+++ b/src/main/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBroker.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans;
+package com.att.nsa.cambria.beans;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -35,12 +35,12 @@ import com.att.eelf.configuration.EELFManager;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Broker;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Topic;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.ConfigurationReader;
 import org.springframework.beans.factory.annotation.Qualifier;
 
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.metabroker.Broker;
+import com.att.nsa.cambria.metabroker.Topic;
+import com.att.nsa.cambria.utils.ConfigurationReader;
 import com.att.nsa.configs.ConfigDb;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.configs.ConfigPath;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPMetricsSet.java b/src/main/java/com/att/nsa/cambria/beans/DMaaPMetricsSet.java
index f98eeee..3c3aa6d 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPMetricsSet.java
+++ b/src/main/java/com/att/nsa/cambria/beans/DMaaPMetricsSet.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans;
+package com.att.nsa.cambria.beans;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -28,10 +28,9 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.apiServer.metrics.cambria.DMaaPMetricsSender;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiVersionInfo;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.MetricsSet;
-
+import com.att.nsa.apiServer.metrics.cambria.DMaaPMetricsSender;
+import com.att.nsa.cambria.CambriaApiVersionInfo;
+import com.att.nsa.cambria.backends.MetricsSet;
 import com.att.nsa.drumlin.till.nv.rrNvReadable;
 import com.att.nsa.metrics.impl.CdmConstant;
 import com.att.nsa.metrics.impl.CdmCounter;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPNsaApiDb.java b/src/main/java/com/att/nsa/cambria/beans/DMaaPNsaApiDb.java
index 2826289..ce257d4 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPNsaApiDb.java
+++ b/src/main/java/com/att/nsa/cambria/beans/DMaaPNsaApiDb.java
@@ -19,15 +19,15 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans;
+package com.att.nsa.cambria.beans;
 
 import java.security.Key;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
 //import org.apache.log4-j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
+import com.att.nsa.cambria.constants.CambriaConstants;
 import com.att.nsa.configs.ConfigDb;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.configs.confimpl.EncryptingLayer;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPZkClient.java b/src/main/java/com/att/nsa/cambria/beans/DMaaPZkClient.java
index 45af1f6..590ecd6 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPZkClient.java
+++ b/src/main/java/com/att/nsa/cambria/beans/DMaaPZkClient.java
@@ -19,12 +19,12 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans;
+package com.att.nsa.cambria.beans;
 
 import org.I0Itec.zkclient.ZkClient;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.ConfigurationReader;
 import org.springframework.beans.factory.annotation.Qualifier;
 
+import com.att.nsa.cambria.utils.ConfigurationReader;
 import com.att.nsa.drumlin.till.nv.rrNvReadable;
 
 /**
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPZkConfigDb.java b/src/main/java/com/att/nsa/cambria/beans/DMaaPZkConfigDb.java
index db59224..8fe96e9 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/DMaaPZkConfigDb.java
+++ b/src/main/java/com/att/nsa/cambria/beans/DMaaPZkConfigDb.java
@@ -19,12 +19,12 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans;
+package com.att.nsa.cambria.beans;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.ConfigurationReader;
 import org.springframework.beans.factory.annotation.Qualifier;
 
+import com.att.nsa.cambria.constants.CambriaConstants;
+import com.att.nsa.cambria.utils.ConfigurationReader;
 import com.att.nsa.configs.confimpl.ZkConfigDb;
 import com.att.nsa.drumlin.till.nv.rrNvReadable;
 //import com.att.nsa.configs.confimpl.ZkConfigDb;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/LogDetails.java b/src/main/java/com/att/nsa/cambria/beans/LogDetails.java
index f28e9ed..5a195e9 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/LogDetails.java
+++ b/src/main/java/com/att/nsa/cambria/beans/LogDetails.java
@@ -22,12 +22,12 @@
 /**
  * 
  */
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans;
+package com.att.nsa.cambria.beans;
 
 import java.util.Date;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.Utils;
+import com.att.nsa.cambria.constants.CambriaConstants;
+import com.att.nsa.cambria.utils.Utils;
 
 /**
  * @author author
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/TopicBean.java b/src/main/java/com/att/nsa/cambria/beans/TopicBean.java
index 9ff8a32..3303c07 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/beans/TopicBean.java
+++ b/src/main/java/com/att/nsa/cambria/beans/TopicBean.java
@@ -22,7 +22,7 @@
 /**
  * 
  */
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans;
+package com.att.nsa.cambria.beans;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/constants/CambriaConstants.java b/src/main/java/com/att/nsa/cambria/constants/CambriaConstants.java
index 98d0766..019fa38 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/constants/CambriaConstants.java
+++ b/src/main/java/com/att/nsa/cambria/constants/CambriaConstants.java
@@ -19,10 +19,11 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants;
+package com.att.nsa.cambria.constants;
 
 import org.apache.coyote.http11.Http11NioProtocol;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.Utils;
+
+import com.att.nsa.cambria.utils.Utils;
 
 /**
  * This is the constant files for all the property or parameters.
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/exception/DMaaPAccessDeniedException.java b/src/main/java/com/att/nsa/cambria/exception/DMaaPAccessDeniedException.java
index 190714f..7558b25 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/exception/DMaaPAccessDeniedException.java
+++ b/src/main/java/com/att/nsa/cambria/exception/DMaaPAccessDeniedException.java
@@ -19,9 +19,9 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception;
+package com.att.nsa.cambria.exception;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.CambriaApiException;
 
 public class DMaaPAccessDeniedException extends CambriaApiException{
 	
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/exception/DMaaPCambriaExceptionMapper.java b/src/main/java/com/att/nsa/cambria/exception/DMaaPCambriaExceptionMapper.java
index 10d127f..8838a49 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/exception/DMaaPCambriaExceptionMapper.java
+++ b/src/main/java/com/att/nsa/cambria/exception/DMaaPCambriaExceptionMapper.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception;
+package com.att.nsa.cambria.exception;
 
 import javax.inject.Singleton;
 import javax.ws.rs.core.MediaType;
@@ -29,9 +29,11 @@ import javax.ws.rs.ext.Provider;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.apache.http.HttpStatus;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.att.nsa.cambria.CambriaApiException;
+
 /**
  * Exception Mapper class to handle
  * CambriaApiException 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/exception/DMaaPErrorMessages.java b/src/main/java/com/att/nsa/cambria/exception/DMaaPErrorMessages.java
index 5ef2493..eb9be06 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/exception/DMaaPErrorMessages.java
+++ b/src/main/java/com/att/nsa/cambria/exception/DMaaPErrorMessages.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception;
+package com.att.nsa.cambria.exception;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/exception/DMaaPResponseCode.java b/src/main/java/com/att/nsa/cambria/exception/DMaaPResponseCode.java
index 1302686..4011112 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/exception/DMaaPResponseCode.java
+++ b/src/main/java/com/att/nsa/cambria/exception/DMaaPResponseCode.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception;
+package com.att.nsa.cambria.exception;
 
 /**
  * Define the Error Response Codes for MR
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/exception/DMaaPWebExceptionMapper.java b/src/main/java/com/att/nsa/cambria/exception/DMaaPWebExceptionMapper.java
index f526eb5..59ede30 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/exception/DMaaPWebExceptionMapper.java
+++ b/src/main/java/com/att/nsa/cambria/exception/DMaaPWebExceptionMapper.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception;
+package com.att.nsa.cambria.exception;
 
 import javax.inject.Singleton;
 import javax.ws.rs.BadRequestException;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/exception/ErrorResponse.java b/src/main/java/com/att/nsa/cambria/exception/ErrorResponse.java
index 3bc5364..d62d5a8 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/exception/ErrorResponse.java
+++ b/src/main/java/com/att/nsa/cambria/exception/ErrorResponse.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception;
+package com.att.nsa.cambria.exception;
 import org.json.JSONObject;
 /**
  * Represents the Error Response Object 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/listener/CambriaServletContextListener.java b/src/main/java/com/att/nsa/cambria/listener/CambriaServletContextListener.java
index 35c0b27..9fbfee8 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/listener/CambriaServletContextListener.java
+++ b/src/main/java/com/att/nsa/cambria/listener/CambriaServletContextListener.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.listener;
+package com.att.nsa.cambria.listener;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/listener/DME2EndPointLoader.java b/src/main/java/com/att/nsa/cambria/listener/DME2EndPointLoader.java
index 9332aeb..20871e5 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/listener/DME2EndPointLoader.java
+++ b/src/main/java/com/att/nsa/cambria/listener/DME2EndPointLoader.java
@@ -19,19 +19,18 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.listener;
+package com.att.nsa.cambria.listener;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.impl.EventsServiceImpl;
-
 import com.att.aft.dme2.api.DME2Exception;
 import com.att.aft.dme2.api.DME2Manager;
 import com.att.aft.dme2.manager.registry.DME2EndpointRegistry;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
+import com.att.nsa.cambria.service.impl.EventsServiceImpl;
 
 /**
  * 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metabroker/Broker.java b/src/main/java/com/att/nsa/cambria/metabroker/Broker.java
index 9634cc2..8c1fff5 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metabroker/Broker.java
+++ b/src/main/java/com/att/nsa/cambria/metabroker/Broker.java
@@ -19,12 +19,11 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker;
+package com.att.nsa.cambria.metabroker;
 
 import java.util.List;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-
+import com.att.nsa.cambria.CambriaApiException;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metabroker/Topic.java b/src/main/java/com/att/nsa/cambria/metabroker/Topic.java
index f38a4a6..b53736d 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metabroker/Topic.java
+++ b/src/main/java/com/att/nsa/cambria/metabroker/Topic.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker;
+package com.att.nsa.cambria.metabroker;
 
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.security.NsaAcl;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/CambriaBatchingPublisher.java b/src/main/java/com/att/nsa/cambria/metrics/publisher/CambriaBatchingPublisher.java
index de6044a..7e01fac 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/CambriaBatchingPublisher.java
+++ b/src/main/java/com/att/nsa/cambria/metrics/publisher/CambriaBatchingPublisher.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher;
+package com.att.nsa.cambria.metrics.publisher;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/CambriaClient.java b/src/main/java/com/att/nsa/cambria/metrics/publisher/CambriaClient.java
index f5ac924..e80235e 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/CambriaClient.java
+++ b/src/main/java/com/att/nsa/cambria/metrics/publisher/CambriaClient.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher;
+package com.att.nsa.cambria.metrics.publisher;
 
 //import org.slf4j.Logger;
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/CambriaConsumer.java b/src/main/java/com/att/nsa/cambria/metrics/publisher/CambriaConsumer.java
index ad2613f..f7c5f89 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/CambriaConsumer.java
+++ b/src/main/java/com/att/nsa/cambria/metrics/publisher/CambriaConsumer.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher;
+package com.att.nsa.cambria.metrics.publisher;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/CambriaPublisher.java b/src/main/java/com/att/nsa/cambria/metrics/publisher/CambriaPublisher.java
index 9b3ac12..1873f7f 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/CambriaPublisher.java
+++ b/src/main/java/com/att/nsa/cambria/metrics/publisher/CambriaPublisher.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher;
+package com.att.nsa.cambria.metrics.publisher;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/CambriaPublisherUtility.java b/src/main/java/com/att/nsa/cambria/metrics/publisher/CambriaPublisherUtility.java
index 066a2f3..8e54ee5 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/CambriaPublisherUtility.java
+++ b/src/main/java/com/att/nsa/cambria/metrics/publisher/CambriaPublisherUtility.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher;
+package com.att.nsa.cambria.metrics.publisher;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/DMaaPCambriaClientFactory.java b/src/main/java/com/att/nsa/cambria/metrics/publisher/DMaaPCambriaClientFactory.java
index 1f32511..98e16f7 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/DMaaPCambriaClientFactory.java
+++ b/src/main/java/com/att/nsa/cambria/metrics/publisher/DMaaPCambriaClientFactory.java
@@ -19,15 +19,15 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher;
+package com.att.nsa.cambria.metrics.publisher;
 
 import java.net.MalformedURLException;
 import java.util.Collection;
 import java.util.TreeSet;
 import java.util.UUID;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher.impl.DMaaPCambriaConsumerImpl;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher.impl.DMaaPCambriaSimplerBatchPublisher;
+import com.att.nsa.cambria.metrics.publisher.impl.DMaaPCambriaConsumerImpl;
+import com.att.nsa.cambria.metrics.publisher.impl.DMaaPCambriaSimplerBatchPublisher;
 
 /**
  * A factory for Cambria clients.<br/>
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/impl/CambriaBaseClient.java b/src/main/java/com/att/nsa/cambria/metrics/publisher/impl/CambriaBaseClient.java
index 397e818..bd480e3 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/impl/CambriaBaseClient.java
+++ b/src/main/java/com/att/nsa/cambria/metrics/publisher/impl/CambriaBaseClient.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher.impl;
+package com.att.nsa.cambria.metrics.publisher.impl;
 
 import java.net.MalformedURLException;
 import java.util.Collection;
@@ -29,21 +29,20 @@ import java.util.concurrent.TimeUnit;
 
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-
 //import org.slf4j.Logger;
 //import org.slf4j.LoggerFactory;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.nsa.apiClient.http.CacheUse;
 import com.att.nsa.apiClient.http.HttpClient;
+import com.att.nsa.cambria.constants.CambriaConstants;
 
 /**
  * 
  * @author author
  *
  */
-public class CambriaBaseClient extends HttpClient implements org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher.CambriaClient 
+public class CambriaBaseClient extends HttpClient implements com.att.nsa.cambria.metrics.publisher.CambriaClient 
 {
 	protected CambriaBaseClient ( Collection<String> hosts ) throws MalformedURLException
 	{
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/impl/Clock.java b/src/main/java/com/att/nsa/cambria/metrics/publisher/impl/Clock.java
index e7531c7..1702ec8 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/impl/Clock.java
+++ b/src/main/java/com/att/nsa/cambria/metrics/publisher/impl/Clock.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher.impl;
+package com.att.nsa.cambria.metrics.publisher.impl;
 
 /**
  * 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java b/src/main/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java
index 332c8b1..adff2a7 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java
+++ b/src/main/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher.impl;
+package com.att.nsa.cambria.metrics.publisher.impl;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -34,10 +34,10 @@ import jline.internal.Log;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher.CambriaPublisherUtility;
 
 import com.att.nsa.apiClient.http.HttpException;
 import com.att.nsa.apiClient.http.HttpObjectNotFoundException;
+import com.att.nsa.cambria.metrics.publisher.CambriaPublisherUtility;
 
 /**
  * 
@@ -45,7 +45,7 @@ import com.att.nsa.apiClient.http.HttpObjectNotFoundException;
  *
  */
 public class DMaaPCambriaConsumerImpl extends CambriaBaseClient
-		implements org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher.CambriaConsumer {
+		implements com.att.nsa.cambria.metrics.publisher.CambriaConsumer {
 	private final String fTopic;
 	private final String fGroup;
 	private final String fId;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java b/src/main/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java
index 2b9bad4..052cc78 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java
+++ b/src/main/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher.impl;
+package com.att.nsa.cambria.metrics.publisher.impl;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -39,10 +39,9 @@ import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Response;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher.CambriaPublisherUtility;
-
 import com.att.ajsc.filemonitor.AJSCPropertiesMap;
+import com.att.nsa.cambria.constants.CambriaConstants;
+import com.att.nsa.cambria.metrics.publisher.CambriaPublisherUtility;
 
 /**
  * 
@@ -53,7 +52,7 @@ import com.att.ajsc.filemonitor.AJSCPropertiesMap;
  *
  */
 public class DMaaPCambriaSimplerBatchPublisher extends CambriaBaseClient
-		implements org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metrics.publisher.CambriaBatchingPublisher {
+		implements com.att.nsa.cambria.metrics.publisher.CambriaBatchingPublisher {
 	/**
 	 * 
 	 * static inner class initializes with urls, topic,batchSize
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/resources/CambriaEventSet.java b/src/main/java/com/att/nsa/cambria/resources/CambriaEventSet.java
index 9eb1691..85cc902 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/resources/CambriaEventSet.java
+++ b/src/main/java/com/att/nsa/cambria/resources/CambriaEventSet.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources;
+package com.att.nsa.cambria.resources;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,14 +27,13 @@ import java.util.zip.GZIPInputStream;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher.message;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.streamReaders.CambriaJsonStreamReader;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.streamReaders.CambriaRawStreamReader;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.streamReaders.CambriaStreamReader;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.streamReaders.CambriaTextStreamReader;
-
 import com.att.nsa.apiServer.streams.ChunkedInputStream;
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.backends.Publisher.message;
+import com.att.nsa.cambria.resources.streamReaders.CambriaJsonStreamReader;
+import com.att.nsa.cambria.resources.streamReaders.CambriaRawStreamReader;
+import com.att.nsa.cambria.resources.streamReaders.CambriaStreamReader;
+import com.att.nsa.cambria.resources.streamReaders.CambriaTextStreamReader;
 import com.att.nsa.drumlin.service.standards.HttpStatusCodes;
 
 /**
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/resources/CambriaOutboundEventStream.java b/src/main/java/com/att/nsa/cambria/resources/CambriaOutboundEventStream.java
index 9fbc7f7..e519f71 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/resources/CambriaOutboundEventStream.java
+++ b/src/main/java/com/att/nsa/cambria/resources/CambriaOutboundEventStream.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources;
+package com.att.nsa.cambria.resources;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -33,16 +33,16 @@ import com.att.eelf.configuration.EELFManager;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Consumer;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Consumer.Message;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Topic;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.Utils;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.DMaaPResponseBuilder.StreamWriter;
 
 import com.att.ajsc.filemonitor.AJSCPropertiesMap;
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.backends.Consumer;
+import com.att.nsa.cambria.backends.Consumer.Message;
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.constants.CambriaConstants;
+import com.att.nsa.cambria.metabroker.Topic;
+import com.att.nsa.cambria.utils.DMaaPResponseBuilder.StreamWriter;
+import com.att.nsa.cambria.utils.Utils;
 
 
 /**
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/resources/streamReaders/CambriaJsonStreamReader.java b/src/main/java/com/att/nsa/cambria/resources/streamReaders/CambriaJsonStreamReader.java
index 5aefe2d..9d727ad 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/resources/streamReaders/CambriaJsonStreamReader.java
+++ b/src/main/java/com/att/nsa/cambria/resources/streamReaders/CambriaJsonStreamReader.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.streamReaders;
+package com.att.nsa.cambria.resources.streamReaders;
 
 import java.io.InputStream;
 
@@ -28,10 +28,11 @@ import javax.servlet.http.HttpServletResponse;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher.message;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.LogDetails;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.CambriaEventSet.reader;
+
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.backends.Publisher.message;
+import com.att.nsa.cambria.beans.LogDetails;
+import com.att.nsa.cambria.resources.CambriaEventSet.reader;
 
 /**
  * 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/resources/streamReaders/CambriaRawStreamReader.java b/src/main/java/com/att/nsa/cambria/resources/streamReaders/CambriaRawStreamReader.java
index f0ec225..16f6785 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/resources/streamReaders/CambriaRawStreamReader.java
+++ b/src/main/java/com/att/nsa/cambria/resources/streamReaders/CambriaRawStreamReader.java
@@ -19,18 +19,17 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.streamReaders;
+package com.att.nsa.cambria.resources.streamReaders;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher.message;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.LogDetails;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.CambriaEventSet.reader;
-
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.backends.Publisher.message;
+import com.att.nsa.cambria.beans.LogDetails;
+import com.att.nsa.cambria.resources.CambriaEventSet.reader;
 import com.att.nsa.util.StreamTools;
 
 /**
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/resources/streamReaders/CambriaStreamReader.java b/src/main/java/com/att/nsa/cambria/resources/streamReaders/CambriaStreamReader.java
index bff6398..38359f0 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/resources/streamReaders/CambriaStreamReader.java
+++ b/src/main/java/com/att/nsa/cambria/resources/streamReaders/CambriaStreamReader.java
@@ -19,17 +19,17 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.streamReaders;
+package com.att.nsa.cambria.resources.streamReaders;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher.message;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.LogDetails;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.CambriaEventSet.reader;
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.backends.Publisher.message;
+import com.att.nsa.cambria.beans.LogDetails;
+import com.att.nsa.cambria.resources.CambriaEventSet.reader;
 
 /**
  * Read an optionally chunked stream in the Cambria app format. This format
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/resources/streamReaders/CambriaTextStreamReader.java b/src/main/java/com/att/nsa/cambria/resources/streamReaders/CambriaTextStreamReader.java
index ce2cffd..2b76a61 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/resources/streamReaders/CambriaTextStreamReader.java
+++ b/src/main/java/com/att/nsa/cambria/resources/streamReaders/CambriaTextStreamReader.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.streamReaders;
+package com.att.nsa.cambria.resources.streamReaders;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -28,10 +28,10 @@ import java.io.InputStreamReader;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher.message;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.LogDetails;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.CambriaEventSet.reader;
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.backends.Publisher.message;
+import com.att.nsa.cambria.beans.LogDetails;
+import com.att.nsa.cambria.resources.CambriaEventSet.reader;
 
 /**
  * This stream reader just pulls single lines. It uses the default partition if provided. If
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/security/DMaaPAAFAuthenticator.java b/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticator.java
index 9593b51..fa4fe17 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/security/DMaaPAAFAuthenticator.java
+++ b/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticator.java
@@ -19,11 +19,11 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security;
+package com.att.nsa.cambria.security;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.CambriaApiException;
 
 
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java b/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java
index 223e8c5..97ca1fd 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java
+++ b/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java
@@ -19,18 +19,19 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security;
+package com.att.nsa.cambria.security;
 
 import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.http.HttpStatus;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.DMaaPResponseCode;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.ErrorResponse;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.Utils;
+
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.constants.CambriaConstants;
+import com.att.nsa.cambria.exception.DMaaPResponseCode;
+import com.att.nsa.cambria.exception.ErrorResponse;
+import com.att.nsa.cambria.utils.Utils;
 
 
 /**
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/security/DMaaPAuthenticator.java b/src/main/java/com/att/nsa/cambria/security/DMaaPAuthenticator.java
index b0c87af..5e7073d 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/security/DMaaPAuthenticator.java
+++ b/src/main/java/com/att/nsa/cambria/security/DMaaPAuthenticator.java
@@ -19,12 +19,11 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security;
+package com.att.nsa.cambria.security;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-
+import com.att.nsa.cambria.beans.DMaaPContext;
 import com.att.nsa.security.NsaApiKey;
 
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/security/DMaaPAuthenticatorImpl.java b/src/main/java/com/att/nsa/cambria/security/DMaaPAuthenticatorImpl.java
index d1d5019..eb2a483 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/security/DMaaPAuthenticatorImpl.java
+++ b/src/main/java/com/att/nsa/cambria/security/DMaaPAuthenticatorImpl.java
@@ -19,15 +19,14 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security;
+package com.att.nsa.cambria.security;
 
 import java.util.LinkedList;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.impl.DMaaPOriginalUebAuthenticator;
-
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.security.impl.DMaaPOriginalUebAuthenticator;
 import com.att.nsa.security.NsaApiKey;
 import com.att.nsa.security.NsaAuthenticator;
 import com.att.nsa.security.authenticators.OriginalUebAuthenticator;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/security/impl/DMaaPMechIdAuthenticator.java b/src/main/java/com/att/nsa/cambria/security/impl/DMaaPMechIdAuthenticator.java
index dcf98f8..c2a41cc 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/security/impl/DMaaPMechIdAuthenticator.java
+++ b/src/main/java/com/att/nsa/cambria/security/impl/DMaaPMechIdAuthenticator.java
@@ -19,13 +19,14 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.impl;
+package com.att.nsa.cambria.security.impl;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAuthenticator;
 
+
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.security.DMaaPAuthenticator;
 import com.att.nsa.security.NsaApiKey;
 import com.att.nsa.security.authenticators.MechIdAuthenticator;
 //import com.att.nsa.security.db.NsaApiDb;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/security/impl/DMaaPOriginalUebAuthenticator.java b/src/main/java/com/att/nsa/cambria/security/impl/DMaaPOriginalUebAuthenticator.java
index 8026ab5..fdcf7c1 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/security/impl/DMaaPOriginalUebAuthenticator.java
+++ b/src/main/java/com/att/nsa/cambria/security/impl/DMaaPOriginalUebAuthenticator.java
@@ -19,18 +19,16 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.impl;
+package com.att.nsa.cambria.security.impl;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import javax.servlet.http.HttpServletRequest;
-
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAuthenticator;
-
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.security.DMaaPAuthenticator;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.drumlin.till.data.sha1HmacSigner;
 import com.att.nsa.security.NsaApiKey;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/AdminService.java b/src/main/java/com/att/nsa/cambria/service/AdminService.java
index b4a7282..6f0d9cf 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/AdminService.java
+++ b/src/main/java/com/att/nsa/cambria/service/AdminService.java
@@ -19,13 +19,13 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service;
+package com.att.nsa.cambria.service;
 
 import java.io.IOException;
 
 import org.json.JSONException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
 
+import com.att.nsa.cambria.beans.DMaaPContext;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/ApiKeysService.java b/src/main/java/com/att/nsa/cambria/service/ApiKeysService.java
index bb3685d..6fc9c0d 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/ApiKeysService.java
+++ b/src/main/java/com/att/nsa/cambria/service/ApiKeysService.java
@@ -19,13 +19,12 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service;
+package com.att.nsa.cambria.service;
 
 import java.io.IOException;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.ApiKeyBean;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-
+import com.att.nsa.cambria.beans.ApiKeyBean;
+import com.att.nsa.cambria.beans.DMaaPContext;
 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.security.db.NsaApiDb.KeyExistsException;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/EventsService.java b/src/main/java/com/att/nsa/cambria/service/EventsService.java
index 526d185..477538d 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/EventsService.java
+++ b/src/main/java/com/att/nsa/cambria/service/EventsService.java
@@ -19,16 +19,15 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service;
+package com.att.nsa.cambria.service;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.ConsumerFactory.UnavailableException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Broker.TopicExistsException;
-
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.backends.ConsumerFactory.UnavailableException;
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.metabroker.Broker.TopicExistsException;
 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/MMService.java b/src/main/java/com/att/nsa/cambria/service/MMService.java
index 021db2c..5c14674 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/MMService.java
+++ b/src/main/java/com/att/nsa/cambria/service/MMService.java
@@ -19,17 +19,17 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service;
+package com.att.nsa.cambria.service;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 import org.json.JSONException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.ConsumerFactory.UnavailableException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Broker.TopicExistsException;
 
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.backends.ConsumerFactory.UnavailableException;
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.metabroker.Broker.TopicExistsException;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;
 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/MetricsService.java b/src/main/java/com/att/nsa/cambria/service/MetricsService.java
index aa3f967..6b11682 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/MetricsService.java
+++ b/src/main/java/com/att/nsa/cambria/service/MetricsService.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service;
+package com.att.nsa.cambria.service;
 
 /**
  * @author 
@@ -27,8 +27,8 @@ package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service;
  */
 import java.io.IOException;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.beans.DMaaPContext;
 
 /**
  * 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/TopicService.java b/src/main/java/com/att/nsa/cambria/service/TopicService.java
index fc91f63..9ed39af 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/TopicService.java
+++ b/src/main/java/com/att/nsa/cambria/service/TopicService.java
@@ -19,16 +19,16 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service;
+package com.att.nsa.cambria.service;
 
 import java.io.IOException;
 
 import org.json.JSONException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.TopicBean;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Broker.TopicExistsException;
 
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.beans.TopicBean;
+import com.att.nsa.cambria.metabroker.Broker.TopicExistsException;
 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
 import com.att.nsa.configs.ConfigDbException;
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/TransactionService.java b/src/main/java/com/att/nsa/cambria/service/TransactionService.java
index b2c8182..109b2c8 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/TransactionService.java
+++ b/src/main/java/com/att/nsa/cambria/service/TransactionService.java
@@ -19,14 +19,13 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service;
+package com.att.nsa.cambria.service;
 
 import java.io.IOException;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction.TransactionObj;
-
 import com.att.aft.dme2.internal.jettison.json.JSONException;
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.transaction.TransactionObj;
 import com.att.nsa.configs.ConfigDbException;
 
 /**
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/UIService.java b/src/main/java/com/att/nsa/cambria/service/UIService.java
index daa3825..b6555fe 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/UIService.java
+++ b/src/main/java/com/att/nsa/cambria/service/UIService.java
@@ -22,12 +22,11 @@
 /**
  * 
  */
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service;
+package com.att.nsa.cambria.service;
 
 import java.io.IOException;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-
+import com.att.nsa.cambria.beans.DMaaPContext;
 import com.att.nsa.configs.ConfigDbException;
 
 import kafka.common.TopicExistsException;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/AdminServiceImpl.java b/src/main/java/com/att/nsa/cambria/service/impl/AdminServiceImpl.java
index 96a63a7..2585ab5 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/AdminServiceImpl.java
+++ b/src/main/java/com/att/nsa/cambria/service/impl/AdminServiceImpl.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.impl;
+package com.att.nsa.cambria.service.impl;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -28,16 +28,16 @@ import java.util.Set;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Consumer;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.ConsumerFactory;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAuthenticatorImpl;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.AdminService;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.DMaaPResponseBuilder;
 import org.springframework.stereotype.Component;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
+import com.att.nsa.cambria.backends.Consumer;
+import com.att.nsa.cambria.backends.ConsumerFactory;
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.security.DMaaPAuthenticatorImpl;
+import com.att.nsa.cambria.service.AdminService;
+import com.att.nsa.cambria.utils.DMaaPResponseBuilder;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.limits.Blacklist;
 import com.att.nsa.security.NsaApiKey;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/ApiKeysServiceImpl.java b/src/main/java/com/att/nsa/cambria/service/impl/ApiKeysServiceImpl.java
index 5086f23..637d2fb 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/ApiKeysServiceImpl.java
+++ b/src/main/java/com/att/nsa/cambria/service/impl/ApiKeysServiceImpl.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.impl;
+package com.att.nsa.cambria.service.impl;
 
 import java.io.IOException;
 
@@ -27,16 +27,17 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.ApiKeyBean;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAuthenticatorImpl;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.ApiKeysService;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.ConfigurationReader;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.DMaaPResponseBuilder;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.Emailer;
 import org.springframework.stereotype.Service;
 
+//import com.att.nsa.apiServer.util.Emailer;
+import com.att.nsa.cambria.utils.Emailer;
+import com.att.nsa.cambria.beans.ApiKeyBean;
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.constants.CambriaConstants;
+import com.att.nsa.cambria.security.DMaaPAuthenticatorImpl;
+import com.att.nsa.cambria.service.ApiKeysService;
+import com.att.nsa.cambria.utils.ConfigurationReader;
+import com.att.nsa.cambria.utils.DMaaPResponseBuilder;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.drumlin.service.standards.HttpStatusCodes;
 import com.att.nsa.security.NsaApiKey;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/BaseTransactionDbImpl.java b/src/main/java/com/att/nsa/cambria/service/impl/BaseTransactionDbImpl.java
index be779fa..cdbf57b 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/BaseTransactionDbImpl.java
+++ b/src/main/java/com/att/nsa/cambria/service/impl/BaseTransactionDbImpl.java
@@ -19,16 +19,15 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.impl;
+package com.att.nsa.cambria.service.impl;
 
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction.DMaaPTransactionFactory;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction.DMaaPTransactionObj;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction.DMaaPTransactionObjDB;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction.TransactionObj;
-
+import com.att.nsa.cambria.transaction.DMaaPTransactionFactory;
+import com.att.nsa.cambria.transaction.DMaaPTransactionObj;
+import com.att.nsa.cambria.transaction.DMaaPTransactionObjDB;
+import com.att.nsa.cambria.transaction.TransactionObj;
 import com.att.nsa.configs.ConfigDb;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.configs.ConfigPath;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/EventsServiceImpl.java b/src/main/java/com/att/nsa/cambria/service/impl/EventsServiceImpl.java
index dce5a19..3386f19 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/EventsServiceImpl.java
+++ b/src/main/java/com/att/nsa/cambria/service/impl/EventsServiceImpl.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.impl;
+package com.att.nsa.cambria.service.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,35 +37,35 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.json.JSONObject;
 import org.json.JSONTokener;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Consumer;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.ConsumerFactory;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.MetricsSet;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.ConsumerFactory.UnavailableException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher.message;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPCambriaLimiter;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.LogDetails;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.DMaaPAccessDeniedException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.DMaaPErrorMessages;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.DMaaPResponseCode;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.ErrorResponse;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Topic;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Broker.TopicExistsException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.CambriaEventSet;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.CambriaOutboundEventStream;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAAFAuthenticator;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAAFAuthenticatorImpl;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAuthenticatorImpl;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.EventsService;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.DMaaPResponseBuilder;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.att.ajsc.filemonitor.AJSCPropertiesMap;
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.backends.Consumer;
+import com.att.nsa.cambria.backends.ConsumerFactory;
+import com.att.nsa.cambria.backends.ConsumerFactory.UnavailableException;
+import com.att.nsa.cambria.backends.MetricsSet;
+import com.att.nsa.cambria.backends.Publisher;
+import com.att.nsa.cambria.backends.Publisher.message;
+import com.att.nsa.cambria.beans.DMaaPCambriaLimiter;
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.beans.LogDetails;
+import com.att.nsa.cambria.constants.CambriaConstants;
+import com.att.nsa.cambria.exception.DMaaPAccessDeniedException;
+import com.att.nsa.cambria.exception.DMaaPErrorMessages;
+import com.att.nsa.cambria.exception.DMaaPResponseCode;
+import com.att.nsa.cambria.exception.ErrorResponse;
+import com.att.nsa.cambria.metabroker.Broker.TopicExistsException;
+import com.att.nsa.cambria.metabroker.Topic;
+import com.att.nsa.cambria.resources.CambriaEventSet;
+import com.att.nsa.cambria.resources.CambriaOutboundEventStream;
+import com.att.nsa.cambria.security.DMaaPAAFAuthenticator;
+import com.att.nsa.cambria.security.DMaaPAAFAuthenticatorImpl;
+import com.att.nsa.cambria.security.DMaaPAuthenticatorImpl;
+import com.att.nsa.cambria.service.EventsService;
+import com.att.nsa.cambria.utils.DMaaPResponseBuilder;
+import com.att.nsa.cambria.utils.Utils;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.drumlin.service.standards.MimeTypes;
 import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/MMServiceImpl.java b/src/main/java/com/att/nsa/cambria/service/impl/MMServiceImpl.java
index cdba378..4f6a9a1 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/MMServiceImpl.java
+++ b/src/main/java/com/att/nsa/cambria/service/impl/MMServiceImpl.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.impl;
+package com.att.nsa.cambria.service.impl;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -39,35 +39,36 @@ import com.att.eelf.configuration.EELFManager;
 
 import org.json.JSONObject;
 import org.json.JSONTokener;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Consumer;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.ConsumerFactory;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.MetricsSet;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.ConsumerFactory.UnavailableException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher.message;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.LogDetails;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.DMaaPAccessDeniedException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.DMaaPErrorMessages;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.DMaaPResponseCode;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.ErrorResponse;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Topic;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Broker.TopicExistsException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.CambriaEventSet;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.resources.CambriaOutboundEventStream;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAAFAuthenticator;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAAFAuthenticatorImpl;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.MMService;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.ConfigurationReader;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.DMaaPResponseBuilder;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import com.att.ajsc.filemonitor.AJSCPropertiesMap;
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.backends.Consumer;
+import com.att.nsa.cambria.backends.ConsumerFactory;
+import com.att.nsa.cambria.backends.ConsumerFactory.UnavailableException;
+import com.att.nsa.cambria.backends.Publisher.message;
+import com.att.nsa.cambria.backends.MetricsSet;
+import com.att.nsa.cambria.backends.Publisher;
+
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.beans.LogDetails;
+import com.att.nsa.cambria.constants.CambriaConstants;
+import com.att.nsa.cambria.exception.DMaaPAccessDeniedException;
+import com.att.nsa.cambria.exception.DMaaPErrorMessages;
+import com.att.nsa.cambria.exception.DMaaPResponseCode;
+import com.att.nsa.cambria.exception.ErrorResponse;
+import com.att.nsa.cambria.metabroker.Broker.TopicExistsException;
+import com.att.nsa.cambria.metabroker.Topic;
+import com.att.nsa.cambria.resources.CambriaEventSet;
+import com.att.nsa.cambria.resources.CambriaOutboundEventStream;
+import com.att.nsa.cambria.security.DMaaPAAFAuthenticator;
+import com.att.nsa.cambria.security.DMaaPAAFAuthenticatorImpl;
+import com.att.nsa.cambria.service.MMService;
+import com.att.nsa.cambria.utils.ConfigurationReader;
+import com.att.nsa.cambria.utils.DMaaPResponseBuilder;
+import com.att.nsa.cambria.utils.Utils;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.drumlin.service.standards.MimeTypes;
 import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/MetricsServiceImpl.java b/src/main/java/com/att/nsa/cambria/service/impl/MetricsServiceImpl.java
index c7db60d..1a1baf5 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/MetricsServiceImpl.java
+++ b/src/main/java/com/att/nsa/cambria/service/impl/MetricsServiceImpl.java
@@ -19,20 +19,20 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.impl;
+package com.att.nsa.cambria.service.impl;
 
 import java.io.IOException;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.MetricsSet;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.MetricsService;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.DMaaPResponseBuilder;
 import org.springframework.stereotype.Component;
 
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.backends.MetricsSet;
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.service.MetricsService;
+import com.att.nsa.cambria.utils.DMaaPResponseBuilder;
 import com.att.nsa.metrics.CdmMeasuredItem;
 
 /**
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/TopicServiceImpl.java b/src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java
index a04e110..658523d 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/TopicServiceImpl.java
+++ b/src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java
@@ -22,7 +22,7 @@
 /**
  * 
  */
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.impl;
+package com.att.nsa.cambria.service.impl;
 
 import java.io.IOException;
 
@@ -32,27 +32,27 @@ import com.att.eelf.configuration.EELFManager;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPKafkaMetaBroker;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.TopicBean;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.DMaaPAccessDeniedException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.DMaaPErrorMessages;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.DMaaPResponseCode;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.ErrorResponse;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Broker;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Topic;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Broker.TopicExistsException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAAFAuthenticator;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAAFAuthenticatorImpl;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAuthenticatorImpl;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.TopicService;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.DMaaPResponseBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.att.ajsc.filemonitor.AJSCPropertiesMap;
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.beans.DMaaPKafkaMetaBroker;
+import com.att.nsa.cambria.beans.TopicBean;
+import com.att.nsa.cambria.constants.CambriaConstants;
+import com.att.nsa.cambria.exception.DMaaPAccessDeniedException;
+import com.att.nsa.cambria.exception.DMaaPErrorMessages;
+import com.att.nsa.cambria.exception.DMaaPResponseCode;
+import com.att.nsa.cambria.exception.ErrorResponse;
+import com.att.nsa.cambria.metabroker.Broker;
+import com.att.nsa.cambria.metabroker.Broker.TopicExistsException;
+import com.att.nsa.cambria.metabroker.Topic;
+import com.att.nsa.cambria.security.DMaaPAAFAuthenticator;
+import com.att.nsa.cambria.security.DMaaPAAFAuthenticatorImpl;
+import com.att.nsa.cambria.security.DMaaPAuthenticatorImpl;
+import com.att.nsa.cambria.service.TopicService;
+import com.att.nsa.cambria.utils.DMaaPResponseBuilder;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.security.NsaAcl;
 import com.att.nsa.security.NsaApiKey;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/TransactionServiceImpl.java b/src/main/java/com/att/nsa/cambria/service/impl/TransactionServiceImpl.java
index 2299b65..9da2852 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/TransactionServiceImpl.java
+++ b/src/main/java/com/att/nsa/cambria/service/impl/TransactionServiceImpl.java
@@ -19,16 +19,16 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.impl;
+package com.att.nsa.cambria.service.impl;
 
 import java.io.IOException;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.TransactionService;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction.TransactionObj;
 import org.springframework.stereotype.Service;
 
 import com.att.aft.dme2.internal.jettison.json.JSONException;
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.service.TransactionService;
+import com.att.nsa.cambria.transaction.TransactionObj;
 import com.att.nsa.configs.ConfigDbException;
 
 /**
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/UIServiceImpl.java b/src/main/java/com/att/nsa/cambria/service/impl/UIServiceImpl.java
index 7582d78..0fbf657 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/service/impl/UIServiceImpl.java
+++ b/src/main/java/com/att/nsa/cambria/service/impl/UIServiceImpl.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.impl;
+package com.att.nsa.cambria.service.impl;
 
 import java.io.IOException;
 import java.util.LinkedList;
@@ -31,13 +31,13 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPKafkaMetaBroker;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Topic;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.service.UIService;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.DMaaPResponseBuilder;
 import org.springframework.stereotype.Service;
 
+import com.att.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.beans.DMaaPKafkaMetaBroker;
+import com.att.nsa.cambria.metabroker.Topic;
+import com.att.nsa.cambria.service.UIService;
+import com.att.nsa.cambria.utils.DMaaPResponseBuilder;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.security.db.NsaApiDb;
 import com.att.nsa.security.db.simple.NsaSimpleApiKey;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/transaction/DMaaPTransactionFactory.java b/src/main/java/com/att/nsa/cambria/transaction/DMaaPTransactionFactory.java
index a721885..ea276f9 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/transaction/DMaaPTransactionFactory.java
+++ b/src/main/java/com/att/nsa/cambria/transaction/DMaaPTransactionFactory.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction;
+package com.att.nsa.cambria.transaction;
 /**
  * 
  * @author author
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/transaction/DMaaPTransactionObj.java b/src/main/java/com/att/nsa/cambria/transaction/DMaaPTransactionObj.java
index 1fa299d..1a9ae0e 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/transaction/DMaaPTransactionObj.java
+++ b/src/main/java/com/att/nsa/cambria/transaction/DMaaPTransactionObj.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction;
+package com.att.nsa.cambria.transaction;
 
 import org.json.JSONObject;
 /**
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/transaction/DMaaPTransactionObjDB.java b/src/main/java/com/att/nsa/cambria/transaction/DMaaPTransactionObjDB.java
index a391842..ab5393a 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/transaction/DMaaPTransactionObjDB.java
+++ b/src/main/java/com/att/nsa/cambria/transaction/DMaaPTransactionObjDB.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction;
+package com.att.nsa.cambria.transaction;
 
 import java.util.Set;
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/transaction/TransactionObj.java b/src/main/java/com/att/nsa/cambria/transaction/TransactionObj.java
index e79bf01..d6e75ef 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/transaction/TransactionObj.java
+++ b/src/main/java/com/att/nsa/cambria/transaction/TransactionObj.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction;
+package com.att.nsa.cambria.transaction;
 
 import org.json.JSONObject;
 
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/transaction/TrnRequest.java b/src/main/java/com/att/nsa/cambria/transaction/TrnRequest.java
index bb8fe37..551570f 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/transaction/TrnRequest.java
+++ b/src/main/java/com/att/nsa/cambria/transaction/TrnRequest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction;
+package com.att.nsa.cambria.transaction;
 
 /**
  * Created for transaction enable logging details, this is nothing but a bean
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/transaction/impl/DMaaPSimpleTransactionFactory.java b/src/main/java/com/att/nsa/cambria/transaction/impl/DMaaPSimpleTransactionFactory.java
index bd18794..10e5da8 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/transaction/impl/DMaaPSimpleTransactionFactory.java
+++ b/src/main/java/com/att/nsa/cambria/transaction/impl/DMaaPSimpleTransactionFactory.java
@@ -19,12 +19,13 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction.impl;
+package com.att.nsa.cambria.transaction.impl;
 
 import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction.DMaaPTransactionFactory;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction.DMaaPTransactionObj;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.transaction.TransactionObj;
+
+import com.att.nsa.cambria.transaction.DMaaPTransactionFactory;
+import com.att.nsa.cambria.transaction.DMaaPTransactionObj;
+import com.att.nsa.cambria.transaction.TransactionObj;
 
 /**
  * A factory for the simple Transaction implementation
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/ConfigurationReader.java b/src/main/java/com/att/nsa/cambria/utils/ConfigurationReader.java
index 34951b8..4f75653 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/ConfigurationReader.java
+++ b/src/main/java/com/att/nsa/cambria/utils/ConfigurationReader.java
@@ -19,32 +19,34 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils;
+package com.att.nsa.cambria.utils;
 
 import javax.servlet.ServletException;
 
 import org.I0Itec.zkclient.ZkClient;
 import org.apache.curator.framework.CuratorFramework;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.ConsumerFactory;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.MetricsSet;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.Publisher;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.memory.MemoryConsumerFactory;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.memory.MemoryMetaBroker;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.memory.MemoryQueue;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.memory.MemoryQueuePublisher;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPCambriaLimiter;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPZkConfigDb;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.metabroker.Broker;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAuthenticator;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.impl.DMaaPOriginalUebAuthenticator;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.Emailer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
+//import com.att.nsa.apiServer.util.Emailer;
+import com.att.nsa.cambria.utils.Emailer;
+import com.att.nsa.cambria.backends.ConsumerFactory;
+import com.att.nsa.cambria.backends.MetricsSet;
+import com.att.nsa.cambria.backends.Publisher;
+import com.att.nsa.cambria.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException;
+import com.att.nsa.cambria.backends.memory.MemoryConsumerFactory;
+import com.att.nsa.cambria.backends.memory.MemoryMetaBroker;
+import com.att.nsa.cambria.backends.memory.MemoryQueue;
+import com.att.nsa.cambria.backends.memory.MemoryQueuePublisher;
+//import com.att.nsa.cambria.beans.DMaaPBlacklist;
+import com.att.nsa.cambria.beans.DMaaPCambriaLimiter;
+import com.att.nsa.cambria.beans.DMaaPZkConfigDb;
+import com.att.nsa.cambria.constants.CambriaConstants;
+import com.att.nsa.cambria.metabroker.Broker;
+import com.att.nsa.cambria.security.DMaaPAuthenticator;
+import com.att.nsa.cambria.security.impl.DMaaPOriginalUebAuthenticator;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.configs.confimpl.MemConfigDb;
 import com.att.nsa.drumlin.till.nv.rrNvReadable;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/DMaaPCuratorFactory.java b/src/main/java/com/att/nsa/cambria/utils/DMaaPCuratorFactory.java
index 8950ec8..4c44c23 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/DMaaPCuratorFactory.java
+++ b/src/main/java/com/att/nsa/cambria/utils/DMaaPCuratorFactory.java
@@ -19,13 +19,12 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils;
+package com.att.nsa.cambria.utils;
 
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.retry.ExponentialBackoffRetry;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-
+import com.att.nsa.cambria.constants.CambriaConstants;
 import com.att.nsa.drumlin.till.nv.rrNvReadable;
 
 /**
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/DMaaPResponseBuilder.java b/src/main/java/com/att/nsa/cambria/utils/DMaaPResponseBuilder.java
index a24dd6b..c99e08c 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/DMaaPResponseBuilder.java
+++ b/src/main/java/com/att/nsa/cambria/utils/DMaaPResponseBuilder.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils;
+package com.att.nsa.cambria.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -33,7 +33,8 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
+
+import com.att.nsa.cambria.beans.DMaaPContext;
 
 /**
  * class is used to create response object which is given to user
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/Emailer.java b/src/main/java/com/att/nsa/cambria/utils/Emailer.java
index 3f87d59..a71370a 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/Emailer.java
+++ b/src/main/java/com/att/nsa/cambria/utils/Emailer.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils;
+package com.att.nsa.cambria.utils;
 
 import java.io.IOException;
 import java.util.Properties;
@@ -37,14 +37,13 @@ import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-
 //import org.slf4j.Logger;
 //import org.slf4j.LoggerFactory;
 
 import com.att.ajsc.filemonitor.AJSCPropertiesMap;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
+import com.att.nsa.cambria.constants.CambriaConstants;
 import com.att.nsa.drumlin.till.nv.rrNvReadable;
 
 /**
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/PropertyReader.java b/src/main/java/com/att/nsa/cambria/utils/PropertyReader.java
index a3b65e1..bda1c14 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/PropertyReader.java
+++ b/src/main/java/com/att/nsa/cambria/utils/PropertyReader.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils;
+package com.att.nsa.cambria.utils;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -27,10 +27,10 @@ import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.constants.CambriaConstants;
-
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
+
+import com.att.nsa.cambria.constants.CambriaConstants;
 import com.att.nsa.drumlin.till.nv.impl.nvPropertiesFile;
 import com.att.nsa.drumlin.till.nv.impl.nvReadableStack;
 import com.att.nsa.drumlin.till.nv.impl.nvReadableTable;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/Utils.java b/src/main/java/com/att/nsa/cambria/utils/Utils.java
index 300cf86..6538576 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/Utils.java
+++ b/src/main/java/com/att/nsa/cambria/utils/Utils.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils;
+package com.att.nsa.cambria.utils;
 
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
@@ -30,7 +30,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPContext;
+import com.att.nsa.cambria.beans.DMaaPContext;
 /**
  * This is an utility class for various operations for formatting
  * @author author
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/filter/ContentLengthFilter.java b/src/main/java/com/att/nsa/filter/ContentLengthFilter.java
index 7f90e80..d70da66 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/filter/ContentLengthFilter.java
+++ b/src/main/java/com/att/nsa/filter/ContentLengthFilter.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.filter;
+package com.att.nsa.filter;
 
 import java.io.IOException;
 
@@ -35,13 +35,14 @@ import org.apache.http.HttpStatus;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.CambriaApiException;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.DMaaPErrorMessages;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.DMaaPResponseCode;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.exception.ErrorResponse;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import com.att.nsa.cambria.CambriaApiException;
+import com.att.nsa.cambria.exception.DMaaPErrorMessages;
+import com.att.nsa.cambria.exception.DMaaPResponseCode;
+import com.att.nsa.cambria.exception.ErrorResponse;
+
 /**
  * Servlet Filter implementation class ContentLengthFilter
  */
diff --git a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/filter/DefaultLength.java b/src/main/java/com/att/nsa/filter/DefaultLength.java
index 9fe91cf..c8a6d0a 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/msgrtr/nsa/filter/DefaultLength.java
+++ b/src/main/java/com/att/nsa/filter/DefaultLength.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.filter;
+package com.att.nsa.filter;
 
 
 public class DefaultLength {
diff --git a/src/main/resources/DMaaPUrl.properties b/src/main/resources/DMaaPUrl.properties
index 8c90912..a0cf9ab 100644
--- a/src/main/resources/DMaaPUrl.properties
+++ b/src/main/resources/DMaaPUrl.properties
@@ -36,4 +36,4 @@ url=http://hltd436.hydc.sbc.com:8080/DMaaP/dmaaprest/
 date=2015-11-23T8:56:19-0700
 
 # topic
-topicName=org.onap.dmaap.messagerouter.msgrtr.app.dmaap.mr.sharjeel
\ No newline at end of file
+topicName=com.att.app.dmaap.mr.sharjeel
\ No newline at end of file
diff --git a/src/main/resources/dme2testcase.properties b/src/main/resources/dme2testcase.properties
index 6f358a3..ad38c43 100644
--- a/src/main/resources/dme2testcase.properties
+++ b/src/main/resources/dme2testcase.properties
@@ -39,17 +39,17 @@ filterType=filter={"class":"Equals", "field":"email", "value":"ai039a@att.com"}
 #topics
 subContextPathGetAllTopic=/topics
 subContextPathGetOneTopic=/topics/
-SubContextPathGetPublisher=/topics/org.onap.dmaap.messagerouter.msgrtr.app.dmaap.mr.sharjeel/producers
-SubContextPathGetPermitPublisher=/topics/org.onap.dmaap.messagerouter.msgrtr.app.dmaap.mr.sharjeel/producers/rk229m@csp.att.com
-SubContextPathGetConsumer=/topics/org.onap.dmaap.messagerouter.msgrtr.app.dmaap.mr.sharjeel/consumers
+SubContextPathGetPublisher=/topics/com.att.app.dmaap.mr.sharjeel/producers
+SubContextPathGetPermitPublisher=/topics/com.att.app.dmaap.mr.sharjeel/producers/rk229m@csp.att.com
+SubContextPathGetConsumer=/topics/com.att.app.dmaap.mr.sharjeel/consumers
 SubContextPathCreateTopic=/topics/create
-SubContextPathGetPermitConsumer=/topics/org.onap.dmaap.messagerouter.msgrtr.app.dmaap.mr.sharjeel/consumers/rk229m@att.com
-newTopic=org.onap.dmaap.messagerouter.msgrtr.dmaap.mr.junittestingtopic
+SubContextPathGetPermitConsumer=/topics/com.att.app.dmaap.mr.sharjeel/consumers/rk229m@att.com
+newTopic=com.att.dmaap.mr.junittestingtopic
 topicDescription=new topic creation
 partition=1
 replication=1
 txenabled=true
-deleteTopic=org.onap.dmaap.messagerouter.msgrtr.dmaap.mr.deleteTopic
+deleteTopic=com.att.dmaap.mr.deleteTopic
 
 
 #Admin
diff --git a/src/main/resources/endpoint.properties b/src/main/resources/endpoint.properties
index f1ab131..34e222f 100644
--- a/src/main/resources/endpoint.properties
+++ b/src/main/resources/endpoint.properties
@@ -22,7 +22,7 @@
 Latitude =37.66
 Longitude =-122.096839
 Version =1.0.0
-ServiceName =org.onap.dmaap.messagerouter.msgrtr.acsi.saat.dt.dmaap.dev.demo1
+ServiceName =com.att.acsi.saat.dt.dmaap.dev.demo1
 Environment =DEV
 RouteOffer =LA
 HostName =hltd436.hydc.sbc.com
diff --git a/src/main/resources/routes.conf b/src/main/resources/routes.conf
index 14c4f56..ccaa94d 100644
--- a/src/main/resources/routes.conf
+++ b/src/main/resources/routes.conf
@@ -1,4 +1,4 @@
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.endpoints
+package com.att.nsa.cambria.endpoints
 
 #
 #	We need to deprecate the original non-versioned paths and use /v1/ for them.
diff --git a/src/main/scripts/cambriaTool.sh b/src/main/scripts/cambriaTool.sh
index 175a19c..a9d6e15 100644
--- a/src/main/scripts/cambriaTool.sh
+++ b/src/main/scripts/cambriaTool.sh
@@ -52,4 +52,4 @@ else
     JAVA=java
 fi
 
-$JAVA -cp ${BASE_DIR}/etc${PATHSEP}${BASE_DIR}/lib/* org.onap.dmaap.messagerouter.messageservice.nsa.cambria.tools.ConfigTool $*
+$JAVA -cp ${BASE_DIR}/etc${PATHSEP}${BASE_DIR}/lib/* com.att.nsa.cambria.tools.ConfigTool $*
diff --git a/src/main/scripts/swmpkgclean.sh b/src/main/scripts/swmpkgclean.sh
index 5f8699f..7e6bc51 100644
--- a/src/main/scripts/swmpkgclean.sh
+++ b/src/main/scripts/swmpkgclean.sh
@@ -24,7 +24,7 @@
 # SWM can only store a finite amount of packages in its repository, so this script deletes the oldest package.
 # This script is run by Jenkins after the build is finished (post SWM upload).
 
-SWM_COMPONENT="org.onap.dmaap.messagerouter.msgrtr.nsa:msgrtr"
+SWM_COMPONENT="com.att.nsa:msgrtr"
 
 SWM_PKGS=`/opt/app/swm/aftswmcli/bin/swmcli "component pkglist -c $SWM_COMPONENT -df -dh -dj -sui"`
 SWM_PKGS_COUNT=`echo "$SWM_PKGS" | wc -l`
diff --git a/src/main/webapp/WEB-INF/spring-context.xml b/src/main/webapp/WEB-INF/spring-context.xml
index d7f128e..5e2e985 100644
--- a/src/main/webapp/WEB-INF/spring-context.xml
+++ b/src/main/webapp/WEB-INF/spring-context.xml
@@ -56,49 +56,49 @@
 	<bean id="drumlinRequestRouter"
 		class="com.att.nsa.drumlin.service.framework.routing.DrumlinRequestRouter" />
 
-	<bean id="dMaaPMetricsSet" class="org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPMetricsSet">
+	<bean id="dMaaPMetricsSet" class="com.att.nsa.cambria.beans.DMaaPMetricsSet">
 		<constructor-arg ref="propertyReader" />
 	</bean>
 
-	<bean id="dMaaPZkClient" class=" org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPZkClient">
+	<bean id="dMaaPZkClient" class=" com.att.nsa.cambria.beans.DMaaPZkClient">
 		<constructor-arg ref="propertyReader" />
 	</bean>
 
-	<bean id="dMaaPZkConfigDb" class=" org.onap.dmaap.messagerouter.msgrt.nsa.cambria.beans.DMaaPZkConfigDb">
+	<bean id="dMaaPZkConfigDb" class=" com.att.nsa.cambria.beans.DMaaPZkConfigDb">
 		<constructor-arg ref="dMaaPZkClient" />
 		<constructor-arg ref="propertyReader" />
 	</bean>
 
-	<bean id="kafkaPublisher" class=" org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.kafka.KafkaPublisher">
+	<bean id="kafkaPublisher" class=" com.att.nsa.cambria.backends.kafka.KafkaPublisher">
 		<constructor-arg ref="propertyReader" />
 	</bean>
 
-	<bean id="dMaaPKafkaConsumerFactory" class=" org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPKafkaConsumerFactory">
+	<bean id="dMaaPKafkaConsumerFactory" class=" com.att.nsa.cambria.beans.DMaaPKafkaConsumerFactory">
 		<constructor-arg ref="propertyReader" />
 		<constructor-arg ref="dMaaPMetricsSet" />
 		<constructor-arg ref="curator" />
 	</bean>
 
-	<bean id="curator" class="org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.DMaaPCuratorFactory"
+	<bean id="curator" class="com.att.nsa.cambria.utils.DMaaPCuratorFactory"
 		factory-method="getCurator">
 		<constructor-arg ref="propertyReader" />
 	</bean>
 
-	<bean id="dMaaPKafkaMetaBroker" class=" org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPKafkaMetaBroker">
+	<bean id="dMaaPKafkaMetaBroker" class=" com.att.nsa.cambria.beans.DMaaPKafkaMetaBroker">
 		<constructor-arg ref="propertyReader" />
 		<constructor-arg ref="dMaaPZkClient" />
 		<constructor-arg ref="dMaaPZkConfigDb" />
 	</bean>
 
-	<bean id="q" class=" org.onap.dmaap.messagerouter.msgrtr.com.att.nsa.cambria.backends.memory.MemoryQueue" />
+	<bean id="q" class=" com.att.nsa.cambria.backends.memory.MemoryQueue" />
 
-	<bean id="mmb" class=" org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.memory.MemoryMetaBroker">
+	<bean id="mmb" class=" com.att.nsa.cambria.backends.memory.MemoryMetaBroker">
 		<constructor-arg ref="q" />
 		<constructor-arg ref="dMaaPZkConfigDb" />
 	<!-- <constructor-arg ref="propertyReader" />-->
 	</bean>
 
-	<bean id="dMaaPNsaApiDb" class="org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPNsaApiDb"
+	<bean id="dMaaPNsaApiDb" class="com.att.nsa.cambria.beans.DMaaPNsaApiDb"
 		factory-method="buildApiKeyDb">
 		<constructor-arg ref="propertyReader" />
 		<constructor-arg ref="dMaaPZkConfigDb" />
@@ -108,10 +108,10 @@
 		factory-method="buildTransactionDb"> <constructor-arg ref="propertyReader" 
 		/> <constructor-arg ref="dMaaPZkConfigDb" /> </bean> -->
 
-	<bean id="dMaaPAuthenticatorImpl" class="org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAuthenticatorImpl">
+	<bean id="dMaaPAuthenticatorImpl" class="com.att.nsa.cambria.security.DMaaPAuthenticatorImpl">
 		<constructor-arg ref="dMaaPNsaApiDb" />
 	</bean>
-	<bean id="defLength" class="org.onap.dmaap.messagerouter.msgrtr.nsa.filter.DefaultLength">
+	<bean id="defLength" class="com.att.nsa.filter.DefaultLength">
 		<property name="defaultLength" value="${maxcontentlength}"></property>
 	</bean>
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index c3e07b5..46d7b45 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -31,12 +31,12 @@
     <param-value>/WEB-INF/spring-context.xml</param-value>
   </context-param>
   <listener>
-    <listener-class>org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.listener.CambriaServletContextListener</listener-class>
+    <listener-class>com.att.nsa.cambria.listener.CambriaServletContextListener</listener-class>
   </listener>
   <filter>
     <display-name>ContentLengthFilter</display-name>
     <filter-name>ContentLengthFilter</filter-name>
-    <filter-class>org.onap.dmaap.messagerouter.msgrtr.nsa.filter.ContentLengthFilter</filter-class>
+    <filter-class>com.att.nsa.filter.ContentLengthFilter</filter-class>
   </filter>
   <filter-mapping>
     <filter-name>ContentLengthFilter</filter-name>
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/ApiKeyBean.java b/src/test/java/com/att/mr/test/dmaap/ApiKeyBean.java
index dd458eb..3c0bb79 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/ApiKeyBean.java
+++ b/src/test/java/com/att/mr/test/dmaap/ApiKeyBean.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import java.io.Serializable;
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DMaapPubSubTest.java b/src/test/java/com/att/mr/test/dmaap/DMaapPubSubTest.java
index 066bf50..fc91598 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DMaapPubSubTest.java
+++ b/src/test/java/com/att/mr/test/dmaap/DMaapPubSubTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import java.io.InputStream;
 import java.util.Scanner;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DMaapTopicTest.java b/src/test/java/com/att/mr/test/dmaap/DMaapTopicTest.java
index 780ce1a..1b5e746 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DMaapTopicTest.java
+++ b/src/test/java/com/att/mr/test/dmaap/DMaapTopicTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import java.io.InputStream;
 import java.util.Properties;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DmaapAdminTest.java b/src/test/java/com/att/mr/test/dmaap/DmaapAdminTest.java
index 19e78a9..f3e7fa9 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DmaapAdminTest.java
+++ b/src/test/java/com/att/mr/test/dmaap/DmaapAdminTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DmaapApiKeyTest.java b/src/test/java/com/att/mr/test/dmaap/DmaapApiKeyTest.java
index e2ed0d4..77a2500 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DmaapApiKeyTest.java
+++ b/src/test/java/com/att/mr/test/dmaap/DmaapApiKeyTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import java.io.InputStream;
 import java.util.Properties;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DmaapMetricsTest.java b/src/test/java/com/att/mr/test/dmaap/DmaapMetricsTest.java
index 658e274..9728687 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DmaapMetricsTest.java
+++ b/src/test/java/com/att/mr/test/dmaap/DmaapMetricsTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import java.io.InputStream;
 import java.util.Scanner;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/JUnitTestSuite.java b/src/test/java/com/att/mr/test/dmaap/JUnitTestSuite.java
index 4b2d52a..40a5286 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/JUnitTestSuite.java
+++ b/src/test/java/com/att/mr/test/dmaap/JUnitTestSuite.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import junit.framework.TestSuite;
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/LoadPropertyFile.java b/src/test/java/com/att/mr/test/dmaap/LoadPropertyFile.java
index 8c4afa2..c9d0387 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/LoadPropertyFile.java
+++ b/src/test/java/com/att/mr/test/dmaap/LoadPropertyFile.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/TestRunner.java b/src/test/java/com/att/mr/test/dmaap/TestRunner.java
index bffb32e..9a744d9 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/TestRunner.java
+++ b/src/test/java/com/att/mr/test/dmaap/TestRunner.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/TopicBean.java b/src/test/java/com/att/mr/test/dmaap/TopicBean.java
index 9c0ddbb..62f9d0c 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/TopicBean.java
+++ b/src/test/java/com/att/mr/test/dmaap/TopicBean.java
@@ -22,7 +22,7 @@
 /**
  * 
  */
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import java.io.Serializable;
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/ApiKeyBean.java b/src/test/java/com/att/mr/test/dme2/ApiKeyBean.java
index 03e34ad..e6545e1 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/ApiKeyBean.java
+++ b/src/test/java/com/att/mr/test/dme2/ApiKeyBean.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.io.Serializable;
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2AdminTest.java b/src/test/java/com/att/mr/test/dme2/DME2AdminTest.java
index ce7f80b..5f6f9c4 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2AdminTest.java
+++ b/src/test/java/com/att/mr/test/dme2/DME2AdminTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -27,12 +27,13 @@ import java.util.HashMap;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
-import org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap.DmaapAdminTest;
 
 import junit.framework.TestCase;
 
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Exception;
+import com.att.mr.test.dmaap.DmaapAdminTest;
+//import com.ibm.disthub2.impl.client.PropSchema;
 
 public class DME2AdminTest extends TestCase {
 	private static final Logger LOGGER = Logger.getLogger(DME2AdminTest.class);
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ApiKeyTest.java b/src/test/java/com/att/mr/test/dme2/DME2ApiKeyTest.java
index 9088eb9..ee2ef9d 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ApiKeyTest.java
+++ b/src/test/java/com/att/mr/test/dme2/DME2ApiKeyTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ConsumerFilterTest.java b/src/test/java/com/att/mr/test/dme2/DME2ConsumerFilterTest.java
index 3a4bc75..30c13ea 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ConsumerFilterTest.java
+++ b/src/test/java/com/att/mr/test/dme2/DME2ConsumerFilterTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -28,12 +28,12 @@ import java.util.HashMap;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
-import org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap.DmaapAdminTest;
 
 import junit.framework.TestCase;
 
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Exception;
+import com.att.mr.test.dmaap.DmaapAdminTest;
 
 public class DME2ConsumerFilterTest extends TestCase {
 	private static final Logger LOGGER = Logger.getLogger(DME2ConsumerFilterTest.class);
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ConsumerTest.java b/src/test/java/com/att/mr/test/dme2/DME2ConsumerTest.java
index 5406c6a..810f451 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ConsumerTest.java
+++ b/src/test/java/com/att/mr/test/dme2/DME2ConsumerTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -27,12 +27,12 @@ import java.util.HashMap;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
-import org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap.DmaapAdminTest;
 
 import junit.framework.TestCase;
 
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Exception;
+import com.att.mr.test.dmaap.DmaapAdminTest;
 
 public class DME2ConsumerTest extends TestCase {
 	private static final Logger LOGGER = Logger.getLogger(DME2ConsumerTest.class);
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2MetricsTest.java b/src/test/java/com/att/mr/test/dme2/DME2MetricsTest.java
index 6f674f4..e7ccebe 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2MetricsTest.java
+++ b/src/test/java/com/att/mr/test/dme2/DME2MetricsTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -27,12 +27,12 @@ import java.util.HashMap;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
-import org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap.DmaapAdminTest;
 
 import junit.framework.TestCase;
 
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Exception;
+import com.att.mr.test.dmaap.DmaapAdminTest;
 
 public class DME2MetricsTest extends TestCase {
 	private static final Logger LOGGER = Logger.getLogger(DME2MetricsTest.class);
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ProducerTest.java b/src/test/java/com/att/mr/test/dme2/DME2ProducerTest.java
index 2941b69..71c5e0f 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ProducerTest.java
+++ b/src/test/java/com/att/mr/test/dme2/DME2ProducerTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -27,13 +27,13 @@ import java.util.HashMap;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
-import org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap.DmaapAdminTest;
 
 import junit.framework.TestCase;
 
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Exception;
 import com.att.aft.dme2.internal.jackson.map.ObjectMapper;
+import com.att.mr.test.dmaap.DmaapAdminTest;
 
 public class DME2ProducerTest extends TestCase {
 	private static final Logger LOGGER = Logger.getLogger(DmaapAdminTest.class);
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2TopicTest.java b/src/test/java/com/att/mr/test/dme2/DME2TopicTest.java
index bfa25f1..9d26083 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2TopicTest.java
+++ b/src/test/java/com/att/mr/test/dme2/DME2TopicTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -29,13 +29,13 @@ import java.util.Properties;
 import javax.ws.rs.client.Entity;
 
 import org.apache.log4j.Logger;
-import org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap.DmaapAdminTest;
 
 import junit.framework.TestCase;
 
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Exception;
 import com.att.aft.dme2.internal.jackson.map.ObjectMapper;
+import com.att.mr.test.dmaap.DmaapAdminTest;
 
 public class DME2TopicTest extends TestCase {
 	private String latitude;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/JUnitTestSuite.java b/src/test/java/com/att/mr/test/dme2/JUnitTestSuite.java
index 45d1dba..b3f2683 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/JUnitTestSuite.java
+++ b/src/test/java/com/att/mr/test/dme2/JUnitTestSuite.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import junit.framework.TestSuite;
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/LoadPropertyFile.java b/src/test/java/com/att/mr/test/dme2/LoadPropertyFile.java
index 188adc7..a274d68 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/LoadPropertyFile.java
+++ b/src/test/java/com/att/mr/test/dme2/LoadPropertyFile.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/TestRunner.java b/src/test/java/com/att/mr/test/dme2/TestRunner.java
index 26c8f34..dce6e6c 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/TestRunner.java
+++ b/src/test/java/com/att/mr/test/dme2/TestRunner.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/TopicBeanDME2.java b/src/test/java/com/att/mr/test/dme2/TopicBeanDME2.java
index d8b1287..4de5015 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/TopicBeanDME2.java
+++ b/src/test/java/com/att/mr/test/dme2/TopicBeanDME2.java
@@ -22,7 +22,7 @@
 /**
  * 
  */
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.io.Serializable;
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/CambriaApiTestCase.java b/src/test/java/com/att/nsa/cambria/CambriaApiTestCase.java
index 5800918..c14f10c 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/CambriaApiTestCase.java
+++ b/src/test/java/com/att/nsa/cambria/CambriaApiTestCase.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria;
+package com.att.nsa.cambria;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/CambriaRateLimiterTest.java b/src/test/java/com/att/nsa/cambria/CambriaRateLimiterTest.java
index f362a0c..8e853d2 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/CambriaRateLimiterTest.java
+++ b/src/test/java/com/att/nsa/cambria/CambriaRateLimiterTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria;
+package com.att.nsa.cambria;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/UtilsTest.java b/src/test/java/com/att/nsa/cambria/utils/UtilsTest.java
index e768033..58e6934 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/UtilsTest.java
+++ b/src/test/java/com/att/nsa/cambria/utils/UtilsTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils;
+package com.att.nsa.cambria.utils;
 
 import static org.junit.Assert.*;
 
@@ -29,7 +29,6 @@ import java.util.Date;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.Utils;
 
 public class UtilsTest {