diff --git a/pom.xml b/pom.xml
index 4d49aba..1db1107 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,9 +46,6 @@
         <module>cli</module>
 
         <module>protocols</module>
-        <!-- FIXME move to protocols/ -->
-        <module>bgp</module>
-
         <module>providers</module>
         <module>drivers</module>
 
diff --git a/bgp/api/pom.xml b/protocols/bgp/api/pom.xml
similarity index 100%
rename from bgp/api/pom.xml
rename to protocols/bgp/api/pom.xml
diff --git a/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpCfg.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpCfg.java
similarity index 100%
rename from bgp/api/src/main/java/org/onosproject/bgp/controller/BgpCfg.java
rename to protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpCfg.java
diff --git a/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpConnectPeer.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpConnectPeer.java
similarity index 100%
rename from bgp/api/src/main/java/org/onosproject/bgp/controller/BgpConnectPeer.java
rename to protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpConnectPeer.java
diff --git a/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpController.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpController.java
similarity index 100%
rename from bgp/api/src/main/java/org/onosproject/bgp/controller/BgpController.java
rename to protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpController.java
diff --git a/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpDpid.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpDpid.java
similarity index 100%
rename from bgp/api/src/main/java/org/onosproject/bgp/controller/BgpDpid.java
rename to protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpDpid.java
diff --git a/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpId.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpId.java
similarity index 100%
rename from bgp/api/src/main/java/org/onosproject/bgp/controller/BgpId.java
rename to protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpId.java
diff --git a/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpLinkListener.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpLinkListener.java
similarity index 100%
rename from bgp/api/src/main/java/org/onosproject/bgp/controller/BgpLinkListener.java
rename to protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpLinkListener.java
diff --git a/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpLocalRib.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpLocalRib.java
similarity index 100%
rename from bgp/api/src/main/java/org/onosproject/bgp/controller/BgpLocalRib.java
rename to protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpLocalRib.java
diff --git a/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpNodeListener.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpNodeListener.java
similarity index 100%
rename from bgp/api/src/main/java/org/onosproject/bgp/controller/BgpNodeListener.java
rename to protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpNodeListener.java
diff --git a/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPacketStats.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPacketStats.java
similarity index 100%
rename from bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPacketStats.java
rename to protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPacketStats.java
diff --git a/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPeer.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPeer.java
similarity index 100%
rename from bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPeer.java
rename to protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPeer.java
diff --git a/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPeerCfg.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPeerCfg.java
similarity index 100%
rename from bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPeerCfg.java
rename to protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPeerCfg.java
diff --git a/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPeerManager.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPeerManager.java
similarity index 100%
rename from bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPeerManager.java
rename to protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpPeerManager.java
diff --git a/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpSessionInfo.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpSessionInfo.java
similarity index 100%
rename from bgp/api/src/main/java/org/onosproject/bgp/controller/BgpSessionInfo.java
rename to protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/BgpSessionInfo.java
diff --git a/bgp/api/src/main/java/org/onosproject/bgp/controller/package-info.java b/protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/package-info.java
similarity index 100%
rename from bgp/api/src/main/java/org/onosproject/bgp/controller/package-info.java
rename to protocols/bgp/api/src/main/java/org/onosproject/bgp/controller/package-info.java
diff --git a/bgp/bgpio/pom.xml b/protocols/bgp/bgpio/pom.xml
similarity index 100%
rename from bgp/bgpio/pom.xml
rename to protocols/bgp/bgpio/pom.xml
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/exceptions/BgpParseException.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/exceptions/BgpParseException.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/exceptions/BgpParseException.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/exceptions/BgpParseException.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/exceptions/package-info.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/exceptions/package-info.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/exceptions/package-info.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/exceptions/package-info.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpFactories.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpFactories.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpFactories.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpFactories.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpFactory.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpFactory.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpFactory.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpFactory.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpKeepaliveMsg.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpKeepaliveMsg.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpKeepaliveMsg.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpKeepaliveMsg.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpLSNlri.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpLSNlri.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpLSNlri.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpLSNlri.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpLinkLsNlri.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpLinkLsNlri.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpLinkLsNlri.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpLinkLsNlri.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpMessage.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpMessage.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpMessage.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpMessage.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpMessageReader.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpMessageReader.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpMessageReader.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpMessageReader.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpMessageWriter.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpMessageWriter.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpMessageWriter.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpMessageWriter.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpNodeLSNlri.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpNodeLSNlri.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpNodeLSNlri.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpNodeLSNlri.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpNotificationMsg.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpNotificationMsg.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpNotificationMsg.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpNotificationMsg.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpOpenMsg.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpOpenMsg.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpOpenMsg.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpOpenMsg.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpPrefixLSNlri.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpPrefixLSNlri.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpPrefixLSNlri.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpPrefixLSNlri.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpType.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpType.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpType.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpType.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpUpdateMsg.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpUpdateMsg.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpUpdateMsg.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpUpdateMsg.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpVersion.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpVersion.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpVersion.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpVersion.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/IGPRouterID.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/IGPRouterID.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/IGPRouterID.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/IGPRouterID.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/NlriType.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/NlriType.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/NlriType.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/NlriType.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/Writeable.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/Writeable.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/Writeable.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/Writeable.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpLinkLSIdentifier.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpLinkLSIdentifier.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpLinkLSIdentifier.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpLinkLSIdentifier.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpLinkLsNlriVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpLinkLsNlriVer4.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpLinkLsNlriVer4.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpLinkLsNlriVer4.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpNodeLSIdentifier.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpNodeLSIdentifier.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpNodeLSIdentifier.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpNodeLSIdentifier.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpNodeLSNlriVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpNodeLSNlriVer4.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpNodeLSNlriVer4.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpNodeLSNlriVer4.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixIPv4LSNlriVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixIPv4LSNlriVer4.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixIPv4LSNlriVer4.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixIPv4LSNlriVer4.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixLSIdentifier.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixLSIdentifier.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixLSIdentifier.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixLSIdentifier.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/NodeDescriptors.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/NodeDescriptors.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/NodeDescriptors.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/NodeDescriptors.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/PathAttrNlriDetails.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/PathAttrNlriDetails.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/PathAttrNlriDetails.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/PathAttrNlriDetails.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/PathAttrNlriDetailsLocalRib.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/PathAttrNlriDetailsLocalRib.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/PathAttrNlriDetailsLocalRib.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/PathAttrNlriDetailsLocalRib.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/package-info.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/package-info.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/package-info.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/package-info.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/package-info.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/package-info.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/package-info.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/package-info.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpFactoryVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpFactoryVer4.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpFactoryVer4.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpFactoryVer4.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpKeepaliveMsgVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpKeepaliveMsgVer4.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpKeepaliveMsgVer4.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpKeepaliveMsgVer4.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpMessageVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpMessageVer4.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpMessageVer4.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpMessageVer4.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpNotificationMsgVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpNotificationMsgVer4.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpNotificationMsgVer4.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpNotificationMsgVer4.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpOpenMsgVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpOpenMsgVer4.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpOpenMsgVer4.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpOpenMsgVer4.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpPathAttributes.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpPathAttributes.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpPathAttributes.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpPathAttributes.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpUpdateMsgVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpUpdateMsgVer4.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpUpdateMsgVer4.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpUpdateMsgVer4.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/package-info.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/package-info.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/package-info.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/package-info.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/AreaIDTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/AreaIDTlv.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/AreaIDTlv.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/AreaIDTlv.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/As4Path.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/As4Path.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/As4Path.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/As4Path.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/AsPath.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/AsPath.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/AsPath.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/AsPath.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/AutonomousSystemTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/AutonomousSystemTlv.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/AutonomousSystemTlv.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/AutonomousSystemTlv.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpErrorType.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpErrorType.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpErrorType.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpErrorType.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpHeader.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpHeader.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpHeader.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpHeader.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpLSIdentifierTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpLSIdentifierTlv.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpLSIdentifierTlv.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpLSIdentifierTlv.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpValueType.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpValueType.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpValueType.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpValueType.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/FourOctetAsNumCapabilityTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/FourOctetAsNumCapabilityTlv.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/FourOctetAsNumCapabilityTlv.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/FourOctetAsNumCapabilityTlv.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPReachabilityInformationTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPReachabilityInformationTlv.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPReachabilityInformationTlv.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPReachabilityInformationTlv.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPv4AddressTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPv4AddressTlv.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPv4AddressTlv.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPv4AddressTlv.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPv6AddressTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPv6AddressTlv.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPv6AddressTlv.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IPv6AddressTlv.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IsIsNonPseudonode.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IsIsNonPseudonode.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IsIsNonPseudonode.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IsIsNonPseudonode.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IsIsPseudonode.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IsIsPseudonode.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IsIsPseudonode.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/IsIsPseudonode.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LinkLocalRemoteIdentifiersTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LinkLocalRemoteIdentifiersTlv.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LinkLocalRemoteIdentifiersTlv.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LinkLocalRemoteIdentifiersTlv.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LinkStateAttributes.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LinkStateAttributes.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LinkStateAttributes.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LinkStateAttributes.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LocalPref.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LocalPref.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LocalPref.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LocalPref.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/Med.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/Med.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/Med.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/Med.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpReachNlri.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpReachNlri.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpReachNlri.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpReachNlri.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpUnReachNlri.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpUnReachNlri.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpUnReachNlri.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpUnReachNlri.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MultiProtocolExtnCapabilityTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MultiProtocolExtnCapabilityTlv.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MultiProtocolExtnCapabilityTlv.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MultiProtocolExtnCapabilityTlv.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/NextHop.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/NextHop.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/NextHop.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/NextHop.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/OSPFNonPseudonode.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/OSPFNonPseudonode.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/OSPFNonPseudonode.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/OSPFNonPseudonode.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/OSPFPseudonode.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/OSPFPseudonode.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/OSPFPseudonode.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/OSPFPseudonode.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/OSPFRouteTypeTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/OSPFRouteTypeTlv.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/OSPFRouteTypeTlv.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/OSPFRouteTypeTlv.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/Origin.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/Origin.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/Origin.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/Origin.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/RouteDistinguisher.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/RouteDistinguisher.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/RouteDistinguisher.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/RouteDistinguisher.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlv.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlv.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlv.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeIsIsAreaId.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeIsIsAreaId.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeIsIsAreaId.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeIsIsAreaId.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeMultiTopologyId.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeMultiTopologyId.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeMultiTopologyId.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeMultiTopologyId.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeName.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeName.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeName.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeName.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrOpaqueNode.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrOpaqueNode.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrOpaqueNode.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrOpaqueNode.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV4.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV4.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV4.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetric.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetric.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetric.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetric.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIsIsAdminstGrp.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIsIsAdminstGrp.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIsIsAdminstGrp.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIsIsAdminstGrp.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMaxLinkBandwidth.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMaxLinkBandwidth.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMaxLinkBandwidth.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMaxLinkBandwidth.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMask.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMask.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMask.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMask.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrName.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrName.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrName.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrName.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrOpaqLnkAttrib.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrOpaqLnkAttrib.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrOpaqLnkAttrib.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrOpaqLnkAttrib.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrProtectionType.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrProtectionType.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrProtectionType.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrProtectionType.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrSrlg.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrSrlg.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrSrlg.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrSrlg.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrTeDefaultMetric.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrTeDefaultMetric.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrTeDefaultMetric.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrTeDefaultMetric.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrUnRsrvdLinkBandwidth.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrUnRsrvdLinkBandwidth.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrUnRsrvdLinkBandwidth.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrUnRsrvdLinkBandwidth.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrExtRouteTag.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrExtRouteTag.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrExtRouteTag.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrExtRouteTag.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlags.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlags.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlags.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlags.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetric.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetric.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetric.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetric.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOpaqueData.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOpaqueData.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOpaqueData.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOpaqueData.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddr.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddr.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddr.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddr.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrRouteTag.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrRouteTag.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrRouteTag.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrRouteTag.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/package-info.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/package-info.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/package-info.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/package-info.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/package-info.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/package-info.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/types/package-info.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/package-info.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/Constants.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/Constants.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/util/Constants.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/Constants.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/UnSupportedAttribute.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/UnSupportedAttribute.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/util/UnSupportedAttribute.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/UnSupportedAttribute.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/Validation.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/Validation.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/util/Validation.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/Validation.java
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/package-info.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/package-info.java
similarity index 100%
rename from bgp/bgpio/src/main/java/org/onosproject/bgpio/util/package-info.java
rename to protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/package-info.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrMaxLinkBandwidthTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrMaxLinkBandwidthTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrMaxLinkBandwidthTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrMaxLinkBandwidthTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrTeDefaultMetricTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrTeDefaultMetricTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrTeDefaultMetricTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrTeDefaultMetricTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpPrefixAttrOpaqueDataTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpPrefixAttrOpaqueDataTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BgpPrefixAttrOpaqueDataTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpPrefixAttrOpaqueDataTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpKeepaliveMsgTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpKeepaliveMsgTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpKeepaliveMsgTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpKeepaliveMsgTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpNotificationMsgTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpNotificationMsgTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpNotificationMsgTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpNotificationMsgTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpOpenMsgTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpOpenMsgTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpOpenMsgTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpOpenMsgTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpUpdateMsgTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpUpdateMsgTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpUpdateMsgTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpUpdateMsgTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AreaIdTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AreaIdTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AreaIdTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AreaIdTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/As4PathTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/As4PathTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/As4PathTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/As4PathTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AsPathTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AsPathTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AsPathTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AsPathTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AutonomousSystemTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AutonomousSystemTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AutonomousSystemTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AutonomousSystemTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/BgpLSIdentifierTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/BgpLSIdentifierTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/BgpLSIdentifierTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/BgpLSIdentifierTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPReachabilityInformationTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPReachabilityInformationTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPReachabilityInformationTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPReachabilityInformationTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPv4AddressTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPv4AddressTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPv4AddressTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPv4AddressTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPv6AddressTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPv6AddressTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPv6AddressTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPv6AddressTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IsIsNonPseudonodeTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IsIsNonPseudonodeTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IsIsNonPseudonodeTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IsIsNonPseudonodeTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IsIsPseudonodeTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IsIsPseudonodeTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IsIsPseudonodeTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IsIsPseudonodeTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/LinkLocalRemoteIdentifiersTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/LinkLocalRemoteIdentifiersTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/LinkLocalRemoteIdentifiersTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/LinkLocalRemoteIdentifiersTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/LocalPrefTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/LocalPrefTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/LocalPrefTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/LocalPrefTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/MedTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/MedTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/MedTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/MedTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/NextHopTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/NextHopTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/NextHopTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/NextHopTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OriginTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OriginTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OriginTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OriginTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OspfPseudonodeTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OspfPseudonodeTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OspfPseudonodeTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OspfPseudonodeTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OspfRouteTypeTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OspfRouteTypeTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OspfRouteTypeTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OspfRouteTypeTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlvTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlvTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlvTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlvTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6Test.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6Test.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6Test.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6Test.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetricTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetricTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetricTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetricTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMaxLinkBandwidthTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMaxLinkBandwidthTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMaxLinkBandwidthTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMaxLinkBandwidthTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMaskTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMaskTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMaskTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMaskTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrNameTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrNameTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrNameTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrNameTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrOpaqLnkAttribTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrOpaqLnkAttribTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrOpaqLnkAttribTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrOpaqLnkAttribTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrProtectionTypeTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrProtectionTypeTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrProtectionTypeTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrProtectionTypeTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrTeDefaultMetricTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrTeDefaultMetricTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrTeDefaultMetricTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrTeDefaultMetricTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrUnRsrvdLinkBandwidthTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrUnRsrvdLinkBandwidthTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrUnRsrvdLinkBandwidthTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrUnRsrvdLinkBandwidthTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlagsTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlagsTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlagsTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlagsTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetricTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetricTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetricTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetricTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOpaqueDataTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOpaqueDataTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOpaqueDataTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOpaqueDataTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddrTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddrTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddrTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddrTest.java
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrRouteTagTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrRouteTagTest.java
similarity index 100%
rename from bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrRouteTagTest.java
rename to protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrRouteTagTest.java
diff --git a/bgp/ctl/pom.xml b/protocols/bgp/ctl/pom.xml
similarity index 100%
rename from bgp/ctl/pom.xml
rename to protocols/bgp/ctl/pom.xml
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/AdjRibIn.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/AdjRibIn.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/AdjRibIn.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/AdjRibIn.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpChannelHandler.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpChannelHandler.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpChannelHandler.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpChannelHandler.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConfig.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConfig.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConfig.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConfig.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConnectPeerImpl.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConnectPeerImpl.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConnectPeerImpl.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConnectPeerImpl.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpControllerImpl.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpControllerImpl.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpControllerImpl.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpControllerImpl.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpKeepAliveTimer.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpKeepAliveTimer.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpKeepAliveTimer.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpKeepAliveTimer.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpLocalRibImpl.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpLocalRibImpl.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpLocalRibImpl.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpLocalRibImpl.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageDecoder.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageDecoder.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageDecoder.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageDecoder.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageEncoder.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageEncoder.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageEncoder.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageEncoder.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPacketStatsImpl.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPacketStatsImpl.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPacketStatsImpl.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPacketStatsImpl.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerConfig.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerConfig.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerConfig.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerConfig.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerImpl.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerImpl.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerImpl.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerImpl.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPipelineFactory.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPipelineFactory.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPipelineFactory.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPipelineFactory.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpSelectionAlgo.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpSelectionAlgo.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpSelectionAlgo.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpSelectionAlgo.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpSessionInfoImpl.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpSessionInfoImpl.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpSessionInfoImpl.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpSessionInfoImpl.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/Controller.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/Controller.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/Controller.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/Controller.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/VpnAdjRibIn.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/VpnAdjRibIn.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/VpnAdjRibIn.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/VpnAdjRibIn.java
diff --git a/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/package-info.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/package-info.java
similarity index 100%
rename from bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/package-info.java
rename to protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/package-info.java
diff --git a/bgp/ctl/src/test/java/org/onosproject/bgp/BgpControllerImplTest.java b/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpControllerImplTest.java
similarity index 100%
rename from bgp/ctl/src/test/java/org/onosproject/bgp/BgpControllerImplTest.java
rename to protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpControllerImplTest.java
diff --git a/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerChannelHandlerTest.java b/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerChannelHandlerTest.java
similarity index 100%
rename from bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerChannelHandlerTest.java
rename to protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerChannelHandlerTest.java
diff --git a/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerFrameDecoderTest.java b/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerFrameDecoderTest.java
similarity index 100%
rename from bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerFrameDecoderTest.java
rename to protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerFrameDecoderTest.java
diff --git a/bgp/ctl/src/test/java/org/onosproject/controller/impl/BgpSelectionAlgoTest.java b/protocols/bgp/ctl/src/test/java/org/onosproject/controller/impl/BgpSelectionAlgoTest.java
similarity index 100%
rename from bgp/ctl/src/test/java/org/onosproject/controller/impl/BgpSelectionAlgoTest.java
rename to protocols/bgp/ctl/src/test/java/org/onosproject/controller/impl/BgpSelectionAlgoTest.java
diff --git a/bgp/pom.xml b/protocols/bgp/pom.xml
similarity index 97%
rename from bgp/pom.xml
rename to protocols/bgp/pom.xml
index 941168b..7649b58 100755
--- a/bgp/pom.xml
+++ b/protocols/bgp/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos</artifactId>
+        <artifactId>onos-protocols</artifactId>
         <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/protocols/pom.xml b/protocols/pom.xml
index bcdc58b..1fc63d6 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -36,9 +36,7 @@
         <module>netconf</module>
         <module>pcep</module>
         <module>ovsdb</module>
-        <!--
         <module>bgp</module>
-        -->
     </modules>
 
     <dependencies>