diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/package-info.java b/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/package-info.java
deleted file mode 100644
index f64ba6c..0000000
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * OpenFlow controller switch driver API.
- */
-package org.onlab.onos.of.controller.driver;
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/package-info.java b/openflow/api/src/main/java/org/onlab/onos/of/controller/package-info.java
deleted file mode 100644
index 888bcce..0000000
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * OpenFlow controller API.
- */
-package org.onlab.onos.of.controller;
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/DefaultOpenFlowPacketContext.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/DefaultOpenFlowPacketContext.java
similarity index 98%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/DefaultOpenFlowPacketContext.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/DefaultOpenFlowPacketContext.java
index 45f615a..f419d24 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/DefaultOpenFlowPacketContext.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/DefaultOpenFlowPacketContext.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import static org.slf4j.LoggerFactory.getLogger;
 
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/Dpid.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/Dpid.java
similarity index 98%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/Dpid.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/Dpid.java
index ca3d8e6..29a427a 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/Dpid.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/Dpid.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import org.projectfloodlight.openflow.util.HexString;
 
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/OpenFlowController.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowController.java
similarity index 98%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/OpenFlowController.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowController.java
index ab80eee..6b2ca9c 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/OpenFlowController.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowController.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import org.projectfloodlight.openflow.protocol.OFMessage;
 
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/OpenFlowPacketContext.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowPacketContext.java
similarity index 97%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/OpenFlowPacketContext.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowPacketContext.java
index 0e90f95..9d07c2f 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/OpenFlowPacketContext.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowPacketContext.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import org.onlab.packet.Ethernet;
 import org.projectfloodlight.openflow.types.OFPort;
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/OpenFlowSwitch.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowSwitch.java
similarity index 97%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/OpenFlowSwitch.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowSwitch.java
index f16bb88..424e63c 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/OpenFlowSwitch.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowSwitch.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import java.util.List;
 
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/OpenFlowSwitchListener.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowSwitchListener.java
similarity index 94%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/OpenFlowSwitchListener.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowSwitchListener.java
index ae5e3a8..c7cc287 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/OpenFlowSwitchListener.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowSwitchListener.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import org.projectfloodlight.openflow.protocol.OFPortStatus;
 
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/PacketListener.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/PacketListener.java
similarity index 84%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/PacketListener.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/PacketListener.java
index 6bd39b8..06c43d6 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/PacketListener.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/PacketListener.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 /**
  * Notifies providers about Packet in events.
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/RoleState.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/RoleState.java
similarity index 93%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/RoleState.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/RoleState.java
index db8efd1..6a32301 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/RoleState.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/RoleState.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.of.controller;
+package org.onlab.onos.openflow.controller;
 
 import org.projectfloodlight.openflow.protocol.OFControllerRole;
 
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/AbstractOpenFlowSwitch.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/AbstractOpenFlowSwitch.java
similarity index 98%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/driver/AbstractOpenFlowSwitch.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/AbstractOpenFlowSwitch.java
index d7e0186..ae36381 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/AbstractOpenFlowSwitch.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/AbstractOpenFlowSwitch.java
@@ -15,7 +15,7 @@
  *    under the License.
  **/
 
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -23,8 +23,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.jboss.netty.channel.Channel;
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.RoleState;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.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/onlab/onos/of/controller/driver/OpenFlowAgent.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowAgent.java
similarity index 93%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/driver/OpenFlowAgent.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowAgent.java
index 0d37666..1261715 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/OpenFlowAgent.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowAgent.java
@@ -1,7 +1,7 @@
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
-import org.onlab.onos.of.controller.Dpid;
-import org.onlab.onos.of.controller.OpenFlowSwitch;
+import org.onlab.onos.openflow.controller.Dpid;
+import org.onlab.onos.openflow.controller.OpenFlowSwitch;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 
 /**
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/OpenFlowSwitchDriver.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowSwitchDriver.java
similarity index 97%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/driver/OpenFlowSwitchDriver.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowSwitchDriver.java
index be99973..849e1c5 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/OpenFlowSwitchDriver.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowSwitchDriver.java
@@ -1,9 +1,9 @@
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 import java.util.List;
 
 import org.jboss.netty.channel.Channel;
-import org.onlab.onos.of.controller.OpenFlowSwitch;
+import org.onlab.onos.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/onlab/onos/of/controller/driver/OpenFlowSwitchDriverFactory.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
similarity index 86%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/driver/OpenFlowSwitchDriverFactory.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
index 4e84d28..5ee85cb 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/OpenFlowSwitchDriverFactory.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
@@ -1,6 +1,6 @@
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
-import org.onlab.onos.of.controller.Dpid;
+import org.onlab.onos.openflow.controller.Dpid;
 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
 import org.projectfloodlight.openflow.protocol.OFVersion;
 
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/RoleHandler.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleHandler.java
similarity index 96%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/driver/RoleHandler.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleHandler.java
index bfded52..406ab74 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/RoleHandler.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleHandler.java
@@ -1,8 +1,8 @@
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 import java.io.IOException;
 
-import org.onlab.onos.of.controller.RoleState;
+import org.onlab.onos.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/onlab/onos/of/controller/driver/RoleRecvStatus.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleRecvStatus.java
similarity index 95%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/driver/RoleRecvStatus.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleRecvStatus.java
index 0a10978..66bfb78 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/RoleRecvStatus.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleRecvStatus.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.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/onlab/onos/of/controller/driver/RoleReplyInfo.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleReplyInfo.java
similarity index 86%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/driver/RoleReplyInfo.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleReplyInfo.java
index cc3c483..9def335 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/RoleReplyInfo.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleReplyInfo.java
@@ -1,6 +1,6 @@
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
-import org.onlab.onos.of.controller.RoleState;
+import org.onlab.onos.openflow.controller.RoleState;
 import org.projectfloodlight.openflow.types.U64;
 
 /**
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java
similarity index 86%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java
index 16ed93a..9d17cd8 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 /**
  * Thrown when IOFSwitch.startDriverHandshake() is called more than once.
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeCompleted.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java
similarity index 91%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeCompleted.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java
index 1c6dac9..cfa5269 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeCompleted.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 import org.projectfloodlight.openflow.protocol.OFMessage;
 
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeException.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeException.java
similarity index 92%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeException.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeException.java
index 1c9a710..1e68023 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeException.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeException.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 /**
  * Base class for exception thrown by switch driver sub-handshake processing.
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeNotStarted.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java
similarity index 88%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeNotStarted.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java
index 0f34b0e..858ec09 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeNotStarted.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.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/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeStateException.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java
similarity index 88%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeStateException.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java
index 09e737e..805bb71 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchDriverSubHandshakeStateException.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 /**
  * Thrown when a switch driver's sub-handshake state-machine receives an
diff --git a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchStateException.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchStateException.java
similarity index 96%
rename from openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchStateException.java
rename to openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchStateException.java
index 55b12de..fc3e0a7 100644
--- a/openflow/api/src/main/java/org/onlab/onos/of/controller/driver/SwitchStateException.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchStateException.java
@@ -15,7 +15,7 @@
  *    under the License.
  **/
 
-package org.onlab.onos.of.controller.driver;
+package org.onlab.onos.openflow.controller.driver;
 
 /**
  * This exception indicates an error or unexpected message during
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/package-info.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/package-info.java
new file mode 100644
index 0000000..200e421
--- /dev/null
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * OpenFlow controller switch driver API.
+ */
+package org.onlab.onos.openflow.controller.driver;
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/package-info.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/package-info.java
new file mode 100644
index 0000000..154e389
--- /dev/null
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * OpenFlow controller API.
+ */
+package org.onlab.onos.openflow.controller;