diff --git a/pom.xml b/pom.xml
index b650b2b..1f4086e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,6 @@
         <module>cli</module>
 
         <module>protocols</module>
-        <module>openflow</module>
         <module>ovsdb</module>
         <module>netconf</module>
         <module>pcep</module>
diff --git a/openflow/api/pom.xml b/protocols/openflow/api/pom.xml
similarity index 100%
rename from openflow/api/pom.xml
rename to protocols/openflow/api/pom.xml
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/Dpid.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/Dpid.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/Dpid.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/Dpid.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/ExtensionInterpreter.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/ExtensionInterpreter.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/ExtensionInterpreter.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/ExtensionInterpreter.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowController.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowController.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowController.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowController.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowEventListener.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowEventListener.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowEventListener.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowEventListener.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowOpticalSwitch.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowOpticalSwitch.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowOpticalSwitch.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowOpticalSwitch.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitchListener.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitchListener.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitchListener.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitchListener.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/PacketListener.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/PacketListener.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/PacketListener.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/PacketListener.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/PortDescPropertyType.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/PortDescPropertyType.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/PortDescPropertyType.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/PortDescPropertyType.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/RoleState.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/RoleState.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/RoleState.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/RoleState.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/ThirdPartyMessage.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/ThirdPartyMessage.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/ThirdPartyMessage.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/ThirdPartyMessage.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/WithTypedPorts.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/WithTypedPorts.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/WithTypedPorts.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/WithTypedPorts.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowAgent.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowAgent.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowAgent.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowAgent.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriver.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriver.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriver.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriver.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriverFactory.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleHandler.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleHandler.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleHandler.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleHandler.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleRecvStatus.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleRecvStatus.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleRecvStatus.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleRecvStatus.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleReplyInfo.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleReplyInfo.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleReplyInfo.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleReplyInfo.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeException.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeException.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeException.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeException.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchStateException.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchStateException.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchStateException.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchStateException.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/package-info.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/package-info.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/driver/package-info.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/package-info.java
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/package-info.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/package-info.java
similarity index 100%
rename from openflow/api/src/main/java/org/onosproject/openflow/controller/package-info.java
rename to protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/package-info.java
diff --git a/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java b/protocols/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java
similarity index 100%
rename from openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java
rename to protocols/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java
diff --git a/openflow/ctl/pom.xml b/protocols/openflow/ctl/pom.xml
similarity index 100%
rename from openflow/ctl/pom.xml
rename to protocols/openflow/ctl/pom.xml
diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java
rename to protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java
diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/HandshakeTimeoutException.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/HandshakeTimeoutException.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/HandshakeTimeoutException.java
rename to protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/HandshakeTimeoutException.java
diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/HandshakeTimeoutHandler.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/HandshakeTimeoutHandler.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/HandshakeTimeoutHandler.java
rename to protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/HandshakeTimeoutHandler.java
diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
rename to protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageDecoder.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageDecoder.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageDecoder.java
rename to protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageDecoder.java
diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java
rename to protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java
diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
rename to protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenflowPipelineFactory.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenflowPipelineFactory.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenflowPipelineFactory.java
rename to protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenflowPipelineFactory.java
diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/RoleManager.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/RoleManager.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/RoleManager.java
rename to protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/RoleManager.java
diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/package-info.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/package-info.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/package-info.java
rename to protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/package-info.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/ChannelAdapter.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/ChannelAdapter.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/ChannelAdapter.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/ChannelAdapter.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/ChannelHandlerContextAdapter.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/ChannelHandlerContextAdapter.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/ChannelHandlerContextAdapter.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/ChannelHandlerContextAdapter.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/DriverAdapter.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/DriverAdapter.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/DriverAdapter.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/DriverAdapter.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/DriverServiceAdapter.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/DriverServiceAdapter.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/DriverServiceAdapter.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/DriverServiceAdapter.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/ExecutorServiceAdapter.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/ExecutorServiceAdapter.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/ExecutorServiceAdapter.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/ExecutorServiceAdapter.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/MockOfFeaturesReply.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/MockOfFeaturesReply.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/MockOfFeaturesReply.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/MockOfFeaturesReply.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/MockOfPacketIn.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/MockOfPacketIn.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/MockOfPacketIn.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/MockOfPacketIn.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/MockOfPortStatus.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/MockOfPortStatus.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/MockOfPortStatus.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/MockOfPortStatus.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/OFDescStatsReplyAdapter.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/OFDescStatsReplyAdapter.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/OFDescStatsReplyAdapter.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/OFDescStatsReplyAdapter.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/OfMessageAdapter.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/OfMessageAdapter.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/OfMessageAdapter.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/OfMessageAdapter.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/OpenFlowSwitchListenerAdapter.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/OpenFlowSwitchListenerAdapter.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/OpenFlowSwitchListenerAdapter.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/OpenFlowSwitchListenerAdapter.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/OpenflowSwitchDriverAdapter.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/OpenflowSwitchDriverAdapter.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/OpenflowSwitchDriverAdapter.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/OpenflowSwitchDriverAdapter.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/ControllerTest.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/ControllerTest.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/ControllerTest.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/ControllerTest.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageDecoderTest.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageDecoderTest.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageDecoderTest.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageDecoderTest.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageEncoderTest.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageEncoderTest.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageEncoderTest.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OFMessageEncoderTest.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplPacketsTest.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplPacketsTest.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplPacketsTest.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplPacketsTest.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplTest.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplTest.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplTest.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplTest.java
diff --git a/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/RoleManagerTest.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/RoleManagerTest.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/RoleManagerTest.java
rename to protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/RoleManagerTest.java
diff --git a/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplSpringOpenTTPDellOSR.java b/protocols/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplSpringOpenTTPDellOSR.java
similarity index 100%
rename from openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplSpringOpenTTPDellOSR.java
rename to protocols/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplSpringOpenTTPDellOSR.java
diff --git a/openflow/pom.xml b/protocols/openflow/pom.xml
similarity index 100%
rename from openflow/pom.xml
rename to protocols/openflow/pom.xml
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 46fdc3c..6c578e9 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -32,8 +32,8 @@
     <description>ONOS south-bound protocols</description>
 
     <modules>
-        <!--
         <module>openflow</module>
+        <!--
         <module>ovsdb</module>
         <module>netconf</module>
         <module>pcep</module>