From 0e3a11b6e5f62976034af939b5624ac593614de0 Mon Sep 17 00:00:00 2001
From: Samuel Schneider <samuel.schneider@pantheon.tech>
Date: Thu, 27 Apr 2023 12:45:28 +0200
Subject: [PATCH] Remove convenience model artifacts

Remove empty artifacts as they do not contribute anything to the actual
picture and act only as maven dependency shortcut.

JIRA: MDSAL-823
Change-Id: I01c83ae3e624582048a47d013082d62e983a2590
Signed-off-by: Samuel Schneider <samuel.schneider@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                             | 66 +------------------
 docs/pom.xml                                  | 46 ++-----------
 features/odl-mdsal-model-rfc6991/pom.xml      |  6 +-
 features/odl-mdsal-model-rfc8294/pom.xml      |  6 +-
 features/odl-mdsal-model-rfc8342/pom.xml      |  6 +-
 features/odl-mdsal-model-rfc8345/pom.xml      | 14 +++-
 features/odl-mdsal-model-rfc8346/pom.xml      |  6 +-
 features/odl-mdsal-model-rfc8348/pom.xml      | 10 ++-
 features/odl-mdsal-model-rfc8349/pom.xml      | 10 ++-
 features/odl-mdsal-model-rfc8519/pom.xml      | 10 ++-
 features/odl-mdsal-model-rfc8520/pom.xml      |  6 +-
 features/odl-mdsal-model-rfc8542/pom.xml      |  6 +-
 features/odl-mdsal-model-rfc8776/pom.xml      |  6 +-
 features/odl-mdsal-model-rfc8795/pom.xml      |  6 +-
 model/ietf/ietf-topology/pom.xml              |  6 +-
 model/ietf/pom.xml                            | 12 ----
 model/ietf/rfc6991/pom.xml                    | 37 -----------
 model/ietf/rfc8294-ietf-routing-types/pom.xml |  6 +-
 model/ietf/rfc8294/pom.xml                    | 37 -----------
 model/ietf/rfc8342/pom.xml                    | 37 -----------
 model/ietf/rfc8344/pom.xml                    |  6 +-
 model/ietf/rfc8345/pom.xml                    | 37 -----------
 model/ietf/rfc8346/pom.xml                    | 33 ----------
 model/ietf/rfc8348-ietf-hardware/pom.xml      |  6 +-
 model/ietf/rfc8348/pom.xml                    | 33 ----------
 model/ietf/rfc8349/pom.xml                    | 41 ------------
 model/ietf/rfc8519-ietf-packet-fields/pom.xml |  6 +-
 model/ietf/rfc8519/pom.xml                    | 41 ------------
 model/ietf/rfc8520/pom.xml                    | 37 -----------
 model/ietf/rfc8525/pom.xml                    |  7 +-
 model/ietf/rfc8528/pom.xml                    |  6 +-
 model/ietf/rfc8542/pom.xml                    | 33 ----------
 model/ietf/rfc8776/pom.xml                    | 37 -----------
 model/ietf/rfc8795/pom.xml                    | 33 ----------
 34 files changed, 125 insertions(+), 570 deletions(-)
 delete mode 100644 model/ietf/rfc6991/pom.xml
 delete mode 100644 model/ietf/rfc8294/pom.xml
 delete mode 100644 model/ietf/rfc8342/pom.xml
 delete mode 100644 model/ietf/rfc8345/pom.xml
 delete mode 100644 model/ietf/rfc8346/pom.xml
 delete mode 100644 model/ietf/rfc8348/pom.xml
 delete mode 100644 model/ietf/rfc8349/pom.xml
 delete mode 100644 model/ietf/rfc8519/pom.xml
 delete mode 100644 model/ietf/rfc8520/pom.xml
 delete mode 100644 model/ietf/rfc8542/pom.xml
 delete mode 100644 model/ietf/rfc8776/pom.xml
 delete mode 100644 model/ietf/rfc8795/pom.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 35cd782276..1c1a4b0f19 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -466,11 +466,6 @@
             </dependency>
 
             <!-- RFC6991 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc6991</artifactId>
-                <version>12.0.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc6991-ietf-inet-types</artifactId>
@@ -524,8 +519,8 @@
 
             <!-- RFC8294 -->
             <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8294</artifactId>
+                <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
+                <artifactId>iana-routing-types</artifactId>
                 <version>12.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
@@ -533,18 +528,8 @@
                 <artifactId>rfc8294-ietf-routing-types</artifactId>
                 <version>12.0.0-SNAPSHOT</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
-                <artifactId>iana-routing-types</artifactId>
-                <version>12.0.0-SNAPSHOT</version>
-            </dependency>
 
             <!-- RFC8342 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8342</artifactId>
-                <version>12.0.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8342-ietf-datastores</artifactId>
@@ -571,11 +556,6 @@
             </dependency>
 
             <!-- RFC8345 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8345</artifactId>
-                <version>12.0.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8345-ietf-network</artifactId>
@@ -598,11 +578,6 @@
             </dependency>
 
             <!-- RFC8346 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8346</artifactId>
-                <version>12.0.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8346-ietf-l3-unicast-topology</artifactId>
@@ -615,11 +590,6 @@
             </dependency>
 
             <!-- RFC8348 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8348</artifactId>
-                <version>12.0.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8348-ietf-hardware</artifactId>
@@ -637,11 +607,6 @@
             </dependency>
 
             <!-- RFC8349 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8349</artifactId>
-                <version>12.0.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8349-ietf-routing</artifactId>
@@ -659,11 +624,6 @@
             </dependency>
 
             <!-- RFC8519 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8519</artifactId>
-                <version>12.0.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8519-ietf-access-control-list</artifactId>
@@ -681,11 +641,6 @@
             </dependency>
 
             <!-- RFC8520 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8520</artifactId>
-                <version>12.0.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8520-ietf-acldns</artifactId>
@@ -726,11 +681,6 @@
             </dependency>
 
             <!-- RFC8542 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8542</artifactId>
-                <version>12.0.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8542-ietf-dc-fabric-topology</artifactId>
@@ -743,11 +693,6 @@
             </dependency>
 
             <!-- RFC8776 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8776</artifactId>
-                <version>12.0.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8776-ietf-te-types</artifactId>
@@ -759,12 +704,7 @@
                 <version>12.0.0-SNAPSHOT</version>
             </dependency>
 
-            <!-- RFC8776 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8795</artifactId>
-                <version>12.0.0-SNAPSHOT</version>
-            </dependency>
+            <!-- RFC8795 -->
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8795-ietf-te-topology</artifactId>
diff --git a/docs/pom.xml b/docs/pom.xml
index 33aa6ece59..2901f0d695 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -218,10 +218,6 @@
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>opendaylight-l2-types</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc6991-ietf-inet-types</artifactId>
@@ -242,18 +238,10 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8040</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8294</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8294-ietf-routing-types</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8342</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8342-ietf-datastores</artifactId>
@@ -270,10 +258,6 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8344</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8345</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8345-ietf-network</artifactId>
@@ -290,10 +274,6 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8345-ietf-network-topology-state</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8346</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8346-ietf-l3-unicast-topology</artifactId>
@@ -302,10 +282,6 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8346-ietf-l3-unicast-topology-state</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8348</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8348-ietf-hardware</artifactId>
@@ -314,10 +290,6 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8348-ietf-hardware-state</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8349</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8349-ietf-routing</artifactId>
@@ -330,10 +302,6 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8349-ietf-ipv6-unicast-routing</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8519</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8519-ietf-access-control-list</artifactId>
@@ -346,10 +314,6 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8519-ietf-packet-fields</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8520</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8520-ietf-acldns</artifactId>
@@ -376,15 +340,19 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8542</artifactId>
+            <artifactId>rfc8542-ietf-dc-fabric-topology</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8542-ietf-dc-fabric-types</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8776</artifactId>
+            <artifactId>rfc8776-ietf-te-types</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8795</artifactId>
+            <artifactId>rfc8776-ietf-te-packet-types</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
diff --git a/features/odl-mdsal-model-rfc6991/pom.xml b/features/odl-mdsal-model-rfc6991/pom.xml
index 2ad318855b..1cb7b0e73e 100644
--- a/features/odl-mdsal-model-rfc6991/pom.xml
+++ b/features/odl-mdsal-model-rfc6991/pom.xml
@@ -31,7 +31,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991</artifactId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-mdsal-model-rfc8294/pom.xml b/features/odl-mdsal-model-rfc8294/pom.xml
index c66b535a47..2ceecca53b 100644
--- a/features/odl-mdsal-model-rfc8294/pom.xml
+++ b/features/odl-mdsal-model-rfc8294/pom.xml
@@ -29,9 +29,13 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
+            <artifactId>iana-routing-types</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8294</artifactId>
+            <artifactId>rfc8294-ietf-routing-types</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-mdsal-model-rfc8342/pom.xml b/features/odl-mdsal-model-rfc8342/pom.xml
index 15ab92489d..949d7b325f 100644
--- a/features/odl-mdsal-model-rfc8342/pom.xml
+++ b/features/odl-mdsal-model-rfc8342/pom.xml
@@ -31,7 +31,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8342</artifactId>
+            <artifactId>rfc8342-ietf-datastores</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8342-ietf-origin</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-mdsal-model-rfc8345/pom.xml b/features/odl-mdsal-model-rfc8345/pom.xml
index 8c95575f03..b4fd34cd98 100644
--- a/features/odl-mdsal-model-rfc8345/pom.xml
+++ b/features/odl-mdsal-model-rfc8345/pom.xml
@@ -31,7 +31,19 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8345</artifactId>
+            <artifactId>rfc8345-ietf-network</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8345-ietf-network-state</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8345-ietf-network-topology</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8345-ietf-network-topology-state</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-mdsal-model-rfc8346/pom.xml b/features/odl-mdsal-model-rfc8346/pom.xml
index 4268d50b70..a4748d30e7 100644
--- a/features/odl-mdsal-model-rfc8346/pom.xml
+++ b/features/odl-mdsal-model-rfc8346/pom.xml
@@ -37,7 +37,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8346</artifactId>
+            <artifactId>rfc8346-ietf-l3-unicast-topology</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8346-ietf-l3-unicast-topology-state</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-mdsal-model-rfc8348/pom.xml b/features/odl-mdsal-model-rfc8348/pom.xml
index af5aaa3a43..8605c06487 100644
--- a/features/odl-mdsal-model-rfc8348/pom.xml
+++ b/features/odl-mdsal-model-rfc8348/pom.xml
@@ -29,9 +29,17 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
+            <artifactId>iana-hardware</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8348-ietf-hardware</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8348</artifactId>
+            <artifactId>rfc8348-ietf-hardware-state</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-mdsal-model-rfc8349/pom.xml b/features/odl-mdsal-model-rfc8349/pom.xml
index a43b8d4f2f..57c03b6c60 100644
--- a/features/odl-mdsal-model-rfc8349/pom.xml
+++ b/features/odl-mdsal-model-rfc8349/pom.xml
@@ -31,7 +31,15 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8349</artifactId>
+            <artifactId>rfc8349-ietf-routing</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8349-ietf-ipv4-unicast-routing</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8349-ietf-ipv6-unicast-routing</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-mdsal-model-rfc8519/pom.xml b/features/odl-mdsal-model-rfc8519/pom.xml
index b0b4d80a31..73e5f30d13 100644
--- a/features/odl-mdsal-model-rfc8519/pom.xml
+++ b/features/odl-mdsal-model-rfc8519/pom.xml
@@ -31,7 +31,15 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8519</artifactId>
+            <artifactId>rfc8519-ietf-access-control-list</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8519-ietf-ethertypes</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8519-ietf-packet-fields</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-mdsal-model-rfc8520/pom.xml b/features/odl-mdsal-model-rfc8520/pom.xml
index cc7280b000..9bff4fce99 100644
--- a/features/odl-mdsal-model-rfc8520/pom.xml
+++ b/features/odl-mdsal-model-rfc8520/pom.xml
@@ -31,7 +31,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8520</artifactId>
+            <artifactId>rfc8520-ietf-acldns</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8520-ietf-mud</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-mdsal-model-rfc8542/pom.xml b/features/odl-mdsal-model-rfc8542/pom.xml
index f47cae945d..a07dd69b01 100644
--- a/features/odl-mdsal-model-rfc8542/pom.xml
+++ b/features/odl-mdsal-model-rfc8542/pom.xml
@@ -31,7 +31,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8542</artifactId>
+            <artifactId>rfc8542-ietf-dc-fabric-topology</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8542-ietf-dc-fabric-types</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-mdsal-model-rfc8776/pom.xml b/features/odl-mdsal-model-rfc8776/pom.xml
index 16fcfe48b8..cacf4973e1 100644
--- a/features/odl-mdsal-model-rfc8776/pom.xml
+++ b/features/odl-mdsal-model-rfc8776/pom.xml
@@ -31,7 +31,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8776</artifactId>
+            <artifactId>rfc8776-ietf-te-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8776-ietf-te-packet-types</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-mdsal-model-rfc8795/pom.xml b/features/odl-mdsal-model-rfc8795/pom.xml
index ee60c69cb9..29413849a2 100644
--- a/features/odl-mdsal-model-rfc8795/pom.xml
+++ b/features/odl-mdsal-model-rfc8795/pom.xml
@@ -37,7 +37,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8795</artifactId>
+            <artifactId>rfc8795-ietf-te-topology</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc8795-ietf-te-topology-state</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml
index 46aef0277a..0b5940f9ab 100644
--- a/model/ietf/ietf-topology/pom.xml
+++ b/model/ietf/ietf-topology/pom.xml
@@ -26,7 +26,11 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991</artifactId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index 994a68fe9f..54d51b6d13 100644
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -26,7 +26,6 @@
 
     <modules>
         <!-- RFC6991 -->
-        <module>rfc6991</module>
         <module>rfc6991-ietf-inet-types</module>
         <module>rfc6991-ietf-yang-types</module>
         <module>ietf-type-util</module>
@@ -41,11 +40,9 @@
         <module>rfc8072</module>
 
         <!-- RFC8294 Common YANG Data Types for the Routing Area -->
-        <module>rfc8294</module>
         <module>rfc8294-ietf-routing-types</module>
 
         <!-- RFC8342 Network Management Datastore Architecture -->
-        <module>rfc8342</module>
         <module>rfc8342-ietf-datastores</module>
         <module>rfc8342-ietf-origin</module>
 
@@ -56,36 +53,30 @@
         <module>rfc8344</module>
 
         <!-- RFC8345 Network Topologies -->
-        <module>rfc8345</module>
         <module>rfc8345-ietf-network</module>
         <module>rfc8345-ietf-network-state</module>
         <module>rfc8345-ietf-network-topology</module>
         <module>rfc8345-ietf-network-topology-state</module>
 
         <!-- RFC8346 Layer 3 Topologies -->
-        <module>rfc8346</module>
         <module>rfc8346-ietf-l3-unicast-topology</module>
         <module>rfc8346-ietf-l3-unicast-topology-state</module>
 
         <!-- RFC8348 Hardware Management -->
-        <module>rfc8348</module>
         <module>rfc8348-ietf-hardware</module>
         <module>rfc8348-ietf-hardware-state</module>
 
         <!-- RFC8349 Routing Management -->
-        <module>rfc8349</module>
         <module>rfc8349-ietf-routing</module>
         <module>rfc8349-ietf-ipv4-unicast-routing</module>
         <module>rfc8349-ietf-ipv6-unicast-routing</module>
 
         <!-- RFC8519 Network Access Control Lists -->
-        <module>rfc8519</module>
         <module>rfc8519-ietf-access-control-list</module>
         <module>rfc8519-ietf-ethertypes</module>
         <module>rfc8519-ietf-packet-fields</module>
 
         <!-- RFC8520 Manufacturer Usage Description -->
-        <module>rfc8520</module>
         <module>rfc8520-ietf-acldns</module>
         <module>rfc8520-ietf-mud</module>
 
@@ -102,17 +93,14 @@
         <module>rfc8530</module>
 
         <!-- RFC8542 Fabric Topology in Data-Center Networks -->
-        <module>rfc8542</module>
         <module>rfc8542-ietf-dc-fabric-topology</module>
         <module>rfc8542-ietf-dc-fabric-types</module>
 
         <!-- RFC8776 Common YANG Data Types for Traffic Engineering -->
-        <module>rfc8776</module>
         <module>rfc8776-ietf-te-types</module>
         <module>rfc8776-ietf-te-packet-types</module>
 
         <!-- RFC8795 YANG Data Model for Traffic Engineering (TE) Topologies -->
-        <module>rfc8795</module>
         <module>rfc8795-ietf-te-topology</module>
         <module>rfc8795-ietf-te-topology-state</module>
 
diff --git a/model/ietf/rfc6991/pom.xml b/model/ietf/rfc6991/pom.xml
deleted file mode 100644
index 5dcb6ee6be..0000000000
--- a/model/ietf/rfc6991/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
-        <version>12.0.0-SNAPSHOT</version>
-        <relativePath>../../../dom/dom-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-    <artifactId>rfc6991</artifactId>
-    <version>12.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>RFC6991 Common YANG Data Types</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991-ietf-inet-types</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991-ietf-yang-types</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/rfc8294-ietf-routing-types/pom.xml b/model/ietf/rfc8294-ietf-routing-types/pom.xml
index 556d65f340..9759bb1861 100644
--- a/model/ietf/rfc8294-ietf-routing-types/pom.xml
+++ b/model/ietf/rfc8294-ietf-routing-types/pom.xml
@@ -29,7 +29,11 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991</artifactId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/model/ietf/rfc8294/pom.xml b/model/ietf/rfc8294/pom.xml
deleted file mode 100644
index 22ca337f49..0000000000
--- a/model/ietf/rfc8294/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2018 Pantheon Technologies, s.ro. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
-        <version>12.0.0-SNAPSHOT</version>
-        <relativePath>../../../dom/dom-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-    <artifactId>rfc8294</artifactId>
-    <version>12.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>RFC8294 Common YANG Data Types for the Routing Area</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8294-ietf-routing-types</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
-            <artifactId>iana-routing-types</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/rfc8342/pom.xml b/model/ietf/rfc8342/pom.xml
deleted file mode 100644
index c4578c139d..0000000000
--- a/model/ietf/rfc8342/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2018 Pantheon Technologies, s.ro. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
-        <version>12.0.0-SNAPSHOT</version>
-        <relativePath>../../../dom/dom-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-    <artifactId>rfc8342</artifactId>
-    <version>12.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>RFC8342 Network Management Datastore Architecture</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8342-ietf-datastores</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8342-ietf-origin</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/rfc8344/pom.xml b/model/ietf/rfc8344/pom.xml
index 35232a1d93..559af03228 100644
--- a/model/ietf/rfc8344/pom.xml
+++ b/model/ietf/rfc8344/pom.xml
@@ -29,7 +29,11 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991</artifactId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
diff --git a/model/ietf/rfc8345/pom.xml b/model/ietf/rfc8345/pom.xml
deleted file mode 100644
index dfb1b39cdf..0000000000
--- a/model/ietf/rfc8345/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
-        <version>12.0.0-SNAPSHOT</version>
-        <relativePath>../../../dom/dom-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-    <artifactId>rfc8345</artifactId>
-    <version>12.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>RFC8345 Network Topologies</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8345-ietf-network</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8345-ietf-network-topology</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/rfc8346/pom.xml b/model/ietf/rfc8346/pom.xml
deleted file mode 100644
index 88f7a73e76..0000000000
--- a/model/ietf/rfc8346/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2020 PANTHEON.tech, s.r.o. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
-        <version>12.0.0-SNAPSHOT</version>
-        <relativePath>../../../dom/dom-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-    <artifactId>rfc8346</artifactId>
-    <version>12.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>RFC8346 Layer 3 Topologies</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8346-ietf-l3-unicast-topology</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/rfc8348-ietf-hardware/pom.xml b/model/ietf/rfc8348-ietf-hardware/pom.xml
index 9f8b16f3b4..38a9e02a57 100644
--- a/model/ietf/rfc8348-ietf-hardware/pom.xml
+++ b/model/ietf/rfc8348-ietf-hardware/pom.xml
@@ -33,7 +33,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991</artifactId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/model/ietf/rfc8348/pom.xml b/model/ietf/rfc8348/pom.xml
deleted file mode 100644
index 96a58d7471..0000000000
--- a/model/ietf/rfc8348/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2018 Pantheon Technologies, s.r.o. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
-        <version>12.0.0-SNAPSHOT</version>
-        <relativePath>../../../dom/dom-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-    <artifactId>rfc8348</artifactId>
-    <version>12.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>RFC8348 Hardware Management</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8348-ietf-hardware</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/rfc8349/pom.xml b/model/ietf/rfc8349/pom.xml
deleted file mode 100644
index d66bc401b7..0000000000
--- a/model/ietf/rfc8349/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
-        <version>12.0.0-SNAPSHOT</version>
-        <relativePath>../../../dom/dom-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-    <artifactId>rfc8349</artifactId>
-    <version>12.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>RFC8349 Routing Management</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8349-ietf-routing</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8349-ietf-ipv4-unicast-routing</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8349-ietf-ipv6-unicast-routing</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/rfc8519-ietf-packet-fields/pom.xml b/model/ietf/rfc8519-ietf-packet-fields/pom.xml
index a6e9922051..730bf0259a 100644
--- a/model/ietf/rfc8519-ietf-packet-fields/pom.xml
+++ b/model/ietf/rfc8519-ietf-packet-fields/pom.xml
@@ -29,7 +29,11 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991</artifactId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
diff --git a/model/ietf/rfc8519/pom.xml b/model/ietf/rfc8519/pom.xml
deleted file mode 100644
index 11fcb2310e..0000000000
--- a/model/ietf/rfc8519/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2019 PANTHEON.tech, s.r.o. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
-        <version>12.0.0-SNAPSHOT</version>
-        <relativePath>../../../dom/dom-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-    <artifactId>rfc8519</artifactId>
-    <version>12.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>RFC8519 Network Access Control Lists</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8519-ietf-access-control-list</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8519-ietf-ethertypes</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8519-ietf-packet-fields</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/rfc8520/pom.xml b/model/ietf/rfc8520/pom.xml
deleted file mode 100644
index af08ca6b88..0000000000
--- a/model/ietf/rfc8520/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2019 PANTHEON.tech, s.r.o. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
-        <version>12.0.0-SNAPSHOT</version>
-        <relativePath>../../../dom/dom-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-    <artifactId>rfc8520</artifactId>
-    <version>12.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>RFC8520 Manufacturer Usage Description</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8520-ietf-acldns</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8520-ietf-mud</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/rfc8525/pom.xml b/model/ietf/rfc8525/pom.xml
index 6e3151b9fb..a8c6115989 100644
--- a/model/ietf/rfc8525/pom.xml
+++ b/model/ietf/rfc8525/pom.xml
@@ -26,12 +26,15 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991</artifactId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8342-ietf-datastores</artifactId>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/model/ietf/rfc8528/pom.xml b/model/ietf/rfc8528/pom.xml
index 7ee56607a0..93c181f720 100644
--- a/model/ietf/rfc8528/pom.xml
+++ b/model/ietf/rfc8528/pom.xml
@@ -29,7 +29,11 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991</artifactId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/model/ietf/rfc8542/pom.xml b/model/ietf/rfc8542/pom.xml
deleted file mode 100644
index 0e472488c4..0000000000
--- a/model/ietf/rfc8542/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2019 PANTHEON.tech, s.r.o. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
-        <version>12.0.0-SNAPSHOT</version>
-        <relativePath>../../../dom/dom-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-    <artifactId>rfc8542</artifactId>
-    <version>12.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>RFC8542 Fabric Topology in Data-Center Networks</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8542-ietf-dc-fabric-topology</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/rfc8776/pom.xml b/model/ietf/rfc8776/pom.xml
deleted file mode 100644
index 7a731ec78d..0000000000
--- a/model/ietf/rfc8776/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2020 PANTHEON.tech, s.r.o. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
-        <version>12.0.0-SNAPSHOT</version>
-        <relativePath>../../../dom/dom-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-    <artifactId>rfc8776</artifactId>
-    <version>12.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>RFC8776 Common YANG Data Types for Traffic Engineering</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8776-ietf-te-types</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8776-ietf-te-packet-types</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/rfc8795/pom.xml b/model/ietf/rfc8795/pom.xml
deleted file mode 100644
index 7ba146bd05..0000000000
--- a/model/ietf/rfc8795/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2020 PANTHEON.tech, s.r.o. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.mdsal</groupId>
-        <artifactId>dom-parent</artifactId>
-        <version>12.0.0-SNAPSHOT</version>
-        <relativePath>../../../dom/dom-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-    <artifactId>rfc8795</artifactId>
-    <version>12.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>RFC8795 YANG Data Model for Traffic Engineering (TE) Topologies</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8795-ietf-te-topology</artifactId>
-        </dependency>
-    </dependencies>
-</project>
-- 
2.36.6