48 files changed, 128 insertions, 128 deletions
diff --git a/src/main/java/com/att/nsa/mr/client/HostSelector.java b/src/main/java/org/onap/dmaap/mr/client/HostSelector.java
index 63ef404..9bd73f9 100644
--- a/src/main/java/com/att/nsa/mr/client/HostSelector.java
+++ b/src/main/java/org/onap/dmaap/mr/client/HostSelector.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client;
+package org.onap.dmaap.mr.client;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/src/main/java/com/att/nsa/mr/client/MRBatchingPublisher.java b/src/main/java/org/onap/dmaap/mr/client/MRBatchingPublisher.java
index 875b5a3..df440bb 100644
--- a/src/main/java/com/att/nsa/mr/client/MRBatchingPublisher.java
+++ b/src/main/java/org/onap/dmaap/mr/client/MRBatchingPublisher.java
@@ -19,12 +19,12 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client;
+package org.onap.dmaap.mr.client;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import com.att.nsa.mr.client.response.MRPublisherResponse;
+import org.onap.dmaap.mr.client.response.MRPublisherResponse;
 
 /**
  * A MR batching publisher is a publisher with additional functionality
diff --git a/src/main/java/com/att/nsa/mr/client/MRClient.java b/src/main/java/org/onap/dmaap/mr/client/MRClient.java
index f3a8f43..8cbf9e0 100644
--- a/src/main/java/com/att/nsa/mr/client/MRClient.java
+++ b/src/main/java/org/onap/dmaap/mr/client/MRClient.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client;
+package org.onap.dmaap.mr.client;
 
 import org.slf4j.Logger;
 
diff --git a/src/main/java/com/att/nsa/mr/client/MRClientBuilders.java b/src/main/java/org/onap/dmaap/mr/client/MRClientBuilders.java
index 73ef5c4..60e0666 100644
--- a/src/main/java/com/att/nsa/mr/client/MRClientBuilders.java
+++ b/src/main/java/org/onap/dmaap/mr/client/MRClientBuilders.java
@@ -21,7 +21,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client;
+package org.onap.dmaap.mr.client;
 
 import java.net.MalformedURLException;
 import java.util.Collection;
@@ -31,9 +31,9 @@ import java.util.UUID;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.att.nsa.mr.client.impl.MRConsumerImpl;
-import com.att.nsa.mr.client.impl.MRMetaClient;
-import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
+import org.onap.dmaap.mr.client.impl.MRConsumerImpl;
+import org.onap.dmaap.mr.client.impl.MRMetaClient;
+import org.onap.dmaap.mr.client.impl.MRSimplerBatchPublisher;
 
 /**
  * A collection of builders for various types of MR API clients
diff --git a/src/main/java/com/att/nsa/mr/client/MRClientFactory.java b/src/main/java/org/onap/dmaap/mr/client/MRClientFactory.java
index 689190e..dc9d555 100644
--- a/src/main/java/com/att/nsa/mr/client/MRClientFactory.java
+++ b/src/main/java/org/onap/dmaap/mr/client/MRClientFactory.java
@@ -21,7 +21,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client;
+package org.onap.dmaap.mr.client;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -37,11 +37,11 @@ import java.util.UUID;
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import com.att.nsa.mr.client.impl.MRConsumerImpl;
-import com.att.nsa.mr.client.impl.MRMetaClient;
-import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
-import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
-import com.att.nsa.mr.tools.ValidatorUtil;
+import org.onap.dmaap.mr.client.impl.MRConsumerImpl;
+import org.onap.dmaap.mr.client.impl.MRMetaClient;
+import org.onap.dmaap.mr.client.impl.MRSimplerBatchPublisher;
+import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
+import org.onap.dmaap.mr.tools.ValidatorUtil;
 
 /**
  * A factory for MR clients.<br/>
diff --git a/src/main/java/com/att/nsa/mr/client/MRConsumer.java b/src/main/java/org/onap/dmaap/mr/client/MRConsumer.java
index 444eb7c..b2f7563 100644
--- a/src/main/java/com/att/nsa/mr/client/MRConsumer.java
+++ b/src/main/java/org/onap/dmaap/mr/client/MRConsumer.java
@@ -19,11 +19,11 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client;
+package org.onap.dmaap.mr.client;
 
 import java.io.IOException;
 
-import com.att.nsa.mr.client.response.MRConsumerResponse;
+import org.onap.dmaap.mr.client.response.MRConsumerResponse;
 
 public interface MRConsumer extends MRClient
 {
diff --git a/src/main/java/com/att/nsa/mr/client/MRIdentityManager.java b/src/main/java/org/onap/dmaap/mr/client/MRIdentityManager.java
index 5483761..1905f82 100644
--- a/src/main/java/com/att/nsa/mr/client/MRIdentityManager.java
+++ b/src/main/java/org/onap/dmaap/mr/client/MRIdentityManager.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client;
+package org.onap.dmaap.mr.client;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/att/nsa/mr/client/MRPublisher.java b/src/main/java/org/onap/dmaap/mr/client/MRPublisher.java
index 651c548..e900229 100644
--- a/src/main/java/com/att/nsa/mr/client/MRPublisher.java
+++ b/src/main/java/org/onap/dmaap/mr/client/MRPublisher.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client;
+package org.onap.dmaap.mr.client;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/src/main/java/com/att/nsa/mr/client/MRTopicManager.java b/src/main/java/org/onap/dmaap/mr/client/MRTopicManager.java
index 13524bd..54ca7ec 100644
--- a/src/main/java/com/att/nsa/mr/client/MRTopicManager.java
+++ b/src/main/java/org/onap/dmaap/mr/client/MRTopicManager.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client;
+package org.onap.dmaap.mr.client;
 
 import java.io.IOException;
 import java.util.Set;
diff --git a/src/main/java/com/att/nsa/mr/client/impl/Clock.java b/src/main/java/org/onap/dmaap/mr/client/impl/Clock.java
index ace791e..6670399 100644
--- a/src/main/java/com/att/nsa/mr/client/impl/Clock.java
+++ b/src/main/java/org/onap/dmaap/mr/client/impl/Clock.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client.impl;
+package org.onap.dmaap.mr.client.impl;
 
 public class Clock
 {
diff --git a/src/main/java/com/att/nsa/mr/client/impl/DmaapClientUtil.java b/src/main/java/org/onap/dmaap/mr/client/impl/DmaapClientUtil.java
index a3a2ce1..b06290a 100644
--- a/src/main/java/com/att/nsa/mr/client/impl/DmaapClientUtil.java
+++ b/src/main/java/org/onap/dmaap/mr/client/impl/DmaapClientUtil.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client.impl;
+package org.onap.dmaap.mr.client.impl;
 
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
diff --git a/src/main/java/com/att/nsa/mr/client/impl/MRBaseClient.java b/src/main/java/org/onap/dmaap/mr/client/impl/MRBaseClient.java
index 76bf5ce..ecea21c 100644
--- a/src/main/java/com/att/nsa/mr/client/impl/MRBaseClient.java
+++ b/src/main/java/org/onap/dmaap/mr/client/impl/MRBaseClient.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client.impl;
+package org.onap.dmaap.mr.client.impl;
 
 import java.net.MalformedURLException;
 import java.util.Collection;
@@ -41,9 +41,9 @@ import org.slf4j.LoggerFactory;
 
 import com.att.nsa.apiClient.http.CacheUse;
 import com.att.nsa.apiClient.http.HttpClient;
-import com.att.nsa.mr.client.MRClient;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
+import org.onap.dmaap.mr.client.MRClient;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
 
 public class MRBaseClient extends HttpClient implements MRClient {
 
diff --git a/src/main/java/com/att/nsa/mr/client/impl/MRBatchPublisher.java b/src/main/java/org/onap/dmaap/mr/client/impl/MRBatchPublisher.java
index 7d1e396..bcd4403 100644
--- a/src/main/java/com/att/nsa/mr/client/impl/MRBatchPublisher.java
+++ b/src/main/java/org/onap/dmaap/mr/client/impl/MRBatchPublisher.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client.impl;
+package org.onap.dmaap.mr.client.impl;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -40,8 +40,8 @@ import org.slf4j.LoggerFactory;
 
 import com.att.nsa.apiClient.http.HttpClient;
 import com.att.nsa.apiClient.http.HttpException;
-import com.att.nsa.mr.client.MRBatchingPublisher;
-import com.att.nsa.mr.client.response.MRPublisherResponse;
+import org.onap.dmaap.mr.client.MRBatchingPublisher;
+import org.onap.dmaap.mr.client.response.MRPublisherResponse;
 
 /**
  * This is a batching publisher class that allows the client to publish messages
diff --git a/src/main/java/com/att/nsa/mr/client/impl/MRClientVersionInfo.java b/src/main/java/org/onap/dmaap/mr/client/impl/MRClientVersionInfo.java
index bb6299d..ed23918 100644
--- a/src/main/java/com/att/nsa/mr/client/impl/MRClientVersionInfo.java
+++ b/src/main/java/org/onap/dmaap/mr/client/impl/MRClientVersionInfo.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client.impl;
+package org.onap.dmaap.mr.client.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/com/att/nsa/mr/client/impl/MRConstants.java b/src/main/java/org/onap/dmaap/mr/client/impl/MRConstants.java
index cb0fc31..f6d9578 100644
--- a/src/main/java/com/att/nsa/mr/client/impl/MRConstants.java
+++ b/src/main/java/org/onap/dmaap/mr/client/impl/MRConstants.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client.impl;
+package org.onap.dmaap.mr.client.impl;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
diff --git a/src/main/java/com/att/nsa/mr/client/impl/MRConsumerImpl.java b/src/main/java/org/onap/dmaap/mr/client/impl/MRConsumerImpl.java
index bc156ea..a1a52aa 100644
--- a/src/main/java/com/att/nsa/mr/client/impl/MRConsumerImpl.java
+++ b/src/main/java/org/onap/dmaap/mr/client/impl/MRConsumerImpl.java
@@ -19,15 +19,15 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * 
  *******************************************************************************/
-package com.att.nsa.mr.client.impl;
+package org.onap.dmaap.mr.client.impl;
 
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Exception;
-import com.att.nsa.mr.client.HostSelector;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRConsumer;
-import com.att.nsa.mr.client.response.MRConsumerResponse;
-import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
+import org.onap.dmaap.mr.client.HostSelector;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRConsumer;
+import org.onap.dmaap.mr.client.response.MRConsumerResponse;
+import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
diff --git a/src/main/java/com/att/nsa/mr/client/impl/MRFormat.java b/src/main/java/org/onap/dmaap/mr/client/impl/MRFormat.java
index 1028adf..538f1e3 100644
--- a/src/main/java/com/att/nsa/mr/client/impl/MRFormat.java
+++ b/src/main/java/org/onap/dmaap/mr/client/impl/MRFormat.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client.impl;
+package org.onap.dmaap.mr.client.impl;
 
 enum MRFormat
 {
diff --git a/src/main/java/com/att/nsa/mr/client/impl/MRMetaClient.java b/src/main/java/org/onap/dmaap/mr/client/impl/MRMetaClient.java
index 609540b..9051b99 100644
--- a/src/main/java/com/att/nsa/mr/client/impl/MRMetaClient.java
+++ b/src/main/java/org/onap/dmaap/mr/client/impl/MRMetaClient.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client.impl;
+package org.onap.dmaap.mr.client.impl;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -37,8 +37,8 @@ import org.slf4j.LoggerFactory;
 import com.att.nsa.apiClient.credentials.ApiCredential;
 import com.att.nsa.apiClient.http.HttpException;
 import com.att.nsa.apiClient.http.HttpObjectNotFoundException;
-import com.att.nsa.mr.client.MRIdentityManager;
-import com.att.nsa.mr.client.MRTopicManager;
+import org.onap.dmaap.mr.client.MRIdentityManager;
+import org.onap.dmaap.mr.client.MRTopicManager;
 
 public class MRMetaClient extends MRBaseClient implements MRTopicManager, MRIdentityManager
 {
diff --git a/src/main/java/com/att/nsa/mr/client/impl/MRSimplerBatchPublisher.java b/src/main/java/org/onap/dmaap/mr/client/impl/MRSimplerBatchPublisher.java
index 4f44d30..c5eb3ba 100644
--- a/src/main/java/com/att/nsa/mr/client/impl/MRSimplerBatchPublisher.java
+++ b/src/main/java/org/onap/dmaap/mr/client/impl/MRSimplerBatchPublisher.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client.impl;
+package org.onap.dmaap.mr.client.impl;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -51,10 +51,10 @@ import org.json.JSONTokener;
 
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Exception;
-import com.att.nsa.mr.client.HostSelector;
-import com.att.nsa.mr.client.MRBatchingPublisher;
-import com.att.nsa.mr.client.response.MRPublisherResponse;
-import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
+import org.onap.dmaap.mr.client.HostSelector;
+import org.onap.dmaap.mr.client.MRBatchingPublisher;
+import org.onap.dmaap.mr.client.response.MRPublisherResponse;
+import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
 
 public class MRSimplerBatchPublisher extends MRBaseClient implements MRBatchingPublisher {
 	private static final Logger logger = LoggerFactory.getLogger(MRSimplerBatchPublisher.class);
diff --git a/src/main/java/com/att/nsa/mr/client/response/MRConsumerResponse.java b/src/main/java/org/onap/dmaap/mr/client/response/MRConsumerResponse.java
index 102794e..5dc3da0 100644
--- a/src/main/java/com/att/nsa/mr/client/response/MRConsumerResponse.java
+++ b/src/main/java/org/onap/dmaap/mr/client/response/MRConsumerResponse.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client.response;
+package org.onap.dmaap.mr.client.response;
 
 public class MRConsumerResponse {
 	
diff --git a/src/main/java/com/att/nsa/mr/client/response/MRPublisherResponse.java b/src/main/java/org/onap/dmaap/mr/client/response/MRPublisherResponse.java
index 96c39d6..f0630be 100644
--- a/src/main/java/com/att/nsa/mr/client/response/MRPublisherResponse.java
+++ b/src/main/java/org/onap/dmaap/mr/client/response/MRPublisherResponse.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.client.response;
+package org.onap.dmaap.mr.client.response;
 
 /**
  * Response for Publisher
diff --git a/src/main/java/com/att/nsa/mr/dme/client/DefaultLoggingFailoverFaultHandler.java b/src/main/java/org/onap/dmaap/mr/dme/client/DefaultLoggingFailoverFaultHandler.java
index 4f04dec..a44d858 100644
--- a/src/main/java/com/att/nsa/mr/dme/client/DefaultLoggingFailoverFaultHandler.java
+++ b/src/main/java/org/onap/dmaap/mr/dme/client/DefaultLoggingFailoverFaultHandler.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.dme.client;
+package org.onap.dmaap.mr.dme.client;
 
 
 
diff --git a/src/main/java/com/att/nsa/mr/dme/client/HeaderReplyHandler.java b/src/main/java/org/onap/dmaap/mr/dme/client/HeaderReplyHandler.java
index 4363902..da0ba62 100644
--- a/src/main/java/com/att/nsa/mr/dme/client/HeaderReplyHandler.java
+++ b/src/main/java/org/onap/dmaap/mr/dme/client/HeaderReplyHandler.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.dme.client;
+package org.onap.dmaap.mr.dme.client;
 
 
 import java.util.Map;
@@ -30,8 +30,8 @@ import org.slf4j.LoggerFactory;
 import com.att.aft.dme2.api.util.DME2ExchangeFaultContext;
 import com.att.aft.dme2.api.util.DME2ExchangeReplyHandler;
 import com.att.aft.dme2.api.util.DME2ExchangeResponseContext;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.impl.MRSimplerBatchPublisher;
 
 
 
diff --git a/src/main/java/com/att/nsa/mr/dme/client/PreferredRouteReplyHandler.java b/src/main/java/org/onap/dmaap/mr/dme/client/PreferredRouteReplyHandler.java
index 2da5ce9..967ccf3 100644
--- a/src/main/java/com/att/nsa/mr/dme/client/PreferredRouteReplyHandler.java
+++ b/src/main/java/org/onap/dmaap/mr/dme/client/PreferredRouteReplyHandler.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.dme.client;
+package org.onap.dmaap.mr.dme.client;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.InputStream;
@@ -30,8 +30,8 @@ import org.slf4j.LoggerFactory;
 import com.att.aft.dme2.api.util.DME2ExchangeFaultContext;
 import com.att.aft.dme2.api.util.DME2ExchangeReplyHandler;
 import com.att.aft.dme2.api.util.DME2ExchangeResponseContext;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.impl.MRSimplerBatchPublisher;
 
 public class PreferredRouteReplyHandler implements DME2ExchangeReplyHandler {
 	private Logger fLog = LoggerFactory.getLogger ( this.getClass().getName () );
diff --git a/src/main/java/com/att/nsa/mr/dme/client/PreferredRouteRequestHandler.java b/src/main/java/org/onap/dmaap/mr/dme/client/PreferredRouteRequestHandler.java
index fbc32a7..4c2e546 100644
--- a/src/main/java/com/att/nsa/mr/dme/client/PreferredRouteRequestHandler.java
+++ b/src/main/java/org/onap/dmaap/mr/dme/client/PreferredRouteRequestHandler.java
@@ -19,14 +19,14 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.dme.client;
+package org.onap.dmaap.mr.dme.client;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.att.aft.dme2.api.util.DME2ExchangeRequestContext;
 import com.att.aft.dme2.api.util.DME2ExchangeRequestHandler;
-import com.att.nsa.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRClientFactory;
 
 public class PreferredRouteRequestHandler implements DME2ExchangeRequestHandler {
 	private Logger logger = LoggerFactory.getLogger(this.getClass().getName());
diff --git a/src/main/java/com/att/nsa/mr/dme/client/SimpleExampleConsumer.java b/src/main/java/org/onap/dmaap/mr/dme/client/SimpleExampleConsumer.java
index ce0138c..6fb02a5 100644
--- a/src/main/java/com/att/nsa/mr/dme/client/SimpleExampleConsumer.java
+++ b/src/main/java/org/onap/dmaap/mr/dme/client/SimpleExampleConsumer.java
@@ -20,7 +20,7 @@
  *  
  *******************************************************************************/
 
-package com.att.nsa.mr.dme.client;
+package org.onap.dmaap.mr.dme.client;
 
 import java.util.Map;
 
@@ -29,8 +29,8 @@ import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRConsumer;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRConsumer;
 
 import java.util.List;
 
diff --git a/src/main/java/com/att/nsa/mr/dme/client/SimpleExamplePublisher.java b/src/main/java/org/onap/dmaap/mr/dme/client/SimpleExamplePublisher.java
index f9e830c..edb3994 100644
--- a/src/main/java/com/att/nsa/mr/dme/client/SimpleExamplePublisher.java
+++ b/src/main/java/org/onap/dmaap/mr/dme/client/SimpleExamplePublisher.java
@@ -20,7 +20,7 @@
  *  
  *******************************************************************************/
 
-package com.att.nsa.mr.dme.client;
+package org.onap.dmaap.mr.dme.client;
 
 
 import java.io.IOException;
@@ -33,9 +33,9 @@ import javax.ws.rs.core.MultivaluedMap;
 
 import org.json.JSONObject;
 
-import com.att.nsa.mr.client.MRBatchingPublisher;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRPublisher.message;
+import org.onap.dmaap.mr.client.MRBatchingPublisher;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRPublisher.message;
 
 /**
  * An example of how to use the Java publisher.
diff --git a/src/main/java/com/att/nsa/mr/logging/MRAppender.java b/src/main/java/org/onap/dmaap/mr/logging/MRAppender.java
index 4bb3e71..8842b14 100644
--- a/src/main/java/com/att/nsa/mr/logging/MRAppender.java
+++ b/src/main/java/org/onap/dmaap/mr/logging/MRAppender.java
@@ -22,7 +22,7 @@
 /**
  * 
  */
-package com.att.nsa.mr.logging;
+package org.onap.dmaap.mr.logging;
 
 import java.io.IOException;
 
@@ -32,8 +32,8 @@ import org.slf4j.LoggerFactory;
 import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.spi.LoggingEvent;
 
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRPublisher;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRPublisher;
 
 /**
  * @author author
diff --git a/src/main/java/com/att/nsa/mr/test/clients/ConsolePublisher.java b/src/main/java/org/onap/dmaap/mr/test/clients/ConsolePublisher.java
index 60971c1..62e4cda 100644
--- a/src/main/java/com/att/nsa/mr/test/clients/ConsolePublisher.java
+++ b/src/main/java/org/onap/dmaap/mr/test/clients/ConsolePublisher.java
@@ -20,7 +20,7 @@
  *  
  *******************************************************************************/
 
-package com.att.nsa.mr.test.clients;
+package org.onap.dmaap.mr.test.clients;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -32,9 +32,9 @@ import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.att.nsa.mr.client.MRBatchingPublisher;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRPublisher.message;
+import org.onap.dmaap.mr.client.MRBatchingPublisher;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRPublisher.message;
 
 /**
  * A simple publisher that reads from std in, sending each line as a message. 
diff --git a/src/main/java/com/att/nsa/mr/test/clients/ProtocolTypeConstants.java b/src/main/java/org/onap/dmaap/mr/test/clients/ProtocolTypeConstants.java
index a4a176e..6ece7f7 100644
--- a/src/main/java/com/att/nsa/mr/test/clients/ProtocolTypeConstants.java
+++ b/src/main/java/org/onap/dmaap/mr/test/clients/ProtocolTypeConstants.java
@@ -22,7 +22,7 @@
 /**
  * 
  */
-package com.att.nsa.mr.test.clients;
+package org.onap.dmaap.mr.test.clients;
 
 /**
  * @author author
diff --git a/src/main/java/com/att/nsa/mr/test/clients/SampleConsumer.java b/src/main/java/org/onap/dmaap/mr/test/clients/SampleConsumer.java
index 44e5205..1f78be1 100644
--- a/src/main/java/com/att/nsa/mr/test/clients/SampleConsumer.java
+++ b/src/main/java/org/onap/dmaap/mr/test/clients/SampleConsumer.java
@@ -19,15 +19,15 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.test.clients;
+package org.onap.dmaap.mr.test.clients;
 
 import java.util.LinkedList;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRConsumer;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRConsumer;
 
 public class SampleConsumer {
     private SampleConsumer() {
diff --git a/src/main/java/com/att/nsa/mr/test/clients/SamplePublisher.java b/src/main/java/org/onap/dmaap/mr/test/clients/SamplePublisher.java
index 0233dcb..29d7f85 100644
--- a/src/main/java/com/att/nsa/mr/test/clients/SamplePublisher.java
+++ b/src/main/java/org/onap/dmaap/mr/test/clients/SamplePublisher.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.test.clients;
+package org.onap.dmaap.mr.test.clients;
 
 import java.io.IOException;
 import java.util.List;
@@ -29,10 +29,10 @@ import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.att.nsa.mr.client.MRBatchingPublisher;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRClientBuilders.PublisherBuilder;
-import com.att.nsa.mr.client.MRPublisher.message;
+import org.onap.dmaap.mr.client.MRBatchingPublisher;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRClientBuilders.PublisherBuilder;
+import org.onap.dmaap.mr.client.MRPublisher.message;
 
 public class SamplePublisher {
 	public static void main ( String[] args ) throws IOException, InterruptedException
diff --git a/src/main/java/com/att/nsa/mr/test/clients/SimpleExampleConsumer.java b/src/main/java/org/onap/dmaap/mr/test/clients/SimpleExampleConsumer.java
index 0e3ee5a..a7f283c 100644
--- a/src/main/java/com/att/nsa/mr/test/clients/SimpleExampleConsumer.java
+++ b/src/main/java/org/onap/dmaap/mr/test/clients/SimpleExampleConsumer.java
@@ -20,7 +20,7 @@
  *  
  *******************************************************************************/
 
-package com.att.nsa.mr.test.clients;
+package org.onap.dmaap.mr.test.clients;
 
 import java.io.File;
 import java.io.FileReader;
@@ -30,8 +30,8 @@ import java.util.Properties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRConsumer;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRConsumer;
 
 public class SimpleExampleConsumer {
 
diff --git a/src/main/java/com/att/nsa/mr/test/clients/SimpleExampleConsumerWithReturnResponse.java b/src/main/java/org/onap/dmaap/mr/test/clients/SimpleExampleConsumerWithReturnResponse.java
index 433ab9f..2e514b0 100644
--- a/src/main/java/com/att/nsa/mr/test/clients/SimpleExampleConsumerWithReturnResponse.java
+++ b/src/main/java/org/onap/dmaap/mr/test/clients/SimpleExampleConsumerWithReturnResponse.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.test.clients;
+package org.onap.dmaap.mr.test.clients;
 
 import java.io.File;
 import java.io.FileReader;
@@ -29,9 +29,9 @@ import java.util.Properties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRConsumer;
-import com.att.nsa.mr.client.response.MRConsumerResponse;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRConsumer;
+import org.onap.dmaap.mr.client.response.MRConsumerResponse;
 
 public class SimpleExampleConsumerWithReturnResponse {
 
diff --git a/src/main/java/com/att/nsa/mr/test/clients/SimpleExamplePublisher.java b/src/main/java/org/onap/dmaap/mr/test/clients/SimpleExamplePublisher.java
index 8a6c586..770d916 100644
--- a/src/main/java/com/att/nsa/mr/test/clients/SimpleExamplePublisher.java
+++ b/src/main/java/org/onap/dmaap/mr/test/clients/SimpleExamplePublisher.java
@@ -20,7 +20,7 @@
  *  
  *******************************************************************************/
 
-package com.att.nsa.mr.test.clients;
+package org.onap.dmaap.mr.test.clients;
 
 import java.io.File;
 import java.io.FileReader;
@@ -33,9 +33,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.json.JSONObject;
 
-import com.att.nsa.mr.client.MRBatchingPublisher;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRPublisher.message;
+import org.onap.dmaap.mr.client.MRBatchingPublisher;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRPublisher.message;
 
 /**
  * An example of how to use the Java publisher. 
diff --git a/src/main/java/com/att/nsa/mr/test/clients/SimpleExamplePublisherWithResponse.java b/src/main/java/org/onap/dmaap/mr/test/clients/SimpleExamplePublisherWithResponse.java
index 9d179b2..33d1164 100644
--- a/src/main/java/com/att/nsa/mr/test/clients/SimpleExamplePublisherWithResponse.java
+++ b/src/main/java/org/onap/dmaap/mr/test/clients/SimpleExamplePublisherWithResponse.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.test.clients;
+package org.onap.dmaap.mr.test.clients;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -28,9 +28,9 @@ import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 import org.json.JSONObject;
-import com.att.nsa.mr.client.MRBatchingPublisher;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.response.MRPublisherResponse;
+import org.onap.dmaap.mr.client.MRBatchingPublisher;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.response.MRPublisherResponse;
 	/**
 	 *An example of how to use the Java publisher. 
 	 * @author author
diff --git a/src/main/java/com/att/nsa/mr/test/support/MRBatchingPublisherMock.java b/src/main/java/org/onap/dmaap/mr/test/support/MRBatchingPublisherMock.java
index 56bec36..3e64c35 100644
--- a/src/main/java/com/att/nsa/mr/test/support/MRBatchingPublisherMock.java
+++ b/src/main/java/org/onap/dmaap/mr/test/support/MRBatchingPublisherMock.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.test.support;
+package org.onap.dmaap.mr.test.support;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -28,8 +28,8 @@ import java.util.concurrent.TimeUnit;
 
 import org.slf4j.Logger;
 
-import com.att.nsa.mr.client.MRBatchingPublisher;
-import com.att.nsa.mr.client.response.MRPublisherResponse;
+import org.onap.dmaap.mr.client.MRBatchingPublisher;
+import org.onap.dmaap.mr.client.response.MRPublisherResponse;
 
 /**
  * A helper for unit testing systems that use a MRPublisher. When setting
diff --git a/src/main/java/com/att/nsa/mr/test/support/MRConsumerMock.java b/src/main/java/org/onap/dmaap/mr/test/support/MRConsumerMock.java
index c731030..afa36ea 100644
--- a/src/main/java/com/att/nsa/mr/test/support/MRConsumerMock.java
+++ b/src/main/java/org/onap/dmaap/mr/test/support/MRConsumerMock.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.test.support;
+package org.onap.dmaap.mr.test.support;
 
 import java.io.IOException;
 import java.util.LinkedList;
@@ -27,8 +27,8 @@ import java.util.List;
 
 import org.slf4j.Logger;
 
-import com.att.nsa.mr.client.MRConsumer;
-import com.att.nsa.mr.client.response.MRConsumerResponse;
+import org.onap.dmaap.mr.client.MRConsumer;
+import org.onap.dmaap.mr.client.response.MRConsumerResponse;
 
 /**
  * A helper for unit testing systems that use a MRConsumer. When setting
diff --git a/src/main/java/com/att/nsa/mr/tools/ApiKeyCommand.java b/src/main/java/org/onap/dmaap/mr/tools/ApiKeyCommand.java
index df28fc0..a2396d8 100644
--- a/src/main/java/com/att/nsa/mr/tools/ApiKeyCommand.java
+++ b/src/main/java/org/onap/dmaap/mr/tools/ApiKeyCommand.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.tools;
+package org.onap.dmaap.mr.tools;
 
 import java.io.IOException;
 import java.io.PrintStream;
@@ -32,10 +32,10 @@ import com.att.nsa.apiClient.http.HttpException;
 import com.att.nsa.apiClient.http.HttpObjectNotFoundException;
 import com.att.nsa.cmdtool.Command;
 import com.att.nsa.cmdtool.CommandNotReadyException;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRIdentityManager;
-import com.att.nsa.mr.client.MRClient.MRApiException;
-import com.att.nsa.mr.client.MRIdentityManager.ApiKey;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRIdentityManager;
+import org.onap.dmaap.mr.client.MRClient.MRApiException;
+import org.onap.dmaap.mr.client.MRIdentityManager.ApiKey;
 
 public class ApiKeyCommand implements Command<MRCommandContext>
 {
diff --git a/src/main/java/com/att/nsa/mr/tools/AuthCommand.java b/src/main/java/org/onap/dmaap/mr/tools/AuthCommand.java
index 72f226b..26a70f0 100644
--- a/src/main/java/com/att/nsa/mr/tools/AuthCommand.java
+++ b/src/main/java/org/onap/dmaap/mr/tools/AuthCommand.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.tools;
+package org.onap.dmaap.mr.tools;
 
 import java.io.PrintStream;
 
diff --git a/src/main/java/com/att/nsa/mr/tools/ClusterCommand.java b/src/main/java/org/onap/dmaap/mr/tools/ClusterCommand.java
index 5ecaf7c..c4ef5e4 100644
--- a/src/main/java/com/att/nsa/mr/tools/ClusterCommand.java
+++ b/src/main/java/org/onap/dmaap/mr/tools/ClusterCommand.java
@@ -19,13 +19,13 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.tools;
+package org.onap.dmaap.mr.tools;
 
 import java.io.PrintStream;
 
 import com.att.nsa.cmdtool.Command;
 import com.att.nsa.cmdtool.CommandNotReadyException;
-import com.att.nsa.mr.client.impl.MRConsumerImpl;
+import org.onap.dmaap.mr.client.impl.MRConsumerImpl;
 
 public class ClusterCommand implements Command<MRCommandContext>
 {
diff --git a/src/main/java/com/att/nsa/mr/tools/MRCommandContext.java b/src/main/java/org/onap/dmaap/mr/tools/MRCommandContext.java
index e512769..5d13b30 100644
--- a/src/main/java/com/att/nsa/mr/tools/MRCommandContext.java
+++ b/src/main/java/org/onap/dmaap/mr/tools/MRCommandContext.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.tools;
+package org.onap.dmaap.mr.tools;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -27,7 +27,7 @@ import java.util.LinkedList;
 import com.att.nsa.apiClient.http.HttpClient;
 import com.att.nsa.apiClient.http.HttpTracer;
 import com.att.nsa.cmdtool.CommandContext;
-import com.att.nsa.mr.client.MRClient;
+import org.onap.dmaap.mr.client.MRClient;
 
 public class MRCommandContext implements CommandContext
 {
diff --git a/src/main/java/com/att/nsa/mr/tools/MRTool.java b/src/main/java/org/onap/dmaap/mr/tools/MRTool.java
index 7f1effd..a37fa79 100644
--- a/src/main/java/com/att/nsa/mr/tools/MRTool.java
+++ b/src/main/java/org/onap/dmaap/mr/tools/MRTool.java
@@ -19,12 +19,12 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.tools;
+package org.onap.dmaap.mr.tools;
 
 import java.io.IOException;
 
 import com.att.nsa.cmdtool.CommandLineTool;
-import com.att.nsa.mr.client.impl.MRClientVersionInfo;
+import org.onap.dmaap.mr.client.impl.MRClientVersionInfo;
 
 public class MRTool extends CommandLineTool<MRCommandContext>
 {
diff --git a/src/main/java/com/att/nsa/mr/tools/MessageCommand.java b/src/main/java/org/onap/dmaap/mr/tools/MessageCommand.java
index 54e92ae..5016c95 100644
--- a/src/main/java/com/att/nsa/mr/tools/MessageCommand.java
+++ b/src/main/java/org/onap/dmaap/mr/tools/MessageCommand.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.tools;
+package org.onap.dmaap.mr.tools;
 
 import java.io.IOException;
 import java.io.PrintStream;
@@ -31,11 +31,11 @@ import org.slf4j.LoggerFactory;
 
 import com.att.nsa.cmdtool.Command;
 import com.att.nsa.cmdtool.CommandNotReadyException;
-import com.att.nsa.mr.client.MRBatchingPublisher;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRConsumer;
-import com.att.nsa.mr.client.MRClientBuilders.PublisherBuilder;
-import com.att.nsa.mr.client.MRPublisher.message;
+import org.onap.dmaap.mr.client.MRBatchingPublisher;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRConsumer;
+import org.onap.dmaap.mr.client.MRClientBuilders.PublisherBuilder;
+import org.onap.dmaap.mr.client.MRPublisher.message;
 
 public class MessageCommand implements Command<MRCommandContext>
 {
diff --git a/src/main/java/com/att/nsa/mr/tools/ToolsUtil.java b/src/main/java/org/onap/dmaap/mr/tools/ToolsUtil.java
index 45b21d1..72e7fbf 100644
--- a/src/main/java/com/att/nsa/mr/tools/ToolsUtil.java
+++ b/src/main/java/org/onap/dmaap/mr/tools/ToolsUtil.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package com.att.nsa.mr.tools;
+package org.onap.dmaap.mr.tools;
 
-import com.att.nsa.mr.client.MRBatchingPublisher;
-import com.att.nsa.mr.client.MRClientBuilders.PublisherBuilder;
+import org.onap.dmaap.mr.client.MRBatchingPublisher;
+import org.onap.dmaap.mr.client.MRClientBuilders.PublisherBuilder;
 
 public final class ToolsUtil {
 
diff --git a/src/main/java/com/att/nsa/mr/tools/TopicCommand.java b/src/main/java/org/onap/dmaap/mr/tools/TopicCommand.java
index 4b1151e..278b04f 100644
--- a/src/main/java/com/att/nsa/mr/tools/TopicCommand.java
+++ b/src/main/java/org/onap/dmaap/mr/tools/TopicCommand.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.tools;
+package org.onap.dmaap.mr.tools;
 
 import java.io.IOException;
 import java.io.PrintStream;
@@ -32,9 +32,9 @@ import com.att.nsa.apiClient.http.HttpException;
 import com.att.nsa.apiClient.http.HttpObjectNotFoundException;
 import com.att.nsa.cmdtool.Command;
 import com.att.nsa.cmdtool.CommandNotReadyException;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRTopicManager;
-import com.att.nsa.mr.client.MRTopicManager.TopicInfo;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRTopicManager;
+import org.onap.dmaap.mr.client.MRTopicManager.TopicInfo;
 
 public class TopicCommand implements Command<MRCommandContext>
 {
diff --git a/src/main/java/com/att/nsa/mr/tools/TraceCommand.java b/src/main/java/org/onap/dmaap/mr/tools/TraceCommand.java
index 0489172..95edf5b 100644
--- a/src/main/java/com/att/nsa/mr/tools/TraceCommand.java
+++ b/src/main/java/org/onap/dmaap/mr/tools/TraceCommand.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.tools;
+package org.onap.dmaap.mr.tools;
 
 import java.io.PrintStream;
 import java.net.URI;
diff --git a/src/main/java/com/att/nsa/mr/tools/ValidatorUtil.java b/src/main/java/org/onap/dmaap/mr/tools/ValidatorUtil.java
index 0539582..cdba1e0 100644
--- a/src/main/java/com/att/nsa/mr/tools/ValidatorUtil.java
+++ b/src/main/java/org/onap/dmaap/mr/tools/ValidatorUtil.java
@@ -19,11 +19,11 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package com.att.nsa.mr.tools;
+package org.onap.dmaap.mr.tools;
 
 import java.util.Properties;
 
-import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
+import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
 
 public class ValidatorUtil {