22 files changed, 76 insertions, 76 deletions
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;
 
 /**