Re-add source from correct branch

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

44 files changed, 271 insertions, 271 deletions

diff --git a/dcae-analytics-tca/pom.xml b/dcae-analytics-tca/pom.xml
index 27475a1..945561f 100644
--- a/dcae-analytics-tca/pom.xml
+++ b/dcae-analytics-tca/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>
@@ -43,20 +43,20 @@
 
     <properties>
         <main.basedir>${project.parent.basedir}</main.basedir>
-        <app.main.class>org.openecomp.dcae.analytics.tca.TCAAnalyticsApplication</app.main.class>
+        <app.main.class>org.openecomp.dcae.apod.analytics.tca.TCAAnalyticsApplication</app.main.class>
     </properties>
 
     <dependencies>
 
         <!-- DCAE 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>
 
         <dependency>
-            <groupId>org.openecomp.dcae.analytics</groupId>
+            <groupId>org.openecomp.dcae.apod.analytics</groupId>
             <artifactId>dcae-analytics-dmaap</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
@@ -99,7 +99,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-tca/src/main/java/org/openecomp/dcae/analytics/tca/TCAAnalyticsApplication.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/TCAAnalyticsApplication.java
index 655ddca..49e35b1 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/TCAAnalyticsApplication.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/TCAAnalyticsApplication.java
@@ -18,25 +18,25 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca;
+package org.openecomp.dcae.apod.analytics.tca;
 
 import co.cask.cdap.api.app.AbstractApplication;
 import co.cask.cdap.api.data.stream.Stream;
 import co.cask.cdap.api.dataset.DatasetProperties;
 import co.cask.cdap.api.dataset.lib.ObjectMappedTable;
-import org.openecomp.dcae.analytics.common.utils.ValidationUtils;
-import org.openecomp.dcae.analytics.tca.flow.TCAVESCollectorFlow;
-import org.openecomp.dcae.analytics.tca.persistance.TCAMessageStatusPersister;
-import org.openecomp.dcae.analytics.tca.persistance.TCAVESAlertsPersister;
-import org.openecomp.dcae.analytics.tca.settings.TCAAppConfig;
-import org.openecomp.dcae.analytics.tca.validator.TCAAppConfigValidator;
-import org.openecomp.dcae.analytics.tca.worker.TCADMaaPMockSubscriberWorker;
-import org.openecomp.dcae.analytics.tca.worker.TCADMaaPPublisherWorker;
-import org.openecomp.dcae.analytics.tca.worker.TCADMaaPSubscriberWorker;
+import org.openecomp.dcae.apod.analytics.common.utils.ValidationUtils;
+import org.openecomp.dcae.apod.analytics.tca.flow.TCAVESCollectorFlow;
+import org.openecomp.dcae.apod.analytics.tca.persistance.TCAMessageStatusPersister;
+import org.openecomp.dcae.apod.analytics.tca.persistance.TCAVESAlertsPersister;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppConfig;
+import org.openecomp.dcae.apod.analytics.tca.validator.TCAAppConfigValidator;
+import org.openecomp.dcae.apod.analytics.tca.worker.TCADMaaPMockSubscriberWorker;
+import org.openecomp.dcae.apod.analytics.tca.worker.TCADMaaPPublisherWorker;
+import org.openecomp.dcae.apod.analytics.tca.worker.TCADMaaPSubscriberWorker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_SUBSCRIBER_OUTPUT_DESCRIPTION_STREAM;
+import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_SUBSCRIBER_OUTPUT_DESCRIPTION_STREAM;
 
 /**
  * @author Rajiv Singla. Creation Date: 10/21/2016.
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flow/TCAVESCollectorFlow.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flow/TCAVESCollectorFlow.java
index 33db3c1..b62bc35 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flow/TCAVESCollectorFlow.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flow/TCAVESCollectorFlow.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.flow;
+package org.openecomp.dcae.apod.analytics.tca.flow;
 
 import co.cask.cdap.api.flow.AbstractFlow;
-import org.openecomp.dcae.analytics.common.CDAPComponentsConstants;
-import org.openecomp.dcae.analytics.tca.flowlet.TCAVESAlertsSinkFlowlet;
-import org.openecomp.dcae.analytics.tca.flowlet.TCAVESMessageRouterFlowlet;
-import org.openecomp.dcae.analytics.tca.flowlet.TCAVESThresholdViolationCalculatorFlowlet;
-import org.openecomp.dcae.analytics.tca.settings.TCAAppConfig;
+import org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants;
+import org.openecomp.dcae.apod.analytics.tca.flowlet.TCAVESAlertsSinkFlowlet;
+import org.openecomp.dcae.apod.analytics.tca.flowlet.TCAVESMessageRouterFlowlet;
+import org.openecomp.dcae.apod.analytics.tca.flowlet.TCAVESThresholdViolationCalculatorFlowlet;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppConfig;
 
 /**
  * TCA Flow for VES (Virtual Event Streaming) Collector Flow
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flowlet/TCAVESAlertsSinkFlowlet.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flowlet/TCAVESAlertsSinkFlowlet.java
index 597fcd0..0277635 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flowlet/TCAVESAlertsSinkFlowlet.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flowlet/TCAVESAlertsSinkFlowlet.java
@@ -18,19 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.flowlet;
+package org.openecomp.dcae.apod.analytics.tca.flowlet;
 
 import co.cask.cdap.api.annotation.ProcessInput;
 import co.cask.cdap.api.annotation.Property;
 import co.cask.cdap.api.dataset.lib.ObjectMappedTable;
 import co.cask.cdap.api.flow.flowlet.AbstractFlowlet;
 import co.cask.cdap.api.flow.flowlet.FlowletContext;
-import org.openecomp.dcae.analytics.tca.persistance.TCAVESAlertEntity;
-import org.openecomp.dcae.analytics.tca.persistance.TCAVESAlertsPersister;
+import org.openecomp.dcae.apod.analytics.tca.persistance.TCAVESAlertEntity;
+import org.openecomp.dcae.apod.analytics.tca.persistance.TCAVESAlertsPersister;
 
-import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_ALERTS_SINK_DESCRIPTION_FLOWLET;
-import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_ALERTS_SINK_NAME_FLOWLET;
-import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_TCA_CALCULATOR_NAME_OUTPUT;
+import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_ALERTS_SINK_DESCRIPTION_FLOWLET;
+import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_ALERTS_SINK_NAME_FLOWLET;
+import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_TCA_CALCULATOR_NAME_OUTPUT;
 
 /**
  * Saves TCA VES Alert Messages in a Time series Table
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flowlet/TCAVESMessageRouterFlowlet.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flowlet/TCAVESMessageRouterFlowlet.java
index 7ecd917..102b116 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flowlet/TCAVESMessageRouterFlowlet.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flowlet/TCAVESMessageRouterFlowlet.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.flowlet;
+package org.openecomp.dcae.apod.analytics.tca.flowlet;
 
 import co.cask.cdap.api.annotation.Output;
 import co.cask.cdap.api.annotation.ProcessInput;
@@ -27,10 +27,10 @@ import co.cask.cdap.api.flow.flowlet.OutputEmitter;
 import co.cask.cdap.api.flow.flowlet.StreamEvent;
 import com.google.common.base.Charsets;
 
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.TCA_VES_MESSAGE_ROUTER_PARTITION_KEY;
-import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_ROUTER_DESCRIPTION_FLOWLET;
-import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_ROUTER_NAME_FLOWLET;
-import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_ROUTER_OUTPUT;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.TCA_VES_MESSAGE_ROUTER_PARTITION_KEY;
+import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_ROUTER_DESCRIPTION_FLOWLET;
+import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_ROUTER_NAME_FLOWLET;
+import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_ROUTER_OUTPUT;
 
 
 /**
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flowlet/TCAVESThresholdViolationCalculatorFlowlet.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flowlet/TCAVESThresholdViolationCalculatorFlowlet.java
index d5ab109..3d03cf7 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flowlet/TCAVESThresholdViolationCalculatorFlowlet.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flowlet/TCAVESThresholdViolationCalculatorFlowlet.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.flowlet;
+package org.openecomp.dcae.apod.analytics.tca.flowlet;
 
 import co.cask.cdap.api.annotation.Output;
 import co.cask.cdap.api.annotation.ProcessInput;
@@ -30,20 +30,20 @@ import co.cask.cdap.api.flow.flowlet.FlowletContext;
 import co.cask.cdap.api.flow.flowlet.OutputEmitter;
 import co.cask.cdap.api.metrics.Metrics;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import org.openecomp.dcae.analytics.common.CDAPComponentsConstants;
-import org.openecomp.dcae.analytics.common.CDAPMetricsConstants;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy;
-import org.openecomp.dcae.analytics.model.facade.tca.TCAVESResponse;
-import org.openecomp.dcae.analytics.tca.persistance.TCACalculatorMessageType;
-import org.openecomp.dcae.analytics.tca.persistance.TCAMessageStatusEntity;
-import org.openecomp.dcae.analytics.tca.persistance.TCAMessageStatusPersister;
-import org.openecomp.dcae.analytics.tca.processor.TCACEFProcessorContext;
-import org.openecomp.dcae.analytics.tca.utils.TCAUtils;
+import org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants;
+import org.openecomp.dcae.apod.analytics.common.CDAPMetricsConstants;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
+import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse;
+import org.openecomp.dcae.apod.analytics.tca.persistance.TCACalculatorMessageType;
+import org.openecomp.dcae.apod.analytics.tca.persistance.TCAMessageStatusEntity;
+import org.openecomp.dcae.apod.analytics.tca.persistance.TCAMessageStatusPersister;
+import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFProcessorContext;
+import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_THRESHOLD_VIOLATION_CALCULATOR_DESCRIPTION_FLOWLET;
-import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_THRESHOLD_VIOLATION_CALCULATOR_NAME_FLOWLET;
+import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_THRESHOLD_VIOLATION_CALCULATOR_DESCRIPTION_FLOWLET;
+import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_THRESHOLD_VIOLATION_CALCULATOR_NAME_FLOWLET;
 
 /**
  * TCA VES Message Filter filters out messages which are not applicable for TCA as per TCA Policy
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCACalculatorMessageType.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCACalculatorMessageType.java
index acef458..afb434e 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCACalculatorMessageType.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCACalculatorMessageType.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.persistance;
+package org.openecomp.dcae.apod.analytics.tca.persistance;
 
 /**
  * TCA Calculator applies TCA Policy to incoming VES messages and classifies them as per this enum
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAMessageStatusEntity.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAMessageStatusEntity.java
index 35aeac4..a2d84c3 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAMessageStatusEntity.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAMessageStatusEntity.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.persistance;
+package org.openecomp.dcae.apod.analytics.tca.persistance;
 
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableUtils;
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAMessageStatusPersister.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAMessageStatusPersister.java
index edd33dd..1ac8bfa 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAMessageStatusPersister.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAMessageStatusPersister.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.persistance;
+package org.openecomp.dcae.apod.analytics.tca.persistance;
 
 import co.cask.cdap.api.data.schema.Schema;
 import co.cask.cdap.api.data.schema.UnsupportedTypeException;
@@ -30,18 +30,18 @@ import co.cask.cdap.api.flow.flowlet.FlowletContext;
 import com.google.common.base.Joiner;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.tuple.Pair;
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.common.service.processor.MessageProcessor;
-import org.openecomp.dcae.analytics.common.service.processor.ProcessorContext;
-import org.openecomp.dcae.analytics.common.utils.PersistenceUtils;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.Threshold;
-import org.openecomp.dcae.analytics.tca.processor.TCACEFJsonProcessor;
-import org.openecomp.dcae.analytics.tca.processor.TCACEFPolicyDomainFilter;
-import org.openecomp.dcae.analytics.tca.processor.TCACEFPolicyFunctionalRoleFilter;
-import org.openecomp.dcae.analytics.tca.processor.TCACEFPolicyThresholdsProcessor;
-import org.openecomp.dcae.analytics.tca.processor.TCACEFProcessorContext;
-import org.openecomp.dcae.analytics.tca.utils.TCAUtils;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.common.service.processor.MessageProcessor;
+import org.openecomp.dcae.apod.analytics.common.service.processor.ProcessorContext;
+import org.openecomp.dcae.apod.analytics.common.utils.PersistenceUtils;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;
+import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFJsonProcessor;
+import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFPolicyDomainFilter;
+import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFPolicyFunctionalRoleFilter;
+import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFPolicyThresholdsProcessor;
+import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFProcessorContext;
+import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -51,8 +51,8 @@ import java.util.List;
 
 import javax.annotation.Nullable;
 
-import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_STATUS_DESCRIPTION_TABLE;
-import static org.openecomp.dcae.analytics.common.utils.PersistenceUtils.TABLE_ROW_KEY_COLUMN_NAME;
+import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_STATUS_DESCRIPTION_TABLE;
+import static org.openecomp.dcae.apod.analytics.common.utils.PersistenceUtils.TABLE_ROW_KEY_COLUMN_NAME;
 
 /**
  *
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAVESAlertEntity.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAVESAlertEntity.java
index ff3906c..4f11f39 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAVESAlertEntity.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAVESAlertEntity.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.persistance;
+package org.openecomp.dcae.apod.analytics.tca.persistance;
 
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableUtils;
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAVESAlertsPersister.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAVESAlertsPersister.java
index bf94cde..83eaf7f 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAVESAlertsPersister.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAVESAlertsPersister.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.persistance;
+package org.openecomp.dcae.apod.analytics.tca.persistance;
 
 import co.cask.cdap.api.data.schema.Schema;
 import co.cask.cdap.api.data.schema.UnsupportedTypeException;
@@ -27,14 +27,14 @@ import co.cask.cdap.api.dataset.lib.IndexedTable;
 import co.cask.cdap.api.dataset.lib.ObjectMappedTable;
 import co.cask.cdap.api.dataset.lib.ObjectMappedTableProperties;
 import org.apache.commons.lang3.StringEscapeUtils;
-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.Date;
 
-import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_DEFAULT_VES_ALERTS_DESCRIPTION_TABLE;
-import static org.openecomp.dcae.analytics.common.utils.PersistenceUtils.TABLE_ROW_KEY_COLUMN_NAME;
+import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_DEFAULT_VES_ALERTS_DESCRIPTION_TABLE;
+import static org.openecomp.dcae.apod.analytics.common.utils.PersistenceUtils.TABLE_ROW_KEY_COLUMN_NAME;
 
 /**
  *
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/AbstractTCAECEFPolicyProcessor.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/AbstractTCAECEFPolicyProcessor.java
index 56ea38f..3e599c4 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/AbstractTCAECEFPolicyProcessor.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/AbstractTCAECEFPolicyProcessor.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.processor;
+package org.openecomp.dcae.apod.analytics.tca.processor;
 
-import org.openecomp.dcae.analytics.common.exception.MessageProcessingException;
-import org.openecomp.dcae.analytics.common.service.processor.AbstractMessageProcessor;
-import org.openecomp.dcae.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException;
+import org.openecomp.dcae.apod.analytics.common.service.processor.AbstractMessageProcessor;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFJsonProcessor.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFJsonProcessor.java
index ab33fe2..7f45adb 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFJsonProcessor.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFJsonProcessor.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.processor;
+package org.openecomp.dcae.apod.analytics.tca.processor;
 
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.dcae.analytics.common.exception.MessageProcessingException;
-import org.openecomp.dcae.analytics.common.service.processor.AbstractMessageProcessor;
-import org.openecomp.dcae.analytics.model.domain.cef.EventListener;
-import org.openecomp.dcae.analytics.tca.utils.TCAUtils;
+import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException;
+import org.openecomp.dcae.apod.analytics.common.service.processor.AbstractMessageProcessor;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyDomainFilter.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyDomainFilter.java
index 639c6bc..d283e35 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyDomainFilter.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyDomainFilter.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.processor;
+package org.openecomp.dcae.apod.analytics.tca.processor;
 
-import org.openecomp.dcae.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
 
 /**
  * <p>
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyFunctionalRoleFilter.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyFunctionalRoleFilter.java
index 0f7e9b6..82aa1d6 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyFunctionalRoleFilter.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyFunctionalRoleFilter.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.processor;
+package org.openecomp.dcae.apod.analytics.tca.processor;
 
 import com.google.common.base.Joiner;
-import org.openecomp.dcae.analytics.model.domain.cef.EventListener;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy;
-import org.openecomp.dcae.analytics.tca.utils.TCAUtils;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
+import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils;
 
 import java.util.List;
 
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyThresholdsProcessor.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyThresholdsProcessor.java
index 6dd334f..89e4941 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyThresholdsProcessor.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyThresholdsProcessor.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.processor;
+package org.openecomp.dcae.apod.analytics.tca.processor;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.Table;
-import org.openecomp.dcae.analytics.common.exception.MessageProcessingException;
-import org.openecomp.dcae.analytics.model.domain.cef.EventListener;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.Threshold;
-import org.openecomp.dcae.analytics.tca.utils.TCAUtils;
+import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;
+import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFProcessorContext.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFProcessorContext.java
index 30ebe9d..b8c31c9 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFProcessorContext.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFProcessorContext.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.processor;
+package org.openecomp.dcae.apod.analytics.tca.processor;
 
-import org.openecomp.dcae.analytics.common.service.processor.AbstractProcessorContext;
-import org.openecomp.dcae.analytics.model.domain.cef.EventListener;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy;
+import org.openecomp.dcae.apod.analytics.common.service.processor.AbstractProcessorContext;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
 
 /**
  *  TCA CEF Policy Processor Context
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/settings/TCAAppConfig.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/settings/TCAAppConfig.java
index 1f7c32d..0e4cbe9 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/settings/TCAAppConfig.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/settings/TCAAppConfig.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.settings;
+package org.openecomp.dcae.apod.analytics.tca.settings;
 
 import com.google.common.base.Objects;
-import org.openecomp.dcae.analytics.common.AnalyticsConstants;
-import org.openecomp.dcae.analytics.common.CDAPComponentsConstants;
-import org.openecomp.dcae.analytics.common.cdap.settings.CDAPBaseAppConfig;
+import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants;
+import org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants;
+import org.openecomp.dcae.apod.analytics.common.cdap.settings.CDAPBaseAppConfig;
 
 
 /**
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/settings/TCAAppPreferences.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/settings/TCAAppPreferences.java
index 8eddb3c..30c7aaf 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/settings/TCAAppPreferences.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/settings/TCAAppPreferences.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.settings;
+package org.openecomp.dcae.apod.analytics.tca.settings;
 
 import com.google.common.base.Objects;
-import org.openecomp.dcae.analytics.common.cdap.settings.CDAPAppPreferences;
+import org.openecomp.dcae.apod.analytics.common.cdap.settings.CDAPAppPreferences;
 
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.TCA_DEFAULT_PUBLISHER_MAX_BATCH_QUEUE_SIZE;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.TCA_DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.TCA_DEFAULT_PUBLISHER_POLLING_INTERVAL_MS;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.TCA_DEFAULT_SUBSCRIBER_POLLING_INTERVAL_MS;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.TCA_DEFAULT_PUBLISHER_MAX_BATCH_QUEUE_SIZE;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.TCA_DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.TCA_DEFAULT_PUBLISHER_POLLING_INTERVAL_MS;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.TCA_DEFAULT_SUBSCRIBER_POLLING_INTERVAL_MS;
 
 /**
  * <p>
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/settings/TCAPolicyPreferences.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/settings/TCAPolicyPreferences.java
index cbbf550..5ee4e7a 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/settings/TCAPolicyPreferences.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/settings/TCAPolicyPreferences.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.settings;
+package org.openecomp.dcae.apod.analytics.tca.settings;
 
-import org.openecomp.dcae.analytics.common.cdap.settings.CDAPAppPreferences;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy;
+import org.openecomp.dcae.apod.analytics.common.cdap.settings.CDAPAppPreferences;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
 
 /**
  * A wrapper over {@link TCAPolicy} to act as app Preferences as TCA Policy is passed
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToPublisherConfigMapper.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToPublisherConfigMapper.java
index f332681..7c6de64 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToPublisherConfigMapper.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToPublisherConfigMapper.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.utils;
+package org.openecomp.dcae.apod.analytics.tca.utils;
 
 import com.google.common.base.Function;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences;
 
 import javax.annotation.Nonnull;
 
-import static org.openecomp.dcae.analytics.common.utils.ValidationUtils.isEmpty;
+import static org.openecomp.dcae.apod.analytics.common.utils.ValidationUtils.isEmpty;
 
 /**
  * Function which translates {@link TCAAppPreferences} to {@link DMaaPMRPublisherConfig}
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToSubscriberConfigMapper.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToSubscriberConfigMapper.java
index d0e7f1f..5188916 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToSubscriberConfigMapper.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToSubscriberConfigMapper.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.utils;
+package org.openecomp.dcae.apod.analytics.tca.utils;
 
 import com.google.common.base.Function;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
-import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences;
 
 import javax.annotation.Nonnull;
 
-import static org.openecomp.dcae.analytics.common.utils.ValidationUtils.isEmpty;
+import static org.openecomp.dcae.apod.analytics.common.utils.ValidationUtils.isEmpty;
 
 /**
  * Function which translates {@link TCAAppPreferences} to {@link DMaaPMRSubscriberConfig}
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/utils/TCAUtils.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtils.java
index 27df27f..d0a17dd 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/utils/TCAUtils.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.utils;
+package org.openecomp.dcae.apod.analytics.tca.utils;
 
 import co.cask.cdap.api.RuntimeContext;
 import com.google.common.base.Function;
@@ -39,31 +39,31 @@ import com.jayway.jsonpath.TypeRef;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
-import org.openecomp.dcae.analytics.common.AnalyticsConstants;
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.common.exception.MessageProcessingException;
-import org.openecomp.dcae.analytics.common.service.processor.AbstractMessageProcessor;
-import org.openecomp.dcae.analytics.common.service.processor.GenericMessageChainProcessor;
-import org.openecomp.dcae.analytics.model.domain.cef.CommonEventHeader;
-import org.openecomp.dcae.analytics.model.domain.cef.EventListener;
-import org.openecomp.dcae.analytics.model.domain.cef.EventSeverity;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.Direction;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.Threshold;
-import org.openecomp.dcae.analytics.model.facade.tca.AAI;
-import org.openecomp.dcae.analytics.model.facade.tca.TCAVESResponse;
-import org.openecomp.dcae.analytics.model.util.AnalyticsModelJsonUtils;
-import org.openecomp.dcae.analytics.tca.persistance.TCAVESAlertEntity;
-import org.openecomp.dcae.analytics.tca.processor.TCACEFJsonProcessor;
-import org.openecomp.dcae.analytics.tca.processor.TCACEFPolicyDomainFilter;
-import org.openecomp.dcae.analytics.tca.processor.TCACEFPolicyFunctionalRoleFilter;
-import org.openecomp.dcae.analytics.tca.processor.TCACEFPolicyThresholdsProcessor;
-import org.openecomp.dcae.analytics.tca.processor.TCACEFProcessorContext;
-import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences;
-import org.openecomp.dcae.analytics.tca.settings.TCAPolicyPreferences;
-import org.openecomp.dcae.analytics.tca.validator.TCAPolicyPreferencesValidator;
-import org.openecomp.dcae.analytics.tca.validator.TCAPreferencesValidator;
+import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException;
+import org.openecomp.dcae.apod.analytics.common.service.processor.AbstractMessageProcessor;
+import org.openecomp.dcae.apod.analytics.common.service.processor.GenericMessageChainProcessor;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.CommonEventHeader;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventSeverity;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Direction;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;
+import org.openecomp.dcae.apod.analytics.model.facade.tca.AAI;
+import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse;
+import org.openecomp.dcae.apod.analytics.model.util.AnalyticsModelJsonUtils;
+import org.openecomp.dcae.apod.analytics.tca.persistance.TCAVESAlertEntity;
+import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFJsonProcessor;
+import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFPolicyDomainFilter;
+import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFPolicyFunctionalRoleFilter;
+import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFPolicyThresholdsProcessor;
+import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFProcessorContext;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCAPolicyPreferences;
+import org.openecomp.dcae.apod.analytics.tca.validator.TCAPolicyPreferencesValidator;
+import org.openecomp.dcae.apod.analytics.tca.validator.TCAPreferencesValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -87,8 +87,8 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import static com.google.common.collect.Lists.newArrayList;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.TCA_POLICY_METRICS_PER_FUNCTIONAL_ROLE_PATH;
-import static org.openecomp.dcae.analytics.common.utils.ValidationUtils.validateSettings;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.TCA_POLICY_METRICS_PER_FUNCTIONAL_ROLE_PATH;
+import static org.openecomp.dcae.apod.analytics.common.utils.ValidationUtils.validateSettings;
 
 /**
  * Utility Helper methods for TCA sub module only. Extends {@link AnalyticsModelJsonUtils} to get
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/validator/TCAAppConfigValidator.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/validator/TCAAppConfigValidator.java
index 05b0331..de6d38e 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/validator/TCAAppConfigValidator.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/validator/TCAAppConfigValidator.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.validator;
+package org.openecomp.dcae.apod.analytics.tca.validator;
 
-import org.openecomp.dcae.analytics.common.cdap.validation.CDAPAppSettingsValidator;
-import org.openecomp.dcae.analytics.common.validation.GenericValidationResponse;
-import org.openecomp.dcae.analytics.tca.settings.TCAAppConfig;
+import org.openecomp.dcae.apod.analytics.common.cdap.validation.CDAPAppSettingsValidator;
+import org.openecomp.dcae.apod.analytics.common.validation.GenericValidationResponse;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppConfig;
 
-import static org.openecomp.dcae.analytics.common.utils.ValidationUtils.isEmpty;
+import static org.openecomp.dcae.apod.analytics.common.utils.ValidationUtils.isEmpty;
 
 /**
  *  <p>
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/validator/TCAPolicyPreferencesValidator.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/validator/TCAPolicyPreferencesValidator.java
index 0ff0eb6..5984bac 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/validator/TCAPolicyPreferencesValidator.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/validator/TCAPolicyPreferencesValidator.java
@@ -18,20 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.validator;
+package org.openecomp.dcae.apod.analytics.tca.validator;
 
-import org.openecomp.dcae.analytics.common.cdap.validation.CDAPAppSettingsValidator;
-import org.openecomp.dcae.analytics.common.validation.GenericValidationResponse;
-import org.openecomp.dcae.analytics.model.domain.cef.EventSeverity;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.Direction;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.Threshold;
-import org.openecomp.dcae.analytics.tca.settings.TCAPolicyPreferences;
-import org.openecomp.dcae.analytics.tca.utils.TCAUtils;
+import org.openecomp.dcae.apod.analytics.common.cdap.validation.CDAPAppSettingsValidator;
+import org.openecomp.dcae.apod.analytics.common.validation.GenericValidationResponse;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventSeverity;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Direction;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCAPolicyPreferences;
+import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils;
 
 import java.util.List;
 
-import static org.openecomp.dcae.analytics.common.utils.ValidationUtils.isEmpty;
+import static org.openecomp.dcae.apod.analytics.common.utils.ValidationUtils.isEmpty;
 
 /**
  * Validates TCA Policy Preferences
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/validator/TCAPreferencesValidator.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/validator/TCAPreferencesValidator.java
index a7cbbf5..78da6f9 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/validator/TCAPreferencesValidator.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/validator/TCAPreferencesValidator.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.validator;
+package org.openecomp.dcae.apod.analytics.tca.validator;
 
-import org.openecomp.dcae.analytics.common.cdap.validation.CDAPAppSettingsValidator;
-import org.openecomp.dcae.analytics.common.validation.GenericValidationResponse;
-import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences;
+import org.openecomp.dcae.apod.analytics.common.cdap.validation.CDAPAppSettingsValidator;
+import org.openecomp.dcae.apod.analytics.common.validation.GenericValidationResponse;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences;
 
-import static org.openecomp.dcae.analytics.common.utils.ValidationUtils.isEmpty;
+import static org.openecomp.dcae.apod.analytics.common.utils.ValidationUtils.isEmpty;
 
 /**
  *
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMRPublisherJob.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMRPublisherJob.java
index 4a9a7ab..cba3d86 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMRPublisherJob.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMRPublisherJob.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.worker;
+package org.openecomp.dcae.apod.analytics.tca.worker;
 
 import co.cask.cdap.api.TxRunnable;
 import co.cask.cdap.api.common.Bytes;
@@ -30,14 +30,14 @@ import co.cask.cdap.api.metrics.Metrics;
 import co.cask.cdap.api.worker.WorkerContext;
 import com.google.common.base.Joiner;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.openecomp.dcae.analytics.common.CDAPMetricsConstants;
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.common.utils.HTTPUtils;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher;
-import org.openecomp.dcae.analytics.tca.persistance.TCAVESAlertEntity;
-import org.openecomp.dcae.analytics.tca.persistance.TCAVESAlertsPersister;
-import org.openecomp.dcae.analytics.tca.utils.TCAUtils;
+import org.openecomp.dcae.apod.analytics.common.CDAPMetricsConstants;
+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.response.DMaaPMRPublisherResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;
+import org.openecomp.dcae.apod.analytics.tca.persistance.TCAVESAlertEntity;
+import org.openecomp.dcae.apod.analytics.tca.persistance.TCAVESAlertsPersister;
+import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils;
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobDataMap;
@@ -53,10 +53,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.CDAP_ALERTS_TABLE_VARIABLE_NAME;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DMAAP_METRICS_VARIABLE_NAME;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DMAAP_PUBLISHER_VARIABLE_NAME;
-import static org.openecomp.dcae.analytics.common.AnalyticsConstants.WORKER_CONTEXT_VARIABLE_NAME;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.CDAP_ALERTS_TABLE_VARIABLE_NAME;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DMAAP_METRICS_VARIABLE_NAME;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DMAAP_PUBLISHER_VARIABLE_NAME;
+import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.WORKER_CONTEXT_VARIABLE_NAME;
 
 /**
  * Quartz Job that will monitor any new alert messages in given TCA Alerts table and if any found publish them to
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMRSubscriberJob.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMRSubscriberJob.java
index 7212527..d5c9c41 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMRSubscriberJob.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMRSubscriberJob.java
@@ -18,18 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.worker;
+package org.openecomp.dcae.apod.analytics.tca.worker;
 
 import co.cask.cdap.api.metrics.Metrics;
 import co.cask.cdap.api.worker.WorkerContext;
 import com.google.common.base.Optional;
 import com.google.common.base.Stopwatch;
-import org.openecomp.dcae.analytics.common.AnalyticsConstants;
-import org.openecomp.dcae.analytics.common.CDAPMetricsConstants;
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.common.utils.HTTPUtils;
-import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
-import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
+import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants;
+import org.openecomp.dcae.apod.analytics.common.CDAPMetricsConstants;
+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.response.DMaaPMRSubscriberResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobDataMap;
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMockSubscriberWorker.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMockSubscriberWorker.java
index d8d1968..0e3da5e 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMockSubscriberWorker.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMockSubscriberWorker.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.worker;
+package org.openecomp.dcae.apod.analytics.tca.worker;
 
 import co.cask.cdap.api.annotation.Property;
 import co.cask.cdap.api.worker.AbstractWorker;
 import co.cask.cdap.api.worker.WorkerContext;
 import com.fasterxml.jackson.core.type.TypeReference;
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.model.domain.cef.EventListener;
-import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,9 +35,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 
-import static org.openecomp.dcae.analytics.tca.utils.TCAUtils.getValidatedTCAAppPreferences;
-import static org.openecomp.dcae.analytics.tca.utils.TCAUtils.readValue;
-import static org.openecomp.dcae.analytics.tca.utils.TCAUtils.writeValueAsString;
+import static org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils.getValidatedTCAAppPreferences;
+import static org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils.readValue;
+import static org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils.writeValueAsString;
 
 /**
  * CDAP Worker which mocks fetching VES Messages from DMaaP MR topic.
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPPublisherWorker.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPPublisherWorker.java
index 49f98fc..0286d43 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPPublisherWorker.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPPublisherWorker.java
@@ -18,22 +18,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.worker;
+package org.openecomp.dcae.apod.analytics.tca.worker;
 
 import co.cask.cdap.api.annotation.Property;
 import co.cask.cdap.api.metrics.Metrics;
 import co.cask.cdap.api.worker.AbstractWorker;
 import co.cask.cdap.api.worker.WorkerContext;
-import org.openecomp.dcae.analytics.common.AnalyticsConstants;
-import org.openecomp.dcae.analytics.common.CDAPComponentsConstants;
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.dmaap.DMaaPMRFactory;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher;
-import org.openecomp.dcae.analytics.model.util.AnalyticsModelIOUtils;
-import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences;
-import org.openecomp.dcae.analytics.tca.utils.AppPreferencesToPublisherConfigMapper;
-import org.openecomp.dcae.analytics.tca.utils.TCAUtils;
+import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants;
+import org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;
+import org.openecomp.dcae.apod.analytics.model.util.AnalyticsModelIOUtils;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences;
+import org.openecomp.dcae.apod.analytics.tca.utils.AppPreferencesToPublisherConfigMapper;
+import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils;
 import org.quartz.JobBuilder;
 import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPSubscriberWorker.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPSubscriberWorker.java
index 8d773e4..7b58dbc 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPSubscriberWorker.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPSubscriberWorker.java
@@ -18,22 +18,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.worker;
+package org.openecomp.dcae.apod.analytics.tca.worker;
 
 import co.cask.cdap.api.annotation.Property;
 import co.cask.cdap.api.metrics.Metrics;
 import co.cask.cdap.api.worker.AbstractWorker;
 import co.cask.cdap.api.worker.WorkerContext;
-import org.openecomp.dcae.analytics.common.AnalyticsConstants;
-import org.openecomp.dcae.analytics.common.CDAPComponentsConstants;
-import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.analytics.dmaap.DMaaPMRFactory;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
-import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
-import org.openecomp.dcae.analytics.model.util.AnalyticsModelIOUtils;
-import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences;
-import org.openecomp.dcae.analytics.tca.utils.AppPreferencesToSubscriberConfigMapper;
-import org.openecomp.dcae.analytics.tca.utils.TCAUtils;
+import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants;
+import org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
+import org.openecomp.dcae.apod.analytics.model.util.AnalyticsModelIOUtils;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences;
+import org.openecomp.dcae.apod.analytics.tca.utils.AppPreferencesToSubscriberConfigMapper;
+import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils;
 import org.quartz.JobBuilder;
 import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/BaseAnalyticsTCAIT.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/BaseAnalyticsTCAIT.java
index 4dedf98..e7fa380 100644
--- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/BaseAnalyticsTCAIT.java
+++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/BaseAnalyticsTCAIT.java
@@ -18,19 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca;
+package org.openecomp.dcae.apod.analytics.tca;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.google.common.base.Suppliers;
 import org.junit.BeforeClass;
-import org.openecomp.dcae.analytics.common.AnalyticsConstants;
-import org.openecomp.dcae.analytics.model.util.AnalyticsModelIOUtils;
-import org.openecomp.dcae.analytics.model.util.json.AnalyticsModelObjectMapperSupplier;
-import org.openecomp.dcae.analytics.tca.settings.TCATestAppConfig;
-import org.openecomp.dcae.analytics.tca.settings.TCATestAppPreferences;
-import org.openecomp.dcae.analytics.test.BaseDCAEAnalyticsIT;
+import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants;
+import org.openecomp.dcae.apod.analytics.model.util.AnalyticsModelIOUtils;
+import org.openecomp.dcae.apod.analytics.model.util.json.AnalyticsModelObjectMapperSupplier;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppConfig;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppPreferences;
+import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsIT;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/BaseAnalyticsTCAUnitTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/BaseAnalyticsTCAUnitTest.java
index 38e4ce1..002c427 100644
--- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/BaseAnalyticsTCAUnitTest.java
+++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/BaseAnalyticsTCAUnitTest.java
@@ -18,19 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca;
+package org.openecomp.dcae.apod.analytics.tca;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Suppliers;
 import org.junit.Assert;
-import org.openecomp.dcae.analytics.model.domain.cef.EventListener;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.Direction;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.Threshold;
-import org.openecomp.dcae.analytics.model.util.json.AnalyticsModelObjectMapperSupplier;
-import org.openecomp.dcae.analytics.tca.settings.TCATestAppPreferences;
-import org.openecomp.dcae.analytics.test.BaseDCAEAnalyticsUnitTest;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Direction;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;
+import org.openecomp.dcae.apod.analytics.model.util.json.AnalyticsModelObjectMapperSupplier;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppPreferences;
+import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/it/TCAnalyticsAppConfigIT.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/it/TCAnalyticsAppConfigIT.java
index 2ed5252..59795fd 100644
--- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/it/TCAnalyticsAppConfigIT.java
+++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/it/TCAnalyticsAppConfigIT.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.it;
+package org.openecomp.dcae.apod.analytics.tca.it;
 
 import org.junit.Test;
-import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAIT;
-import org.openecomp.dcae.analytics.tca.settings.TCATestAppConfig;
-import org.openecomp.dcae.analytics.tca.settings.TCATestAppConfigHolder;
-import org.openecomp.dcae.analytics.tca.settings.TCATestAppPreferences;
+import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAIT;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppConfig;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppConfigHolder;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppPreferences;
 
 /**
  *
diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/processor/TCACEFJsonProcessorTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFJsonProcessorTest.java
index 05efcd6..dfb640c 100644
--- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/processor/TCACEFJsonProcessorTest.java
+++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFJsonProcessorTest.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.processor;
+package org.openecomp.dcae.apod.analytics.tca.processor;
 
 import org.junit.Test;
-import org.openecomp.dcae.analytics.common.exception.MessageProcessingException;
-import org.openecomp.dcae.analytics.model.domain.cef.EventListener;
-import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAUnitTest;
+import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyThresholdsProcessorTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyThresholdsProcessorTest.java
index 8d83307..e03d81b 100644
--- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyThresholdsProcessorTest.java
+++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyThresholdsProcessorTest.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.processor;
+package org.openecomp.dcae.apod.analytics.tca.processor;
 
 import org.junit.Test;
-import org.openecomp.dcae.analytics.common.service.processor.ProcessingState;
-import org.openecomp.dcae.analytics.model.domain.cef.EventListener;
-import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAUnitTest;
+import org.openecomp.dcae.apod.analytics.common.service.processor.ProcessingState;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertFalse;
diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/processor/TCACEFProcessorContextTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFProcessorContextTest.java
index d955d81..ff044bc 100644
--- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/processor/TCACEFProcessorContextTest.java
+++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFProcessorContextTest.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.processor;
+package org.openecomp.dcae.apod.analytics.tca.processor;
 
 import org.junit.Test;
-import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAUnitTest;
+import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest;
 
 /**
  *
diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/settings/TCATestAppConfig.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/settings/TCATestAppConfig.java
index 4e057cc..b8718c3 100644
--- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/settings/TCATestAppConfig.java
+++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/settings/TCATestAppConfig.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.settings;
+package org.openecomp.dcae.apod.analytics.tca.settings;
 
 /**
  * TCA Test App Config is used for testing purposes only
diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/settings/TCATestAppConfigHolder.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/settings/TCATestAppConfigHolder.java
index e854cac..4007a7c 100644
--- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/settings/TCATestAppConfigHolder.java
+++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/settings/TCATestAppConfigHolder.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.settings;
+package org.openecomp.dcae.apod.analytics.tca.settings;
 
 /**
  * Holder for TCA Test App Config
diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/settings/TCATestAppPreferences.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/settings/TCATestAppPreferences.java
index f8a0474..2218d63 100644
--- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/settings/TCATestAppPreferences.java
+++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/settings/TCATestAppPreferences.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.settings;
+package org.openecomp.dcae.apod.analytics.tca.settings;
 
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToPublisherConfigMapperTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToPublisherConfigMapperTest.java
index d66ef52..7ae3cf8 100644
--- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToPublisherConfigMapperTest.java
+++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToPublisherConfigMapperTest.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.utils;
+package org.openecomp.dcae.apod.analytics.tca.utils;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAUnitTest;
-import org.openecomp.dcae.analytics.tca.settings.TCATestAppPreferences;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
+import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppPreferences;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToSubscriberConfigMapperTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToSubscriberConfigMapperTest.java
index 6963201..7ff8d60 100644
--- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToSubscriberConfigMapperTest.java
+++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToSubscriberConfigMapperTest.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.utils;
+package org.openecomp.dcae.apod.analytics.tca.utils;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
-import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAUnitTest;
-import org.openecomp.dcae.analytics.tca.settings.TCATestAppPreferences;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
+import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppPreferences;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/utils/TCAUtilsTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtilsTest.java
index 19c80d2..7fa961e 100644
--- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/utils/TCAUtilsTest.java
+++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtilsTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.utils;
+package org.openecomp.dcae.apod.analytics.tca.utils;
 
 import co.cask.cdap.api.RuntimeContext;
 import com.google.common.base.Supplier;
@@ -31,19 +31,19 @@ import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.openecomp.dcae.analytics.common.exception.MessageProcessingException;
-import org.openecomp.dcae.analytics.model.domain.cef.CommonEventHeader;
-import org.openecomp.dcae.analytics.model.domain.cef.Event;
-import org.openecomp.dcae.analytics.model.domain.cef.EventListener;
-import org.openecomp.dcae.analytics.model.domain.cef.EventSeverity;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.Threshold;
-import org.openecomp.dcae.analytics.model.facade.tca.TCAVESResponse;
-import org.openecomp.dcae.analytics.model.util.AnalyticsModelIOUtils;
-import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAUnitTest;
-import org.openecomp.dcae.analytics.tca.processor.TCACEFProcessorContext;
-import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences;
+import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.CommonEventHeader;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.Event;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventSeverity;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;
+import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse;
+import org.openecomp.dcae.apod.analytics.model.util.AnalyticsModelIOUtils;
+import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest;
+import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFProcessorContext;
+import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMRSubscriberJobTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMRSubscriberJobTest.java
index bc8a6f0..453f195 100644
--- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMRSubscriberJobTest.java
+++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMRSubscriberJobTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.analytics.tca.worker;
+package org.openecomp.dcae.apod.analytics.tca.worker;
 
 import co.cask.cdap.api.metrics.Metrics;
 import co.cask.cdap.api.worker.WorkerConfigurer;
@@ -27,9 +27,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.openecomp.dcae.analytics.common.AnalyticsConstants;
-import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
-import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAUnitTest;
+import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants;
+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
+import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest;
 import org.quartz.JobDataMap;
 import org.quartz.JobExecutionContext;