Correct maven pom groupId

Correct the mismatch between gerrit project directory and wiki groupid definition.

Change-Id: I35035c67dc654e7383c5e9951f1f72986c588d57
Issue-Id:VFC-86
Signed-off-by: victor.gao <victor.gao@huawei.com>

125 files changed, 464 insertions, 464 deletions

diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/ResourceUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/ResourceUtil.java
index d38459a..4259574 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/ResourceUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/ResourceUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common;
+package org.onap.vfc.nfvo.resmanagement.common;
 
 /**
  * <br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/VimUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java
index 6dc3121..8e66c7f 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/VimUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common;
+package org.onap.vfc.nfvo.resmanagement.common;
 
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/Constant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/Constant.java
index d26c63e..57bd3cc 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/Constant.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/Constant.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.constant;
+package org.onap.vfc.nfvo.resmanagement.common.constant;
 
 /**
  * HTTP constants<br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/HttpConstant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/HttpConstant.java
index a81dff5..354f887 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/HttpConstant.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/HttpConstant.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.constant;
+package org.onap.vfc.nfvo.resmanagement.common.constant;
 
 /**
  *
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/ParamConstant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ParamConstant.java
index 870e4a7..3b958c5 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/ParamConstant.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ParamConstant.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.constant;
+package org.onap.vfc.nfvo.resmanagement.common.constant;
 
 /**
  * <br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/ResponseConstant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ResponseConstant.java
index 5e7126c..8222b5f 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/ResponseConstant.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ResponseConstant.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.constant;
+package org.onap.vfc.nfvo.resmanagement.common.constant;
 
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 
 /**
  * Response constants.<br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/UrlConstant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java
index 572bff3..1aa50c1 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/UrlConstant.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.constant;
+package org.onap.vfc.nfvo.resmanagement.common.constant;
 
 /**
  * <br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/JsonUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtil.java
index 2b6e905..faf63f7 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/JsonUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtil.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util;
+package org.onap.vfc.nfvo.resmanagement.common.util;
 
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/RestfulUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtil.java
index 5d7d334..4036de7 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/RestfulUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util;
+package org.onap.vfc.nfvo.resmanagement.common.util;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -24,9 +24,9 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.common.constant.Constant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.Constant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.Restful;
 import org.openo.baseservice.roa.util.restclient.RestfulAsyncCallback;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/StringUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtil.java
index 2d4b1c7..a415a71 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/StringUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util;
+package org.onap.vfc.nfvo.resmanagement.common.util;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/request/RequestUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtil.java
index bbc28a3..8ae59b1 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/request/RequestUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util.request;
+package org.onap.vfc.nfvo.resmanagement.common.util.request;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/response/ResponseUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/ResponseUtil.java
index 28ee1b0..6658b29 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/response/ResponseUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/ResponseUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util.response;
+package org.onap.vfc.nfvo.resmanagement.common.util.response;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/response/RoaResponseUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtil.java
index 1043e7a..a54891b 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/response/RoaResponseUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtil.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util.response;
+package org.onap.vfc.nfvo.resmanagement.common.util.response;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.ResponseConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ResponseConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/activator/ROAResmgrServicePostProcessor.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java
index 6c217c2..2525064 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/activator/ROAResmgrServicePostProcessor.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.activator;
+package org.onap.vfc.nfvo.resmanagement.service.activator;
 
-import org.onap.vfc.nfvo.res.service.adapter.inf.IResmgrAdapterMgrService;
+import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapterMgrService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapter2MSBManager.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java
index f9ccbed..4054a62 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapter2MSBManager.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.adapter.impl;
+package org.onap.vfc.nfvo.resmanagement.service.adapter.impl;
 
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.common.constant.Constant;
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
-import org.onap.vfc.nfvo.res.service.adapter.inf.IResmgrAdapter2MSBManager;
+import org.onap.vfc.nfvo.resmanagement.common.constant.Constant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapter2MSBManager;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapterMgrService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java
index 8b1d905..f403aa0 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapterMgrService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.adapter.impl;
+package org.onap.vfc.nfvo.resmanagement.service.adapter.impl;
 
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
@@ -25,12 +25,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executors;
 
-import org.onap.vfc.nfvo.res.common.constant.Constant;
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.service.adapter.inf.IResmgrAdapter2MSBManager;
-import org.onap.vfc.nfvo.res.service.adapter.inf.IResmgrAdapterMgrService;
+import org.onap.vfc.nfvo.resmanagement.common.constant.Constant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapter2MSBManager;
+import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapterMgrService;
 import org.openo.baseservice.util.impl.SystemEnvVariablesFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/inf/IResmgrAdapter2MSBManager.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapter2MSBManager.java
index 5981f59..509c9af 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/inf/IResmgrAdapter2MSBManager.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapter2MSBManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.adapter.inf;
+package org.onap.vfc.nfvo.resmanagement.service.adapter.inf;
 
 import java.util.Map;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/inf/IResmgrAdapterMgrService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapterMgrService.java
index 3bce8af..4e4d035 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/inf/IResmgrAdapterMgrService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapterMgrService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.adapter.inf;
+package org.onap.vfc.nfvo.resmanagement.service.adapter.inf;
 
 /**
  * <br>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/HostImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImpl.java
index 1dbaf51..f3afa9b 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/HostImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImpl.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Host;
-import org.onap.vfc.nfvo.res.service.business.inf.HostBusiness;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Host;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.HostBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/LocationImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java
index 422fa06..a3fffdb 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/LocationImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.common.VimUtil;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Location;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Sites;
-import org.onap.vfc.nfvo.res.service.business.inf.LocationBusiness;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Location;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.LocationBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/NetworkImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java
index 9bfcf74..8ac3b95 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/NetworkImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Network;
-import org.onap.vfc.nfvo.res.service.business.inf.NetworkBusiness;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Network;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.NetworkBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/PortImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java
index 36b6cd1..deec19d 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/PortImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Port;
-import org.onap.vfc.nfvo.res.service.business.inf.PortBusiness;
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Port;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.PortBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/SitesImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java
index 3238f50..939385f 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/SitesImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -23,14 +23,14 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.VimUtil;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Sites;
-import org.onap.vfc.nfvo.res.service.business.inf.LimitsBusiness;
-import org.onap.vfc.nfvo.res.service.business.inf.SitesBusiness;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
-import org.onap.vfc.nfvo.res.service.group.inf.ResOperateService;
+import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.SitesBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/VimImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImpl.java
index 99c1e96..f6cf553 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/VimImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImpl.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Vim;
-import org.onap.vfc.nfvo.res.service.business.inf.VimBusiness;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Vim;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.VimBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Host.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Host.java
index 068762b..673d274 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Host.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Host.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.inf;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/InterfaceResManagement.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/InterfaceResManagement.java
index 167c617..b9ec1f6 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/InterfaceResManagement.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/InterfaceResManagement.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.inf;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Location.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Location.java
index a3a0c15..9767e12 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Location.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Location.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.inf;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Network.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Network.java
index 398d8a9..449ebe9 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Network.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Network.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.inf;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Port.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Port.java
index 9fc7f77..9d073f0 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Port.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Port.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.inf;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/ResManagement.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/ResManagement.java
index 225f095..e840827 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/ResManagement.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/ResManagement.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.inf;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Sites.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Sites.java
index c6c622a..7aaba35 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Sites.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Sites.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.inf;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Vim.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Vim.java
index 4d3e278..9378f3f 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Vim.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Vim.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.inf;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/HostBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java
index f7be74f..e66c6f5 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/HostBusinessImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.service.business.inf.HostBusiness;
-import org.onap.vfc.nfvo.res.service.dao.inf.HostDao;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.HostBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.HostDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/LimitsBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java
index 8a2be18..668257b 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/LimitsBusinessImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
-import org.onap.vfc.nfvo.res.common.VimUtil;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
-import org.onap.vfc.nfvo.res.service.business.inf.LimitsBusiness;
+import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/LocationBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java
index f1da586..fcbd3ae 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/LocationBusinessImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -22,12 +22,12 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.util.StringUtil;
-import org.onap.vfc.nfvo.res.service.business.inf.LocationBusiness;
-import org.onap.vfc.nfvo.res.service.dao.inf.LocationDao;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.LocationBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.LocationDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/NetworkBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java
index e14f9ca..433af10 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/NetworkBusinessImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.service.business.inf.NetworkBusiness;
-import org.onap.vfc.nfvo.res.service.dao.inf.NetworkDao;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.NetworkBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.NetworkDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/PortBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java
index 8b11b82..b2545ac 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/PortBusinessImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.service.business.inf.PortBusiness;
-import org.onap.vfc.nfvo.res.service.dao.inf.PortDao;
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.PortBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.PortDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/SitesBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java
index 4b724b0..9ffed0a 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/SitesBusinessImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -22,11 +22,11 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.service.business.inf.SitesBusiness;
-import org.onap.vfc.nfvo.res.service.dao.inf.SitesDao;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.SitesBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.SitesDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/VimBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java
index 48ecd1f..5c6dda3 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/VimBusinessImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.common.util.StringUtil;
-import org.onap.vfc.nfvo.res.service.business.inf.VimBusiness;
-import org.onap.vfc.nfvo.res.service.dao.inf.VimDao;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.VimBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VimDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/HostBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/HostBusiness.java
index d8a95f3..e017709 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/HostBusiness.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/HostBusiness.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.inf;
+package org.onap.vfc.nfvo.resmanagement.service.business.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 /**
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/LimitsBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LimitsBusiness.java
index 661406a..62326ea 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/LimitsBusiness.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LimitsBusiness.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.inf;
+package org.onap.vfc.nfvo.resmanagement.service.business.inf;
 
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/LocationBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LocationBusiness.java
index f132a6d..6fab40a 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/LocationBusiness.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LocationBusiness.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.inf;
+package org.onap.vfc.nfvo.resmanagement.service.business.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 /**
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/NetworkBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/NetworkBusiness.java
index f75d2ae..80ff1e3 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/NetworkBusiness.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/NetworkBusiness.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.inf;
+package org.onap.vfc.nfvo.resmanagement.service.business.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 /**
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/PortBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/PortBusiness.java
index 4c19408..7e32484 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/PortBusiness.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/PortBusiness.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.inf;
+package org.onap.vfc.nfvo.resmanagement.service.business.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 /**
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/SitesBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/SitesBusiness.java
index 574e745..f3c09dd 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/SitesBusiness.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/SitesBusiness.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.inf;
+package org.onap.vfc.nfvo.resmanagement.service.business.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 /**
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/VimBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/VimBusiness.java
index f29f257..fc2a857 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/VimBusiness.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/VimBusiness.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.inf;
+package org.onap.vfc.nfvo.resmanagement.service.business.inf;
 
 import java.util.List;
 
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 /**
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/AbstractDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/AbstractDao.java
index b31c5bc..84171d3 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/AbstractDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/AbstractDao.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import org.apache.ibatis.session.SqlSession;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/HostDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImpl.java
index 7dae83c..e72f426 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/HostDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImpl.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.inf.HostDao;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
-import org.onap.vfc.nfvo.res.service.mapper.HostMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.HostDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.HostMapper;
 
 /**
  *
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/LocationDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImpl.java
index b6af978..7901331 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/LocationDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImpl.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.inf.LocationDao;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
-import org.onap.vfc.nfvo.res.service.mapper.LocationMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.LocationDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.LocationMapper;
 
 /**
  *
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/NetworkDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImpl.java
index a63e094..612aba6 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/NetworkDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImpl.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.inf.NetworkDao;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.mapper.NetworkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.NetworkDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
 
 /**
  *
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/PortDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImpl.java
index d4ec76d..3854152 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/PortDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImpl.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.inf.PortDao;
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
-import org.onap.vfc.nfvo.res.service.mapper.PortMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.PortDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.PortMapper;
 
 /**
  *
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/SitesDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImpl.java
index f35963e..0aec201 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/SitesDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImpl.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.inf.SitesDao;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
-import org.onap.vfc.nfvo.res.service.mapper.SitesMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.SitesDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
 
 /**
  * DC interface.<br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VimDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImpl.java
index e8c7374..e450300 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VimDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImpl.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.inf.VimDao;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
-import org.onap.vfc.nfvo.res.service.mapper.VimMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VimDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VimMapper;
 
 /**
  * Vim interface.<br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VirtualLinkDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImpl.java
index bfe0345..e93b9ad 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VirtualLinkDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImpl.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.dao.inf.VirtualLinkDao;
-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;
-import org.onap.vfc.nfvo.res.service.mapper.VirtualLinkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VirtualLinkDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VirtualLinkMapper;
 
 /**
  * <br>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VmDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImpl.java
index ec174e2..5e7d34a 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VmDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImpl.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.dao.inf.VmDao;
-import org.onap.vfc.nfvo.res.service.entity.VmEntity;
-import org.onap.vfc.nfvo.res.service.mapper.VmMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VmDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VmMapper;
 
 /**
  * <br>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfDaoImpl.java
index de1b293..565089a 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfDaoImpl.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.dao.inf.VnfDao;
-import org.onap.vfc.nfvo.res.service.entity.VnfEntity;
-import org.onap.vfc.nfvo.res.service.mapper.VnfMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VnfMapper;
 
 /**
  * <br>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfInfoDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfInfoDaoImpl.java
index a01e01d..f2369c3 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfInfoDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfInfoDaoImpl.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.dao.inf.VnfInfoDao;
-import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity;
-import org.onap.vfc.nfvo.res.service.mapper.VnfInfoMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfInfoDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VnfInfoMapper;
 
 /**
  * <br>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfStatusDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfStatusDaoImpl.java
index 6570664..4026e9e 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfStatusDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfStatusDaoImpl.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.dao.inf.VnfStatusDao;
-import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity;
-import org.onap.vfc.nfvo.res.service.mapper.VnfStatusMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfStatusDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VnfStatusMapper;
 
 /**
  * <br>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/HostDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/HostDao.java
index 0f0c825..79e32a1 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/HostDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/HostDao.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 
 /**
  * Host info interface.<br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/LocationDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/LocationDao.java
index 4266b6a..e40cb13 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/LocationDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/LocationDao.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 
 /**
  *
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/NetworkDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/NetworkDao.java
index 1c9b319..ed6ce69 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/NetworkDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/NetworkDao.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 
 /**
  *
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/PortDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/PortDao.java
index 555e507..3514194 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/PortDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/PortDao.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 
 /**
  * Port info interface.<br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/SitesDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/SitesDao.java
index c179d40..b085c8d 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/SitesDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/SitesDao.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 
 /**
  * Sites info interface. <br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VimDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VimDao.java
index 38f1dda..fd4cd80 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VimDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VimDao.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 
 /**
  * Vim info interface.<br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VirtualLinkDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VirtualLinkDao.java
index 4b12169..04c0bc1 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VirtualLinkDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VirtualLinkDao.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
 
 /**
  * <br>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VmDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VmDao.java
index 3b88b5c..5572cee 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VmDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VmDao.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
 
 /**
  * <br>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfDao.java
index 03b7ff4..4a34f22 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfDao.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
 
 /**
  * <br>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfInfoDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfInfoDao.java
index 6ea65cb..e96c636 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfInfoDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfInfoDao.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
 
 /**
  * <br>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfStatusDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfStatusDao.java
index ee6f0f1..852ea98 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfStatusDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfStatusDao.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
 
 /**
  * <br>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/HostEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/HostEntity.java
index 6c5a20f..b948fd9 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/HostEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/HostEntity.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/LocationEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/LocationEntity.java
index 95d5fad..657c1a0 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/LocationEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/LocationEntity.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/NetworkEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/NetworkEntity.java
index 7f1a7e5..9d4948e 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/NetworkEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/NetworkEntity.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/PortEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/PortEntity.java
index 2249726..6aa9c39 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/PortEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/PortEntity.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/SitesEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/SitesEntity.java
index c2940d6..b0aa27b 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/SitesEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/SitesEntity.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
-import org.onap.vfc.nfvo.res.common.util.StringUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VimEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VimEntity.java
index b1b52de..fc0c9e9 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VimEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VimEntity.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VirtualLinkEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VirtualLinkEntity.java
index d4408e8..228fa5c 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VirtualLinkEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VirtualLinkEntity.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VmEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VmEntity.java
index d46633e..817ffe2 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VmEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VmEntity.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java
index 4028c89..4de6658 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfInfoEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfInfoEntity.java
index f993d9c..948187f 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfInfoEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfInfoEntity.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfStatusEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfStatusEntity.java
index 78ad1b8..27f008e 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfStatusEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfStatusEntity.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/GrantResServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java
index 2eea6d0..362f80a 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/GrantResServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.service.group.impl;
 
-import org.onap.vfc.nfvo.res.common.VimUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Sites;
-import org.onap.vfc.nfvo.res.service.group.inf.GrantResService;
+import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.GrantResService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceAddServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java
index 6c7bad9..1247b0e 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceAddServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.service.group.impl;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.InterfaceResManagement;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceDelServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java
index 8dbcaf0..2642ae0 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceDelServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.service.group.impl;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.InterfaceResManagement;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Vim;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Vim;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceUpdateServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java
index f26fedf..03cbfc3 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceUpdateServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.service.group.impl;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.InterfaceResManagement;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/ResOperateServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java
index 66686e7..4a8ae39 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/ResOperateServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java
@@ -14,29 +14,29 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.service.group.impl;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.common.constant.Constant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
-import org.onap.vfc.nfvo.res.common.util.StringUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Host;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.InterfaceResManagement;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Network;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Port;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Sites;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Vim;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
-import org.onap.vfc.nfvo.res.service.group.inf.ResOperateService;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.Constant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Host;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Network;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Port;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Vim;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VirtualLinkServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java
index 287f636..6619bfe 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VirtualLinkServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.service.group.impl;
 
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.service.dao.inf.VirtualLinkDao;
-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;
-import org.onap.vfc.nfvo.res.service.group.inf.VirtualLinkService;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VirtualLinkDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VirtualLinkService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,7 +58,7 @@ public class VirtualLinkServiceImpl implements VirtualLinkService {
         if(!checkId(virtualLinkEntity.getId())) {
             LOGGER.error("function=addVl; msg=add error, because id is already exist.");
             throw new ServiceException(ResourceUtil
-                    .getMessage("org.onap.vfc.nfvo.res.service.group.impl.VirtualLinkServiceImpl.add.id.check"));
+                    .getMessage("org.onap.vfc.nfvo.resmanagement.service.group.impl.VirtualLinkServiceImpl.add.id.check"));
         }
         if(StringUtils.isEmpty(virtualLinkEntity.getId())) {
             virtualLinkEntity.setId(UUID.randomUUID().toString());
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VmServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VmServiceImpl.java
index fef97b2..df73a15 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VmServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VmServiceImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.service.group.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -22,12 +22,12 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
-import org.onap.vfc.nfvo.res.service.dao.inf.VmDao;
-import org.onap.vfc.nfvo.res.service.entity.VmEntity;
-import org.onap.vfc.nfvo.res.service.group.inf.VmService;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VmDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfInfoServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java
index 7b0e1b8..bf4ce37 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfInfoServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.service.group.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.dao.inf.VnfInfoDao;
-import org.onap.vfc.nfvo.res.service.entity.VmEntity;
-import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity;
-import org.onap.vfc.nfvo.res.service.group.inf.VmService;
-import org.onap.vfc.nfvo.res.service.group.inf.VnfInfoService;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfInfoDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java
index 552d252..59059ea 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.service.group.impl;
 
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.service.dao.inf.VnfDao;
-import org.onap.vfc.nfvo.res.service.entity.VnfEntity;
-import org.onap.vfc.nfvo.res.service.group.inf.VnfInfoService;
-import org.onap.vfc.nfvo.res.service.group.inf.VnfService;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,7 +61,7 @@ public class VnfServiceImpl implements VnfService {
         if(!checkId(vnfEntity.getId())) {
             LOGGER.error("function=addVnf; msg=add error, because id is already exist.");
             throw new ServiceException(ResourceUtil
-                    .getMessage("org.onap.vfc.nfvo.res.service.group.impl.VnfServiceImpl.add.id.check"));
+                    .getMessage("org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfServiceImpl.add.id.check"));
         }
         if(StringUtils.isEmpty(vnfEntity.getId())) {
             vnfEntity.setId(UUID.randomUUID().toString());
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfStatusServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java
index a846d59..49bfda1 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfStatusServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.service.group.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.dao.inf.VnfStatusDao;
-import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity;
-import org.onap.vfc.nfvo.res.service.group.inf.VnfStatusService;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfStatusDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfStatusService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/GrantResService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/GrantResService.java
index 502cba9..ff483e3 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/GrantResService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/GrantResService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.inf;
+package org.onap.vfc.nfvo.resmanagement.service.group.inf;
 
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/ResOperateService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/ResOperateService.java
index ebd1b7b..89c2d67 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/ResOperateService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/ResOperateService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.inf;
+package org.onap.vfc.nfvo.resmanagement.service.group.inf;
 
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VirtualLinkService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VirtualLinkService.java
index aaca1b9..a74c08a 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VirtualLinkService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VirtualLinkService.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.inf;
+package org.onap.vfc.nfvo.resmanagement.service.group.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VmService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VmService.java
index 98d9565..8b5d56f 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VmService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VmService.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.inf;
+package org.onap.vfc.nfvo.resmanagement.service.group.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfInfoService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfInfoService.java
index 891a8ac..da408e1 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfInfoService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfInfoService.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.inf;
+package org.onap.vfc.nfvo.resmanagement.service.group.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfService.java
index ab4c46d..196f383 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfService.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.inf;
+package org.onap.vfc.nfvo.resmanagement.service.group.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfStatusService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfStatusService.java
index 029dd1a..df5e4d9 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfStatusService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfStatusService.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.inf;
+package org.onap.vfc.nfvo.resmanagement.service.group.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/HostMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/HostMapper.java
index ab3fdc9..6372c33 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/HostMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/HostMapper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 
 /**
  * Host info interface.<br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/LocationMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/LocationMapper.java
index b06fd55..4af0e3d 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/LocationMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/LocationMapper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 
 /**
  *
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/NetworkMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/NetworkMapper.java
index 6b71ca0..c18233d 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/NetworkMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/NetworkMapper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 
 /**
  *
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/PortMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/PortMapper.java
index d14b476..cff6e7f 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/PortMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/PortMapper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 
 /**
  * Port info interface.<br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/SitesMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/SitesMapper.java
index 28407c3..e92f753 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/SitesMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/SitesMapper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 
 /**
  * ResPool info interface.<br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VimMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VimMapper.java
index 6963637..05fdfc2 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VimMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VimMapper.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 
 /**
  * Vim info interface.<br/>
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VirtualLinkMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VirtualLinkMapper.java
index 5a1294b..32d4714 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VirtualLinkMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VirtualLinkMapper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
 
 public interface VirtualLinkMapper {
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VmMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VmMapper.java
index 51fea63..c9f7ed4 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VmMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VmMapper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
 
 public interface VmMapper {
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfInfoMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VnfInfoMapper.java
index c7a51ae..fd0c0c8 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfInfoMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VnfInfoMapper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
 
 public interface VnfInfoMapper {
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VnfMapper.java
index 39bbeff..57afa8f 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VnfMapper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
 
 public interface VnfMapper {
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfStatusMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VnfStatusMapper.java
index 75dd652..d9652de 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfStatusMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VnfStatusMapper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
 
 public interface VnfStatusMapper {
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/GrantResourseRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoa.java
index 7affca5..23190a7 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/GrantResourseRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoa.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -24,12 +24,12 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
-import org.onap.vfc.nfvo.res.service.group.inf.GrantResService;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.GrantResService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/HostRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoa.java
index b8ab7b7..43f0993 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/HostRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoa.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -33,14 +33,14 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
-import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Host;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Host;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/LimitsRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoa.java
index 849e64d..2b86d3e 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/LimitsRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoa.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -25,9 +25,9 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.service.business.inf.LimitsBusiness;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/LocationRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoa.java
index b982b4c..b875f53 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/LocationRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoa.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -34,18 +34,18 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
-import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Location;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Sites;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Location;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/NetworkRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoa.java
index 7f9d0f5..22dc8e1 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/NetworkRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoa.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -33,14 +33,14 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
-import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Network;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Network;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/PortRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoa.java
index 952e326..dbe5780 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/PortRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoa.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -33,14 +33,14 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
-import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Port;
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Port;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/ResOperateRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoa.java
index 111160e..4a4a976 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/ResOperateRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoa.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -27,14 +27,14 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.onap.vfc.nfvo.res.common.VimUtil;
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
-import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil;
-import org.onap.vfc.nfvo.res.service.group.inf.ResOperateService;
+import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/SitesRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoa.java
index 6d31aa8..9b7c8e4 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/SitesRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoa.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -32,15 +32,15 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.onap.vfc.nfvo.res.common.VimUtil;
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
-import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Sites;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/SwaggerRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoa.java
index 45ea2c1..3651102 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/SwaggerRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoa.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.io.IOException;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VirtualLinkRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoa.java
index a30d673..fd2a325 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VirtualLinkRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoa.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,15 +31,15 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
-import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil;
-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;
-import org.onap.vfc.nfvo.res.service.group.inf.VirtualLinkService;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VirtualLinkService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VmRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoa.java
index 5b17caa..a13d295 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VmRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoa.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,15 +31,15 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
-import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil;
-import org.onap.vfc.nfvo.res.service.entity.VmEntity;
-import org.onap.vfc.nfvo.res.service.group.inf.VmService;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfInfoRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoa.java
index c4f631c..25351d6 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfInfoRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoa.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,15 +31,15 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
-import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil;
-import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity;
-import org.onap.vfc.nfvo.res.service.group.inf.VnfInfoService;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoa.java
index a60842b..96b90d7 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoa.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,15 +31,15 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
-import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil;
-import org.onap.vfc.nfvo.res.service.entity.VnfEntity;
-import org.onap.vfc.nfvo.res.service.group.inf.VnfService;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfStatusRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoa.java
index d67c11b..a071199 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfStatusRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoa.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,15 +31,15 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
-import org.onap.vfc.nfvo.res.common.constant.HttpConstant;
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
-import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil;
-import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity;
-import org.onap.vfc.nfvo.res.service.group.inf.VnfStatusService;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfStatusService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ExceptionMessage.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessage.java
index 2529c1f..3ded1e0 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ExceptionMessage.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessage.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest.exceptionmapper;
+package org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper;
 
 import org.apache.http.HttpStatus;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/GenericExceptionMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapper.java
index 104c29a..4614d87 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/GenericExceptionMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest.exceptionmapper;
+package org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ServiceExceptionMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapper.java
index 27d0c9f..47d2a0d 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ServiceExceptionMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest.exceptionmapper;
+package org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;