diff --git a/pom.xml b/pom.xml
index 8093fe6..78fbcf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,8 +46,8 @@
         <module>cli</module>
 
         <module>protocols</module>
+        <!-- FIXME move to protocols/ -->
         <module>ovsdb</module>
-        <module>netconf</module>
         <module>bgp</module>
 
         <module>providers</module>
diff --git a/netconf/api/pom.xml b/protocols/netconf/api/pom.xml
similarity index 100%
rename from netconf/api/pom.xml
rename to protocols/netconf/api/pom.xml
diff --git a/netconf/api/src/main/java/org/onosproject/netconf/NetconfController.java b/protocols/netconf/api/src/main/java/org/onosproject/netconf/NetconfController.java
similarity index 100%
rename from netconf/api/src/main/java/org/onosproject/netconf/NetconfController.java
rename to protocols/netconf/api/src/main/java/org/onosproject/netconf/NetconfController.java
diff --git a/netconf/api/src/main/java/org/onosproject/netconf/NetconfDevice.java b/protocols/netconf/api/src/main/java/org/onosproject/netconf/NetconfDevice.java
similarity index 100%
rename from netconf/api/src/main/java/org/onosproject/netconf/NetconfDevice.java
rename to protocols/netconf/api/src/main/java/org/onosproject/netconf/NetconfDevice.java
diff --git a/netconf/api/src/main/java/org/onosproject/netconf/NetconfDeviceInfo.java b/protocols/netconf/api/src/main/java/org/onosproject/netconf/NetconfDeviceInfo.java
similarity index 100%
rename from netconf/api/src/main/java/org/onosproject/netconf/NetconfDeviceInfo.java
rename to protocols/netconf/api/src/main/java/org/onosproject/netconf/NetconfDeviceInfo.java
diff --git a/netconf/api/src/main/java/org/onosproject/netconf/NetconfDeviceListener.java b/protocols/netconf/api/src/main/java/org/onosproject/netconf/NetconfDeviceListener.java
similarity index 100%
rename from netconf/api/src/main/java/org/onosproject/netconf/NetconfDeviceListener.java
rename to protocols/netconf/api/src/main/java/org/onosproject/netconf/NetconfDeviceListener.java
diff --git a/netconf/api/src/main/java/org/onosproject/netconf/NetconfSession.java b/protocols/netconf/api/src/main/java/org/onosproject/netconf/NetconfSession.java
similarity index 100%
rename from netconf/api/src/main/java/org/onosproject/netconf/NetconfSession.java
rename to protocols/netconf/api/src/main/java/org/onosproject/netconf/NetconfSession.java
diff --git a/netconf/api/src/main/java/org/onosproject/netconf/package-info.java b/protocols/netconf/api/src/main/java/org/onosproject/netconf/package-info.java
similarity index 100%
rename from netconf/api/src/main/java/org/onosproject/netconf/package-info.java
rename to protocols/netconf/api/src/main/java/org/onosproject/netconf/package-info.java
diff --git a/netconf/ctl/pom.xml b/protocols/netconf/ctl/pom.xml
similarity index 100%
rename from netconf/ctl/pom.xml
rename to protocols/netconf/ctl/pom.xml
diff --git a/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfControllerImpl.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfControllerImpl.java
similarity index 100%
rename from netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfControllerImpl.java
rename to protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfControllerImpl.java
diff --git a/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfDeviceImpl.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfDeviceImpl.java
similarity index 100%
rename from netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfDeviceImpl.java
rename to protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfDeviceImpl.java
diff --git a/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfSessionImpl.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfSessionImpl.java
similarity index 100%
rename from netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfSessionImpl.java
rename to protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfSessionImpl.java
diff --git a/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/package-info.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/package-info.java
similarity index 100%
rename from netconf/ctl/src/main/java/org/onosproject/netconf/ctl/package-info.java
rename to protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/package-info.java
diff --git a/netconf/pom.xml b/protocols/netconf/pom.xml
similarity index 100%
rename from netconf/pom.xml
rename to protocols/netconf/pom.xml
diff --git a/netconf/rfc/pom.xml b/protocols/netconf/rfc/pom.xml
similarity index 100%
rename from netconf/rfc/pom.xml
rename to protocols/netconf/rfc/pom.xml
diff --git a/netconf/rfc/src/main/java/org/onosproject/netconf/rfc/Foo.java b/protocols/netconf/rfc/src/main/java/org/onosproject/netconf/rfc/Foo.java
similarity index 100%
rename from netconf/rfc/src/main/java/org/onosproject/netconf/rfc/Foo.java
rename to protocols/netconf/rfc/src/main/java/org/onosproject/netconf/rfc/Foo.java
diff --git a/netconf/rfc/src/main/java/org/onosproject/netconf/rfc/package-info.java b/protocols/netconf/rfc/src/main/java/org/onosproject/netconf/rfc/package-info.java
similarity index 100%
rename from netconf/rfc/src/main/java/org/onosproject/netconf/rfc/package-info.java
rename to protocols/netconf/rfc/src/main/java/org/onosproject/netconf/rfc/package-info.java
diff --git a/protocols/pom.xml b/protocols/pom.xml
index d922b08..7a33a74 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -33,10 +33,10 @@
 
     <modules>
         <module>openflow</module>
+        <module>netconf</module>
         <module>pcep</module>
         <!--
         <module>ovsdb</module>
-        <module>netconf</module>
         <module>bgp</module>
         -->
     </modules>