143 files changed, 149 insertions, 169 deletions

diff --git a/oom-app-common/README.md b/ccsdk-app-common/README.md
index fa3eb19..fa3eb19 100644
--- a/oom-app-common/README.md
+++ b/ccsdk-app-common/README.md
diff --git a/oom-app-common/db-scripts/README.md b/ccsdk-app-common/db-scripts/README.md
index dc9379d..dc9379d 100644
--- a/oom-app-common/db-scripts/README.md
+++ b/ccsdk-app-common/db-scripts/README.md
diff --git a/oom-app-common/db-scripts/oom-ddl-postgres-1707-common.sql b/ccsdk-app-common/db-scripts/oom-ddl-postgres-1707-common.sql
index c42eb0f..c42eb0f 100644
--- a/oom-app-common/db-scripts/oom-ddl-postgres-1707-common.sql
+++ b/ccsdk-app-common/db-scripts/oom-ddl-postgres-1707-common.sql
diff --git a/oom-app-common/db-scripts/oom-dml-postgres-1707-common.sql b/ccsdk-app-common/db-scripts/oom-dml-postgres-1707-common.sql
index 4503531..4503531 100644
--- a/oom-app-common/db-scripts/oom-dml-postgres-1707-common.sql
+++ b/ccsdk-app-common/db-scripts/oom-dml-postgres-1707-common.sql
diff --git a/oom-app-common/pom.xml b/ccsdk-app-common/pom.xml
index fa61c01..b28b292 100644
--- a/oom-app-common/pom.xml
+++ b/ccsdk-app-common/pom.xml
@@ -3,12 +3,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.onap.oom.dashboard</groupId>
-	<artifactId>oom-app-common</artifactId>
+	<groupId>org.onap.ccsdk.dashboard</groupId>
+	<artifactId>ccsdk-app-common</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>ONAP Operations Manager Dashboard common</name>
-	<description>OOM Dashboard common Java code</description>
+	<description>CCSDK Dashboard common Java code</description>
 
 	<properties>
 		<encoding>UTF-8</encoding>
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/CloudifyController.java
index f3e136c..1962c4f 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/CloudifyController.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.controller;
+package org.onap.ccsdk.dashboard.controller;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.util.ArrayList;
@@ -29,19 +29,19 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.onap.oom.dashboard.exception.DashboardControllerException;
-import org.onap.oom.dashboard.model.CloudifyBlueprint;
-import org.onap.oom.dashboard.model.CloudifyBlueprintUpload;
-import org.onap.oom.dashboard.model.CloudifyDeployment;
-import org.onap.oom.dashboard.model.CloudifyDeploymentList;
-import org.onap.oom.dashboard.model.CloudifyDeploymentRequest;
-import org.onap.oom.dashboard.model.CloudifyExecution;
-import org.onap.oom.dashboard.model.CloudifyExecutionList;
-import org.onap.oom.dashboard.model.CloudifyExecutionRequest;
-import org.onap.oom.dashboard.model.ECTransportModel;
-import org.onap.oom.dashboard.model.RestResponseError;
-import org.onap.oom.dashboard.model.RestResponsePage;
-import org.onap.oom.dashboard.rest.IControllerRestClient;
+import org.onap.ccsdk.dashboard.model.CloudifyDeploymentList;
+import org.onap.ccsdk.dashboard.model.CloudifyExecutionRequest;
+import org.onap.ccsdk.dashboard.exception.DashboardControllerException;
+import org.onap.ccsdk.dashboard.model.CloudifyBlueprint;
+import org.onap.ccsdk.dashboard.model.CloudifyBlueprintUpload;
+import org.onap.ccsdk.dashboard.model.CloudifyDeployment;
+import org.onap.ccsdk.dashboard.model.CloudifyDeploymentRequest;
+import org.onap.ccsdk.dashboard.model.CloudifyExecution;
+import org.onap.ccsdk.dashboard.model.CloudifyExecutionList;
+import org.onap.ccsdk.dashboard.model.ECTransportModel;
+import org.onap.ccsdk.dashboard.model.RestResponseError;
+import org.onap.ccsdk.dashboard.model.RestResponsePage;
+import org.onap.ccsdk.dashboard.rest.IControllerRestClient;
 import org.openecomp.portalsdk.core.domain.User;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.openecomp.portalsdk.core.util.SystemProperties;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/ConsulController.java
index 03e956c..9f22456 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/ConsulController.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.controller;
+package org.onap.ccsdk.dashboard.controller;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.net.URI;
@@ -30,16 +30,16 @@ import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
-import org.onap.oom.dashboard.exception.DashboardControllerException;
-import org.onap.oom.dashboard.model.ConsulHealthServiceRegistration;
-import org.onap.oom.dashboard.model.ConsulNodeInfo;
-import org.onap.oom.dashboard.model.ConsulServiceHealth;
-import org.onap.oom.dashboard.model.ConsulServiceInfo;
-import org.onap.oom.dashboard.model.ECTransportModel;
-import org.onap.oom.dashboard.model.RestResponseError;
-import org.onap.oom.dashboard.model.RestResponsePage;
-import org.onap.oom.dashboard.model.RestResponseSuccess;
-import org.onap.oom.dashboard.rest.IControllerRestClient;
+import org.onap.ccsdk.dashboard.model.ConsulHealthServiceRegistration;
+import org.onap.ccsdk.dashboard.model.ConsulNodeInfo;
+import org.onap.ccsdk.dashboard.model.ConsulServiceHealth;
+import org.onap.ccsdk.dashboard.model.RestResponsePage;
+import org.onap.ccsdk.dashboard.rest.IControllerRestClient;
+import org.onap.ccsdk.dashboard.exception.DashboardControllerException;
+import org.onap.ccsdk.dashboard.model.ConsulServiceInfo;
+import org.onap.ccsdk.dashboard.model.ECTransportModel;
+import org.onap.ccsdk.dashboard.model.RestResponseError;
+import org.onap.ccsdk.dashboard.model.RestResponseSuccess;
 import org.openecomp.portalsdk.core.domain.User;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.openecomp.portalsdk.core.util.SystemProperties;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/DashboardHomeController.java
index bebf0dd..618e84d 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/DashboardHomeController.java
@@ -19,19 +19,19 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.controller;
+package org.onap.ccsdk.dashboard.controller;
 
 import java.util.ArrayList;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.onap.oom.dashboard.domain.ControllerEndpoint;
-import org.onap.oom.dashboard.exception.DashboardControllerException;
-import org.onap.oom.dashboard.model.ControllerEndpointCredentials;
-import org.onap.oom.dashboard.model.ControllerEndpointTransport;
-import org.onap.oom.dashboard.model.RestResponseError;
-import org.onap.oom.dashboard.model.RestResponseSuccess;
-import org.onap.oom.dashboard.service.ControllerEndpointService;
+import org.onap.ccsdk.dashboard.domain.ControllerEndpoint;
+import org.onap.ccsdk.dashboard.exception.DashboardControllerException;
+import org.onap.ccsdk.dashboard.model.ControllerEndpointCredentials;
+import org.onap.ccsdk.dashboard.model.ControllerEndpointTransport;
+import org.onap.ccsdk.dashboard.model.RestResponseError;
+import org.onap.ccsdk.dashboard.model.RestResponseSuccess;
+import org.onap.ccsdk.dashboard.service.ControllerEndpointService;
 import org.openecomp.portalsdk.core.domain.User;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.openecomp.portalsdk.core.web.support.UserUtils;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/DashboardRestrictedBaseController.java
index 622acea..6f80d22 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/DashboardRestrictedBaseController.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.controller;
+package org.onap.ccsdk.dashboard.controller;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -27,14 +27,14 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.onap.oom.dashboard.domain.ControllerEndpoint;
-import org.onap.oom.dashboard.exception.DashboardControllerException;
-import org.onap.oom.dashboard.model.ControllerEndpointCredentials;
-import org.onap.oom.dashboard.rest.ControllerRestClientImpl;
-import org.onap.oom.dashboard.rest.ControllerRestClientMockImpl;
-import org.onap.oom.dashboard.rest.IControllerRestClient;
-import org.onap.oom.dashboard.service.ControllerEndpointService;
-import org.onap.oom.dashboard.util.DashboardProperties;
+import org.onap.ccsdk.dashboard.exception.DashboardControllerException;
+import org.onap.ccsdk.dashboard.rest.ControllerRestClientMockImpl;
+import org.onap.ccsdk.dashboard.service.ControllerEndpointService;
+import org.onap.ccsdk.dashboard.domain.ControllerEndpoint;
+import org.onap.ccsdk.dashboard.rest.IControllerRestClient;
+import org.onap.ccsdk.dashboard.util.DashboardProperties;
+import org.onap.ccsdk.dashboard.model.ControllerEndpointCredentials;
+import org.onap.ccsdk.dashboard.rest.ControllerRestClientImpl;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.domain.User;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/ECDSingleSignOnController.java
index e877890..953adff 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/ECDSingleSignOnController.java
@@ -18,7 +18,7 @@
  * ================================================================================
  */
 
-package org.onap.oom.dashboard.controller;
+package org.onap.ccsdk.dashboard.controller;
 
 import java.io.UnsupportedEncodingException;
 
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.onap.oom.dashboard.exception.DashboardControllerException;
+import org.onap.ccsdk.dashboard.exception.DashboardControllerException;
 import org.openecomp.portalsdk.core.auth.LoginStrategy;
 import org.openecomp.portalsdk.core.command.LoginBean;
 import org.openecomp.portalsdk.core.controller.UnRestrictedBaseController;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/HealthCheckController.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/HealthCheckController.java
index 7ed3fbe..3393236 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/HealthCheckController.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/HealthCheckController.java
@@ -19,13 +19,13 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.controller;
+package org.onap.ccsdk.dashboard.controller;
 
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.onap.oom.dashboard.model.HealthStatus;
+import org.onap.ccsdk.dashboard.model.HealthStatus;
 import org.openecomp.portalsdk.core.controller.UnRestrictedBaseController;
 import org.openecomp.portalsdk.core.domain.App;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/domain/ControllerEndpoint.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/domain/ControllerEndpoint.java
index 33a22d0..1e74611 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/domain/ControllerEndpoint.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/domain/ControllerEndpoint.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.domain;
+package org.onap.ccsdk.dashboard.domain;
 
 import org.openecomp.portalsdk.core.domain.support.DomainVo;
 
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/exception/DashboardControllerException.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/exception/DashboardControllerException.java
index ce2d169..f288741 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/exception/DashboardControllerException.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/exception/DashboardControllerException.java
@@ -1,4 +1,4 @@
-package org.onap.oom.dashboard.exception;
+package org.onap.ccsdk.dashboard.exception;
 
 /**
  * A little something to placate the Sonar code-analysis tool.
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprint.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprint.java
index df02cc2..f66a072 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprint.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprint.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import java.util.Map;
 
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintContent.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintContent.java
index 89c3c38..6b95eaa 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintContent.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintContent.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintList.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintList.java
index 933d0d3..a9a98a1 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintList.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintList.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import java.util.List;
 
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintUpload.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintUpload.java
index 2d63d92..70e093b 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintUpload.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintUpload.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeployment.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeployment.java
index b4dc65c..126fe9c 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeployment.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeployment.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import java.util.List;
 import java.util.Map;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentList.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeploymentList.java
index f57784f..51b6169 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentList.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeploymentList.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import java.util.List;
 
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentRequest.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeploymentRequest.java
index 0bc7b44..32c7199 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentRequest.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeploymentRequest.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import java.util.Map;
 
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecution.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecution.java
index d580ef0..071ef57 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecution.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecution.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import java.util.Map;
 
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionList.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionList.java
index 6d97c94..5909c62 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionList.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionList.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import java.util.List;
 
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionRequest.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionRequest.java
index 13b6826..d787fec 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionRequest.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionRequest.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import java.util.Map;
 
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulDatacenter.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulDatacenter.java
index 93eb224..7b610b5 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulDatacenter.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulDatacenter.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulHealthServiceRegistration.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulHealthServiceRegistration.java
index 1385de9..f899a8d 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulHealthServiceRegistration.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulHealthServiceRegistration.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import java.util.List;
 
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulNodeInfo.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulNodeInfo.java
index 4235cd9..b3ba4ae 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulNodeInfo.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulNodeInfo.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import java.util.Map;
 
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealth.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceHealth.java
index 5d019cf..b609b78 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealth.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceHealth.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealthHistory.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceHealthHistory.java
index 4ad75e6..f80b506 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealthHistory.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceHealthHistory.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceInfo.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceInfo.java
index 3b4ad40..edeb029 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceInfo.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceInfo.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import java.util.List;
 
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ControllerEndpointCredentials.java
index 1d5c1d4..02c892f 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ControllerEndpointCredentials.java
@@ -19,9 +19,9 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
-import org.onap.oom.dashboard.exception.DashboardControllerException;
+import org.onap.ccsdk.dashboard.exception.DashboardControllerException;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
 
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointTransport.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ControllerEndpointTransport.java
index 94a88f8..0a2f529 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointTransport.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ControllerEndpointTransport.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 /**
  * Model for message passed by backend to frontend about ECOMP-C Endpoints.
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ECTransportModel.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ECTransportModel.java
index 1c498eb..3e0baa1 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ECTransportModel.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ECTransportModel.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/HealthStatus.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/HealthStatus.java
index 6d6a0e4..93d072f 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/HealthStatus.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/HealthStatus.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 /**
  * Model for JSON response with health-check results.
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseError.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponseError.java
index 0b4f5b8..64e0d71 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseError.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponseError.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponsePage.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponsePage.java
index 1fe8e29..0902fb0 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponsePage.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponsePage.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 /**
  * Model for a response with count of items available, count of pages required
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseSuccess.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponseSuccess.java
index 655fcf0..145c1cd 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseSuccess.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponseSuccess.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.model;
+package org.onap.ccsdk.dashboard.model;
 
 /**
  * Trivial model for carrying a message indicating success.
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/ControllerRestClientImpl.java
index e6d3d54..bb79c9f 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/ControllerRestClientImpl.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.rest;
+package org.onap.ccsdk.dashboard.rest;
 
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -36,20 +36,20 @@ import org.apache.http.client.CredentialsProvider;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.onap.oom.dashboard.model.CloudifyBlueprintContent;
-import org.onap.oom.dashboard.model.CloudifyBlueprintList;
-import org.onap.oom.dashboard.model.CloudifyBlueprintUpload;
-import org.onap.oom.dashboard.model.CloudifyDeploymentList;
-import org.onap.oom.dashboard.model.CloudifyDeploymentRequest;
-import org.onap.oom.dashboard.model.CloudifyExecution;
-import org.onap.oom.dashboard.model.CloudifyExecutionList;
-import org.onap.oom.dashboard.model.CloudifyExecutionRequest;
-import org.onap.oom.dashboard.model.ConsulDatacenter;
-import org.onap.oom.dashboard.model.ConsulHealthServiceRegistration;
-import org.onap.oom.dashboard.model.ConsulNodeInfo;
-import org.onap.oom.dashboard.model.ConsulServiceHealth;
-import org.onap.oom.dashboard.model.ConsulServiceHealthHistory;
-import org.onap.oom.dashboard.model.ConsulServiceInfo;
+import org.onap.ccsdk.dashboard.model.CloudifyBlueprintContent;
+import org.onap.ccsdk.dashboard.model.CloudifyBlueprintList;
+import org.onap.ccsdk.dashboard.model.CloudifyBlueprintUpload;
+import org.onap.ccsdk.dashboard.model.CloudifyDeploymentList;
+import org.onap.ccsdk.dashboard.model.CloudifyDeploymentRequest;
+import org.onap.ccsdk.dashboard.model.CloudifyExecution;
+import org.onap.ccsdk.dashboard.model.CloudifyExecutionList;
+import org.onap.ccsdk.dashboard.model.CloudifyExecutionRequest;
+import org.onap.ccsdk.dashboard.model.ConsulDatacenter;
+import org.onap.ccsdk.dashboard.model.ConsulHealthServiceRegistration;
+import org.onap.ccsdk.dashboard.model.ConsulNodeInfo;
+import org.onap.ccsdk.dashboard.model.ConsulServiceHealth;
+import org.onap.ccsdk.dashboard.model.ConsulServiceHealthHistory;
+import org.onap.ccsdk.dashboard.model.ConsulServiceInfo;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpMethod;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/ControllerRestClientMockImpl.java
index 67a46c1..2523538 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/ControllerRestClientMockImpl.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.rest;
+package org.onap.ccsdk.dashboard.rest;
 
 import java.io.InputStream;
 import java.net.URI;
@@ -30,22 +30,22 @@ import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
 
-import org.onap.oom.dashboard.exception.DashboardControllerException;
-import org.onap.oom.dashboard.model.CloudifyBlueprintContent;
-import org.onap.oom.dashboard.model.CloudifyBlueprintList;
-import org.onap.oom.dashboard.model.CloudifyBlueprintUpload;
-import org.onap.oom.dashboard.model.CloudifyDeploymentList;
-import org.onap.oom.dashboard.model.CloudifyDeploymentRequest;
-import org.onap.oom.dashboard.model.CloudifyExecution;
-import org.onap.oom.dashboard.model.CloudifyExecutionList;
-import org.onap.oom.dashboard.model.CloudifyExecutionRequest;
-import org.onap.oom.dashboard.model.ConsulDatacenter;
-import org.onap.oom.dashboard.model.ConsulHealthServiceRegistration;
-import org.onap.oom.dashboard.model.ConsulNodeInfo;
-import org.onap.oom.dashboard.model.ConsulServiceHealth;
-import org.onap.oom.dashboard.model.ConsulServiceHealthHistory;
-import org.onap.oom.dashboard.model.ConsulServiceInfo;
-import org.onap.oom.dashboard.model.ECTransportModel;
+import org.onap.ccsdk.dashboard.exception.DashboardControllerException;
+import org.onap.ccsdk.dashboard.model.CloudifyBlueprintContent;
+import org.onap.ccsdk.dashboard.model.CloudifyBlueprintList;
+import org.onap.ccsdk.dashboard.model.CloudifyBlueprintUpload;
+import org.onap.ccsdk.dashboard.model.CloudifyDeploymentList;
+import org.onap.ccsdk.dashboard.model.CloudifyDeploymentRequest;
+import org.onap.ccsdk.dashboard.model.CloudifyExecution;
+import org.onap.ccsdk.dashboard.model.CloudifyExecutionList;
+import org.onap.ccsdk.dashboard.model.CloudifyExecutionRequest;
+import org.onap.ccsdk.dashboard.model.ConsulDatacenter;
+import org.onap.ccsdk.dashboard.model.ConsulHealthServiceRegistration;
+import org.onap.ccsdk.dashboard.model.ConsulNodeInfo;
+import org.onap.ccsdk.dashboard.model.ConsulServiceHealth;
+import org.onap.ccsdk.dashboard.model.ConsulServiceHealthHistory;
+import org.onap.ccsdk.dashboard.model.ConsulServiceInfo;
+import org.onap.ccsdk.dashboard.model.ECTransportModel;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 
 import com.fasterxml.jackson.core.type.TypeReference;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java
index 2779df5..77ccda0 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.rest;
+package org.onap.ccsdk.dashboard.rest;
 
 import java.net.URI;
 
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/IControllerRestClient.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/IControllerRestClient.java
index 0150bbb..5e060e9 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/IControllerRestClient.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/IControllerRestClient.java
@@ -19,25 +19,26 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.rest;
+package org.onap.ccsdk.dashboard.rest;
 
 import java.net.URI;
 import java.time.Instant;
 import java.util.List;
-import org.onap.oom.dashboard.model.CloudifyBlueprintContent;
-import org.onap.oom.dashboard.model.CloudifyBlueprintList;
-import org.onap.oom.dashboard.model.CloudifyBlueprintUpload;
-import org.onap.oom.dashboard.model.CloudifyDeploymentList;
-import org.onap.oom.dashboard.model.CloudifyDeploymentRequest;
-import org.onap.oom.dashboard.model.CloudifyExecution;
-import org.onap.oom.dashboard.model.CloudifyExecutionList;
-import org.onap.oom.dashboard.model.CloudifyExecutionRequest;
-import org.onap.oom.dashboard.model.ConsulDatacenter;
-import org.onap.oom.dashboard.model.ConsulHealthServiceRegistration;
-import org.onap.oom.dashboard.model.ConsulNodeInfo;
-import org.onap.oom.dashboard.model.ConsulServiceHealth;
-import org.onap.oom.dashboard.model.ConsulServiceHealthHistory;
-import org.onap.oom.dashboard.model.ConsulServiceInfo;
+
+import org.onap.ccsdk.dashboard.model.CloudifyBlueprintContent;
+import org.onap.ccsdk.dashboard.model.CloudifyBlueprintList;
+import org.onap.ccsdk.dashboard.model.CloudifyBlueprintUpload;
+import org.onap.ccsdk.dashboard.model.CloudifyDeploymentList;
+import org.onap.ccsdk.dashboard.model.CloudifyDeploymentRequest;
+import org.onap.ccsdk.dashboard.model.CloudifyExecution;
+import org.onap.ccsdk.dashboard.model.CloudifyExecutionList;
+import org.onap.ccsdk.dashboard.model.CloudifyExecutionRequest;
+import org.onap.ccsdk.dashboard.model.ConsulDatacenter;
+import org.onap.ccsdk.dashboard.model.ConsulHealthServiceRegistration;
+import org.onap.ccsdk.dashboard.model.ConsulNodeInfo;
+import org.onap.ccsdk.dashboard.model.ConsulServiceHealth;
+import org.onap.ccsdk.dashboard.model.ConsulServiceHealthHistory;
+import org.onap.ccsdk.dashboard.model.ConsulServiceInfo;
 
 /**
  * Defines the interface of the Controller REST client.
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointService.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/service/ControllerEndpointService.java
index 5cec49d..621de95 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointService.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/service/ControllerEndpointService.java
@@ -19,9 +19,9 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.service;
+package org.onap.ccsdk.dashboard.service;
 
-import org.onap.oom.dashboard.domain.ControllerEndpoint;
+import org.onap.ccsdk.dashboard.domain.ControllerEndpoint;
 
 /**
  * Provides methods for managing the user's selection of controller endpoint.
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointServiceImpl.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/service/ControllerEndpointServiceImpl.java
index 6b657e1..b1c64b5 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointServiceImpl.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/service/ControllerEndpointServiceImpl.java
@@ -19,9 +19,9 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.service;
+package org.onap.ccsdk.dashboard.service;
 
-import org.onap.oom.dashboard.domain.ControllerEndpoint;
+import org.onap.ccsdk.dashboard.domain.ControllerEndpoint;
 import org.openecomp.portalsdk.core.service.DataAccessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/util/DashboardProperties.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java
index 2dbd103..717be11 100644
--- a/oom-app-common/src/main/java/org/onap/oom/dashboard/util/DashboardProperties.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java
@@ -19,7 +19,7 @@
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *******************************************************************************/
-package org.onap.oom.dashboard.util;
+package org.onap.ccsdk.dashboard.util;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
diff --git a/oom-app-common/src/main/java/org/onap/fusionapp/model/Result.java b/ccsdk-app-common/src/main/java/org/onap/fusionapp/model/Result.java
index 1f6328d..1f6328d 100644
--- a/oom-app-common/src/main/java/org/onap/fusionapp/model/Result.java
+++ b/ccsdk-app-common/src/main/java/org/onap/fusionapp/model/Result.java
diff --git a/oom-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java b/ccsdk-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java
index 8a64ab5..8a64ab5 100644
--- a/oom-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java
+++ b/ccsdk-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java
diff --git a/oom-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java b/ccsdk-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java
index 1f08b88..1f08b88 100644
--- a/oom-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java
+++ b/ccsdk-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java
diff --git a/oom-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java b/ccsdk-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java
index f3d55e2..f3d55e2 100644
--- a/oom-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java
+++ b/ccsdk-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java
diff --git a/oom-app-common/src/test/java/org/onap/fusionapp/SanityTest.java b/ccsdk-app-common/src/test/java/org/onap/fusionapp/SanityTest.java
index c859c28..c859c28 100644
--- a/oom-app-common/src/test/java/org/onap/fusionapp/SanityTest.java
+++ b/ccsdk-app-common/src/test/java/org/onap/fusionapp/SanityTest.java
diff --git a/oom-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java b/ccsdk-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java
index 4a661da..4a661da 100644
--- a/oom-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java
+++ b/ccsdk-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java
diff --git a/oom-app-os/README.md b/ccsdk-app-os/README.md
index eba22e5..eba22e5 100644
--- a/oom-app-os/README.md
+++ b/ccsdk-app-os/README.md
diff --git a/oom-app-os/pom.xml b/ccsdk-app-os/pom.xml
index 38303cf..4d8975d 100644
--- a/oom-app-os/pom.xml
+++ b/ccsdk-app-os/pom.xml
@@ -3,19 +3,19 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.onap.oom.dashboard</groupId>
-	<artifactId>oom-app-os</artifactId>
+	<groupId>org.onap.ccsdk.dashboard</groupId>
+	<artifactId>ccsdk-app-os</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>ONAP Operations Manager Dashboard app</name>
-	<description>OOM Dashboard Web Application for external release</description>
+	<description>CCSDK Dashboard Web Application for external release</description>
 
 	<properties>
 		<encoding>UTF-8</encoding>
 		<springframework.version>4.2.0.RELEASE</springframework.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<epsdk.version>1.1.0</epsdk.version>
-		<oom.version>1.1.0-SNAPSHOT</oom.version>
+		<ccsdk.version>1.1.0-SNAPSHOT</ccsdk.version>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -73,8 +73,8 @@
 					</archive>
 					<overlays>
 						<overlay>
-							<groupId>org.onap.oom.dashboard</groupId>
-							<artifactId>oom-app-overlay</artifactId>
+							<groupId>org.onap.ccsdk.dashboard</groupId>
+							<artifactId>ccsdk-app-overlay</artifactId>
 						</overlay>
 						<overlay>
 							<groupId>org.openecomp.ecompsdkos</groupId>
@@ -111,16 +111,16 @@
 	<dependencies>
 		<!-- ECD webapp resources -->
 		<dependency>
-			<groupId>org.onap.oom.dashboard</groupId>
-			<artifactId>oom-app-overlay</artifactId>
-			<version>${oom.version}</version>
+			<groupId>org.onap.ccsdk.dashboard</groupId>
+			<artifactId>ccsdk-app-overlay</artifactId>
+			<version>${ccsdk.version}</version>
 			<type>war</type>
 		</dependency>
 		<!-- ECD webapp controllers -->
 		<dependency>
-			<groupId>org.onap.oom.dashboard</groupId>
-			<artifactId>oom-app-common</artifactId>
-			<version>${oom.version}</version>
+			<groupId>org.onap.ccsdk.dashboard</groupId>
+			<artifactId>ccsdk-app-common</artifactId>
+			<version>${ccsdk.version}</version>
 		</dependency>
 		<!-- SDK webapp resources -->
 		<dependency>
diff --git a/oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index e532b5f..e532b5f 100644
--- a/oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
+++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
diff --git a/oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
index 347bb51..347bb51 100644
--- a/oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
+++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
diff --git a/oom-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
index 6432478..6432478 100644
--- a/oom-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
+++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
diff --git a/oom-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
index e0da1c9..e0da1c9 100644
--- a/oom-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
+++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
diff --git a/oom-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
index 22fca6d..22fca6d 100644
--- a/oom-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
+++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
diff --git a/oom-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java
index 17fe4ee..17fe4ee 100644
--- a/oom-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java
+++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java
diff --git a/oom-app-os/src/main/resources/logback.xml b/ccsdk-app-os/src/main/resources/logback.xml
index 474dd7c..474dd7c 100644
--- a/oom-app-os/src/main/resources/logback.xml
+++ b/ccsdk-app-os/src/main/resources/logback.xml
diff --git a/oom-app-os/src/main/resources/portal.properties b/ccsdk-app-os/src/main/resources/portal.properties
index c9bde0a..c9bde0a 100644
--- a/oom-app-os/src/main/resources/portal.properties
+++ b/ccsdk-app-os/src/main/resources/portal.properties
diff --git a/oom-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
index 735afe6..735afe6 100644
--- a/oom-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
+++ b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
diff --git a/oom-app-os/src/main/webapp/WEB-INF/conf/sql.properties b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/sql.properties
index d19402f..d19402f 100644
--- a/oom-app-os/src/main/webapp/WEB-INF/conf/sql.properties
+++ b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/sql.properties
diff --git a/oom-app-os/src/main/webapp/WEB-INF/conf/system.properties.template b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template
index a4e0d5d..a4e0d5d 100644
--- a/oom-app-os/src/main/webapp/WEB-INF/conf/system.properties.template
+++ b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template
diff --git a/oom-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/ccsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
index 881fdd1..881fdd1 100644
--- a/oom-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
+++ b/ccsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
diff --git a/oom-app-os/src/main/webapp/WEB-INF/jsp/login.jsp b/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login.jsp
index 564a572..564a572 100644
--- a/oom-app-os/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login.jsp
diff --git a/oom-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp b/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp
index 935c6aa..935c6aa 100644
--- a/oom-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp
+++ b/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp
diff --git a/oom-app-os/src/main/webapp/WEB-INF/web.xml b/ccsdk-app-os/src/main/webapp/WEB-INF/web.xml
index c2ec2ea..c2ec2ea 100644
--- a/oom-app-os/src/main/webapp/WEB-INF/web.xml
+++ b/ccsdk-app-os/src/main/webapp/WEB-INF/web.xml
diff --git a/oom-app-os/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css b/ccsdk-app-os/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css
index 26308ae..26308ae 100644
--- a/oom-app-os/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css
diff --git a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css
index 8a27586..8a27586 100644
--- a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css
diff --git a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css
index 885aa6b..885aa6b 100644
--- a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css
diff --git a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot
index 92a3f20..92a3f20 100644
--- a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot
diff --git a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg
index 49fc8f3..49fc8f3 100644
--- a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg
diff --git a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf
index c4e4632..c4e4632 100644
--- a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf
diff --git a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff
index 5f3a14e..5f3a14e 100644
--- a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff
diff --git a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js
index 432df78..432df78 100644
--- a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js
diff --git a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js
index 650dae5..650dae5 100644
--- a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js
diff --git a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html
index 669139d..669139d 100644
--- a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html
diff --git a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html
index 3b5ef52..3b5ef52 100644
--- a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html
diff --git a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
index f4d8d7e..f4d8d7e 100644
--- a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
diff --git a/oom-app-overlay/README.md b/ccsdk-app-overlay/README.md
index 930e9b9..930e9b9 100644
--- a/oom-app-overlay/README.md
+++ b/ccsdk-app-overlay/README.md
diff --git a/oom-app-overlay/pom.xml b/ccsdk-app-overlay/pom.xml
index fe0ee5c..8efb201 100644
--- a/oom-app-overlay/pom.xml
+++ b/ccsdk-app-overlay/pom.xml
@@ -3,12 +3,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.onap.oom.dashboard</groupId>
-	<artifactId>oom-app-overlay</artifactId>
+	<groupId>org.onap.ccsdk.dashboard</groupId>
+	<artifactId>ccsdk-app-overlay</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>ONAP Operations Manager Dashboard overlay</name>
-	<description>OOM Dashboard web resources</description>
+	<description>CCSDK Dashboard web resources</description>
 
 	<properties>
 		<encoding>UTF-8</encoding>
diff --git a/oom-app-overlay/src/main/webapp/WEB-INF/fusion-110-copy.hbm.xml b/ccsdk-app-overlay/src/main/webapp/WEB-INF/fusion-110-copy.hbm.xml
index a827e6c..a827e6c 100644
--- a/oom-app-overlay/src/main/webapp/WEB-INF/fusion-110-copy.hbm.xml
+++ b/ccsdk-app-overlay/src/main/webapp/WEB-INF/fusion-110-copy.hbm.xml
diff --git a/oom-app-overlay/src/main/webapp/WEB-INF/jsp/error.jsp b/ccsdk-app-overlay/src/main/webapp/WEB-INF/jsp/error.jsp
index 9583314..9583314 100644
--- a/oom-app-overlay/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/ccsdk-app-overlay/src/main/webapp/WEB-INF/jsp/error.jsp
diff --git a/oom-app-overlay/src/main/webapp/WEB-INF/oom-app-definitions.xml b/ccsdk-app-overlay/src/main/webapp/WEB-INF/oom-app-definitions.xml
index 69f7a05..69f7a05 100644
--- a/oom-app-overlay/src/main/webapp/WEB-INF/oom-app-definitions.xml
+++ b/ccsdk-app-overlay/src/main/webapp/WEB-INF/oom-app-definitions.xml
diff --git a/oom-app-overlay/src/main/webapp/WEB-INF/oom-app.hbm.xml b/ccsdk-app-overlay/src/main/webapp/WEB-INF/oom-app.hbm.xml
index f92261d..f92261d 100644
--- a/oom-app-overlay/src/main/webapp/WEB-INF/oom-app.hbm.xml
+++ b/ccsdk-app-overlay/src/main/webapp/WEB-INF/oom-app.hbm.xml
diff --git a/oom-app-overlay/src/main/webapp/WEB-INF/web.xml b/ccsdk-app-overlay/src/main/webapp/WEB-INF/web.xml
index 3a90041..3a90041 100644
--- a/oom-app-overlay/src/main/webapp/WEB-INF/web.xml
+++ b/ccsdk-app-overlay/src/main/webapp/WEB-INF/web.xml
diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint-controllers.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint-controllers.js
index cb6e712..cb6e712 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint-controllers.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint-controllers.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint-service.js
index f058b09..f058b09 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint-service.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint-service.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint_popups.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint_popups.html
index ee92d84..ee92d84 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint_popups.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint_popups.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint_table.html
index 3ce60b9..3ce60b9 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint_table.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint_table.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment-controllers.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment-controllers.js
index 1e80082..1e80082 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment-controllers.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment-controllers.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment-service.js
index cee83c3..cee83c3 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment-service.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment-service.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment_popups.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment_popups.html
index f4a4cdd..f4a4cdd 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment_popups.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment_popups.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment_table.html
index c414484..c414484 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment_table.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment_table.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/execution-service.js
index 34414c4..34414c4 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution-service.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/execution-service.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution-table-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/execution-table-controller.js
index a9c8574..a9c8574 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution-table-controller.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/execution-table-controller.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/execution_table.html
index f29e90d..f29e90d 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution_table.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/execution_table.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/tosca-table-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/tosca-table-controller.js
index cafc517..cafc517 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/cloudify/tosca-table-controller.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/tosca-table-controller.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/tosca_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/tosca_table.html
index affec91..affec91 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/cloudify/tosca_table.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/tosca_table.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter-health-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/datacenter-health-service.js
index 64618c1..64618c1 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter-health-service.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/datacenter-health-service.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter-table-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/datacenter-table-controller.js
index f1c8820..f1c8820 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter-table-controller.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/datacenter-table-controller.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/datacenter_table.html
index 73a1b82..73a1b82 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter_table.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/datacenter_table.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/node-health-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-health-service.js
index 18fc30b..18fc30b 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/consul/node-health-service.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-health-service.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/node-services-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-services-controller.js
index b82ba40..b82ba40 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/consul/node-services-controller.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-services-controller.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/node-table-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-table-controller.js
index 61ececb..61ececb 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/consul/node-table-controller.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-table-controller.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/node_popups.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node_popups.html
index 63b5e5f..63b5e5f 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/consul/node_popups.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node_popups.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/node_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node_table.html
index 231d331..231d331 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/consul/node_table.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node_table.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/service-controllers.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service-controllers.js
index 339c436..339c436 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/consul/service-controllers.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service-controllers.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/service-health-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service-health-service.js
index 1a60b21..1a60b21 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/consul/service-health-service.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service-health-service.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/service_health_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service_health_table.html
index b6a4557..b6a4557 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/consul/service_health_table.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service_health_table.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/service_popups.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service_popups.html
index 8fd92b3..8fd92b3 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/consul/service_popups.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service_popups.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.css b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/bootstrap.min.css
index ed3905e..ed3905e 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.css
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/bootstrap.min.css
diff --git a/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.css.map b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/bootstrap.min.css.map
index 6c7fa40..6c7fa40 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.css.map
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/bootstrap.min.css.map
diff --git a/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/bootstrap.min.js
index 07cf295..07cf295 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/bootstrap.min.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/external/yaml.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/yaml.js
index 61b8476..61b8476 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/external/yaml.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/yaml.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/appDS2.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/appDS2.js
index 80ee672..80ee672 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/appDS2.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/appDS2.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/controller-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/controller-service.js
index 6c4c45d..6c4c45d 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/controller-service.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/controller-service.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/controller_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/controller_table.html
index c2a0ca9..c2a0ca9 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/controller_table.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/controller_table.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/executions-view-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/executions-view-controller.js
index 4b28fed..4b28fed 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/executions-view-controller.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/executions-view-controller.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/executions_view.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/executions_view.html
index 9f3e113..9f3e113 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/executions_view.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/executions_view.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/modal-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/modal-service.js
index 07b5d77..07b5d77 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/modal-service.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/modal-service.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/oom-instances-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-instances-controller.js
index f07d1b3..f07d1b3 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/oom-instances-controller.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-instances-controller.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/oom-router.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js
index e598487..e598487 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/oom-router.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/oom-style.css b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-style.css
index e08fc31..e08fc31 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/oom-style.css
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-style.css
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/oom_instances_popup.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom_instances_popup.html
index bc523aa..bc523aa 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/oom_instances_popup.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom_instances_popup.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/oom_popup_templates.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom_popup_templates.html
index fe4d505..fe4d505 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/oom_popup_templates.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom_popup_templates.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/oom_spa.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom_spa.html
index 47eac2d..47eac2d 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/oom_spa.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom_spa.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree-view-controller.js
index 577ebe1..577ebe1 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-controller.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree-view-controller.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-directive.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree-view-directive.js
index fa81246..fa81246 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-directive.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree-view-directive.js
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-style.css b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree-view-style.css
index 5a3e056..5a3e056 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-style.css
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree-view-style.css
diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/tree_view.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree_view.html
index a4ab27d..a4ab27d 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/home/tree_view.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree_view.html
diff --git a/oom-app-overlay/src/main/webapp/app/oom/images/ecomp-login-550x360.jpg b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/ecomp-login-550x360.jpg
index 618b1a9..618b1a9 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/images/ecomp-login-550x360.jpg
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/ecomp-login-550x360.jpg
diff --git a/oom-app-overlay/src/main/webapp/app/oom/images/ecomp.png b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/ecomp.png
index b355f10..b355f10 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/images/ecomp.png
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/ecomp.png
diff --git a/oom-app-overlay/src/main/webapp/app/oom/images/onap_16x16.ico b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/onap_16x16.ico
index 8eb0495..8eb0495 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/images/onap_16x16.ico
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/onap_16x16.ico
diff --git a/oom-app-overlay/src/main/webapp/app/oom/images/onap_32x32.ico b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/onap_32x32.ico
index e434286..e434286 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/images/onap_32x32.ico
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/onap_32x32.ico
diff --git a/oom-app-overlay/src/main/webapp/app/oom/images/onap_logo_2257x496.png b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/onap_logo_2257x496.png
index 36ee1f5..36ee1f5 100644
--- a/oom-app-overlay/src/main/webapp/app/oom/images/onap_logo_2257x496.png
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/onap_logo_2257x496.png
diff --git a/oom-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html b/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html
index 66c38e0..66c38e0 100644
--- a/oom-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html
diff --git a/oom-app-overlay/src/main/webapp/index.jsp b/ccsdk-app-overlay/src/main/webapp/index.jsp
index e02bb6b..e02bb6b 100644
--- a/oom-app-overlay/src/main/webapp/index.jsp
+++ b/ccsdk-app-overlay/src/main/webapp/index.jsp
diff --git a/oom-app-overlay/src/main/webapp/manifest.jsp b/ccsdk-app-overlay/src/main/webapp/manifest.jsp
index 417825f..417825f 100644
--- a/oom-app-overlay/src/main/webapp/manifest.jsp
+++ b/ccsdk-app-overlay/src/main/webapp/manifest.jsp
diff --git a/oom-app-common/.gitignore b/oom-app-common/.gitignore
deleted file mode 100644
index 6a47a7c..0000000
--- a/oom-app-common/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.classpath
-.project
-.settings/
-/bin/
-/target/
-/catalina.base_IS_UNDEFINED/
-/debug-logs/
-/logs/
diff --git a/oom-app-os/.gitignore b/oom-app-os/.gitignore
deleted file mode 100644
index 0a897e3..0000000
--- a/oom-app-os/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.classpath
-.project
-.settings/
-/bin/
-/target/
-/catalina.base_IS_UNDEFINED/
diff --git a/oom-app-os/src/main/webapp/WEB-INF/conf/.gitignore b/oom-app-os/src/main/webapp/WEB-INF/conf/.gitignore
deleted file mode 100644
index 2dc7bb0..0000000
--- a/oom-app-os/src/main/webapp/WEB-INF/conf/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-system.properties
diff --git a/oom-app-overlay/.gitignore b/oom-app-overlay/.gitignore
deleted file mode 100644
index 0a897e3..0000000
--- a/oom-app-overlay/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.classpath
-.project
-.settings/
-/bin/
-/target/
-/catalina.base_IS_UNDEFINED/
diff --git a/pom.xml b/pom.xml
index d50abe3..571eeb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,16 +10,16 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <!-- Maven parent project for convenience of building and cleaning -->
-    <groupId>org.onap.oom.dashboard</groupId>
-    <artifactId>oom-app-parent</artifactId>
+    <groupId>org.onap.ccsdk.dashboard</groupId>
+    <artifactId>ccsdk-app-parent</artifactId>
     <version>0</version>
     <packaging>pom</packaging>
     <name>ccsdk-dashboard</name>
 
     <modules>
-        <module>oom-app-common</module>
-        <module>oom-app-overlay</module>
-        <module>oom-app-os</module>
+        <module>ccsdk-app-common</module>
+        <module>ccsdk-app-overlay</module>
+        <module>ccsdk-app-os</module>
     </modules>
   <distributionManagement>
     <repository>