53 files changed, 147 insertions, 147 deletions
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/IDistributionClient.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/IDistributionClient.java
index 8caf109..d3a8188 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/IDistributionClient.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/IDistributionClient.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api;
+package org.onap.sdc.api;
 
 import java.util.List;
 
-import org.openecomp.sdc.api.consumer.*;
-import org.openecomp.sdc.api.consumer.IStatusCallback;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.api.consumer.*;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.api.consumer.*;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IVfModuleMetadata;
 
 public interface IDistributionClient {
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/IDistributionStatusMessageJsonBuilder.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/IDistributionStatusMessageJsonBuilder.java
index 7c28271..6db00fa 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/IDistributionStatusMessageJsonBuilder.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/IDistributionStatusMessageJsonBuilder.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api;
+package org.onap.sdc.api;
 
 public interface IDistributionStatusMessageJsonBuilder {
 	String build();
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/asdc/RegistrationRequest.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/asdc/RegistrationRequest.java
index 1e398be..6e64396 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/asdc/RegistrationRequest.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/asdc/RegistrationRequest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api.asdc;
+package org.onap.sdc.api.asdc;
 
 import java.util.List;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/asdc/ServerListResponse.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/asdc/ServerListResponse.java
index c131a95..8d3b823 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/asdc/ServerListResponse.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/asdc/ServerListResponse.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api.asdc;
+package org.onap.sdc.api.asdc;
 
 import java.util.List;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IComponentDoneStatusMessage.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IComponentDoneStatusMessage.java
index 25661bf..e9b4359 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IComponentDoneStatusMessage.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IComponentDoneStatusMessage.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
 
 public interface IComponentDoneStatusMessage extends IDistributionStatusMessageBasic {
     String getComponentName();
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IConfiguration.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IConfiguration.java
index 51d219f..c5a1857 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IConfiguration.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IConfiguration.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
 
 import java.util.List;
-import org.openecomp.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.INotificationData;
 
 public interface IConfiguration {
 	/**
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IDistributionStatusMessage.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IDistributionStatusMessage.java
index ab3d6a7..fd73bac 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IDistributionStatusMessage.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IDistributionStatusMessage.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
 
 public interface IDistributionStatusMessage extends IDistributionStatusMessageBasic{
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IDistributionStatusMessageBasic.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IDistributionStatusMessageBasic.java
index fb1194d..59dcc57 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IDistributionStatusMessageBasic.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IDistributionStatusMessageBasic.java
@@ -1,6 +1,6 @@
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
 
-import org.openecomp.sdc.utils.DistributionStatusEnum;
+import org.onap.sdc.utils.DistributionStatusEnum;
 
 public interface IDistributionStatusMessageBasic {
     /**
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IFinalDistrStatusMessage.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IFinalDistrStatusMessage.java
index 42affd7..0869a67 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IFinalDistrStatusMessage.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IFinalDistrStatusMessage.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
 
 
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/INotificationCallback.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/INotificationCallback.java
index 60666ed..5121407 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/INotificationCallback.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/INotificationCallback.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
 
-import org.openecomp.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.INotificationData;
 /**When a relevant notification will be found activateCallback method will be activated with the notification data.<br>
  * Please implement it according to your desired callback logic.*/
 public interface INotificationCallback {
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IStatusCallback.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IStatusCallback.java
index a889f52..5bcc4a2 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IStatusCallback.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IStatusCallback.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
 
-import org.openecomp.sdc.api.notification.IStatusData;
+import org.onap.sdc.api.notification.IStatusData;
 
 /**
  * When a relevant status will be found activateCallback method will be
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IArtifactInfo.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IArtifactInfo.java
index f720e35..8c34185 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IArtifactInfo.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IArtifactInfo.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api.notification;
+package org.onap.sdc.api.notification;
 
 import java.util.List;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/INotificationData.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/INotificationData.java
index 74ebf65..ecc4a5b 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/INotificationData.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/INotificationData.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api.notification;
+package org.onap.sdc.api.notification;
 
 import java.util.List;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IResourceInstance.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IResourceInstance.java
index a2f7828..0cc3ca4 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IResourceInstance.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IResourceInstance.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api.notification;
+package org.onap.sdc.api.notification;
 
 import java.util.List;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IStatusData.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IStatusData.java
index 7a46686..734c200 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IStatusData.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IStatusData.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api.notification;
+package org.onap.sdc.api.notification;
 
-import org.openecomp.sdc.utils.DistributionStatusEnum;
+import org.onap.sdc.utils.DistributionStatusEnum;
 
 public interface IStatusData {
 	/**
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IVfModuleMetadata.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IVfModuleMetadata.java
index a769d71..3613c94 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IVfModuleMetadata.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IVfModuleMetadata.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api.notification;
+package org.onap.sdc.api.notification;
 
 import java.util.List;
 /**VF Module in the resource (VF) context*/
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/results/IDistributionClientDownloadResult.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/results/IDistributionClientDownloadResult.java
index 6030b9e..47fe023 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/results/IDistributionClientDownloadResult.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/results/IDistributionClientDownloadResult.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api.results;
+package org.onap.sdc.api.results;
 
 /**Distribution Client Result For Download API*/
 public interface IDistributionClientDownloadResult extends IDistributionClientResult{
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/results/IDistributionClientResult.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/results/IDistributionClientResult.java
index b4086ac..4f33555 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/results/IDistributionClientResult.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/results/IDistributionClientResult.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.api.results;
+package org.onap.sdc.api.results;
 
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.utils.DistributionActionResultEnum;
 /**General Distribution Client Result*/
 public interface IDistributionClientResult {
 	DistributionActionResultEnum getDistributionActionResult();
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/AsdcUrls.java b/sdc-distribution-client/src/main/java/org/onap/sdc/http/AsdcUrls.java
index 320cade..72a51d3 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/AsdcUrls.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/http/AsdcUrls.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
 
 public class AsdcUrls {
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/HttpAsdcClient.java b/sdc-distribution-client/src/main/java/org/onap/sdc/http/HttpAsdcClient.java
index c3a486a..c241bec 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/HttpAsdcClient.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/http/HttpAsdcClient.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -59,8 +59,8 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.message.BasicHeader;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.ssl.TrustStrategy;
-import org.openecomp.sdc.api.consumer.IConfiguration;
-import org.openecomp.sdc.utils.Pair;
+import org.onap.sdc.api.consumer.IConfiguration;
+import org.onap.sdc.utils.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/HttpAsdcResponse.java b/sdc-distribution-client/src/main/java/org/onap/sdc/http/HttpAsdcResponse.java
index 9e48d5e..9734a32 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/HttpAsdcResponse.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/http/HttpAsdcResponse.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
 
 import java.util.Map;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/IHttpAsdcClient.java b/sdc-distribution-client/src/main/java/org/onap/sdc/http/IHttpAsdcClient.java
index aa62bac..a3cc5e5 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/IHttpAsdcClient.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/http/IHttpAsdcClient.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
 
 import java.util.Map;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/SdcConnectorClient.java b/sdc-distribution-client/src/main/java/org/onap/sdc/http/SdcConnectorClient.java
index 2ae78af..41d78ba 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/SdcConnectorClient.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/http/SdcConnectorClient.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,17 +36,17 @@ import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
-import org.openecomp.sdc.api.asdc.RegistrationRequest;
-import org.openecomp.sdc.api.asdc.ServerListResponse;
-import org.openecomp.sdc.api.consumer.IConfiguration;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.impl.DistributionClientDownloadResultImpl;
-import org.openecomp.sdc.impl.DistributionClientResultImpl;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-import org.openecomp.sdc.utils.DistributionClientConstants;
-import org.openecomp.sdc.utils.GeneralUtils;
-import org.openecomp.sdc.utils.Pair;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.impl.DistributionClientResultImpl;
+import org.onap.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.utils.GeneralUtils;
+import org.onap.sdc.api.asdc.RegistrationRequest;
+import org.onap.sdc.api.asdc.ServerListResponse;
+import org.onap.sdc.api.consumer.IConfiguration;
+import org.onap.sdc.impl.DistributionClientDownloadResultImpl;
+import org.onap.sdc.utils.DistributionClientConstants;
+import org.onap.sdc.utils.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/TopicRegistrationResponse.java b/sdc-distribution-client/src/main/java/org/onap/sdc/http/TopicRegistrationResponse.java
index 280d7da..e8d0545 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/TopicRegistrationResponse.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/http/TopicRegistrationResponse.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
 
 public class TopicRegistrationResponse {
 	String distrNotificationTopicName;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/ArtifactInfoImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/ArtifactInfoImpl.java
index 64ff9a8..6a3da83 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/ArtifactInfoImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/ArtifactInfoImpl.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IArtifactInfo;
 
 class ArtifactInfoImpl implements IArtifactInfo {
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/Configuration.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/Configuration.java
index 851a198..a33f911 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/Configuration.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/Configuration.java
@@ -18,15 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
 import java.util.List;
 
-import fj.data.Either;
-import org.openecomp.sdc.api.consumer.IConfiguration;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-import org.openecomp.sdc.utils.DistributionClientConstants;
+import org.onap.sdc.utils.DistributionClientConstants;
+import org.onap.sdc.api.consumer.IConfiguration;
 
 public class Configuration implements IConfiguration {
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientDownloadResultImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientDownloadResultImpl.java
index 0fa918a..6323113 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientDownloadResultImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientDownloadResultImpl.java
@@ -18,18 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.utils.DistributionActionResultEnum;
 
-public class DistributionClientDownloadResultImpl  extends DistributionClientResultImpl implements IDistributionClientDownloadResult{
+public class DistributionClientDownloadResultImpl  extends DistributionClientResultImpl implements IDistributionClientDownloadResult {
 	byte[] artifactPayload;
 	String artifactName;
 
 	
 	public DistributionClientDownloadResultImpl(
-			DistributionActionResultEnum responseStatus, String responseMessage) {
+            DistributionActionResultEnum responseStatus, String responseMessage) {
 		super(responseStatus, responseMessage);
 		
 	}
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientFactory.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientFactory.java
index 467f9cb..96aabc2 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientFactory.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientFactory.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.impl.mock.DistributionClientStubImpl;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.impl.mock.DistributionClientStubImpl;
 
 public class DistributionClientFactory {
 	public static IDistributionClient createDistributionClient(){
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientImpl.java
index a8778e5..5d15046 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientImpl.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
 import static java.util.Objects.isNull;
 
@@ -36,19 +36,20 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.IDistributionStatusMessageJsonBuilder;
-import org.openecomp.sdc.api.consumer.*;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.http.SdcConnectorClient;
-import org.openecomp.sdc.http.TopicRegistrationResponse;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-import org.openecomp.sdc.utils.DistributionClientConstants;
-import org.openecomp.sdc.utils.GeneralUtils;
-import org.openecomp.sdc.utils.Wrapper;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.IDistributionStatusMessageJsonBuilder;
+import org.onap.sdc.api.consumer.*;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.http.SdcConnectorClient;
+import org.onap.sdc.http.TopicRegistrationResponse;
+import org.onap.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.utils.DistributionClientConstants;
+import org.onap.sdc.utils.GeneralUtils;
+import org.onap.sdc.utils.Wrapper;
+import org.onap.sdc.api.consumer.*;
+import org.onap.sdc.api.notification.IVfModuleMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientResultImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientResultImpl.java
index a5af31a..0df0b7b 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientResultImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientResultImpl.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.utils.DistributionActionResultEnum;
 
 public class DistributionClientResultImpl implements IDistributionClientResult {
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionStatusMessageImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionStatusMessageImpl.java
index d9ed654..d5bc4ce 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionStatusMessageImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionStatusMessageImpl.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
-import org.openecomp.sdc.api.consumer.IComponentDoneStatusMessage;
-import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;
-import org.openecomp.sdc.api.consumer.IFinalDistrStatusMessage;
-import org.openecomp.sdc.utils.DistributionStatusEnum;
+import org.onap.sdc.api.consumer.IComponentDoneStatusMessage;
+import org.onap.sdc.api.consumer.IDistributionStatusMessage;
+import org.onap.sdc.api.consumer.IFinalDistrStatusMessage;
+import org.onap.sdc.utils.DistributionStatusEnum;
 
 class DistributionStatusMessageImpl implements IDistributionStatusMessage {
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionStatusMessageJsonBuilderFactory.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionStatusMessageJsonBuilderFactory.java
index e2f9f89..d8c722d 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionStatusMessageJsonBuilderFactory.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionStatusMessageJsonBuilderFactory.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
-import org.openecomp.sdc.api.IDistributionStatusMessageJsonBuilder;
-import org.openecomp.sdc.api.consumer.IComponentDoneStatusMessage;
-import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;
-import org.openecomp.sdc.api.consumer.IFinalDistrStatusMessage;
-import org.openecomp.sdc.utils.DistributionStatusEnum;
+import org.onap.sdc.api.IDistributionStatusMessageJsonBuilder;
+import org.onap.sdc.api.consumer.IComponentDoneStatusMessage;
+import org.onap.sdc.api.consumer.IDistributionStatusMessage;
+import org.onap.sdc.api.consumer.IFinalDistrStatusMessage;
+import org.onap.sdc.utils.DistributionStatusEnum;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/JsonContainerResourceInstance.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/JsonContainerResourceInstance.java
index 0000806..92dad7b 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/JsonContainerResourceInstance.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/JsonContainerResourceInstance.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IResourceInstance;
 
-class JsonContainerResourceInstance implements IResourceInstance{
+class JsonContainerResourceInstance implements IResourceInstance {
 	JsonContainerResourceInstance (){}
 	private String resourceInstanceName;
 	private String resourceCustomizationUUID;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/NotificationConsumer.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/NotificationConsumer.java
index ccfc6ca..aab1e29 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/NotificationConsumer.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/NotificationConsumer.java
@@ -18,18 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.sdc.api.consumer.INotificationCallback;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.utils.ArtifactTypeEnum;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.consumer.INotificationCallback;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.sdc.utils.ArtifactTypeEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/NotificationDataImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/NotificationDataImpl.java
index c60e2fd..7b7b532 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/NotificationDataImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/NotificationDataImpl.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.INotificationData;
 
 
 class NotificationDataImpl implements INotificationData {
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/StatusConsumer.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/StatusConsumer.java
index 34d85ec..49ba428 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/StatusConsumer.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/StatusConsumer.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
-import org.openecomp.sdc.api.consumer.IStatusCallback;
-import org.openecomp.sdc.api.notification.IStatusData;
+import org.onap.sdc.api.consumer.IStatusCallback;
+import org.onap.sdc.api.notification.IStatusData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/StatusDataImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/StatusDataImpl.java
index 119a7f3..70513fe 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/StatusDataImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/StatusDataImpl.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
-import org.openecomp.sdc.api.notification.IStatusData;
-import org.openecomp.sdc.utils.DistributionStatusEnum;
+import org.onap.sdc.api.notification.IStatusData;
+import org.onap.sdc.utils.DistributionStatusEnum;
 
-public class StatusDataImpl implements IStatusData{
+public class StatusDataImpl implements IStatusData {
 
 	String distributionID;
 	String consumerID;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/VfModuleMetadata.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/VfModuleMetadata.java
index 3932253..fb745f3 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/VfModuleMetadata.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/VfModuleMetadata.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
 import java.util.List;
 
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
+import org.onap.sdc.api.notification.IVfModuleMetadata;
 
 final class VfModuleMetadata implements IVfModuleMetadata {
 	private VfModuleMetadata(){
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientDownloadResultStubImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientDownloadResultStubImpl.java
index aff0d0e..e0cd56e 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientDownloadResultStubImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientDownloadResultStubImpl.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl.mock;
+package org.onap.sdc.impl.mock;
 
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
 
 /** Mock Implementation */
 public class DistributionClientDownloadResultStubImpl extends DistributionClientResultStubImpl implements IDistributionClientDownloadResult {
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientResultStubImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientResultStubImpl.java
index 13d64a4..cf0466b 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientResultStubImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientResultStubImpl.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl.mock;
+package org.onap.sdc.impl.mock;
 
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.utils.DistributionActionResultEnum;
 /** Mock Implementation */
 public class DistributionClientResultStubImpl implements IDistributionClientResult {
 	@Override
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientStubImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientStubImpl.java
index 1730290..9049215 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientStubImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientStubImpl.java
@@ -18,18 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.impl.mock;
+package org.onap.sdc.impl.mock;
 
 import java.util.List;
 
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.consumer.*;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.consumer.*;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IVfModuleMetadata;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.api.consumer.*;
+
 /** Mock Implementation */
-public class DistributionClientStubImpl implements IDistributionClient{
+public class DistributionClientStubImpl implements IDistributionClient {
 
 	
 	public IDistributionClientResult updateConfiguration(IConfiguration newConf) {
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/ArtifactTypeEnum.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/ArtifactTypeEnum.java
index ca5339f..8df257e 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/ArtifactTypeEnum.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/ArtifactTypeEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
 
 public enum ArtifactTypeEnum {
 	HEAT,
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionActionResultEnum.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionActionResultEnum.java
index 6ac4d35..fe871f8 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionActionResultEnum.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionActionResultEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
 
 public enum DistributionActionResultEnum {
 	SUCCESS, 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionClientConstants.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionClientConstants.java
index 37b8ae3..1dcbca3 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionClientConstants.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionClientConstants.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
 
 import java.util.regex.Pattern;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionStatusEnum.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionStatusEnum.java
index 13fcfcc..e620195 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionStatusEnum.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionStatusEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
 
 public enum DistributionStatusEnum {
 	/**Can be sent  when ONAP component  successfully  downloaded the specific artifact*/
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/GeneralUtils.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/GeneralUtils.java
index 0f76574..a69e479 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/GeneralUtils.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/GeneralUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -27,8 +27,8 @@ import java.util.List;
 import java.util.regex.Pattern;
 
 import org.apache.commons.codec.binary.Base64;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.impl.DistributionClientResultImpl;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.impl.DistributionClientResultImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/Pair.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/Pair.java
index eca644a..097cafb 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/Pair.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/Pair.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
 
 public final class Pair<F, S> {
 	private final F first;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/Wrapper.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/Wrapper.java
index 047ea86..d1d799c 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/Wrapper.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/Wrapper.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
 /**
  * Very Basic Wrapper class.
  * @author mshitrit
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/YamlToObjectConverter.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/YamlToObjectConverter.java
index 50feb6c..9c294d2 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/YamlToObjectConverter.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/YamlToObjectConverter.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
 
 import java.beans.IntrospectionException;
 import java.io.File;
@@ -28,7 +28,7 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.HashMap;
 
-import org.openecomp.sdc.utils.heat.HeatConfiguration;
+import org.onap.sdc.utils.heat.HeatConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.TypeDescription;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatConfiguration.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatConfiguration.java
index 6cd2de0..ee272f4 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatConfiguration.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatConfiguration.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.utils.heat;
+package org.onap.sdc.utils.heat;
 
 import java.util.Map;
 
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParameter.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParameter.java
index 954152d..3638bcf 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParameter.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParameter.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.utils.heat;
+package org.onap.sdc.utils.heat;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParameterConstraint.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParameterConstraint.java
index b89ad48..d618caf 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParameterConstraint.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParameterConstraint.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.utils.heat;
+package org.onap.sdc.utils.heat;
 
 import java.util.List;
 import java.util.Map;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParser.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParser.java
index 5aa4968..340a59d 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParser.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParser.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.utils.heat;
+package org.onap.sdc.utils.heat;
 
 import java.util.Map;
 
-import org.openecomp.sdc.utils.YamlToObjectConverter;
+import org.onap.sdc.utils.YamlToObjectConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;