diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index a12c185b9e..c36a903a92 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -274,13 +274,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}.openflowjava</groupId>
-                <artifactId>features-openflowjava</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-openflowplugin-flow-services-rest</artifactId>
@@ -365,6 +358,13 @@
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-openflowplugin-eric-extensions</artifactId>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-openflowplugin-nxm-extensions</artifactId>
@@ -374,7 +374,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-openflowplugin-eric-extensions</artifactId>
+                <artifactId>odl-openflowplugin-onf-extensions</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>
@@ -407,6 +407,34 @@
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-openflowplugin-app-lldp-speaker</artifactId>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-openflowplugin-app-topology-lldp-discovery</artifactId>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-openflowplugin-app-topology-manager</artifactId>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>odl-openflowjava-protocol</artifactId>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
deleted file mode 100644
index 9a1f5c444c..0000000000
--- a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>feature-repo-parent</artifactId>
-        <version>14.0.3</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.openflowplugin</groupId>
-    <artifactId>features-openflowplugin-extension</artifactId>
-    <packaging>feature</packaging>
-    <version>0.20.0-SNAPSHOT</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-openflowplugin-nxm-extensions</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-openflowplugin-onf-extensions</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-openflowplugin-eric-extensions</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/extension/features-extension-aggregator/pom.xml b/extension/features-extension-aggregator/pom.xml
deleted file mode 100644
index e1eb2ee39d..0000000000
--- a/extension/features-extension-aggregator/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>14.0.3</version>
-        <relativePath/>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.opendaylight.openflowplugin</groupId>
-    <artifactId>features-extension-aggregator</artifactId>
-    <packaging>pom</packaging>
-    <version>0.20.0-SNAPSHOT</version>
-
-    <modules>
-        <module>features-openflowplugin-extension</module>
-        <module>odl-openflowplugin-nxm-extensions</module>
-        <module>odl-openflowplugin-onf-extensions</module>
-        <module>odl-openflowplugin-eric-extensions</module>
-    </modules>
-
-</project>
diff --git a/extension/pom.xml b/extension/pom.xml
index 0cb94c5487..76233c8c76 100644
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -28,6 +28,5 @@
         <module>openflowplugin-extension-onf</module>
         <module>openflowplugin-extension-eric</module>
         <module>test-extension</module>
-        <module>features-extension-aggregator</module>
     </modules>
 </project>
diff --git a/features-aggregator/features-openflowplugin/pom.xml b/features/features-openflowplugin/pom.xml
similarity index 62%
rename from features-aggregator/features-openflowplugin/pom.xml
rename to features/features-openflowplugin/pom.xml
index d77702a24a..e2b2c02a0d 100644
--- a/features-aggregator/features-openflowplugin/pom.xml
+++ b/features/features-openflowplugin/pom.xml
@@ -13,133 +13,150 @@
     <packaging>feature</packaging>
     <version>0.20.0-SNAPSHOT</version>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.openflowplugin</groupId>
+                <artifactId>openflowplugin-artifacts</artifactId>
+                <version>0.20.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
+            <artifactId>odl-openflowjava-protocol</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-bulk-o-matic</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-config-pusher</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-forwardingrules-manager</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-forwardingrules-sync</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-table-miss-enforcer</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-topology</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-lldp-speaker</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-topology-lldp-discovery</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-topology-manager</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-drop-test</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-flow-services</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-flow-services-rest</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-nsf-model</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-southbound</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-reconciliation-framework</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-southbound-cli</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-libraries</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-arbitratorreconciliation</artifactId>
-            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-nxm-extensions</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-onf-extensions</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-eric-extensions</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/features/odl-openflowjava-protocol/pom.xml
similarity index 100%
rename from openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
rename to features/odl-openflowjava-protocol/pom.xml
diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml b/features/odl-openflowjava-protocol/src/main/feature/feature.xml
similarity index 100%
rename from openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml
rename to features/odl-openflowjava-protocol/src/main/feature/feature.xml
diff --git a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml b/features/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
rename to features/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml b/features/odl-openflowplugin-app-bulk-o-matic/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
rename to features/odl-openflowplugin-app-bulk-o-matic/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml b/features/odl-openflowplugin-app-config-pusher/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
rename to features/odl-openflowplugin-app-config-pusher/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml b/features/odl-openflowplugin-app-forwardingrules-manager/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
rename to features/odl-openflowplugin-app-forwardingrules-manager/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml b/features/odl-openflowplugin-app-forwardingrules-sync/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
rename to features/odl-openflowplugin-app-forwardingrules-sync/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml b/features/odl-openflowplugin-app-lldp-speaker/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
rename to features/odl-openflowplugin-app-lldp-speaker/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml b/features/odl-openflowplugin-app-reconciliation-framework/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
rename to features/odl-openflowplugin-app-reconciliation-framework/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml b/features/odl-openflowplugin-app-southbound-cli/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
rename to features/odl-openflowplugin-app-southbound-cli/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml b/features/odl-openflowplugin-app-table-miss-enforcer/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
rename to features/odl-openflowplugin-app-table-miss-enforcer/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml b/features/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
rename to features/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml b/features/odl-openflowplugin-app-topology-manager/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
rename to features/odl-openflowplugin-app-topology-manager/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-app-topology/pom.xml b/features/odl-openflowplugin-app-topology/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-app-topology/pom.xml
rename to features/odl-openflowplugin-app-topology/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-drop-test/pom.xml b/features/odl-openflowplugin-drop-test/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-drop-test/pom.xml
rename to features/odl-openflowplugin-drop-test/pom.xml
diff --git a/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml b/features/odl-openflowplugin-eric-extensions/pom.xml
similarity index 100%
rename from extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml
rename to features/odl-openflowplugin-eric-extensions/pom.xml
diff --git a/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/src/main/features/features.xml b/features/odl-openflowplugin-eric-extensions/src/main/features/features.xml
similarity index 100%
rename from extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/src/main/features/features.xml
rename to features/odl-openflowplugin-eric-extensions/src/main/features/features.xml
diff --git a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml b/features/odl-openflowplugin-flow-services-rest/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
rename to features/odl-openflowplugin-flow-services-rest/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-flow-services-rest/src/main/feature/feature.xml b/features/odl-openflowplugin-flow-services-rest/src/main/feature/feature.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-flow-services-rest/src/main/feature/feature.xml
rename to features/odl-openflowplugin-flow-services-rest/src/main/feature/feature.xml
diff --git a/features-aggregator/odl-openflowplugin-flow-services/pom.xml b/features/odl-openflowplugin-flow-services/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-flow-services/pom.xml
rename to features/odl-openflowplugin-flow-services/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-libraries/pom.xml b/features/odl-openflowplugin-libraries/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-libraries/pom.xml
rename to features/odl-openflowplugin-libraries/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml b/features/odl-openflowplugin-libraries/src/main/feature/feature.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml
rename to features/odl-openflowplugin-libraries/src/main/feature/feature.xml
diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features/odl-openflowplugin-nsf-model/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-nsf-model/pom.xml
rename to features/odl-openflowplugin-nsf-model/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-nsf-model/src/main/feature/feature.xml b/features/odl-openflowplugin-nsf-model/src/main/feature/feature.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-nsf-model/src/main/feature/feature.xml
rename to features/odl-openflowplugin-nsf-model/src/main/feature/feature.xml
diff --git a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml b/features/odl-openflowplugin-nxm-extensions/pom.xml
similarity index 100%
rename from extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
rename to features/odl-openflowplugin-nxm-extensions/pom.xml
diff --git a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/src/main/features/features.xml b/features/odl-openflowplugin-nxm-extensions/src/main/features/features.xml
similarity index 100%
rename from extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/src/main/features/features.xml
rename to features/odl-openflowplugin-nxm-extensions/src/main/features/features.xml
diff --git a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml b/features/odl-openflowplugin-onf-extensions/pom.xml
similarity index 100%
rename from extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
rename to features/odl-openflowplugin-onf-extensions/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-southbound/pom.xml b/features/odl-openflowplugin-southbound/pom.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-southbound/pom.xml
rename to features/odl-openflowplugin-southbound/pom.xml
diff --git a/features-aggregator/odl-openflowplugin-southbound/src/main/feature/feature.xml b/features/odl-openflowplugin-southbound/src/main/feature/feature.xml
similarity index 100%
rename from features-aggregator/odl-openflowplugin-southbound/src/main/feature/feature.xml
rename to features/odl-openflowplugin-southbound/src/main/feature/feature.xml
diff --git a/features-aggregator/pom.xml b/features/pom.xml
similarity index 83%
rename from features-aggregator/pom.xml
rename to features/pom.xml
index 93c58477bd..bcc2f04f93 100644
--- a/features-aggregator/pom.xml
+++ b/features/pom.xml
@@ -13,26 +13,34 @@
     <packaging>pom</packaging>
     <version>0.20.0-SNAPSHOT</version>
 
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
     <modules>
         <module>features-openflowplugin</module>
-        <module>odl-openflowplugin-flow-services-rest</module>
-        <module>odl-openflowplugin-flow-services</module>
-        <module>odl-openflowplugin-southbound</module>
-        <module>odl-openflowplugin-nsf-model</module>
-        <module>odl-openflowplugin-drop-test</module>
-        <module>odl-openflowplugin-app-table-miss-enforcer</module>
-        <module>odl-openflowplugin-app-config-pusher</module>
-        <module>odl-openflowplugin-app-topology</module>
-        <module>odl-openflowplugin-app-lldp-speaker</module>
-        <module>odl-openflowplugin-app-topology-lldp-discovery</module>
-        <module>odl-openflowplugin-app-topology-manager</module>
+        <module>odl-openflowjava-protocol</module>
+        <module>odl-openflowplugin-app-arbitratorreconciliation</module>
         <module>odl-openflowplugin-app-bulk-o-matic</module>
+        <module>odl-openflowplugin-app-config-pusher</module>
         <module>odl-openflowplugin-app-forwardingrules-manager</module>
         <module>odl-openflowplugin-app-forwardingrules-sync</module>
+        <module>odl-openflowplugin-app-lldp-speaker</module>
         <module>odl-openflowplugin-app-reconciliation-framework</module>
         <module>odl-openflowplugin-app-southbound-cli</module>
+        <module>odl-openflowplugin-app-table-miss-enforcer</module>
+        <module>odl-openflowplugin-app-topology-lldp-discovery</module>
+        <module>odl-openflowplugin-app-topology-manager</module>
+        <module>odl-openflowplugin-app-topology</module>
+        <module>odl-openflowplugin-drop-test</module>
+        <module>odl-openflowplugin-flow-services</module>
+        <module>odl-openflowplugin-flow-services-rest</module>
         <module>odl-openflowplugin-libraries</module>
-        <module>odl-openflowplugin-app-arbitratorreconciliation</module>
+        <module>odl-openflowplugin-nsf-model</module>
+        <module>odl-openflowplugin-southbound</module>
+        <module>odl-openflowplugin-eric-extensions</module>
+        <module>odl-openflowplugin-nxm-extensions</module>
+        <module>odl-openflowplugin-onf-extensions</module>
     </modules>
-
 </project>
diff --git a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
deleted file mode 100644
index 4d66dd24d4..0000000000
--- a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>feature-repo-parent</artifactId>
-    <version>14.0.3</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
-  <artifactId>features-openflowjava</artifactId>
-  <version>0.20.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-  <!-- <name> formatting is used by autorelease to parse and notify projects on
-       build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: openflowjava :: ${project.artifactId}</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-openflowjava-protocol</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/openflowjava/features-openflowjava-aggregator/pom.xml b/openflowjava/features-openflowjava-aggregator/pom.xml
deleted file mode 100644
index c741669104..0000000000
--- a/openflowjava/features-openflowjava-aggregator/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>14.0.3</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
-  <artifactId>features-openflowjava-aggregator</artifactId>
-  <version>0.20.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <!-- <name> formatting is used by autorelease to parse and notify projects on
-       build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: openflowjava :: ${project.artifactId}</name>
-
-  <modules>
-    <module>features-openflowjava</module>
-    <module>odl-openflowjava-protocol</module>
-  </modules>
-
-</project>
diff --git a/openflowjava/pom.xml b/openflowjava/pom.xml
index 89aaa0b7da..68ff3d12f9 100644
--- a/openflowjava/pom.xml
+++ b/openflowjava/pom.xml
@@ -13,7 +13,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>features-openflowjava-aggregator</module>
         <module>openflowjava-blueprint-config</module>
         <module>openflow-protocol-api</module>
         <module>openflow-protocol-impl</module>
diff --git a/pom.xml b/pom.xml
index ca2e799e8d..2a63998219 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,8 @@
     <modules>
         <module>artifacts</module>
         <module>parent</module>
+        <module>features</module>
+        <module>model</module>
         <module>libraries</module>
         <module>openflowjava</module>
         <module>openflowplugin-api</module>
@@ -35,9 +37,7 @@
         <module>test-provider</module>
         <module>drop-test-karaf</module>
         <module>test-common</module>
-        <module>features-aggregator</module>
         <module>applications</module>
-        <module>model</module>
         <module>samples</module>
     </modules>