diff --git a/src/main/java/org/onosproject/cordvtn/api/ConnectionHandler.java b/src/main/java/org/opencord/cordvtn/api/ConnectionHandler.java
similarity index 96%
rename from src/main/java/org/onosproject/cordvtn/api/ConnectionHandler.java
rename to src/main/java/org/opencord/cordvtn/api/ConnectionHandler.java
index 5676221..6f032fa 100644
--- a/src/main/java/org/onosproject/cordvtn/api/ConnectionHandler.java
+++ b/src/main/java/org/opencord/cordvtn/api/ConnectionHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.api;
+package org.opencord.cordvtn.api;
 
 /**
  * Entity capable of handling a subject connected and disconnected situation.
diff --git a/src/main/java/org/onosproject/cordvtn/api/CordVtnConfig.java b/src/main/java/org/opencord/cordvtn/api/CordVtnConfig.java
similarity index 99%
rename from src/main/java/org/onosproject/cordvtn/api/CordVtnConfig.java
rename to src/main/java/org/opencord/cordvtn/api/CordVtnConfig.java
index be097ce..f4a8cec 100644
--- a/src/main/java/org/onosproject/cordvtn/api/CordVtnConfig.java
+++ b/src/main/java/org/opencord/cordvtn/api/CordVtnConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.api;
+package org.opencord.cordvtn.api;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.Maps;
diff --git a/src/main/java/org/onosproject/cordvtn/api/CordVtnNode.java b/src/main/java/org/opencord/cordvtn/api/CordVtnNode.java
similarity index 99%
rename from src/main/java/org/onosproject/cordvtn/api/CordVtnNode.java
rename to src/main/java/org/opencord/cordvtn/api/CordVtnNode.java
index c63a9e4..b251b49 100644
--- a/src/main/java/org/onosproject/cordvtn/api/CordVtnNode.java
+++ b/src/main/java/org/opencord/cordvtn/api/CordVtnNode.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.api;
+package org.opencord.cordvtn.api;
 
 import com.google.common.base.MoreObjects;
 import org.onlab.packet.TpPort;
diff --git a/src/main/java/org/onosproject/cordvtn/api/CordVtnNodeState.java b/src/main/java/org/opencord/cordvtn/api/CordVtnNodeState.java
similarity index 95%
rename from src/main/java/org/onosproject/cordvtn/api/CordVtnNodeState.java
rename to src/main/java/org/opencord/cordvtn/api/CordVtnNodeState.java
index 1121390..c95e270 100644
--- a/src/main/java/org/onosproject/cordvtn/api/CordVtnNodeState.java
+++ b/src/main/java/org/opencord/cordvtn/api/CordVtnNodeState.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.api;
+package org.opencord.cordvtn.api;
 
 /**
  * Entity that defines possible init state of the cordvtn node.
diff --git a/src/main/java/org/onosproject/cordvtn/api/CordVtnService.java b/src/main/java/org/opencord/cordvtn/api/CordVtnService.java
similarity index 97%
rename from src/main/java/org/onosproject/cordvtn/api/CordVtnService.java
rename to src/main/java/org/opencord/cordvtn/api/CordVtnService.java
index 1a8849e..dd4c2c3 100644
--- a/src/main/java/org/onosproject/cordvtn/api/CordVtnService.java
+++ b/src/main/java/org/opencord/cordvtn/api/CordVtnService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.api;
+package org.opencord.cordvtn.api;
 
 import org.onosproject.xosclient.api.VtnServiceId;
 
diff --git a/src/main/java/org/onosproject/cordvtn/api/Instance.java b/src/main/java/org/opencord/cordvtn/api/Instance.java
similarity index 98%
rename from src/main/java/org/onosproject/cordvtn/api/Instance.java
rename to src/main/java/org/opencord/cordvtn/api/Instance.java
index 83c7c08..3945a9d 100644
--- a/src/main/java/org/onosproject/cordvtn/api/Instance.java
+++ b/src/main/java/org/opencord/cordvtn/api/Instance.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.api;
+package org.opencord.cordvtn.api;
 
 import com.google.common.base.Strings;
 import org.onlab.packet.Ip4Address;
diff --git a/src/main/java/org/onosproject/cordvtn/api/InstanceHandler.java b/src/main/java/org/opencord/cordvtn/api/InstanceHandler.java
similarity index 96%
rename from src/main/java/org/onosproject/cordvtn/api/InstanceHandler.java
rename to src/main/java/org/opencord/cordvtn/api/InstanceHandler.java
index 3e5be2f..ea44857 100644
--- a/src/main/java/org/onosproject/cordvtn/api/InstanceHandler.java
+++ b/src/main/java/org/opencord/cordvtn/api/InstanceHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.api;
+package org.opencord.cordvtn.api;
 
 /**
  * Handles service instance detection and removal.
diff --git a/src/main/java/org/onosproject/cordvtn/api/NetworkAddress.java b/src/main/java/org/opencord/cordvtn/api/NetworkAddress.java
similarity index 98%
rename from src/main/java/org/onosproject/cordvtn/api/NetworkAddress.java
rename to src/main/java/org/opencord/cordvtn/api/NetworkAddress.java
index 23c7318..551d084 100644
--- a/src/main/java/org/onosproject/cordvtn/api/NetworkAddress.java
+++ b/src/main/java/org/opencord/cordvtn/api/NetworkAddress.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.api;
+package org.opencord.cordvtn.api;
 
 import com.google.common.base.MoreObjects;
 import org.onlab.packet.IpAddress;
diff --git a/src/main/java/org/onosproject/cordvtn/api/SshAccessInfo.java b/src/main/java/org/opencord/cordvtn/api/SshAccessInfo.java
similarity index 98%
rename from src/main/java/org/onosproject/cordvtn/api/SshAccessInfo.java
rename to src/main/java/org/opencord/cordvtn/api/SshAccessInfo.java
index 7679348..3a85978 100644
--- a/src/main/java/org/onosproject/cordvtn/api/SshAccessInfo.java
+++ b/src/main/java/org/opencord/cordvtn/api/SshAccessInfo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.api;
+package org.opencord.cordvtn.api;
 
 import com.google.common.base.MoreObjects;
 import org.onlab.packet.Ip4Address;
diff --git a/src/main/java/org/onosproject/cordvtn/api/package-info.java b/src/main/java/org/opencord/cordvtn/api/package-info.java
similarity index 94%
rename from src/main/java/org/onosproject/cordvtn/api/package-info.java
rename to src/main/java/org/opencord/cordvtn/api/package-info.java
index 7d41963..3aa14b6 100644
--- a/src/main/java/org/onosproject/cordvtn/api/package-info.java
+++ b/src/main/java/org/opencord/cordvtn/api/package-info.java
@@ -17,4 +17,4 @@
 /**
  * API for CORD VTN application.
  */
-package org.onosproject.cordvtn.api;
\ No newline at end of file
+package org.opencord.cordvtn.api;
\ No newline at end of file
diff --git a/src/main/java/org/onosproject/cordvtn/cli/CordVtnFlushRules.java b/src/main/java/org/opencord/cordvtn/cli/CordVtnFlushRules.java
similarity index 92%
rename from src/main/java/org/onosproject/cordvtn/cli/CordVtnFlushRules.java
rename to src/main/java/org/opencord/cordvtn/cli/CordVtnFlushRules.java
index 228d06c..3669b48 100644
--- a/src/main/java/org/onosproject/cordvtn/cli/CordVtnFlushRules.java
+++ b/src/main/java/org/opencord/cordvtn/cli/CordVtnFlushRules.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.onosproject.cordvtn.cli;
+package org.opencord.cordvtn.cli;
 
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.cli.AbstractShellCommand;
-import org.onosproject.cordvtn.impl.CordVtnPipeline;
+import org.opencord.cordvtn.impl.CordVtnPipeline;
 
 /**
  * Deletes nodes from the service.
diff --git a/src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeCheckCommand.java b/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeCheckCommand.java
similarity index 94%
rename from src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeCheckCommand.java
rename to src/main/java/org/opencord/cordvtn/cli/CordVtnNodeCheckCommand.java
index 782003e..6d591b0 100644
--- a/src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeCheckCommand.java
+++ b/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeCheckCommand.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onosproject.cordvtn.cli;
+package org.opencord.cordvtn.cli;
 
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.cli.AbstractShellCommand;
-import org.onosproject.cordvtn.api.CordVtnNode;
-import org.onosproject.cordvtn.impl.CordVtnNodeManager;
+import org.opencord.cordvtn.api.CordVtnNode;
+import org.opencord.cordvtn.impl.CordVtnNodeManager;
 import org.onosproject.net.Device;
 import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.driver.DriverService;
diff --git a/src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeDeleteCommand.java b/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeDeleteCommand.java
similarity index 92%
rename from src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeDeleteCommand.java
rename to src/main/java/org/opencord/cordvtn/cli/CordVtnNodeDeleteCommand.java
index c3b49e1..19a4b8a 100644
--- a/src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeDeleteCommand.java
+++ b/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeDeleteCommand.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onosproject.cordvtn.cli;
+package org.opencord.cordvtn.cli;
 
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.cli.AbstractShellCommand;
-import org.onosproject.cordvtn.impl.CordVtnNodeManager;
-import org.onosproject.cordvtn.api.CordVtnNode;
+import org.opencord.cordvtn.impl.CordVtnNodeManager;
+import org.opencord.cordvtn.api.CordVtnNode;
 
 import java.util.NoSuchElementException;
 
diff --git a/src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeInitCommand.java b/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeInitCommand.java
similarity index 92%
rename from src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeInitCommand.java
rename to src/main/java/org/opencord/cordvtn/cli/CordVtnNodeInitCommand.java
index b47ec7d..4ec2040 100644
--- a/src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeInitCommand.java
+++ b/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeInitCommand.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onosproject.cordvtn.cli;
+package org.opencord.cordvtn.cli;
 
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.cli.AbstractShellCommand;
-import org.onosproject.cordvtn.impl.CordVtnNodeManager;
-import org.onosproject.cordvtn.api.CordVtnNode;
+import org.opencord.cordvtn.impl.CordVtnNodeManager;
+import org.opencord.cordvtn.api.CordVtnNode;
 
 import java.util.NoSuchElementException;
 
diff --git a/src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeListCommand.java b/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeListCommand.java
similarity index 95%
rename from src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeListCommand.java
rename to src/main/java/org/opencord/cordvtn/cli/CordVtnNodeListCommand.java
index a6e4039..b8aa2cd 100644
--- a/src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeListCommand.java
+++ b/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeListCommand.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.onosproject.cordvtn.cli;
+package org.opencord.cordvtn.cli;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.cli.AbstractShellCommand;
-import org.onosproject.cordvtn.impl.CordVtnNodeManager;
-import org.onosproject.cordvtn.api.CordVtnNode;
+import org.opencord.cordvtn.impl.CordVtnNodeManager;
+import org.opencord.cordvtn.api.CordVtnNode;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/org/onosproject/cordvtn/cli/package-info.java b/src/main/java/org/opencord/cordvtn/cli/package-info.java
similarity index 94%
rename from src/main/java/org/onosproject/cordvtn/cli/package-info.java
rename to src/main/java/org/opencord/cordvtn/cli/package-info.java
index f5c69a1..6c00779 100644
--- a/src/main/java/org/onosproject/cordvtn/cli/package-info.java
+++ b/src/main/java/org/opencord/cordvtn/cli/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Console commands to manage OVSDB nodes for cordvtn.
  */
-package org.onosproject.cordvtn.cli;
\ No newline at end of file
+package org.opencord.cordvtn.cli;
\ No newline at end of file
diff --git a/src/main/java/org/onosproject/cordvtn/impl/CordVtn.java b/src/main/java/org/opencord/cordvtn/impl/CordVtn.java
similarity index 98%
rename from src/main/java/org/onosproject/cordvtn/impl/CordVtn.java
rename to src/main/java/org/opencord/cordvtn/impl/CordVtn.java
index efa0e4a..f007a36 100644
--- a/src/main/java/org/onosproject/cordvtn/impl/CordVtn.java
+++ b/src/main/java/org/opencord/cordvtn/impl/CordVtn.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.impl;
+package org.opencord.cordvtn.impl;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -27,9 +27,9 @@
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.Ip4Address;
 import org.onlab.packet.Ip4Prefix;
-import org.onosproject.cordvtn.api.CordVtnNode;
-import org.onosproject.cordvtn.api.CordVtnService;
-import org.onosproject.cordvtn.api.Instance;
+import org.opencord.cordvtn.api.CordVtnNode;
+import org.opencord.cordvtn.api.CordVtnService;
+import org.opencord.cordvtn.api.Instance;
 import org.onosproject.core.DefaultGroupId;
 import org.onosproject.core.GroupId;
 import org.onosproject.net.DeviceId;
@@ -64,7 +64,7 @@
 
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static org.onlab.util.Tools.groupedThreads;
-import static org.onosproject.cordvtn.impl.CordVtnPipeline.*;
+import static org.opencord.cordvtn.impl.CordVtnPipeline.*;
 import static org.onosproject.net.group.DefaultGroupBucket.createSelectGroupBucket;
 import static org.slf4j.LoggerFactory.getLogger;
 
diff --git a/src/main/java/org/onosproject/cordvtn/impl/CordVtnArpProxy.java b/src/main/java/org/opencord/cordvtn/impl/CordVtnArpProxy.java
similarity index 98%
rename from src/main/java/org/onosproject/cordvtn/impl/CordVtnArpProxy.java
rename to src/main/java/org/opencord/cordvtn/impl/CordVtnArpProxy.java
index 8200fcc..6d29a7d 100644
--- a/src/main/java/org/onosproject/cordvtn/impl/CordVtnArpProxy.java
+++ b/src/main/java/org/opencord/cordvtn/impl/CordVtnArpProxy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.impl;
+package org.opencord.cordvtn.impl;
 
 import com.google.common.collect.Maps;
 import org.onlab.packet.ARP;
@@ -22,7 +22,7 @@
 import org.onlab.packet.Ip4Address;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.MacAddress;
-import org.onosproject.cordvtn.api.Instance;
+import org.opencord.cordvtn.api.Instance;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.net.Host;
 import org.onosproject.net.flow.DefaultTrafficSelector;
diff --git a/src/main/java/org/onosproject/cordvtn/impl/CordVtnInstanceHandler.java b/src/main/java/org/opencord/cordvtn/impl/CordVtnInstanceHandler.java
similarity index 90%
rename from src/main/java/org/onosproject/cordvtn/impl/CordVtnInstanceHandler.java
rename to src/main/java/org/opencord/cordvtn/impl/CordVtnInstanceHandler.java
index 197f8df..242d94c 100644
--- a/src/main/java/org/onosproject/cordvtn/impl/CordVtnInstanceHandler.java
+++ b/src/main/java/org/opencord/cordvtn/impl/CordVtnInstanceHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.impl;
+package org.opencord.cordvtn.impl;
 
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
@@ -21,11 +21,11 @@
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.Ip4Address;
 import org.onlab.packet.Ip4Prefix;
-import org.onosproject.cordvtn.api.CordVtnConfig;
-import org.onosproject.cordvtn.api.CordVtnNode;
-import org.onosproject.cordvtn.api.CordVtnService;
-import org.onosproject.cordvtn.api.Instance;
-import org.onosproject.cordvtn.api.InstanceHandler;
+import org.opencord.cordvtn.api.CordVtnConfig;
+import org.opencord.cordvtn.api.CordVtnNode;
+import org.opencord.cordvtn.api.CordVtnService;
+import org.opencord.cordvtn.api.Instance;
+import org.opencord.cordvtn.api.InstanceHandler;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 import org.onosproject.mastership.MastershipService;
@@ -59,7 +59,6 @@
 import java.util.stream.StreamSupport;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onosproject.cordvtn.impl.CordVtnPipeline.*;
 import static org.onosproject.xosclient.api.VtnService.NetworkType.MANAGEMENT;
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -223,9 +222,9 @@
                 .fromApp(appId)
                 .withSelector(selector)
                 .withTreatment(treatment)
-                .withPriority(PRIORITY_MANAGEMENT)
+                .withPriority(CordVtnPipeline.PRIORITY_MANAGEMENT)
                 .forDevice(instance.deviceId())
-                .forTable(TABLE_ZERO)
+                .forTable(CordVtnPipeline.TABLE_ZERO)
                 .makePermanent()
                 .build();
 
@@ -238,16 +237,16 @@
                 .build();
 
         treatment = DefaultTrafficTreatment.builder()
-                .transition(TABLE_DST_IP)
+                .transition(CordVtnPipeline.TABLE_DST_IP)
                 .build();
 
         flowRule = DefaultFlowRule.builder()
                 .fromApp(appId)
                 .withSelector(selector)
                 .withTreatment(treatment)
-                .withPriority(PRIORITY_MANAGEMENT)
+                .withPriority(CordVtnPipeline.PRIORITY_MANAGEMENT)
                 .forDevice(instance.deviceId())
-                .forTable(TABLE_ZERO)
+                .forTable(CordVtnPipeline.TABLE_ZERO)
                 .makePermanent()
                 .build();
 
@@ -266,9 +265,9 @@
                 .fromApp(appId)
                 .withSelector(selector)
                 .withTreatment(treatment)
-                .withPriority(PRIORITY_MANAGEMENT)
+                .withPriority(CordVtnPipeline.PRIORITY_MANAGEMENT)
                 .forDevice(instance.deviceId())
-                .forTable(TABLE_ACCESS_TYPE)
+                .forTable(CordVtnPipeline.TABLE_ACCESS_TYPE)
                 .makePermanent()
                 .build();
 
@@ -290,9 +289,9 @@
                 .fromApp(appId)
                 .withSelector(selector)
                 .withTreatment(treatment)
-                .withPriority(PRIORITY_MANAGEMENT)
+                .withPriority(CordVtnPipeline.PRIORITY_MANAGEMENT)
                 .forDevice(instance.deviceId())
-                .forTable(TABLE_ZERO)
+                .forTable(CordVtnPipeline.TABLE_ZERO)
                 .makePermanent()
                 .build();
 
@@ -307,7 +306,7 @@
                 .build();
 
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .transition(TABLE_ACCESS_TYPE)
+                .transition(CordVtnPipeline.TABLE_ACCESS_TYPE)
                 .build();
 
 
@@ -315,9 +314,9 @@
                 .fromApp(appId)
                 .withSelector(selector)
                 .withTreatment(treatment)
-                .withPriority(PRIORITY_DEFAULT)
+                .withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
                 .forDevice(instance.deviceId())
-                .forTable(TABLE_IN_PORT)
+                .forTable(CordVtnPipeline.TABLE_IN_PORT)
                 .makePermanent()
                 .build();
 
@@ -328,16 +327,16 @@
                 .build();
 
         treatment = DefaultTrafficTreatment.builder()
-                .transition(TABLE_IN_SERVICE)
+                .transition(CordVtnPipeline.TABLE_IN_SERVICE)
                 .build();
 
         flowRule = DefaultFlowRule.builder()
                 .fromApp(appId)
                 .withSelector(selector)
                 .withTreatment(treatment)
-                .withPriority(PRIORITY_LOW)
+                .withPriority(CordVtnPipeline.PRIORITY_LOW)
                 .forDevice(instance.deviceId())
-                .forTable(TABLE_IN_PORT)
+                .forTable(CordVtnPipeline.TABLE_IN_PORT)
                 .makePermanent()
                 .build();
 
@@ -361,9 +360,9 @@
                 .fromApp(appId)
                 .withSelector(selector)
                 .withTreatment(treatment)
-                .withPriority(PRIORITY_DEFAULT)
+                .withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
                 .forDevice(instance.deviceId())
-                .forTable(TABLE_DST_IP)
+                .forTable(CordVtnPipeline.TABLE_DST_IP)
                 .makePermanent()
                 .build();
 
@@ -390,9 +389,9 @@
                     .fromApp(appId)
                     .withSelector(selector)
                     .withTreatment(treatment)
-                    .withPriority(PRIORITY_DEFAULT)
+                    .withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
                     .forDevice(node.intBrId())
-                    .forTable(TABLE_DST_IP)
+                    .forTable(CordVtnPipeline.TABLE_DST_IP)
                     .makePermanent()
                     .build();
 
@@ -414,9 +413,9 @@
                 .fromApp(appId)
                 .withSelector(selector)
                 .withTreatment(treatment)
-                .withPriority(PRIORITY_DEFAULT)
+                .withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
                 .forDevice(instance.deviceId())
-                .forTable(TABLE_TUNNEL_IN)
+                .forTable(CordVtnPipeline.TABLE_TUNNEL_IN)
                 .makePermanent()
                 .build();
 
@@ -431,7 +430,7 @@
                 .build();
 
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .transition(TABLE_DST_IP)
+                .transition(CordVtnPipeline.TABLE_DST_IP)
                 .build();
 
 
@@ -440,9 +439,9 @@
                     .fromApp(appId)
                     .withSelector(selector)
                     .withTreatment(treatment)
-                    .withPriority(PRIORITY_DEFAULT)
+                    .withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
                     .forDevice(node.intBrId())
-                    .forTable(TABLE_ACCESS_TYPE)
+                    .forTable(CordVtnPipeline.TABLE_ACCESS_TYPE)
                     .makePermanent()
                     .build();
 
@@ -465,9 +464,9 @@
                     .fromApp(appId)
                     .withSelector(selector)
                     .withTreatment(treatment)
-                    .withPriority(PRIORITY_LOW)
+                    .withPriority(CordVtnPipeline.PRIORITY_LOW)
                     .forDevice(node.intBrId())
-                    .forTable(TABLE_ACCESS_TYPE)
+                    .forTable(CordVtnPipeline.TABLE_ACCESS_TYPE)
                     .makePermanent()
                     .build();
 
diff --git a/src/main/java/org/onosproject/cordvtn/impl/CordVtnInstanceManager.java b/src/main/java/org/opencord/cordvtn/impl/CordVtnInstanceManager.java
similarity index 96%
rename from src/main/java/org/onosproject/cordvtn/impl/CordVtnInstanceManager.java
rename to src/main/java/org/opencord/cordvtn/impl/CordVtnInstanceManager.java
index 3ca7361..6acca13 100644
--- a/src/main/java/org/onosproject/cordvtn/impl/CordVtnInstanceManager.java
+++ b/src/main/java/org/opencord/cordvtn/impl/CordVtnInstanceManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.impl;
+package org.opencord.cordvtn.impl;
 
 import com.google.common.collect.Sets;
 import org.apache.felix.scr.annotations.Activate;
@@ -27,9 +27,9 @@
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.VlanId;
-import org.onosproject.cordvtn.api.CordVtnConfig;
-import org.onosproject.cordvtn.api.CordVtnService;
-import org.onosproject.cordvtn.api.Instance;
+import org.opencord.cordvtn.api.CordVtnConfig;
+import org.opencord.cordvtn.api.CordVtnService;
+import org.opencord.cordvtn.api.Instance;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 import org.onosproject.dhcp.DhcpService;
@@ -81,10 +81,10 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static org.onlab.util.Tools.groupedThreads;
-import static org.onosproject.cordvtn.api.Instance.*;
 import static org.onosproject.dhcp.IpAssignment.AssignmentStatus.Option_RangeNotEnforced;
 import static org.onosproject.xosclient.api.VtnService.NetworkType.MANAGEMENT;
 import static org.onosproject.xosclient.api.VtnService.NetworkType.PRIVATE;
+
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
@@ -220,10 +220,10 @@
         // Added CREATE_TIME intentionally to trigger HOST_UPDATED event for the
         // existing instances.
         DefaultAnnotations.Builder annotations = DefaultAnnotations.builder()
-                .set(SERVICE_TYPE, vtnService.serviceType().toString())
-                .set(SERVICE_ID, vtnPort.serviceId().id())
-                .set(PORT_ID, vtnPort.id().id())
-                .set(CREATE_TIME, String.valueOf(System.currentTimeMillis()));
+                .set(Instance.SERVICE_TYPE, vtnService.serviceType().toString())
+                .set(Instance.SERVICE_ID, vtnPort.serviceId().id())
+                .set(Instance.PORT_ID, vtnPort.id().id())
+                .set(Instance.CREATE_TIME, String.valueOf(System.currentTimeMillis()));
 
         HostDescription hostDesc = new DefaultHostDescription(
                 vtnPort.mac(),
diff --git a/src/main/java/org/onosproject/cordvtn/impl/CordVtnNodeManager.java b/src/main/java/org/opencord/cordvtn/impl/CordVtnNodeManager.java
similarity index 98%
rename from src/main/java/org/onosproject/cordvtn/impl/CordVtnNodeManager.java
rename to src/main/java/org/opencord/cordvtn/impl/CordVtnNodeManager.java
index 7fa6c5c..c037c05 100644
--- a/src/main/java/org/onosproject/cordvtn/impl/CordVtnNodeManager.java
+++ b/src/main/java/org/opencord/cordvtn/impl/CordVtnNodeManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.impl;
+package org.opencord.cordvtn.impl;
 
 import com.google.common.collect.Sets;
 import com.jcraft.jsch.Session;
@@ -29,13 +29,13 @@
 import org.onosproject.cluster.ClusterService;
 import org.onosproject.cluster.LeadershipService;
 import org.onosproject.cluster.NodeId;
-import org.onosproject.cordvtn.api.ConnectionHandler;
-import org.onosproject.cordvtn.api.CordVtnConfig;
-import org.onosproject.cordvtn.api.CordVtnNode;
-import org.onosproject.cordvtn.api.CordVtnNodeState;
-import org.onosproject.cordvtn.api.CordVtnService;
-import org.onosproject.cordvtn.api.NetworkAddress;
-import org.onosproject.cordvtn.api.SshAccessInfo;
+import org.opencord.cordvtn.api.ConnectionHandler;
+import org.opencord.cordvtn.api.CordVtnConfig;
+import org.opencord.cordvtn.api.CordVtnNode;
+import org.opencord.cordvtn.api.CordVtnNodeState;
+import org.opencord.cordvtn.api.CordVtnService;
+import org.opencord.cordvtn.api.NetworkAddress;
+import org.opencord.cordvtn.api.SshAccessInfo;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 import org.onosproject.net.ConnectPoint;
@@ -85,10 +85,10 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static org.onlab.util.Tools.groupedThreads;
-import static org.onosproject.cordvtn.impl.CordVtnPipeline.DEFAULT_TUNNEL;
-import static org.onosproject.cordvtn.impl.RemoteIpCommandUtil.*;
+import static org.opencord.cordvtn.impl.CordVtnPipeline.DEFAULT_TUNNEL;
 import static org.onosproject.net.Device.Type.SWITCH;
 import static org.onosproject.net.behaviour.TunnelDescription.Type.VXLAN;
+import static org.opencord.cordvtn.impl.RemoteIpCommandUtil.*;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
diff --git a/src/main/java/org/onosproject/cordvtn/impl/CordVtnPipeline.java b/src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java
similarity index 98%
rename from src/main/java/org/onosproject/cordvtn/impl/CordVtnPipeline.java
rename to src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java
index 4abbcf0..f5799c3 100644
--- a/src/main/java/org/onosproject/cordvtn/impl/CordVtnPipeline.java
+++ b/src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.impl;
+package org.opencord.cordvtn.impl;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
@@ -28,8 +28,8 @@
 import org.onlab.packet.TpPort;
 import org.onlab.packet.VlanId;
 import org.onlab.util.ItemNotFoundException;
-import org.onosproject.cordvtn.api.CordVtnNode;
-import org.onosproject.cordvtn.api.CordVtnService;
+import org.opencord.cordvtn.api.CordVtnNode;
+import org.opencord.cordvtn.api.CordVtnService;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 import org.onosproject.net.Device;
diff --git a/src/main/java/org/onosproject/cordvtn/impl/RemoteIpCommandUtil.java b/src/main/java/org/opencord/cordvtn/impl/RemoteIpCommandUtil.java
similarity index 98%
rename from src/main/java/org/onosproject/cordvtn/impl/RemoteIpCommandUtil.java
rename to src/main/java/org/opencord/cordvtn/impl/RemoteIpCommandUtil.java
index c09e3a0..bd2d922 100644
--- a/src/main/java/org/onosproject/cordvtn/impl/RemoteIpCommandUtil.java
+++ b/src/main/java/org/opencord/cordvtn/impl/RemoteIpCommandUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.impl;
+package org.opencord.cordvtn.impl;
 
 import com.google.common.collect.Sets;
 import com.google.common.io.CharStreams;
@@ -23,8 +23,8 @@
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
 import org.onlab.packet.IpAddress;
-import org.onosproject.cordvtn.api.NetworkAddress;
-import org.onosproject.cordvtn.api.SshAccessInfo;
+import org.opencord.cordvtn.api.NetworkAddress;
+import org.opencord.cordvtn.api.SshAccessInfo;
 import org.slf4j.Logger;
 
 import java.io.IOException;
diff --git a/src/main/java/org/onosproject/cordvtn/impl/package-info.java b/src/main/java/org/opencord/cordvtn/impl/package-info.java
similarity index 94%
rename from src/main/java/org/onosproject/cordvtn/impl/package-info.java
rename to src/main/java/org/opencord/cordvtn/impl/package-info.java
index fcc52ff..fe7554d 100644
--- a/src/main/java/org/onosproject/cordvtn/impl/package-info.java
+++ b/src/main/java/org/opencord/cordvtn/impl/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Implementation for CORD VTN application.
  */
-package org.onosproject.cordvtn.impl;
\ No newline at end of file
+package org.opencord.cordvtn.impl;
\ No newline at end of file
diff --git a/src/main/java/org/onosproject/cordvtn/impl/service/DummyInstanceHandler.java b/src/main/java/org/opencord/cordvtn/impl/service/DummyInstanceHandler.java
similarity index 89%
rename from src/main/java/org/onosproject/cordvtn/impl/service/DummyInstanceHandler.java
rename to src/main/java/org/opencord/cordvtn/impl/service/DummyInstanceHandler.java
index ee78218..86a5f1b 100644
--- a/src/main/java/org/onosproject/cordvtn/impl/service/DummyInstanceHandler.java
+++ b/src/main/java/org/opencord/cordvtn/impl/service/DummyInstanceHandler.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.impl.service;
+package org.opencord.cordvtn.impl.service;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 
 import org.apache.felix.scr.annotations.Deactivate;
-import org.onosproject.cordvtn.api.Instance;
-import org.onosproject.cordvtn.api.InstanceHandler;
-import org.onosproject.cordvtn.impl.CordVtnInstanceHandler;
+import org.opencord.cordvtn.api.Instance;
+import org.opencord.cordvtn.api.InstanceHandler;
+import org.opencord.cordvtn.impl.CordVtnInstanceHandler;
 import org.onosproject.xosclient.api.VtnService;
 
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
diff --git a/src/main/java/org/onosproject/cordvtn/impl/service/OltAgentInstanceHandler.java b/src/main/java/org/opencord/cordvtn/impl/service/OltAgentInstanceHandler.java
similarity index 90%
rename from src/main/java/org/onosproject/cordvtn/impl/service/OltAgentInstanceHandler.java
rename to src/main/java/org/opencord/cordvtn/impl/service/OltAgentInstanceHandler.java
index eaec689..7919c5a 100644
--- a/src/main/java/org/onosproject/cordvtn/impl/service/OltAgentInstanceHandler.java
+++ b/src/main/java/org/opencord/cordvtn/impl/service/OltAgentInstanceHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.impl.service;
+package org.opencord.cordvtn.impl.service;
 
 import com.google.common.collect.Maps;
 import org.apache.felix.scr.annotations.Activate;
@@ -21,14 +21,14 @@
 import org.apache.felix.scr.annotations.Deactivate;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.IpPrefix;
-import org.onosproject.cordconfig.access.AccessAgentConfig;
-import org.onosproject.cordconfig.access.AccessAgentData;
-import org.onosproject.cordvtn.api.CordVtnConfig;
-import org.onosproject.cordvtn.api.Instance;
-import org.onosproject.cordvtn.api.InstanceHandler;
-import org.onosproject.cordvtn.impl.CordVtnInstanceHandler;
+
+import org.opencord.cordvtn.api.CordVtnConfig;
+import org.opencord.cordvtn.api.Instance;
+import org.opencord.cordvtn.api.InstanceHandler;
+import org.opencord.cordvtn.impl.CordVtnInstanceHandler;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
+
 import org.onosproject.net.config.ConfigFactory;
 import org.onosproject.net.config.NetworkConfigEvent;
 import org.onosproject.net.config.NetworkConfigListener;
@@ -40,14 +40,15 @@
 import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.xosclient.api.VtnService;
+import org.opencord.cordconfig.access.AccessAgentConfig;
+import org.opencord.cordconfig.access.AccessAgentData;
+import org.opencord.cordvtn.impl.CordVtnPipeline;
 
 import java.util.Map;
 import java.util.Set;
 
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static org.onlab.util.Tools.groupedThreads;
-import static org.onosproject.cordvtn.impl.CordVtnPipeline.PRIORITY_MANAGEMENT;
-import static org.onosproject.cordvtn.impl.CordVtnPipeline.TABLE_ACCESS_TYPE;
 
 /**
  * Provides network connectivity for OLT agent instances.
@@ -120,9 +121,9 @@
                     .fromApp(appId)
                     .withSelector(selector)
                     .withTreatment(treatment)
-                    .withPriority(PRIORITY_MANAGEMENT)
+                    .withPriority(CordVtnPipeline.PRIORITY_MANAGEMENT)
                     .forDevice(deviceId)
-                    .forTable(TABLE_ACCESS_TYPE)
+                    .forTable(CordVtnPipeline.TABLE_ACCESS_TYPE)
                     .makePermanent()
                     .build();
 
diff --git a/src/main/java/org/onosproject/cordvtn/impl/service/VsgInstanceHandler.java b/src/main/java/org/opencord/cordvtn/impl/service/VsgInstanceHandler.java
similarity index 92%
rename from src/main/java/org/onosproject/cordvtn/impl/service/VsgInstanceHandler.java
rename to src/main/java/org/opencord/cordvtn/impl/service/VsgInstanceHandler.java
index f60f72b..46c4a01 100644
--- a/src/main/java/org/onosproject/cordvtn/impl/service/VsgInstanceHandler.java
+++ b/src/main/java/org/opencord/cordvtn/impl/service/VsgInstanceHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.impl.service;
+package org.opencord.cordvtn.impl.service;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Sets;
@@ -28,10 +28,10 @@
 import org.onlab.packet.IpPrefix;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.VlanId;
-import org.onosproject.cordvtn.api.Instance;
-import org.onosproject.cordvtn.api.InstanceHandler;
-import org.onosproject.cordvtn.impl.CordVtnInstanceHandler;
-import org.onosproject.cordvtn.impl.CordVtnInstanceManager;
+import org.opencord.cordvtn.api.Instance;
+import org.opencord.cordvtn.api.InstanceHandler;
+import org.opencord.cordvtn.impl.CordVtnInstanceHandler;
+import org.opencord.cordvtn.impl.CordVtnInstanceManager;
 import org.onosproject.net.DefaultAnnotations;
 import org.onosproject.net.HostId;
 import org.onosproject.net.PortNumber;
@@ -53,6 +53,7 @@
 import org.onosproject.xosclient.api.VtnPortApi;
 import org.onosproject.xosclient.api.VtnPortId;
 import org.onosproject.xosclient.api.VtnService;
+import org.opencord.cordvtn.impl.CordVtnPipeline;
 
 import java.util.Map;
 import java.util.Set;
@@ -60,8 +61,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static org.onlab.util.Tools.groupedThreads;
-import static org.onosproject.cordvtn.api.Instance.*;
-import static org.onosproject.cordvtn.impl.CordVtnPipeline.*;
 import static org.onosproject.net.flow.criteria.Criterion.Type.IPV4_DST;
 import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.VLAN_PUSH;
 
@@ -210,13 +209,13 @@
                                  String stag) {
         HostId hostId = HostId.hostId(vsgMac);
         DefaultAnnotations.Builder annotations = DefaultAnnotations.builder()
-                .set(SERVICE_TYPE, vsgVm.serviceType().toString())
-                .set(SERVICE_ID, vsgVm.serviceId().id())
-                .set(PORT_ID, vsgVm.portId().id())
-                .set(NESTED_INSTANCE, TRUE)
+                .set(Instance.SERVICE_TYPE, vsgVm.serviceType().toString())
+                .set(Instance.SERVICE_ID, vsgVm.serviceId().id())
+                .set(Instance.PORT_ID, vsgVm.portId().id())
+                .set(Instance.NESTED_INSTANCE, Instance.TRUE)
                 .set(STAG, stag)
                 .set(VSG_VM, vsgVm.host().id().toString())
-                .set(CREATE_TIME, String.valueOf(System.currentTimeMillis()));
+                .set(Instance.CREATE_TIME, String.valueOf(System.currentTimeMillis()));
 
         HostDescription hostDesc = new DefaultHostDescription(
                 vsgMac,
@@ -244,9 +243,9 @@
                 .fromApp(appId)
                 .withSelector(selector)
                 .withTreatment(treatment)
-                .withPriority(PRIORITY_DEFAULT)
+                .withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
                 .forDevice(vsgVm.deviceId())
-                .forTable(TABLE_VLAN)
+                .forTable(CordVtnPipeline.TABLE_VLAN)
                 .makePermanent()
                 .build();
 
@@ -267,9 +266,9 @@
                 .fromApp(appId)
                 .withSelector(selector)
                 .withTreatment(treatment)
-                .withPriority(PRIORITY_DEFAULT)
+                .withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
                 .forDevice(vsgVm.deviceId())
-                .forTable(TABLE_VLAN)
+                .forTable(CordVtnPipeline.TABLE_VLAN)
                 .makePermanent()
                 .build();
 
@@ -285,7 +284,7 @@
 
             TrafficTreatment downstreamTreatment = DefaultTrafficTreatment.builder()
                     .pushVlan()
-                    .setVlanId(VLAN_WAN)
+                    .setVlanId(CordVtnPipeline.VLAN_WAN)
                     .setEthDst(vsgVm.mac())
                     .setOutput(vsgVm.portNumber())
                     .build();
@@ -294,9 +293,9 @@
                     .fromApp(appId)
                     .withSelector(downstream)
                     .withTreatment(downstreamTreatment)
-                    .withPriority(PRIORITY_DEFAULT)
+                    .withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
                     .forDevice(vsgVm.deviceId())
-                    .forTable(TABLE_DST_IP)
+                    .forTable(CordVtnPipeline.TABLE_DST_IP)
                     .makePermanent()
                     .build();
 
diff --git a/src/main/java/org/onosproject/cordvtn/impl/service/package-info.java b/src/main/java/org/opencord/cordvtn/impl/service/package-info.java
similarity index 93%
rename from src/main/java/org/onosproject/cordvtn/impl/service/package-info.java
rename to src/main/java/org/opencord/cordvtn/impl/service/package-info.java
index 035b012..7d00d9f 100644
--- a/src/main/java/org/onosproject/cordvtn/impl/service/package-info.java
+++ b/src/main/java/org/opencord/cordvtn/impl/service/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Implementation of instance handlers for various network services.
  */
-package org.onosproject.cordvtn.impl.service;
\ No newline at end of file
+package org.opencord.cordvtn.impl.service;
\ No newline at end of file
diff --git a/src/main/java/org/onosproject/cordvtn/rest/CordVtnWebApplication.java b/src/main/java/org/opencord/cordvtn/rest/CordVtnWebApplication.java
similarity index 96%
rename from src/main/java/org/onosproject/cordvtn/rest/CordVtnWebApplication.java
rename to src/main/java/org/opencord/cordvtn/rest/CordVtnWebApplication.java
index e1193df..a9af9d2 100644
--- a/src/main/java/org/onosproject/cordvtn/rest/CordVtnWebApplication.java
+++ b/src/main/java/org/opencord/cordvtn/rest/CordVtnWebApplication.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.cordvtn.rest;
+package org.opencord.cordvtn.rest;
 
 import org.onlab.rest.AbstractWebApplication;
 
diff --git a/src/main/java/org/onosproject/cordvtn/rest/NeutronMl2NetworksWebResource.java b/src/main/java/org/opencord/cordvtn/rest/NeutronMl2NetworksWebResource.java
similarity index 97%
rename from src/main/java/org/onosproject/cordvtn/rest/NeutronMl2NetworksWebResource.java
rename to src/main/java/org/opencord/cordvtn/rest/NeutronMl2NetworksWebResource.java
index ebb3be4..5e0a580 100644
--- a/src/main/java/org/onosproject/cordvtn/rest/NeutronMl2NetworksWebResource.java
+++ b/src/main/java/org/opencord/cordvtn/rest/NeutronMl2NetworksWebResource.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.rest;
+package org.opencord.cordvtn.rest;
 
 import org.onosproject.rest.AbstractWebResource;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/onosproject/cordvtn/rest/NeutronMl2PortsWebResource.java b/src/main/java/org/opencord/cordvtn/rest/NeutronMl2PortsWebResource.java
similarity index 97%
rename from src/main/java/org/onosproject/cordvtn/rest/NeutronMl2PortsWebResource.java
rename to src/main/java/org/opencord/cordvtn/rest/NeutronMl2PortsWebResource.java
index bf8d79d..f47f9db 100644
--- a/src/main/java/org/onosproject/cordvtn/rest/NeutronMl2PortsWebResource.java
+++ b/src/main/java/org/opencord/cordvtn/rest/NeutronMl2PortsWebResource.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.rest;
+package org.opencord.cordvtn.rest;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -21,7 +21,7 @@
 import org.onlab.osgi.DefaultServiceDirectory;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.MacAddress;
-import org.onosproject.cordvtn.impl.service.VsgInstanceHandler;
+import org.opencord.cordvtn.impl.service.VsgInstanceHandler;
 import org.onosproject.net.HostId;
 import org.onosproject.rest.AbstractWebResource;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/onosproject/cordvtn/rest/NeutronMl2SubnetsWebResource.java b/src/main/java/org/opencord/cordvtn/rest/NeutronMl2SubnetsWebResource.java
similarity index 97%
rename from src/main/java/org/onosproject/cordvtn/rest/NeutronMl2SubnetsWebResource.java
rename to src/main/java/org/opencord/cordvtn/rest/NeutronMl2SubnetsWebResource.java
index c6b9544..71ebbb0 100644
--- a/src/main/java/org/onosproject/cordvtn/rest/NeutronMl2SubnetsWebResource.java
+++ b/src/main/java/org/opencord/cordvtn/rest/NeutronMl2SubnetsWebResource.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.rest;
+package org.opencord.cordvtn.rest;
 
 import org.onosproject.rest.AbstractWebResource;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/onosproject/cordvtn/rest/ServiceDependencyWebResource.java b/src/main/java/org/opencord/cordvtn/rest/ServiceDependencyWebResource.java
similarity index 97%
rename from src/main/java/org/onosproject/cordvtn/rest/ServiceDependencyWebResource.java
rename to src/main/java/org/opencord/cordvtn/rest/ServiceDependencyWebResource.java
index f7ddf96..4d27856 100644
--- a/src/main/java/org/onosproject/cordvtn/rest/ServiceDependencyWebResource.java
+++ b/src/main/java/org/opencord/cordvtn/rest/ServiceDependencyWebResource.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordvtn.rest;
+package org.opencord.cordvtn.rest;
 
-import org.onosproject.cordvtn.api.CordVtnService;
+import org.opencord.cordvtn.api.CordVtnService;
 import org.onosproject.rest.AbstractWebResource;
 import org.onosproject.xosclient.api.VtnServiceId;
 
diff --git a/src/main/java/org/onosproject/cordvtn/rest/package-info.java b/src/main/java/org/opencord/cordvtn/rest/package-info.java
similarity index 94%
rename from src/main/java/org/onosproject/cordvtn/rest/package-info.java
rename to src/main/java/org/opencord/cordvtn/rest/package-info.java
index 0b7e606..8f163c3 100644
--- a/src/main/java/org/onosproject/cordvtn/rest/package-info.java
+++ b/src/main/java/org/opencord/cordvtn/rest/package-info.java
@@ -17,4 +17,4 @@
 /**
  * REST APIs for CORD VTN.
  */
-package org.onosproject.cordvtn.rest;
\ No newline at end of file
+package org.opencord.cordvtn.rest;
\ No newline at end of file
diff --git a/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 07704ce..0e717d5 100644
--- a/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -17,19 +17,19 @@
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.onosproject.cordvtn.cli.CordVtnNodeListCommand"/>
+            <action class="org.opencord.cordvtn.cli.CordVtnNodeListCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.cordvtn.cli.CordVtnNodeDeleteCommand"/>
+            <action class="org.opencord.cordvtn.cli.CordVtnNodeDeleteCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.cordvtn.cli.CordVtnNodeInitCommand"/>
+            <action class="org.opencord.cordvtn.cli.CordVtnNodeInitCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.cordvtn.cli.CordVtnNodeCheckCommand"/>
+            <action class="org.opencord.cordvtn.cli.CordVtnNodeCheckCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.cordvtn.cli.CordVtnFlushRules"/>
+            <action class="org.opencord.cordvtn.cli.CordVtnFlushRules"/>
         </command>
     </command-bundle>
 </blueprint>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 37aea15..bc179aa 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -45,7 +45,7 @@
         <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
-            <param-value>org.onosproject.cordvtn.rest.CordVtnWebApplication</param-value>
+            <param-value>org.opencord.cordvtn.rest.CordVtnWebApplication</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>