diff --git a/openflow/api/pom.xml b/openflow/api/pom.xml
index 9e63684..3ed1e3f 100644
--- a/openflow/api/pom.xml
+++ b/openflow/api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onlab.onos</groupId>
+        <groupId>org.onosproject</groupId>
         <artifactId>onos-of</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -77,7 +77,7 @@
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            org.onlab.onos.openflow.*,org.projectfloodlight.openflow.*
+                            org.onosproject.openflow.*,org.projectfloodlight.openflow.*
                         </Export-Package>
                     </instructions>
                 </configuration>
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java
index 7924b9d..6ac7cbf 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller;
+package org.onosproject.openflow.controller;
 
 
 import java.util.Collections;
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/Dpid.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/Dpid.java
index 6258f3a..cbfaa3e 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/Dpid.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/Dpid.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller;
+package org.onosproject.openflow.controller;
 
 import org.projectfloodlight.openflow.util.HexString;
 
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowController.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowController.java
index c48291f..d8a005d 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowController.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowController.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller;
+package org.onosproject.openflow.controller;
 
 import org.projectfloodlight.openflow.protocol.OFMessage;
 
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowEventListener.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowEventListener.java
index fc9a872..416a6e7 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowEventListener.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowEventListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller;
+package org.onosproject.openflow.controller;
 
 import org.projectfloodlight.openflow.protocol.OFMessage;
 
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java
index 0d085dd..9f381cf 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller;
+package org.onosproject.openflow.controller;
 
 import org.onlab.packet.Ethernet;
 import org.projectfloodlight.openflow.types.OFPort;
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java
index bd90241..c6f923d 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller;
+package org.onosproject.openflow.controller;
 
 import java.util.List;
 
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitchListener.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitchListener.java
index 3b6450b..248e2fc 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitchListener.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitchListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller;
+package org.onosproject.openflow.controller;
 
 import org.projectfloodlight.openflow.protocol.OFPortStatus;
 
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/PacketListener.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/PacketListener.java
index 2073206..3570a1e 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/PacketListener.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/PacketListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller;
+package org.onosproject.openflow.controller;
 
 /**
  * Notifies providers about Packet in events.
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/RoleState.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/RoleState.java
index c925337..b8304f3 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/RoleState.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/RoleState.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller;
+package org.onosproject.openflow.controller;
 
 import org.projectfloodlight.openflow.protocol.OFControllerRole;
 
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
index 3a19d14..f08c411 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onlab.onos.openflow.controller.driver;
+package org.onosproject.openflow.controller.driver;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -22,8 +22,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.jboss.netty.channel.Channel;
-import org.onlab.onos.openflow.controller.Dpid;
-import org.onlab.onos.openflow.controller.RoleState;
+import org.onosproject.openflow.controller.Dpid;
+import org.onosproject.openflow.controller.RoleState;
 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
 import org.projectfloodlight.openflow.protocol.OFErrorMsg;
 import org.projectfloodlight.openflow.protocol.OFExperimenter;
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowAgent.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowAgent.java
index 468d3ae..23924a7 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowAgent.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowAgent.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller.driver;
+package org.onosproject.openflow.controller.driver;
 
-import org.onlab.onos.openflow.controller.Dpid;
-import org.onlab.onos.openflow.controller.OpenFlowSwitch;
-import org.onlab.onos.openflow.controller.RoleState;
+import org.onosproject.openflow.controller.Dpid;
+import org.onosproject.openflow.controller.OpenFlowSwitch;
+import org.onosproject.openflow.controller.RoleState;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 
 /**
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriver.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriver.java
index b6a4770..c6f83e2 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriver.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriver.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller.driver;
+package org.onosproject.openflow.controller.driver;
 
 import java.util.List;
 
 import org.jboss.netty.channel.Channel;
-import org.onlab.onos.openflow.controller.OpenFlowSwitch;
+import org.onosproject.openflow.controller.OpenFlowSwitch;
 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
 import org.projectfloodlight.openflow.protocol.OFErrorMsg;
 import org.projectfloodlight.openflow.protocol.OFFeaturesReply;
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriverFactory.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
index 106939c..98030fe 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller.driver;
+package org.onosproject.openflow.controller.driver;
 
-import org.onlab.onos.openflow.controller.Dpid;
+import org.onosproject.openflow.controller.Dpid;
 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
 import org.projectfloodlight.openflow.protocol.OFVersion;
 
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleHandler.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleHandler.java
index c32d298..d930aaa 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleHandler.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleHandler.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller.driver;
+package org.onosproject.openflow.controller.driver;
 
 import java.io.IOException;
 
-import org.onlab.onos.openflow.controller.RoleState;
+import org.onosproject.openflow.controller.RoleState;
 import org.projectfloodlight.openflow.protocol.OFErrorMsg;
 import org.projectfloodlight.openflow.protocol.OFExperimenter;
 import org.projectfloodlight.openflow.protocol.OFRoleReply;
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleRecvStatus.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleRecvStatus.java
index b6d8b66..88c4cc7 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleRecvStatus.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleRecvStatus.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller.driver;
+package org.onosproject.openflow.controller.driver;
 
 /**
  * When we remove a pending role request we use this enum to indicate how we
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleReplyInfo.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleReplyInfo.java
index 6efb333..dc9b6ba 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleReplyInfo.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleReplyInfo.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller.driver;
+package org.onosproject.openflow.controller.driver;
 
-import org.onlab.onos.openflow.controller.RoleState;
+import org.onosproject.openflow.controller.RoleState;
 import org.projectfloodlight.openflow.types.U64;
 
 /**
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java
index ab54bf2..96b4bd7 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller.driver;
+package org.onosproject.openflow.controller.driver;
 
 /**
  * Thrown when IOFSwitch.startDriverHandshake() is called more than once.
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java
index 19959ac..b0f59fe 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller.driver;
+package org.onosproject.openflow.controller.driver;
 
 import org.projectfloodlight.openflow.protocol.OFMessage;
 
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeException.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeException.java
index 6bc9c9a..1bc750a 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeException.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller.driver;
+package org.onosproject.openflow.controller.driver;
 
 /**
  * Base class for exception thrown by switch driver sub-handshake processing.
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java
index 8c76e6b..a073683 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller.driver;
+package org.onosproject.openflow.controller.driver;
 
 /**
  * Thrown when a switch driver's sub-handshake has not been started but an
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java
index 868c5fc..3f4be81 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller.driver;
+package org.onosproject.openflow.controller.driver;
 
 /**
  * Thrown when a switch driver's sub-handshake state-machine receives an
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchStateException.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchStateException.java
index 83d3342..30c4e91 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchStateException.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchStateException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onlab.onos.openflow.controller.driver;
+package org.onosproject.openflow.controller.driver;
 
 /**
  * This exception indicates an error or unexpected message during
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/package-info.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/package-info.java
index 4468416..c03a584 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/package-info.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/package-info.java
@@ -17,4 +17,4 @@
 /**
  * OpenFlow controller switch driver API.
  */
-package org.onlab.onos.openflow.controller.driver;
+package org.onosproject.openflow.controller.driver;
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/package-info.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/package-info.java
index 5be06df..5477842 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/package-info.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/package-info.java
@@ -17,4 +17,4 @@
 /**
  * OpenFlow controller API.
  */
-package org.onlab.onos.openflow.controller;
+package org.onosproject.openflow.controller;
diff --git a/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java b/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java
index 116ccb2..580fbdc 100644
--- a/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java
+++ b/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.openflow.controller;
+package org.onosproject.openflow.controller;
 
 import org.projectfloodlight.openflow.protocol.OFMessage;