Re-add source from correct branch

Change-Id: I515f8378ea1d2baf0aa2434ec46272f1b5bdb229
Signed-off-by: Lisa Revel <lr0306@att.com>

39 files changed, 164 insertions, 164 deletions

diff --git a/dcae-analytics-dmaap/pom.xml b/dcae-analytics-dmaap/pom.xml
index ce54088..94d84cf 100644
--- a/dcae-analytics-dmaap/pom.xml
+++ b/dcae-analytics-dmaap/pom.xml
@@ -28,7 +28,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.openecomp.dcae.analytics</groupId>
+        <groupId>org.openecomp.dcae.apod.analytics</groupId>
         <artifactId>dcae-analytics</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -52,7 +52,7 @@
 
         <!-- DCAE COMMON DEPENDENCIES -->
         <dependency>
-            <groupId>org.openecomp.dcae.analytics</groupId>
+            <groupId>org.openecomp.dcae.apod.analytics</groupId>
             <artifactId>dcae-analytics-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
@@ -98,7 +98,7 @@
 
         <!-- TEST DEPENDENCIES -->
         <dependency>
-            <groupId>org.openecomp.dcae.analytics</groupId>
+            <groupId>org.openecomp.dcae.apod.analytics</groupId>
             <artifactId>dcae-analytics-test</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>test</scope>
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/DMaaPMRFactory.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/DMaaPMRFactory.java
index 6966a46..6a6e064 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/DMaaPMRFactory.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/DMaaPMRFactory.java
@@ -18,18 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap;
+package org.openecomp.dcae.apod.analytics.dmaap;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
-import org.openecomp.dcae.analytics.dmaap.module.AnalyticsDMaaPModule;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherFactory;
-import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
-import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriberFactory;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.module.AnalyticsDMaaPModule;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherFactory;
+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriberFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRBaseConfig.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRBaseConfig.java
index f2435f1..bb594f8 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRBaseConfig.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRBaseConfig.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.domain.config;
+package org.openecomp.dcae.apod.analytics.dmaap.domain.config;
 
 import com.google.common.base.Objects;
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Locale;
 
-import static org.openecomp.dcae.analytics.common.utils.HTTPUtils.JSON_APPLICATION_TYPE;
+import static org.openecomp.dcae.apod.analytics.common.utils.HTTPUtils.JSON_APPLICATION_TYPE;
 
 /**
  * <p>
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRConfig.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRConfig.java
index f5ef71e..fd55c4c 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRConfig.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRConfig.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.domain.config;
+package org.openecomp.dcae.apod.analytics.dmaap.domain.config;
 
 /**
  * <p>
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRPublisherConfig.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfig.java
index 4a08cd3..5a0e601 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRPublisherConfig.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfig.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.domain.config;
+package org.openecomp.dcae.apod.analytics.dmaap.domain.config;
 
 import com.google.common.base.Objects;
 
 import javax.annotation.Nonnull;
 
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_BATCH_SIZE;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_BATCH_SIZE;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE;
 
 /**
  * <p>
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRSubscriberConfig.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRSubscriberConfig.java
index 9741fa5..5e30738 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRSubscriberConfig.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRSubscriberConfig.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.domain.config;
+package org.openecomp.dcae.apod.analytics.dmaap.domain.config;
 
 import com.google.common.base.Objects;
 
@@ -26,9 +26,9 @@ import java.util.UUID;
 
 import javax.annotation.Nonnull;
 
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_GROUP_PREFIX;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_MESSAGE_LIMIT;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_TIMEOUT_MS;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_GROUP_PREFIX;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_MESSAGE_LIMIT;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_TIMEOUT_MS;
 
 /**
  * <p>
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRPublisherResponse.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRPublisherResponse.java
index ad6a86f..d7c6f5c 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRPublisherResponse.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRPublisherResponse.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.domain.response;
+package org.openecomp.dcae.apod.analytics.dmaap.domain.response;
 
 /**
  * <p>
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRPublisherResponseImpl.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRPublisherResponseImpl.java
index dd1dfe8..0ee241d 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRPublisherResponseImpl.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRPublisherResponseImpl.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.domain.response;
+package org.openecomp.dcae.apod.analytics.dmaap.domain.response;
 
 import com.google.common.base.Objects;
 
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRResponse.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRResponse.java
index 7dc7523..a8ded96 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRResponse.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRResponse.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.domain.response;
+package org.openecomp.dcae.apod.analytics.dmaap.domain.response;
 
 /**
  * <p>
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRSubscriberResponse.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRSubscriberResponse.java
index fd1a9e3..8b7c847 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRSubscriberResponse.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRSubscriberResponse.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.domain.response;
+package org.openecomp.dcae.apod.analytics.dmaap.domain.response;
 
 import java.util.List;
 
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRSubscriberResponseImpl.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRSubscriberResponseImpl.java
index 1254654..2ae0c5c 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRSubscriberResponseImpl.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRSubscriberResponseImpl.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.domain.response;
+package org.openecomp.dcae.apod.analytics.dmaap.domain.response;
 
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/module/AnalyticsDMaaPModule.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/module/AnalyticsDMaaPModule.java
index 1296798..c46995f 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/module/AnalyticsDMaaPModule.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/module/AnalyticsDMaaPModule.java
@@ -18,21 +18,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.module;
+package org.openecomp.dcae.apod.analytics.dmaap.module;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherFactory;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherImpl;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueFactory;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueImpl;
-import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
-import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriberFactory;
-import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriberImpl;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherFactory;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherImpl;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueFactory;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueImpl;
+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriberFactory;
+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriberImpl;
 
 /**
  * Guice Module to wire concrete implementations with interfaces
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/BaseDMaaPMRComponent.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/BaseDMaaPMRComponent.java
index e7e8ea4..7e16b8d 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/BaseDMaaPMRComponent.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/BaseDMaaPMRComponent.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service;
+package org.openecomp.dcae.apod.analytics.dmaap.service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -33,16 +33,16 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.ResponseHandler;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.util.EntityUtils;
-import org.openecomp.dcae.analytics.common.AnalyticsConstants;
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.common.utils.HTTPUtils;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponseImpl;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponseImpl;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue;
+import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.common.utils.HTTPUtils;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponseImpl;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponseImpl;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/DMaaPMRComponent.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/DMaaPMRComponent.java
index 6f9a0ce..9d891f1 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/DMaaPMRComponent.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/DMaaPMRComponent.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service;
+package org.openecomp.dcae.apod.analytics.dmaap.service;
 
 /**
  * Marker interface for all DMaaP MR Components e.g. MR Publishers, MR Subscribers
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisher.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisher.java
index afbdf9f..dcd46d9 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisher.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisher.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.publisher;
+package org.openecomp.dcae.apod.analytics.dmaap.service.publisher;
 
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
 
 import java.util.Date;
 import java.util.List;
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherFactory.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherFactory.java
index 74245f8..1d84011 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherFactory.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherFactory.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.publisher;
+package org.openecomp.dcae.apod.analytics.dmaap.service.publisher;
 
-import org.openecomp.dcae.analytics.dmaap.DMaaPMRFactory;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
 
 /**
  * <p>
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java
index 425bead..cb62ee1 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.publisher;
+package org.openecomp.dcae.apod.analytics.dmaap.service.publisher;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.Iterables;
@@ -32,11 +32,11 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
-import org.openecomp.dcae.analytics.common.AnalyticsConstants;
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
-import org.openecomp.dcae.analytics.dmaap.service.BaseDMaaPMRComponent;
+import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.service.BaseDMaaPMRComponent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,7 +45,7 @@ import java.net.URI;
 import java.util.Date;
 import java.util.List;
 
-import static org.openecomp.dcae.analytics.common.utils.HTTPUtils.isSuccessfulResponseCode;
+import static org.openecomp.dcae.apod.analytics.common.utils.HTTPUtils.isSuccessfulResponseCode;
 import static java.lang.String.format;
 
 /**
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueue.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueue.java
index cb3c113..bb8fd9b 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueue.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueue.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.publisher;
+package org.openecomp.dcae.apod.analytics.dmaap.service.publisher;
 
 import java.util.List;
 
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueFactory.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueFactory.java
index bfc3dab..75df65e 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueFactory.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueFactory.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.publisher;
+package org.openecomp.dcae.apod.analytics.dmaap.service.publisher;
 
 import com.google.inject.assistedinject.Assisted;
 
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImpl.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImpl.java
index 0367950..b293998 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImpl.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImpl.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.publisher;
+package org.openecomp.dcae.apod.analytics.dmaap.service.publisher;
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriber.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriber.java
index 096c0a9..33fe83e 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriber.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriber.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.subscriber;
+package org.openecomp.dcae.apod.analytics.dmaap.service.subscriber;
 
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
 
 import java.util.Date;
 
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberFactory.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberFactory.java
index 33c405e..be114f6 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberFactory.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberFactory.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.subscriber;
+package org.openecomp.dcae.apod.analytics.dmaap.service.subscriber;
 
-import org.openecomp.dcae.analytics.dmaap.DMaaPMRFactory;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
 
 /**
  * Factory to initialize instance of {@link DMaaPMRSubscriber} for Guice DI injection purposes.
diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImpl.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImpl.java
index 6d98189..2729b55 100644
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImpl.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImpl.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.subscriber;
+package org.openecomp.dcae.apod.analytics.dmaap.service.subscriber;
 
 import com.google.common.base.Optional;
 import com.google.inject.Inject;
@@ -28,10 +28,10 @@ import org.apache.http.HttpHeaders;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
-import org.openecomp.dcae.analytics.dmaap.service.BaseDMaaPMRComponent;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.service.BaseDMaaPMRComponent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,7 +41,7 @@ import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 
-import static org.openecomp.dcae.analytics.common.utils.HTTPUtils.isSuccessfulResponseCode;
+import static org.openecomp.dcae.apod.analytics.common.utils.HTTPUtils.isSuccessfulResponseCode;
 import static java.lang.String.format;
 
 /**
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/BaseAnalyticsDMaaPGuiceUnitTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPGuiceUnitTest.java
index 522b057..133cf84 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/BaseAnalyticsDMaaPGuiceUnitTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPGuiceUnitTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap;
+package org.openecomp.dcae.apod.analytics.dmaap;
 
 import org.junit.runner.RunWith;
-import org.openecomp.dcae.analytics.test.runner.GuiceJUnitRunner;
+import org.openecomp.dcae.apod.analytics.test.runner.GuiceJUnitRunner;
 
 /**
  * @author Rajiv Singla. Creation Date: 10/20/2016.
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/BaseAnalyticsDMaaPUnitTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPUnitTest.java
index 75e3ec4..c9c07a7 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/BaseAnalyticsDMaaPUnitTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPUnitTest.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap;
+package org.openecomp.dcae.apod.analytics.dmaap;
 
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
-import org.openecomp.dcae.analytics.test.BaseDCAEAnalyticsUnitTest;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
+import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest;
 
 import java.util.List;
 
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/DMaaPMRFactoryTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/DMaaPMRFactoryTest.java
index 646b48d..38f6381 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/DMaaPMRFactoryTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/DMaaPMRFactoryTest.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap;
+package org.openecomp.dcae.apod.analytics.dmaap;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
-import org.openecomp.dcae.analytics.dmaap.module.AnalyticsDMaaPTestModule;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher;
-import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
-import org.openecomp.dcae.analytics.test.annotation.GuiceModules;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.module.AnalyticsDMaaPTestModule;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;
+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
+import org.openecomp.dcae.apod.analytics.test.annotation.GuiceModules;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRPublisherConfigTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfigTest.java
index a66d3f2..4699700 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRPublisherConfigTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfigTest.java
@@ -18,19 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.domain.config;
+package org.openecomp.dcae.apod.analytics.dmaap.domain.config;
 
 import org.junit.Test;
-import org.openecomp.dcae.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
+import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
 
 import static org.junit.Assert.assertTrue;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_BATCH_SIZE;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE;
-import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_CONTENT_TYPE;
-import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PORT_NUMBER;
-import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PROTOCOL;
-import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_USER_NAME;
-import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_USER_PASSWORD;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_BATCH_SIZE;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE;
+import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_CONTENT_TYPE;
+import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PORT_NUMBER;
+import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PROTOCOL;
+import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_USER_NAME;
+import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_USER_PASSWORD;
 
 /**
  * @author Rajiv Singla. Creation Date: 10/14/2016.
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRSubscriberConfigTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRSubscriberConfigTest.java
index 10edc0c..4490c6f 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRSubscriberConfigTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRSubscriberConfigTest.java
@@ -18,19 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.domain.config;
+package org.openecomp.dcae.apod.analytics.dmaap.domain.config;
 
 import org.junit.Test;
-import org.openecomp.dcae.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
+import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
 
 import static org.junit.Assert.assertTrue;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_GROUP_PREFIX;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_MESSAGE_LIMIT;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_TIMEOUT_MS;
-import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_CONTENT_TYPE;
-import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PORT_NUMBER;
-import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PROTOCOL;
-import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_USER_NAME;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_GROUP_PREFIX;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_MESSAGE_LIMIT;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_TIMEOUT_MS;
+import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_CONTENT_TYPE;
+import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PORT_NUMBER;
+import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PROTOCOL;
+import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_USER_NAME;
 
 /**
  * @author Rajiv Singla. Creation Date: 10/14/2016.
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/it/BaseAnalyticsDMaaPIT.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/BaseAnalyticsDMaaPIT.java
index 987b57b..d25fbad 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/it/BaseAnalyticsDMaaPIT.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/BaseAnalyticsDMaaPIT.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.it;
+package org.openecomp.dcae.apod.analytics.dmaap.it;
 
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher;
-import org.openecomp.dcae.analytics.test.BaseDCAEAnalyticsIT;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;
+import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsIT;
 
 import java.util.List;
 
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/it/DMaaPMRPublisherImplIT.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRPublisherImplIT.java
index a7e1f8c..129e64c 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/it/DMaaPMRPublisherImplIT.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRPublisherImplIT.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.it;
+package org.openecomp.dcae.apod.analytics.dmaap.it;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.dcae.analytics.dmaap.DMaaPMRFactory;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher;
+import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;
 
 /**
  * @author Rajiv Singla. Creation Date: 10/13/2016.
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/it/DMaaPMRSubscriberImplIT.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRSubscriberImplIT.java
index 4b32e96..6553dc7 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/it/DMaaPMRSubscriberImplIT.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRSubscriberImplIT.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.it;
+package org.openecomp.dcae.apod.analytics.dmaap.it;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.dcae.analytics.dmaap.DMaaPMRFactory;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher;
-import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
+import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;
+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/module/AnalyticsDMaaPTestModule.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/module/AnalyticsDMaaPTestModule.java
index 7ef44aa..00ac232 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/module/AnalyticsDMaaPTestModule.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/module/AnalyticsDMaaPTestModule.java
@@ -18,21 +18,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.module;
+package org.openecomp.dcae.apod.analytics.dmaap.module;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherFactory;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherMockImpl;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueFactory;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueImpl;
-import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
-import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriberFactory;
-import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriberMockImpl;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherFactory;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherMockImpl;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueFactory;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueImpl;
+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriberFactory;
+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriberMockImpl;
 
 /**
  * DMaaP Guice Test Module
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/BaseDMaaPMRComponentTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/BaseDMaaPMRComponentTest.java
index 4cc3f1e..4edf91b 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/BaseDMaaPMRComponentTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/BaseDMaaPMRComponentTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service;
+package org.openecomp.dcae.apod.analytics.dmaap.service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.base.Optional;
@@ -31,12 +31,12 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mockito;
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherImplTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImplTest.java
index a24bb39..e037ceb 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherImplTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImplTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.publisher;
+package org.openecomp.dcae.apod.analytics.dmaap.service.publisher;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.http.client.ResponseHandler;
@@ -34,10 +34,10 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherMockImpl.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherMockImpl.java
index 333b816..abd8618 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherMockImpl.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherMockImpl.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.publisher;
+package org.openecomp.dcae.apod.analytics.dmaap.service.publisher;
 
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponseImpl;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponseImpl;
 
 import java.util.Date;
 import java.util.List;
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImplTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImplTest.java
index 07622df..7a24fa8 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImplTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImplTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.publisher;
+package org.openecomp.dcae.apod.analytics.dmaap.service.publisher;
 
 import org.junit.Test;
-import org.openecomp.dcae.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
+import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
 
 import java.util.List;
 
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueMockImpl.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueMockImpl.java
index 585d0ba..84fea09 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueMockImpl.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueMockImpl.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.publisher;
+package org.openecomp.dcae.apod.analytics.dmaap.service.publisher;
 
 import java.util.List;
 
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImplTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImplTest.java
index 6d8c79a..f206aa2 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImplTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImplTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.subscriber;
+package org.openecomp.dcae.apod.analytics.dmaap.service.subscriber;
 
 import com.jayway.jsonassert.impl.matcher.IsCollectionWithSize;
 import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -34,10 +34,10 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
 
 import java.io.IOException;
 import java.util.Random;
diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberMockImpl.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberMockImpl.java
index 87a76d0..92a795a 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberMockImpl.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberMockImpl.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.dmaap.service.subscriber;
+package org.openecomp.dcae.apod.analytics.dmaap.service.subscriber;
 
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponseImpl;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponseImpl;
 
 import java.util.Date;