diff --git a/app/src/main/java/org/onosproject/olt/impl/package-info.java b/app/src/main/java/org/onosproject/olt/impl/package-info.java
deleted file mode 100644
index 238823b..0000000
--- a/app/src/main/java/org/onosproject/olt/impl/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2016-present Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * OLT application handling PMC OLT hardware.
- */
-package org.onosproject.olt.impl;
diff --git a/app/src/main/java/org/onosproject/olt/cli/ShowOltCommand.java b/app/src/main/java/org/opencord/olt/cli/ShowOltCommand.java
similarity index 95%
rename from app/src/main/java/org/onosproject/olt/cli/ShowOltCommand.java
rename to app/src/main/java/org/opencord/olt/cli/ShowOltCommand.java
index a59714b..24d0828 100644
--- a/app/src/main/java/org/onosproject/olt/cli/ShowOltCommand.java
+++ b/app/src/main/java/org/opencord/olt/cli/ShowOltCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.onosproject.olt.cli;
+package org.opencord.olt.cli;
 
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.cordconfig.access.AccessDeviceData;
 import org.onosproject.net.DeviceId;
-import org.onosproject.olt.AccessDeviceService;
+import org.opencord.olt.AccessDeviceService;
 
 import java.util.Map;
 
diff --git a/app/src/main/java/org/onosproject/olt/cli/ShowSubscribersCommand.java b/app/src/main/java/org/opencord/olt/cli/ShowSubscribersCommand.java
similarity index 94%
rename from app/src/main/java/org/onosproject/olt/cli/ShowSubscribersCommand.java
rename to app/src/main/java/org/opencord/olt/cli/ShowSubscribersCommand.java
index aee7b4d..08952eb 100644
--- a/app/src/main/java/org/onosproject/olt/cli/ShowSubscribersCommand.java
+++ b/app/src/main/java/org/opencord/olt/cli/ShowSubscribersCommand.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onosproject.olt.cli;
+package org.opencord.olt.cli;
 
 import org.apache.karaf.shell.commands.Command;
 import org.onlab.packet.VlanId;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.net.ConnectPoint;
-import org.onosproject.olt.AccessDeviceService;
+import org.opencord.olt.AccessDeviceService;
 
 import java.util.Map;
 
diff --git a/app/src/main/java/org/onosproject/olt/cli/SubscriberAddCommand.java b/app/src/main/java/org/opencord/olt/cli/SubscriberAddCommand.java
similarity index 96%
rename from app/src/main/java/org/onosproject/olt/cli/SubscriberAddCommand.java
rename to app/src/main/java/org/opencord/olt/cli/SubscriberAddCommand.java
index 94578a7..9cf526d 100644
--- a/app/src/main/java/org/onosproject/olt/cli/SubscriberAddCommand.java
+++ b/app/src/main/java/org/opencord/olt/cli/SubscriberAddCommand.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.olt.cli;
+package org.opencord.olt.cli;
 
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
@@ -23,7 +23,7 @@
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
-import org.onosproject.olt.AccessDeviceService;
+import org.opencord.olt.AccessDeviceService;
 
 /**
  * Adds a subscriber to an access device.
diff --git a/app/src/main/java/org/onosproject/olt/cli/SubscriberRemoveCommand.java b/app/src/main/java/org/opencord/olt/cli/SubscriberRemoveCommand.java
similarity index 95%
rename from app/src/main/java/org/onosproject/olt/cli/SubscriberRemoveCommand.java
rename to app/src/main/java/org/opencord/olt/cli/SubscriberRemoveCommand.java
index b119095..29bfd20 100644
--- a/app/src/main/java/org/onosproject/olt/cli/SubscriberRemoveCommand.java
+++ b/app/src/main/java/org/opencord/olt/cli/SubscriberRemoveCommand.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.olt.cli;
+package org.opencord.olt.cli;
 
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
@@ -22,7 +22,7 @@
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
-import org.onosproject.olt.AccessDeviceService;
+import org.opencord.olt.AccessDeviceService;
 
 /**
  * Adds a subscriber to an access device.
diff --git a/app/src/main/java/org/onosproject/olt/cli/package-info.java b/app/src/main/java/org/opencord/olt/cli/package-info.java
similarity index 95%
rename from app/src/main/java/org/onosproject/olt/cli/package-info.java
rename to app/src/main/java/org/opencord/olt/cli/package-info.java
index 3b97404..d5805ce 100644
--- a/app/src/main/java/org/onosproject/olt/cli/package-info.java
+++ b/app/src/main/java/org/opencord/olt/cli/package-info.java
@@ -17,4 +17,4 @@
 /**
  * OLT application handling PMC OLT hardware.
  */
-package org.onosproject.olt.cli;
+package org.opencord.olt.cli;
diff --git a/app/src/main/java/org/onosproject/olt/impl/Olt.java b/app/src/main/java/org/opencord/olt/impl/Olt.java
similarity index 98%
rename from app/src/main/java/org/onosproject/olt/impl/Olt.java
rename to app/src/main/java/org/opencord/olt/impl/Olt.java
index 7075213..5e9a413 100644
--- a/app/src/main/java/org/onosproject/olt/impl/Olt.java
+++ b/app/src/main/java/org/opencord/olt/impl/Olt.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.olt.impl;
+package org.opencord.olt.impl;
 
 import com.google.common.collect.Maps;
 import org.apache.felix.scr.annotations.Activate;
@@ -58,9 +58,9 @@
 import org.onosproject.net.flowobjective.Objective;
 import org.onosproject.net.flowobjective.ObjectiveContext;
 import org.onosproject.net.flowobjective.ObjectiveError;
-import org.onosproject.olt.AccessDeviceEvent;
-import org.onosproject.olt.AccessDeviceListener;
-import org.onosproject.olt.AccessDeviceService;
+import org.opencord.olt.AccessDeviceEvent;
+import org.opencord.olt.AccessDeviceListener;
+import org.opencord.olt.AccessDeviceService;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.service.Serializer;
 import org.onosproject.store.service.StorageService;
diff --git a/app/src/main/java/org/onosproject/olt/cli/package-info.java b/app/src/main/java/org/opencord/olt/impl/package-info.java
similarity index 95%
copy from app/src/main/java/org/onosproject/olt/cli/package-info.java
copy to app/src/main/java/org/opencord/olt/impl/package-info.java
index 3b97404..5ea7afd 100644
--- a/app/src/main/java/org/onosproject/olt/cli/package-info.java
+++ b/app/src/main/java/org/opencord/olt/impl/package-info.java
@@ -17,4 +17,4 @@
 /**
  * OLT application handling PMC OLT hardware.
  */
-package org.onosproject.olt.cli;
+package org.opencord.olt.impl;
diff --git a/app/src/main/java/org/onosproject/olt/rest/OltWebResource.java b/app/src/main/java/org/opencord/olt/rest/OltWebResource.java
similarity index 96%
rename from app/src/main/java/org/onosproject/olt/rest/OltWebResource.java
rename to app/src/main/java/org/opencord/olt/rest/OltWebResource.java
index 84536ac..18b0221 100644
--- a/app/src/main/java/org/onosproject/olt/rest/OltWebResource.java
+++ b/app/src/main/java/org/opencord/olt/rest/OltWebResource.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.olt.rest;
+package org.opencord.olt.rest;
 
 import javax.ws.rs.DELETE;
 import javax.ws.rs.POST;
@@ -27,7 +27,7 @@
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
-import org.onosproject.olt.AccessDeviceService;
+import org.opencord.olt.AccessDeviceService;
 import org.onosproject.rest.AbstractWebResource;
 
 /**
diff --git a/app/src/main/java/org/onosproject/olt/rest/package-info.java b/app/src/main/java/org/opencord/olt/rest/package-info.java
similarity index 94%
rename from app/src/main/java/org/onosproject/olt/rest/package-info.java
rename to app/src/main/java/org/opencord/olt/rest/package-info.java
index c0ddb5f..7bfc3c6 100644
--- a/app/src/main/java/org/onosproject/olt/rest/package-info.java
+++ b/app/src/main/java/org/opencord/olt/rest/package-info.java
@@ -17,4 +17,4 @@
 /**
  * REST APIs for the OLT application.
  */
-package org.onosproject.olt.rest;
+package org.opencord.olt.rest;
diff --git a/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 3830357..b30fb06 100644
--- a/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -17,28 +17,28 @@
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.onosproject.olt.cli.SubscriberAddCommand"/>
+            <action class="org.opencord.olt.cli.SubscriberAddCommand"/>
             <completers>
                 <ref component-id="deviceIdCompleter"/>
                 <null/>
             </completers>
         </command>
         <command>
-            <action class="org.onosproject.olt.cli.SubscriberRemoveCommand"/>
+            <action class="org.opencord.olt.cli.SubscriberRemoveCommand"/>
             <completers>
                 <ref component-id="deviceIdCompleter"/>
                 <null/>
             </completers>
         </command>
         <command>
-            <action class="org.onosproject.olt.cli.ShowOltCommand"/>
+            <action class="org.opencord.olt.cli.ShowOltCommand"/>
             <completers>
                 <ref component-id="deviceIdCompleter"/>
                 <null/>
             </completers>
         </command>
         <command>
-            <action class="org.onosproject.olt.cli.ShowSubscribersCommand"/>
+            <action class="org.opencord.olt.cli.ShowSubscribersCommand"/>
         </command>
     </command-bundle>
 
diff --git a/app/src/main/webapp/WEB-INF/web.xml b/app/src/main/webapp/WEB-INF/web.xml
index f463194..a598262 100644
--- a/app/src/main/webapp/WEB-INF/web.xml
+++ b/app/src/main/webapp/WEB-INF/web.xml
@@ -26,7 +26,7 @@
         <init-param>
             <param-name>jersey.config.server.provider.classnames</param-name>
             <param-value>
-                org.onosproject.olt.rest.OltWebResource
+                org.opencord.olt.rest.OltWebResource
             </param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>