191 files changed, 811 insertions, 811 deletions

diff --git a/ResmanagementService/service/pom.xml b/ResmanagementService/service/pom.xml
index 5de8505..398a1eb 100644
--- a/ResmanagementService/service/pom.xml
+++ b/ResmanagementService/service/pom.xml
@@ -17,7 +17,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.vfc.nfvo.res</groupId>
+        <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
         <artifactId>resmanagement-service-root</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
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;
diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/HostMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/HostMapper.xml
index 7c4c1da..5c242d0 100644
--- a/ResmanagementService/service/src/main/resources/mybatis/mysql/HostMapper.xml
+++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/HostMapper.xml
@@ -16,9 +16,9 @@ limitations under the License.
 -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.HostMapper">
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.HostMapper">
     <resultMap id="BaseResultMap"
-        type="org.onap.vfc.nfvo.res.service.entity.HostEntity">
+        type="org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity">
         <id column="ID" property="id" jdbcType="VARCHAR" />
         <result column="NAME" property="name" jdbcType="VARCHAR" />
         <result column="CPU" property="cpu" jdbcType="VARCHAR" />
@@ -58,7 +58,7 @@ limitations under the License.
         where VIM_ID = #{vimId,jdbcType=VARCHAR}
     </delete>
     <insert id="addHost"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity">
         insert into host (ID, NAME, CPU, MEMORY, DISK, VIM_ID, VIM_NAME)
         values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
         #{cpu,jdbcType=VARCHAR},
@@ -66,7 +66,7 @@ limitations under the License.
         , #{vimName,jdbcType=VARCHAR})
     </insert>
     <insert id="addHostSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity">
         insert into host
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -116,7 +116,7 @@ limitations under the License.
         </trim>
     </insert>
     <update id="updateHostSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity">
         update host
         <set>
             <if test="name != null">
@@ -148,7 +148,7 @@ limitations under the License.
         </where>
     </update>
     <update id="updateHost"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity">
         update host
         set NAME = #{name,jdbcType=VARCHAR},
         CPU = #{cpu,jdbcType=VARCHAR},
@@ -159,7 +159,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updateHostByVimId"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity">
         update host
         <set>
             <if test="id != null">
diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/LocationMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/LocationMapper.xml
index 22e8885..431c151 100644
--- a/ResmanagementService/service/src/main/resources/mybatis/mysql/LocationMapper.xml
+++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/LocationMapper.xml
@@ -16,9 +16,9 @@ limitations under the License.
 -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.LocationMapper">
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.LocationMapper">
     <resultMap id="BaseResultMap"
-        type="org.onap.vfc.nfvo.res.service.entity.LocationEntity">
+        type="org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity">
 
         <id column="ID" property="id" jdbcType="VARCHAR" />
         <result column="COUNTRY" property="country" jdbcType="VARCHAR" />
@@ -68,7 +68,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </delete>
     <insert id="addLocation"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity">
 
         insert into location (ID, COUNTRY, LOCATION,
         LATITUDE, LONGITUDE, DESCRIPTION)
@@ -77,7 +77,7 @@ limitations under the License.
         #{latitude,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR})
     </insert>
     <insert id="addLocationSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity">
 
         insert into location
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -122,7 +122,7 @@ limitations under the License.
         </trim>
     </insert>
     <update id="updateLocationSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity">
 
         update location
         <set>
@@ -145,7 +145,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updateLocation"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity">
 
         update location
         set COUNTRY = #{country,jdbcType=VARCHAR},
diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/NetworkMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/NetworkMapper.xml
index dbae050..c07c4c2 100644
--- a/ResmanagementService/service/src/main/resources/mybatis/mysql/NetworkMapper.xml
+++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/NetworkMapper.xml
@@ -16,9 +16,9 @@ limitations under the License.
 -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.NetworkMapper">
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper">
     <resultMap id="BaseResultMap"
-        type="org.onap.vfc.nfvo.res.service.entity.NetworkEntity">
+        type="org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity">
         <id column="ID" property="id" jdbcType="VARCHAR" />
         <result column="NAME" property="name" jdbcType="VARCHAR" />
         <result column="TENANT_ID" property="tenantId" jdbcType="VARCHAR" />
@@ -64,7 +64,7 @@ limitations under the License.
         where VIM_ID = #{vimId,jdbcType=VARCHAR}
     </delete>
     <insert id="addNetwork"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity">
         insert into network (ID, NAME, TENANT_ID,
         VIM_ID, VIM_NAME, STATUS,
         PHYSICAL_NETWORK, NETWORK_TYPE, SEGMENTATION_ID
@@ -77,7 +77,7 @@ limitations under the License.
         )
     </insert>
     <insert id="addNetworkSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity">
         insert into network
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -139,7 +139,7 @@ limitations under the License.
         </trim>
     </insert>
     <update id="updateNetworkSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity">
         update network
         <set>
             <if test="name != null">
@@ -170,7 +170,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updateNetwork"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity">
         update network
         set NAME = #{name,jdbcType=VARCHAR},
         TENANT_ID = #{tenantId,jdbcType=VARCHAR},
@@ -183,7 +183,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updateNetworkByVimId"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity">
         update network
         <set>
             <if test="id != null">
diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/PortMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/PortMapper.xml
index 5cdb358..ab2eede 100644
--- a/ResmanagementService/service/src/main/resources/mybatis/mysql/PortMapper.xml
+++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/PortMapper.xml
@@ -16,9 +16,9 @@ limitations under the License.
 -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.PortMapper">
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.PortMapper">
     <resultMap id="BaseResultMap"
-        type="org.onap.vfc.nfvo.res.service.entity.PortEntity">
+        type="org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity">
         <id column="ID" property="id" jdbcType="VARCHAR" />
         <result column="NAME" property="name" jdbcType="VARCHAR" />
         <result column="NWTWORK_ID" property="networkId" jdbcType="VARCHAR" />
@@ -55,7 +55,7 @@ limitations under the License.
     where VIM_ID = #{vimId,jdbcType=VARCHAR}
     </delete>
     <insert id="addPort"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity">
         insert into port (ID, NAME, NWTWORK_ID, STATUS, TENANT_ID, VIM_ID,
         VIM_NAME)
         values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
@@ -64,7 +64,7 @@ limitations under the License.
         , #{vimName,jdbcType=VARCHAR})
     </insert>
     <insert id="addPortSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity">
         insert into port
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -114,7 +114,7 @@ limitations under the License.
         </trim>
     </insert>
     <update id="updatePortSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity">
         update port
         <set>
             <if test="name != null">
@@ -139,7 +139,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updatePort"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity">
         update port
         set NAME = #{name,jdbcType=VARCHAR},
         NWTWORK_ID = #{networkId,jdbcType=VARCHAR},
@@ -150,7 +150,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updatePortByVimId"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity">
         update port
         <set>
             <if test="id != null">
diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/SitesMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/SitesMapper.xml
index 17fad53..aac11c6 100644
--- a/ResmanagementService/service/src/main/resources/mybatis/mysql/SitesMapper.xml
+++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/SitesMapper.xml
@@ -16,9 +16,9 @@ limitations under the License.
 -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.SitesMapper">
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper">
     <resultMap id="BaseResultMap"
-        type="org.onap.vfc.nfvo.res.service.entity.SitesEntity">
+        type="org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity">
         <id column="ID" property="id" jdbcType="VARCHAR" />
         <result column="NAME" property="name" jdbcType="VARCHAR" />
         <result column="LOCATION" property="location" jdbcType="VARCHAR" />
@@ -70,7 +70,7 @@ limitations under the License.
         #{id,jdbcType=VARCHAR}
     </delete>
     <insert id="addSite"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity">
         insert into site (ID, NAME, LOCATION,
         COUNTRY, VIM_ID,
         VIM_NAME, STATUS,TOTAL_CPU, TOTAL_MEMORY, TOTAL_DISK,
@@ -89,7 +89,7 @@ limitations under the License.
         #{usedDisk,jdbcType=VARCHAR})
     </insert>
     <insert id="addSiteSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity">
         insert into site
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -175,7 +175,7 @@ limitations under the License.
         </trim>
     </insert>
     <update id="updateSiteSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity">
         update site
         <set>
             <if test="name != null">
@@ -218,7 +218,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updateSite"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity">
         update site
         set NAME = #{name,jdbcType=VARCHAR},
         LOCATION
@@ -240,7 +240,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updateSiteByVimId"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity">
         update site
         <set>
             <if test="id != null">
diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VimMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VimMapper.xml
index 90d09ed..0140306 100644
--- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VimMapper.xml
+++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VimMapper.xml
@@ -16,9 +16,9 @@ limitations under the License.
 -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VimMapper">
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.VimMapper">
     <resultMap id="BaseResultMap"
-        type="org.onap.vfc.nfvo.res.service.entity.VimEntity">
+        type="org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity">
         <id column="ID" property="id" jdbcType="VARCHAR" />
     </resultMap>
     <sql id="Base_Column_List">
@@ -45,7 +45,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </delete>
     <insert id="addVim"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.VimEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity">
         insert into vim (ID)
         values (#{id,jdbcType=VARCHAR})
     </insert>
diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VirtualLinkMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VirtualLinkMapper.xml
index c73dbed..3649d40 100644
--- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VirtualLinkMapper.xml
+++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VirtualLinkMapper.xml
@@ -15,8 +15,8 @@
     limitations under the License.
  -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VirtualLinkMapper" >
-  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" >
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.VirtualLinkMapper" >
+  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity" >
     <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="name" property="name" jdbcType="VARCHAR" />
     <result column="backend_id" property="backendId" jdbcType="VARCHAR" />
@@ -61,7 +61,7 @@
     delete from vl
     where id = #{id,jdbcType=VARCHAR}
   </delete>
-  <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" >
+  <insert id="insert" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity" >
     insert into vl (id, name, backend_id, 
       is_public, dc_name, vim_id, 
       vim_name, physicial_net, ns_id, 
@@ -77,7 +77,7 @@
       #{routerExternal,jdbcType=VARCHAR}, #{resourceProviderType,jdbcType=VARCHAR}, #{resourceProviderId,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" >
+  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity" >
     insert into vl
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -192,7 +192,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" >
+  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity" >
     update vl
     <set >
       <if test="name != null" >
@@ -249,7 +249,7 @@
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" >
+  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity" >
     update vl
     set name = #{name,jdbcType=VARCHAR},
       backend_id = #{backendId,jdbcType=VARCHAR},
diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VmMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VmMapper.xml
index 6c5fd68..825c55f 100644
--- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VmMapper.xml
+++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VmMapper.xml
@@ -15,8 +15,8 @@
     limitations under the License.
  -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VmMapper" >
-  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VmEntity" >
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.VmMapper" >
+  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity" >
     <id column="vm_id" property="vmId" jdbcType="VARCHAR" />
     <result column="vm_name" property="vmName" jdbcType="VARCHAR" />
     <result column="vm_status" property="vmStatus" jdbcType="VARCHAR" />
@@ -52,13 +52,13 @@
     delete from vm
     where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR}
   </delete>
-  <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VmEntity" >
+  <insert id="insert" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity" >
     insert into vm (vm_id, vm_name, vm_status, 
       vnf_instance_id)
     values (#{vmId,jdbcType=VARCHAR}, #{vmName,jdbcType=VARCHAR}, #{vmStatus,jdbcType=VARCHAR}, 
       #{vnfInstanceId,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VmEntity" >
+  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity" >
     insert into vm
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="vmId != null" >
@@ -89,7 +89,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VmEntity" >
+  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity" >
     update vm
     <set >
       <if test="vmName != null" >
@@ -104,7 +104,7 @@
     </set>
     where vm_id = #{vmId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VmEntity" >
+  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity" >
     update vm
     set vm_name = #{vmName,jdbcType=VARCHAR},
       vm_status = #{vmStatus,jdbcType=VARCHAR},
diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfInfoMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfInfoMapper.xml
index e4220fb..da12a0d 100644
--- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfInfoMapper.xml
+++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfInfoMapper.xml
@@ -15,8 +15,8 @@
     limitations under the License.
  -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VnfInfoMapper" >
-  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" >
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.VnfInfoMapper" >
+  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity" >
     <id column="vnf_instance_id" property="vnfInstanceId" jdbcType="VARCHAR" />
     <result column="ns_id" property="nsId" jdbcType="VARCHAR" />
     <result column="vnfm_id" property="vnfmId" jdbcType="VARCHAR" />
@@ -44,13 +44,13 @@
     delete from vnfinfo
     where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR}
   </delete>
-  <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" >
+  <insert id="insert" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity" >
     insert into vnfinfo (vnf_instance_id, ns_id, vnfm_id
       )
     values (#{vnfInstanceId,jdbcType=VARCHAR}, #{nsId,jdbcType=VARCHAR}, #{vnfmId,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" >
+  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity" >
     insert into vnfinfo
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="vnfInstanceId != null" >
@@ -75,7 +75,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" >
+  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity" >
     update vnfinfo
     <set >
       <if test="nsId != null" >
@@ -87,7 +87,7 @@
     </set>
     where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" >
+  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity" >
     update vnfinfo
     set ns_id = #{nsId,jdbcType=VARCHAR},
       vnfm_id = #{vnfmId,jdbcType=VARCHAR}
diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfMapper.xml
index bf36b81..7374dd1 100644
--- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfMapper.xml
+++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfMapper.xml
@@ -15,8 +15,8 @@
     limitations under the License.
  -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VnfMapper" >
-  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VnfEntity" >
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.VnfMapper" >
+  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity" >
     <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="vnf_instance_id" property="vnfInstanceId" jdbcType="VARCHAR" />
     <result column="vnf_instance_name" property="vnfInstanceName" jdbcType="VARCHAR" />
@@ -65,7 +65,7 @@
     delete from vnf
     where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR}
   </delete>
-  <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfEntity" >
+  <insert id="insert" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity" >
     insert into vnf (id, vnf_instance_id, vnf_instance_name, 
       ns_id, ns_name, vnfm_id, 
       vnfm_name, vnf_package_name, vnf_descriptor_name, 
@@ -83,7 +83,7 @@
       #{maxRam,jdbcType=INTEGER}, #{maxShd,jdbcType=INTEGER}, #{maxNet,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfEntity" >
+  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity" >
     insert into vnf
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -222,7 +222,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfEntity" >
+  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity" >
     update vnf
     <set >
       <if test="vnfInstanceId != null" >
@@ -291,7 +291,7 @@
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfEntity" >
+  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity" >
     update vnf
     set vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR},
       vnf_instance_name = #{vnfInstanceName,jdbcType=VARCHAR},
diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfStatusMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfStatusMapper.xml
index a23a39e..19c4f4a 100644
--- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfStatusMapper.xml
+++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfStatusMapper.xml
@@ -15,8 +15,8 @@
     limitations under the License.
  -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VnfStatusMapper" >
-  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" >
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.VnfStatusMapper" >
+  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity" >
     <id column="vnf_instance_id" property="vnfInstanceId" jdbcType="VARCHAR" />
     <result column="job_id" property="jobId" jdbcType="VARCHAR" />
     <result column="ns_id" property="nsId" jdbcType="VARCHAR" />
@@ -55,7 +55,7 @@
     delete from vnfstatus
     where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR}
   </delete>
-  <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" >
+  <insert id="insert" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity" >
     insert into vnfstatus (vnf_instance_id, job_id, ns_id, 
       vnfm_id, response_descriptor, status, 
       progress, status_description, error_code, 
@@ -67,7 +67,7 @@
       #{responseId,jdbcType=VARCHAR}, #{responseHistoryList,jdbcType=VARCHAR}, #{addVm,jdbcType=VARCHAR}, 
       #{delVm,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" >
+  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity" >
     insert into vnfstatus
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="vnfInstanceId != null" >
@@ -152,7 +152,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" >
+  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity" >
     update vnfstatus
     <set >
       <if test="jobId != null" >
@@ -194,7 +194,7 @@
     </set>
     where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" >
+  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity" >
     update vnfstatus
     set job_id = #{jobId,jdbcType=VARCHAR},
       ns_id = #{nsId,jdbcType=VARCHAR},
diff --git a/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml b/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml
index f08019e..7dd42a3 100644
--- a/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml
+++ b/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml
@@ -66,217 +66,217 @@
 
     <!--location -->
     <bean id="locationDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.LocationDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.LocationDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
 
     <bean id="locationBusiness"
-        class="org.onap.vfc.nfvo.res.service.business.impl.LocationBusinessImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.business.impl.LocationBusinessImpl">
         <property name="locationDao" ref="locationDao"></property>
     </bean>
 
     <bean id="location"
-        class="org.onap.vfc.nfvo.res.service.base.openstack.impl.LocationImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.LocationImpl">
         <property name="locationBusiness" ref="locationBusiness"></property>
     </bean>
 
-    <bean id="locationRoa" class="org.onap.vfc.nfvo.res.service.rest.LocationRoa">
+    <bean id="locationRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.LocationRoa">
         <property name="location" ref="location"></property>
         <property name="sites" ref="sites"></property>
     </bean>
 
     <!--port -->
     <bean id="portDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.PortDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.PortDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
 
     <bean id="portBusiness"
-        class="org.onap.vfc.nfvo.res.service.business.impl.PortBusinessImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.business.impl.PortBusinessImpl">
         <property name="portDao" ref="portDao"></property>
     </bean>
 
     <bean id="port"
-        class="org.onap.vfc.nfvo.res.service.base.openstack.impl.PortImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.PortImpl">
         <property name="portBusiness" ref="portBusiness"></property>
     </bean>
 
-    <bean id="portRoa" class="org.onap.vfc.nfvo.res.service.rest.PortRoa">
+    <bean id="portRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.PortRoa">
         <property name="port" ref="port"></property>
     </bean>
 
     <!--host -->
     <bean id="hostDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.HostDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.HostDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
 
     <bean id="hostBusiness"
-        class="org.onap.vfc.nfvo.res.service.business.impl.HostBusinessImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.business.impl.HostBusinessImpl">
         <property name="hostDao" ref="hostDao"></property>
     </bean>
 
     <bean id="host"
-        class="org.onap.vfc.nfvo.res.service.base.openstack.impl.HostImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.HostImpl">
         <property name="hostBusiness" ref="hostBusiness"></property>
     </bean>
 
-    <bean id="hostRoa" class="org.onap.vfc.nfvo.res.service.rest.HostRoa">
+    <bean id="hostRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.HostRoa">
         <property name="host" ref="host"></property>
     </bean>
 
     <!--network -->
     <bean id="networkDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.NetworkDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
 
     <bean id="networkBusiness"
-        class="org.onap.vfc.nfvo.res.service.business.impl.NetworkBusinessImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.business.impl.NetworkBusinessImpl">
         <property name="networkDao" ref="networkDao"></property>
     </bean>
 
     <bean id="network"
-        class="org.onap.vfc.nfvo.res.service.base.openstack.impl.NetworkImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.NetworkImpl">
         <property name="networkBusiness" ref="networkBusiness"></property>
     </bean>
 
-    <bean id="networkRoa" class="org.onap.vfc.nfvo.res.service.rest.NetworkRoa">
+    <bean id="networkRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.NetworkRoa">
         <property name="network" ref="network"></property>
     </bean>
 
     <!--sites -->
     <bean id="sitesDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.SitesDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.SitesDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
 
     <bean id="sitesBusiness"
-        class="org.onap.vfc.nfvo.res.service.business.impl.SitesBusinessImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.business.impl.SitesBusinessImpl">
         <property name="sitesDao" ref="sitesDao"></property>
     </bean>
 
     <bean id="sites"
-        class="org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl">
         <property name="sitesBusiness" ref="sitesBusiness"></property>
         <property name="limitsBusiness" ref="limitsBusiness"></property>
         <property name="resOperateService" ref="resOperateService"></property>
     </bean>
 
-    <bean id="sitesRoa" class="org.onap.vfc.nfvo.res.service.rest.SitesRoa">
+    <bean id="sitesRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.SitesRoa">
         <property name="sites" ref="sites"></property>
     </bean>
 
     <!--vim -->
     <bean id="vimDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.VimDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.VimDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
 
     <bean id="vimBusiness"
-        class="org.onap.vfc.nfvo.res.service.business.impl.VimBusinessImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.business.impl.VimBusinessImpl">
         <property name="vimDao" ref="vimDao"></property>
     </bean>
 
     <bean id="vim"
-        class="org.onap.vfc.nfvo.res.service.base.openstack.impl.VimImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.VimImpl">
         <property name="vimBusiness" ref="vimBusiness"></property>
     </bean>
 
     <!-- limits -->
     <bean id="limitsBusiness"
-        class="org.onap.vfc.nfvo.res.service.business.impl.LimitsBusinessImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.business.impl.LimitsBusinessImpl">
     </bean>
 
-     <bean id="limitsRoa" class="org.onap.vfc.nfvo.res.service.rest.LimitsRoa">
+     <bean id="limitsRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.LimitsRoa">
         <property name="limitsBusiness" ref="limitsBusiness"></property>
     </bean>
     
     <!-- vl -->
     <bean id="virtualLinkDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.VirtualLinkDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.VirtualLinkDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
     
     <bean id="virtualLink"
-        class="org.onap.vfc.nfvo.res.service.group.impl.VirtualLinkServiceImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.group.impl.VirtualLinkServiceImpl">
         <property name="virtualLinkDao" ref="virtualLinkDao"></property>
     </bean>
 
-     <bean id="virtualLinkRoa" class="org.onap.vfc.nfvo.res.service.rest.VirtualLinkRoa">
+     <bean id="virtualLinkRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.VirtualLinkRoa">
         <property name="virtualLink" ref="virtualLink"></property>
     </bean>
     
     <!-- vnf -->
     <bean id="vnfDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.VnfDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.VnfDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
     
     <bean id="vnfService"
-        class="org.onap.vfc.nfvo.res.service.group.impl.VnfServiceImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfServiceImpl">
         <property name="vnfDao" ref="vnfDao"></property>
         <property name="vnfInfoService" ref="vnfInfoService"></property>
     </bean>
 
-    <bean id="vnfRoa" class="org.onap.vfc.nfvo.res.service.rest.VnfRoa">
+    <bean id="vnfRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.VnfRoa">
         <property name="vnfService" ref="vnfService"></property>
     </bean>
     
     <!-- vm -->
-    <bean id="vmDao" class="org.onap.vfc.nfvo.res.service.dao.impl.VmDaoImpl">
+    <bean id="vmDao" class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.VmDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
     
-    <bean id="vmService" class="org.onap.vfc.nfvo.res.service.group.impl.VmServiceImpl">
+    <bean id="vmService" class="org.onap.vfc.nfvo.resmanagement.service.group.impl.VmServiceImpl">
         <property name="vmDao" ref="vmDao"></property>
     </bean>
     
-    <bean id="vmRoa" class="org.onap.vfc.nfvo.res.service.rest.VmRoa">
+    <bean id="vmRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.VmRoa">
         <property name="vmService" ref="vmService"></property>
     </bean>
     
     <!-- vnfInfo -->
     <bean id="vnfInfoDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.VnfInfoDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.VnfInfoDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
     
     <bean id="vnfInfoService"
-        class="org.onap.vfc.nfvo.res.service.group.impl.VnfInfoServiceImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfInfoServiceImpl">
         <property name="vnfInfoDao" ref="vnfInfoDao"></property>
         <property name="vmService" ref="vmService"></property>
     </bean>
 
-    <bean id="vnfInfoRoa" class="org.onap.vfc.nfvo.res.service.rest.VnfInfoRoa">
+    <bean id="vnfInfoRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.VnfInfoRoa">
         <property name="vnfInfoService" ref="vnfInfoService"></property>
     </bean>
     
     <!-- vnfstatus -->
-    <bean id="vnfStatusDao" class="org.onap.vfc.nfvo.res.service.dao.impl.VnfStatusDaoImpl">
+    <bean id="vnfStatusDao" class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.VnfStatusDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
     
-    <bean id="vnfStatusService" class="org.onap.vfc.nfvo.res.service.group.impl.VnfStatusServiceImpl">
+    <bean id="vnfStatusService" class="org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfStatusServiceImpl">
         <property name="vnfStatusDao" ref="vnfStatusDao"></property>
     </bean>
     
-    <bean id="vnfStatusRoa" class="org.onap.vfc.nfvo.res.service.rest.VnfStatusRoa">
+    <bean id="vnfStatusRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.VnfStatusRoa">
         <property name="vnfStatusService" ref="vnfStatusService"></property>
     </bean>
     
     <!-- grantResource -->
-    <bean id="grantResService" class="org.onap.vfc.nfvo.res.service.group.impl.GrantResServiceImpl">
+    <bean id="grantResService" class="org.onap.vfc.nfvo.resmanagement.service.group.impl.GrantResServiceImpl">
         <property name="sites" ref="sites"></property>
     </bean>
     
-    <bean id="grantResourseRoa" class="org.onap.vfc.nfvo.res.service.rest.GrantResourseRoa">
+    <bean id="grantResourseRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.GrantResourseRoa">
         <property name="grantResService" ref="grantResService"></property>
     </bean>
     
     <!--group_resoperate -->
     <bean id="resOperateService"
-        class="org.onap.vfc.nfvo.res.service.group.impl.ResOperateServiceImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.group.impl.ResOperateServiceImpl">
         <property name="host" ref="host"></property>
         <property name="port" ref="port"></property>
         <property name="sites" ref="sites"></property>
@@ -288,22 +288,22 @@
     </bean>
 
     <bean id="iResourceUpdateServiceImpl"
-        class="org.onap.vfc.nfvo.res.service.group.impl.IResourceUpdateServiceImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.group.impl.IResourceUpdateServiceImpl">
     </bean>
 
     <bean id="iResourceAddServiceImpl"
-        class="org.onap.vfc.nfvo.res.service.group.impl.IResourceAddServiceImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.group.impl.IResourceAddServiceImpl">
     </bean>
 
     <bean id="iResourceDelServiceImpl"
-        class="org.onap.vfc.nfvo.res.service.group.impl.IResourceDelServiceImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.group.impl.IResourceDelServiceImpl">
     </bean>
 
-    <bean id="resOperateRoa" class="org.onap.vfc.nfvo.res.service.rest.ResOperateRoa">
+    <bean id="resOperateRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.ResOperateRoa">
         <property name="resOperateService" ref="resOperateService"></property>
     </bean>
 
-    <bean id="SwaggerRoa" class="org.onap.vfc.nfvo.res.service.rest.SwaggerRoa"></bean>
+    <bean id="SwaggerRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.SwaggerRoa"></bean>
 
     <jaxrs:server id="restContainer" address="/">
         <jaxrs:serviceBeans>
@@ -324,8 +324,8 @@
      </jaxrs:serviceBeans>
         <jaxrs:providers>
             <ref bean="jsonProvider" />
-            <bean class="org.onap.vfc.nfvo.res.service.rest.exceptionmapper.ServiceExceptionMapper" />
-            <bean class="org.onap.vfc.nfvo.res.service.rest.exceptionmapper.GenericExceptionMapper" />
+            <bean class="org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.ServiceExceptionMapper" />
+            <bean class="org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.GenericExceptionMapper" />
         </jaxrs:providers>
     </jaxrs:server>
 </beans>
diff --git a/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml b/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml
index 9133d04..e1d7493 100644
--- a/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml
+++ b/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml
@@ -37,6 +37,6 @@
     http://www.springframework.org/schema/aop
     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd 
     http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
-    <bean class="org.onap.vfc.nfvo.res.service.activator.ROAResmgrServicePostProcessor"></bean>
-    <bean class="org.onap.vfc.nfvo.res.service.adapter.impl.ResmgrAdapterMgrService"></bean>
+    <bean class="org.onap.vfc.nfvo.resmanagement.service.activator.ROAResmgrServicePostProcessor"></bean>
+    <bean class="org.onap.vfc.nfvo.resmanagement.service.adapter.impl.ResmgrAdapterMgrService"></bean>
 </beans>
\ No newline at end of file
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/ResourceUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/ResourceUtilTest.java
index 26de39a..cb2680e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/ResourceUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/ResourceUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common;
+package org.onap.vfc.nfvo.resmanagement.common;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -25,7 +25,7 @@ import java.lang.reflect.Modifier;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 
 
 public class ResourceUtilTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/VimUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/VimUtilTest.java
index db2b30d..6d15bbc 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/VimUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/VimUtilTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.common;
+package org.onap.vfc.nfvo.resmanagement.common;
 
 import static org.junit.Assert.*;
 
@@ -21,9 +21,9 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.VimUtil;
-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.VimUtil;
+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.RestfulOptions;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/JsonUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtilTest.java
index 9124fc7..1f7c8a1 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/JsonUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtilTest.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 static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,7 +24,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import mockit.Mock;
 import mockit.MockUp;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/RestfulUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtilTest.java
index 4483316..8947985 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/RestfulUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtilTest.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 static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -23,8 +23,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.constant.Constant;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.Constant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.RestfulOptions;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/StringUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtilTest.java
index cc5f42c..05fb52e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/StringUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtilTest.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 static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,7 +24,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.StringUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil;
 
 public class StringUtilTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/request/RequestUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtilTest.java
index dafc9e4..26feb0e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/request/RequestUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtilTest.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 static org.junit.Assert.*;
 
@@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.io.IOUtils;
 import org.apache.cxf.jaxrs.impl.HttpServletRequestFilter;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
 
 import javassist.Modifier;
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/ResponseUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/response/ResponseUtilTest.java
index 6cef0c3..a62e61e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/ResponseUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/response/ResponseUtilTest.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 static org.junit.Assert.*;
 
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/RoaResponseUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtilTest.java
index 9b69944..d8f8a8e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/RoaResponseUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtilTest.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 static org.junit.Assert.*;
 
@@ -23,8 +23,8 @@ import java.lang.reflect.Modifier;
 import java.util.Map;
 
 import org.junit.Test;
-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.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
 
 import mockit.Mock;
 import mockit.MockUp;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java
index 0855f9b..0bcdb81 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.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 static org.junit.Assert.assertNotNull;
 
@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
-import org.onap.vfc.nfvo.res.service.adapter.impl.ResmgrAdapter2MSBManager;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.service.adapter.impl.ResmgrAdapter2MSBManager;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapterMgrServiceTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java
index d045149..24200e8 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapterMgrServiceTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java
@@ -14,12 +14,12 @@
  * 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.IOException;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.adapter.impl.ResmgrAdapterMgrService;
+import org.onap.vfc.nfvo.resmanagement.service.adapter.impl.ResmgrAdapterMgrService;
 
 import mockit.Mock;
 import mockit.MockUp;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/HostImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImplTest.java
index 827a56d..8e5dcc4 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/HostImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImplTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * 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 static org.junit.Assert.*;
 
@@ -22,10 +22,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.HostImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.HostBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.HostDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.HostImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.HostBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.HostDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/LocationImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImplTest.java
index 4bf8763..803d421 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/LocationImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImplTest.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 static org.junit.Assert.assertTrue;
 
@@ -25,13 +25,13 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.LocationImpl;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.LocationBusinessImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.SitesBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.LocationDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.LocationImpl;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.LocationBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.SitesBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.LocationDaoImpl;
+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 mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/NetworkImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImplTest.java
index 478e6ef..a94e994 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/NetworkImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImplTest.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 static org.junit.Assert.*;
 
@@ -23,11 +23,11 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.NetworkImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.NetworkBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.NetworkDaoImpl;
-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.service.base.openstack.impl.NetworkImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.NetworkBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl;
+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 mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/PortImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImplTest.java
index a7ea6c4..ae482f4 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/PortImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImplTest.java
@@ -14,16 +14,16 @@
  * 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 static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.PortImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.PortBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.PortDaoImpl;
-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.impl.PortImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.PortBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.PortDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/SitesImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImplTest.java
index ea7aa28..95bbca7 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/SitesImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImplTest.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 static org.junit.Assert.assertEquals;
 
@@ -24,9 +24,9 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.SitesBusinessImpl;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.SitesBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/VimImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImplTest.java
index 9205d30..28a7344 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/VimImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImplTest.java
@@ -14,16 +14,16 @@
  * 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 static org.junit.Assert.assertEquals;
 
 import java.util.List;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.VimImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.VimBusinessImpl;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.VimImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.VimBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/HostBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImplTest.java
index 4197de9..18ade35 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/HostBusinessImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImplTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.HostBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.HostDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.HostBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.HostDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LimitsBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImplTest.java
index 6c2f849..c5c9d78 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LimitsBusinessImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImplTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.LimitsBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.LimitsBusinessImpl;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.HttpRest;
 import org.openo.baseservice.roa.util.restclient.RestfulOptions;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LocationBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImplTest.java
index 35126cd..70ba66e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LocationBusinessImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImplTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.LocationBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.LocationDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.LocationBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.LocationDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/SitesBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java
index ae86558..ce33e8f 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/SitesBusinessImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.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 static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -27,9 +27,9 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.SitesBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.SitesDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.SitesBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.SitesDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/VimBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java
index 6de3741..c36aaf2 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/VimBusinessImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.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 static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -22,9 +22,9 @@ import static org.junit.Assert.assertTrue;
 import java.util.List;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.VimBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.VimDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.VimBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.VimDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/HostDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java
index 3aac705..9ec2c8d 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/HostDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.HostDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.mapper.HostMapper;
-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.impl.HostDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.HostMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/LocationDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImplTest.java
index c131bd1..908dd5c 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/LocationDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImplTest.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.LocationDaoImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.NetworkDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-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.impl.LocationDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.LocationMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/NetworkDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImplTest.java
index a366b8f..88117fa 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/NetworkDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImplTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
@@ -22,10 +22,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.NetworkDaoImpl;
-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.impl.NetworkDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/PortDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java
index 1cb4de8..efb633c 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/PortDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.PortDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
-import org.onap.vfc.nfvo.res.service.mapper.NetworkMapper;
-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.impl.PortDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.PortMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/SitesDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java
index 763ce16..0944936 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/SitesDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.SitesDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
-import org.onap.vfc.nfvo.res.service.mapper.NetworkMapper;
-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.impl.SitesDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VimDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java
index 3c393f6..8adf0c8 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VimDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.VimDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-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.impl.VimDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VimMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VirtualLinkDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java
index 839b4b3..fa7fb54 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VirtualLinkDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.VirtualLinkDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;
-import org.onap.vfc.nfvo.res.service.mapper.SitesMapper;
-import org.onap.vfc.nfvo.res.service.mapper.VirtualLinkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.VirtualLinkDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VirtualLinkMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VmDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java
index 5b53db4..07ac61c 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VmDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.VmDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.VmEntity;
-import org.onap.vfc.nfvo.res.service.mapper.SitesMapper;
-import org.onap.vfc.nfvo.res.service.mapper.VmMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.VmDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VmMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/HostEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/HostEntityTest.java
index 4a1574b..cbbccff 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/HostEntityTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/HostEntityTest.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/LocationEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/LocationEntityTest.java
index 7e708ed..576101a 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/LocationEntityTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/LocationEntityTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/NetworkEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/NetworkEntityTest.java
index 1bd94c1..4ce309b 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/NetworkEntityTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/NetworkEntityTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/PortEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/PortEntityTest.java
index 0826514..6eef4c9 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/PortEntityTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/PortEntityTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/SitesEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/SitesEntityTest.java
index d20c714..6d22897 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/SitesEntityTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/SitesEntityTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/VimEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/VimEntityTest.java
index 98e5994..e204c0f 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/VimEntityTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/VimEntityTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/GrantResourseRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java
index 9c5087b..952ca90 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/GrantResourseRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.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 static org.junit.Assert.assertNotNull;

 

@@ -22,10 +22,10 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.group.impl.GrantResServiceImpl;

-import org.onap.vfc.nfvo.res.service.group.inf.GrantResService;

-import org.onap.vfc.nfvo.res.service.rest.GrantResourseRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.group.impl.GrantResServiceImpl;

+import org.onap.vfc.nfvo.resmanagement.service.group.inf.GrantResService;

+import org.onap.vfc.nfvo.resmanagement.service.rest.GrantResourseRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/HostRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java
index ef697ce..72e79d7 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/HostRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.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 static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.base.openstack.impl.HostImpl;

-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.res.service.rest.HostRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.HostImpl;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Host;

+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;

+import org.onap.vfc.nfvo.resmanagement.service.rest.HostRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LimitsRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java
index 757856b..391aad3 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LimitsRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.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 static org.junit.Assert.assertNotNull;

 

@@ -22,9 +22,9 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.service.business.impl.LimitsBusinessImpl;

-import org.onap.vfc.nfvo.res.service.business.inf.LimitsBusiness;

-import org.onap.vfc.nfvo.res.service.rest.LimitsRoa;

+import org.onap.vfc.nfvo.resmanagement.service.business.impl.LimitsBusinessImpl;

+import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness;

+import org.onap.vfc.nfvo.resmanagement.service.rest.LimitsRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LocationRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java
index fc15bfc..78157f6 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LocationRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.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 static org.junit.Assert.assertNotNull;

 

@@ -26,14 +26,14 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.base.openstack.impl.LocationImpl;

-import org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl;

-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.res.service.rest.LocationRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.LocationImpl;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;

+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.onap.vfc.nfvo.resmanagement.service.rest.LocationRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/NetworkRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java
index 0aef982..4536b0d 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/NetworkRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.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 static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.base.openstack.impl.NetworkImpl;

-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.res.service.rest.NetworkRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.NetworkImpl;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Network;

+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;

+import org.onap.vfc.nfvo.resmanagement.service.rest.NetworkRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/PortRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java
index 115a893..181e6e5 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/PortRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.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 static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.base.openstack.impl.PortImpl;

-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.res.service.rest.PortRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.PortImpl;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Port;

+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;

+import org.onap.vfc.nfvo.resmanagement.service.rest.PortRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/ResOperateRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java
index 3dffc89..aa87bf5 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/ResOperateRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.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 static org.junit.Assert.assertNotNull;

 

@@ -22,11 +22,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.VimUtil;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.group.impl.ResOperateServiceImpl;

-import org.onap.vfc.nfvo.res.service.group.inf.ResOperateService;

-import org.onap.vfc.nfvo.res.service.rest.ResOperateRoa;

+import org.onap.vfc.nfvo.resmanagement.common.VimUtil;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.group.impl.ResOperateServiceImpl;

+import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService;

+import org.onap.vfc.nfvo.resmanagement.service.rest.ResOperateRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SitesRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java
index 60330c9..1a813c8 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SitesRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.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 static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -27,11 +27,11 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.VimUtil;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
-import org.onap.vfc.nfvo.res.service.rest.SitesRoa;
+import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.rest.SitesRoa;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.springframework.mock.web.MockHttpServletRequest;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SwaggerRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoaTest.java
index 4e5124b..eccc4d9 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SwaggerRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoaTest.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 static org.junit.Assert.assertNotNull;

 

@@ -23,7 +23,7 @@ import java.io.InputStream;
 

 import org.apache.commons.io.IOUtils;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.service.rest.SwaggerRoa;

+import org.onap.vfc.nfvo.resmanagement.service.rest.SwaggerRoa;

 

 import mockit.Mock;

 import mockit.MockUp;

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VirtualLinkRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java
index ff53d48..5377f60 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VirtualLinkRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.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 static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;

-import org.onap.vfc.nfvo.res.service.group.impl.VirtualLinkServiceImpl;

-import org.onap.vfc.nfvo.res.service.group.inf.VirtualLinkService;

-import org.onap.vfc.nfvo.res.service.rest.VirtualLinkRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;

+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VirtualLinkServiceImpl;

+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VirtualLinkService;

+import org.onap.vfc.nfvo.resmanagement.service.rest.VirtualLinkRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VmRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java
index 0d7f52c..f3321fa 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VmRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.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 static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.entity.VmEntity;

-import org.onap.vfc.nfvo.res.service.group.impl.VmServiceImpl;

-import org.onap.vfc.nfvo.res.service.group.inf.VmService;

-import org.onap.vfc.nfvo.res.service.rest.VmRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;

+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VmServiceImpl;

+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService;

+import org.onap.vfc.nfvo.resmanagement.service.rest.VmRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfInfoRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java
index 68d00dd..e6aafa6 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfInfoRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.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 static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity;

-import org.onap.vfc.nfvo.res.service.group.impl.VnfInfoServiceImpl;

-import org.onap.vfc.nfvo.res.service.group.inf.VnfInfoService;

-import org.onap.vfc.nfvo.res.service.rest.VnfInfoRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;

+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfInfoServiceImpl;

+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService;

+import org.onap.vfc.nfvo.resmanagement.service.rest.VnfInfoRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java
index 112f661..099bae0 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.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 static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.entity.VnfEntity;

-import org.onap.vfc.nfvo.res.service.group.impl.VnfServiceImpl;

-import org.onap.vfc.nfvo.res.service.group.inf.VnfService;

-import org.onap.vfc.nfvo.res.service.rest.VnfRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;

+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfServiceImpl;

+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfService;

+import org.onap.vfc.nfvo.resmanagement.service.rest.VnfRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfStatusRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java
index a749290..61d3e6e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfStatusRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.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 static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity;

-import org.onap.vfc.nfvo.res.service.group.impl.VnfStatusServiceImpl;

-import org.onap.vfc.nfvo.res.service.group.inf.VnfStatusService;

-import org.onap.vfc.nfvo.res.service.rest.VnfStatusRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;

+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfStatusServiceImpl;

+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfStatusService;

+import org.onap.vfc.nfvo.resmanagement.service.rest.VnfStatusRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ExceptionMessageTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java
index e118918..c3a3c33 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ExceptionMessageTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest.exceptionmapper;

+package org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertNotNull;

 

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.service.rest.exceptionmapper.ExceptionMessage;

+import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.ExceptionMessage;

 

 /**

  * <br>

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/GenericExceptionMapperTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java
index 2b150c8..e6b4916 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/GenericExceptionMapperTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest.exceptionmapper;

+package org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper;

 

 import static org.junit.Assert.assertNotNull;

 

 import javax.ws.rs.core.Response;

 

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.service.rest.exceptionmapper.GenericExceptionMapper;

+import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.GenericExceptionMapper;

 

 /**

  * <br>

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ServiceExceptionMapperTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java
index d5281bf..f465772 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ServiceExceptionMapperTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest.exceptionmapper;

+package org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper;

 

 import static org.junit.Assert.assertNotNull;

 

 import javax.ws.rs.core.Response;

 

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.service.rest.exceptionmapper.ServiceExceptionMapper;

+import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.ServiceExceptionMapper;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 

 /**