39 files changed, 33 insertions, 43 deletions
diff --git a/interface-definitions/include/bgp-neighbor-afi-l2vpn-evpn.xml.i b/interface-definitions/include/bgp-neighbor-afi-l2vpn-evpn.xml.i
deleted file mode 100644
index df346afc1..000000000
--- a/interface-definitions/include/bgp-neighbor-afi-l2vpn-evpn.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- included start from bgp-neighbor-afi-l2vpn-evpn.xml.i -->
-<node name="l2vpn-evpn">
-  <properties>
-    <help>L2VPN EVPN BGP settings</help>
-  </properties>
-  <children>
-    #include <include/bgp-afi-allowas-in.xml.i>
-    #include <include/bgp-afi-attribute-unchanged.xml.i>
-    #include <include/bgp-afi-nexthop-self.xml.i>
-    #include <include/bgp-afi-route-map.xml.i>
-    #include <include/bgp-afi-route-reflector-client.xml.i>
-    #include <include/bgp-afi-route-server-client.xml.i>
-    #include <include/bgp-afi-soft-reconfiguration.xml.i>
-  </children>
-</node>
-<!-- included end -->
diff --git a/interface-definitions/include/bgp-route-map.xml.i b/interface-definitions/include/bgp-route-map.xml.i
deleted file mode 100644
index 18b092354..000000000
--- a/interface-definitions/include/bgp-route-map.xml.i
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- included start from bgp-route-map.xml.i -->
-<leafNode name="route-map">
-  <properties>
-    <help>Route-map to modify route attributes</help>
-    <completionHelp>
-      <path>policy route-map</path>
-    </completionHelp>
-  </properties>
-</leafNode>
-<!-- included end -->
diff --git a/interface-definitions/include/bgp-afi-aggregate-address.xml.i b/interface-definitions/include/bgp/bgp-afi-aggregate-address.xml.i
index c33d1097c..c33d1097c 100644
--- a/interface-definitions/include/bgp-afi-aggregate-address.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-aggregate-address.xml.i
diff --git a/interface-definitions/include/bgp-afi-allowas-in.xml.i b/interface-definitions/include/bgp/bgp-afi-allowas-in.xml.i
index 77de04ed7..77de04ed7 100644
--- a/interface-definitions/include/bgp-afi-allowas-in.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-allowas-in.xml.i
diff --git a/interface-definitions/include/bgp-afi-attribute-unchanged.xml.i b/interface-definitions/include/bgp/bgp-afi-attribute-unchanged.xml.i
index fef53dd9d..fef53dd9d 100644
--- a/interface-definitions/include/bgp-afi-attribute-unchanged.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-attribute-unchanged.xml.i
diff --git a/interface-definitions/include/bgp-afi-capability-orf.xml.i b/interface-definitions/include/bgp/bgp-afi-capability-orf.xml.i
index 9bd265f93..9bd265f93 100644
--- a/interface-definitions/include/bgp-afi-capability-orf.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-capability-orf.xml.i
diff --git a/interface-definitions/include/bgp-afi-common.xml.i b/interface-definitions/include/bgp/bgp-afi-common.xml.i
index 90c2753c8..9126b36e7 100644
--- a/interface-definitions/include/bgp-afi-common.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-common.xml.i
@@ -11,14 +11,14 @@
     <valueless/>
   </properties>
 </leafNode>
-#include <include/bgp-afi-allowas-in.xml.i>
+#include <include/bgp/bgp-afi-allowas-in.xml.i>
 <leafNode name="as-override">
   <properties>
     <help>AS for routes sent to this peer to be the local AS</help>
     <valueless/>
   </properties>
 </leafNode>
-#include <include/bgp-afi-attribute-unchanged.xml.i>
+#include <include/bgp/bgp-afi-attribute-unchanged.xml.i>
 <node name="disable-send-community">
   <properties>
     <help>Disable sending community attributes to this peer</help>
@@ -43,7 +43,7 @@
     <help>Originate default route to this peer</help>
   </properties>
   <children>
-    #include <include/bgp-route-map.xml.i>
+    #include <include/route-map.xml.i>
   </children>
 </node>
 <node name="distribute-list">
@@ -118,17 +118,17 @@
     </constraint>
   </properties>
 </leafNode>
-#include <include/bgp-afi-nexthop-self.xml.i>
+#include <include/bgp/bgp-afi-nexthop-self.xml.i>
 <leafNode name="remove-private-as">
   <properties>
     <help>Remove private AS numbers from AS path in outbound route updates</help>
     <valueless/>
   </properties>
 </leafNode>
-#include <include/bgp-afi-route-map.xml.i>
-#include <include/bgp-afi-route-reflector-client.xml.i>
-#include <include/bgp-afi-route-server-client.xml.i>
-#include <include/bgp-afi-soft-reconfiguration.xml.i>
+#include <include/bgp/bgp-afi-route-map.xml.i>
+#include <include/bgp/bgp-afi-route-reflector-client.xml.i>
+#include <include/bgp/bgp-afi-route-server-client.xml.i>
+#include <include/bgp/bgp-afi-soft-reconfiguration.xml.i>
 <leafNode name="unsuppress-map">
   <properties>
     <help>Route-map to selectively unsuppress suppressed routes</help>
diff --git a/interface-definitions/include/bgp-afi-ipv4-prefix-list.xml.i b/interface-definitions/include/bgp/bgp-afi-ipv4-prefix-list.xml.i
index bbbada6bd..bbbada6bd 100644
--- a/interface-definitions/include/bgp-afi-ipv4-prefix-list.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-ipv4-prefix-list.xml.i
diff --git a/interface-definitions/include/bgp-afi-ipv6-nexthop-local.xml.i b/interface-definitions/include/bgp/bgp-afi-ipv6-nexthop-local.xml.i
index 4778b392f..4778b392f 100644
--- a/interface-definitions/include/bgp-afi-ipv6-nexthop-local.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-ipv6-nexthop-local.xml.i
diff --git a/interface-definitions/include/bgp-afi-ipv6-prefix-list.xml.i b/interface-definitions/include/bgp/bgp-afi-ipv6-prefix-list.xml.i
index 8ae7837e9..8ae7837e9 100644
--- a/interface-definitions/include/bgp-afi-ipv6-prefix-list.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-ipv6-prefix-list.xml.i
diff --git a/interface-definitions/include/bgp-afi-l2vpn-common.xml.i b/interface-definitions/include/bgp/bgp-afi-l2vpn-common.xml.i
index 2bbf57532..0b804f9cd 100644
--- a/interface-definitions/include/bgp-afi-l2vpn-common.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-l2vpn-common.xml.i
@@ -23,5 +23,5 @@
     </constraint>
   </properties>
 </leafNode>
-#include <include/bgp-route-target.xml.i>
+#include <include/bgp/bgp-route-target.xml.i>
 <!-- included end -->
diff --git a/interface-definitions/include/bgp-afi-maximum-paths.xml.i b/interface-definitions/include/bgp/bgp-afi-maximum-paths.xml.i
index 62133c375..62133c375 100644
--- a/interface-definitions/include/bgp-afi-maximum-paths.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-maximum-paths.xml.i
diff --git a/interface-definitions/include/bgp-afi-nexthop-self.xml.i b/interface-definitions/include/bgp/bgp-afi-nexthop-self.xml.i
index 0bcc4e937..0bcc4e937 100644
--- a/interface-definitions/include/bgp-afi-nexthop-self.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-nexthop-self.xml.i
diff --git a/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i b/interface-definitions/include/bgp/bgp-afi-redistribute-metric-route-map.xml.i
index e85bf7d11..cb930ed70 100644
--- a/interface-definitions/include/bgp-afi-redistribute-metric-route-map.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-redistribute-metric-route-map.xml.i
@@ -8,5 +8,5 @@
     </valueHelp>
   </properties>
 </leafNode>
-#include <include/bgp-route-map.xml.i>
+#include <include/route-map.xml.i>
 <!-- included end -->
diff --git a/interface-definitions/include/bgp-afi-route-map.xml.i b/interface-definitions/include/bgp/bgp-afi-route-map.xml.i
index 5549f56ca..5549f56ca 100644
--- a/interface-definitions/include/bgp-afi-route-map.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-route-map.xml.i
diff --git a/interface-definitions/include/bgp-afi-route-reflector-client.xml.i b/interface-definitions/include/bgp/bgp-afi-route-reflector-client.xml.i
index f6a9caa61..f6a9caa61 100644
--- a/interface-definitions/include/bgp-afi-route-reflector-client.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-route-reflector-client.xml.i
diff --git a/interface-definitions/include/bgp-afi-route-server-client.xml.i b/interface-definitions/include/bgp/bgp-afi-route-server-client.xml.i
index 60de553fe..60de553fe 100644
--- a/interface-definitions/include/bgp-afi-route-server-client.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-route-server-client.xml.i
diff --git a/interface-definitions/include/bgp-afi-soft-reconfiguration.xml.i b/interface-definitions/include/bgp/bgp-afi-soft-reconfiguration.xml.i
index 7af11f8f4..7af11f8f4 100644
--- a/interface-definitions/include/bgp-afi-soft-reconfiguration.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-soft-reconfiguration.xml.i
diff --git a/interface-definitions/include/bgp-bfd.xml.i b/interface-definitions/include/bgp/bgp-bfd.xml.i
index fe52b12f2..fe52b12f2 100644
--- a/interface-definitions/include/bgp-bfd.xml.i
+++ b/interface-definitions/include/bgp/bgp-bfd.xml.i
diff --git a/interface-definitions/include/bgp-capability.xml.i b/interface-definitions/include/bgp/bgp-capability.xml.i
index 8de5bd8ab..8de5bd8ab 100644
--- a/interface-definitions/include/bgp-capability.xml.i
+++ b/interface-definitions/include/bgp/bgp-capability.xml.i
diff --git a/interface-definitions/include/bgp-description.xml.i b/interface-definitions/include/bgp/bgp-description.xml.i
index e1766cb9f..e1766cb9f 100644
--- a/interface-definitions/include/bgp-description.xml.i
+++ b/interface-definitions/include/bgp/bgp-description.xml.i
diff --git a/interface-definitions/include/bgp-disable-capability-negotiation.xml.i b/interface-definitions/include/bgp/bgp-disable-capability-negotiation.xml.i
index a43c6e8b9..a43c6e8b9 100644
--- a/interface-definitions/include/bgp-disable-capability-negotiation.xml.i
+++ b/interface-definitions/include/bgp/bgp-disable-capability-negotiation.xml.i
diff --git a/interface-definitions/include/bgp-disable-connected-check.xml.i b/interface-definitions/include/bgp/bgp-disable-connected-check.xml.i
index bb9098bf6..bb9098bf6 100644
--- a/interface-definitions/include/bgp-disable-connected-check.xml.i
+++ b/interface-definitions/include/bgp/bgp-disable-connected-check.xml.i
diff --git a/interface-definitions/include/bgp-ebgp-multihop.xml.i b/interface-definitions/include/bgp/bgp-ebgp-multihop.xml.i
index 6459fcf47..6459fcf47 100644
--- a/interface-definitions/include/bgp-ebgp-multihop.xml.i
+++ b/interface-definitions/include/bgp/bgp-ebgp-multihop.xml.i
diff --git a/interface-definitions/include/bgp-local-as.xml.i b/interface-definitions/include/bgp/bgp-local-as.xml.i
index cf55ce476..cf55ce476 100644
--- a/interface-definitions/include/bgp-local-as.xml.i
+++ b/interface-definitions/include/bgp/bgp-local-as.xml.i
diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-unicast.xml.i
index ece277fbf..964bc6264 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
+++ b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-unicast.xml.i
@@ -9,11 +9,11 @@
         <help>Advertise capabilities to this neighbor (IPv4)</help>
       </properties>
       <children>
-        #include <include/bgp-afi-capability-orf.xml.i>
+        #include <include/bgp/bgp-afi-capability-orf.xml.i>
       </children>
     </node>
-    #include <include/bgp-afi-ipv4-prefix-list.xml.i>
-    #include <include/bgp-afi-common.xml.i>
+    #include <include/bgp/bgp-afi-ipv4-prefix-list.xml.i>
+    #include <include/bgp/bgp-afi-common.xml.i>
   </children>
 </node>
 <!-- included end -->
diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-unicast.xml.i
index e43c34113..c31863320 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
+++ b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-unicast.xml.i
@@ -9,12 +9,12 @@
         <help>Advertise capabilities to this neighbor (IPv6)</help>
       </properties>
       <children>
-        #include <include/bgp-afi-capability-orf.xml.i>
+        #include <include/bgp/bgp-afi-capability-orf.xml.i>
       </children>
     </node>
-    #include <include/bgp-afi-ipv6-nexthop-local.xml.i>
-    #include <include/bgp-afi-ipv6-prefix-list.xml.i>
-    #include <include/bgp-afi-common.xml.i>
+    #include <include/bgp/bgp-afi-ipv6-nexthop-local.xml.i>
+    #include <include/bgp/bgp-afi-ipv6-prefix-list.xml.i>
+    #include <include/bgp/bgp-afi-common.xml.i>
   </children>
 </node>
 <!-- included end -->
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-l2vpn-evpn.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-l2vpn-evpn.xml.i
new file mode 100644
index 000000000..35e11ad2c
--- /dev/null
+++ b/interface-definitions/include/bgp/bgp-neighbor-afi-l2vpn-evpn.xml.i
@@ -0,0 +1,16 @@
+<!-- included start from bgp-neighbor-afi-l2vpn-evpn.xml.i -->
+<node name="l2vpn-evpn">
+  <properties>
+    <help>L2VPN EVPN BGP settings</help>
+  </properties>
+  <children>
+    #include <include/bgp/bgp-afi-allowas-in.xml.i>
+    #include <include/bgp/bgp-afi-attribute-unchanged.xml.i>
+    #include <include/bgp/bgp-afi-nexthop-self.xml.i>
+    #include <include/bgp/bgp-afi-route-map.xml.i>
+    #include <include/bgp/bgp-afi-route-reflector-client.xml.i>
+    #include <include/bgp/bgp-afi-route-server-client.xml.i>
+    #include <include/bgp/bgp-afi-soft-reconfiguration.xml.i>
+  </children>
+</node>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-override-capability.xml.i b/interface-definitions/include/bgp/bgp-override-capability.xml.i
index 88c277c8b..88c277c8b 100644
--- a/interface-definitions/include/bgp-override-capability.xml.i
+++ b/interface-definitions/include/bgp/bgp-override-capability.xml.i
diff --git a/interface-definitions/include/bgp-passive.xml.i b/interface-definitions/include/bgp/bgp-passive.xml.i
index ada961866..ada961866 100644
--- a/interface-definitions/include/bgp-passive.xml.i
+++ b/interface-definitions/include/bgp/bgp-passive.xml.i
diff --git a/interface-definitions/include/bgp-password.xml.i b/interface-definitions/include/bgp/bgp-password.xml.i
index 5b68a2d71..5b68a2d71 100644
--- a/interface-definitions/include/bgp-password.xml.i
+++ b/interface-definitions/include/bgp/bgp-password.xml.i
diff --git a/interface-definitions/include/bgp-peer-group.xml.i b/interface-definitions/include/bgp/bgp-peer-group.xml.i
index 6ee90b17f..6ee90b17f 100644
--- a/interface-definitions/include/bgp-peer-group.xml.i
+++ b/interface-definitions/include/bgp/bgp-peer-group.xml.i
diff --git a/interface-definitions/include/bgp-remote-as.xml.i b/interface-definitions/include/bgp/bgp-remote-as.xml.i
index de3f4d2ad..de3f4d2ad 100644
--- a/interface-definitions/include/bgp-remote-as.xml.i
+++ b/interface-definitions/include/bgp/bgp-remote-as.xml.i
diff --git a/interface-definitions/include/bgp-route-target.xml.i b/interface-definitions/include/bgp/bgp-route-target.xml.i
index c3df56a74..c3df56a74 100644
--- a/interface-definitions/include/bgp-route-target.xml.i
+++ b/interface-definitions/include/bgp/bgp-route-target.xml.i
diff --git a/interface-definitions/include/bgp-shutdown.xml.i b/interface-definitions/include/bgp/bgp-shutdown.xml.i
index fefbfcebb..fefbfcebb 100644
--- a/interface-definitions/include/bgp-shutdown.xml.i
+++ b/interface-definitions/include/bgp/bgp-shutdown.xml.i
diff --git a/interface-definitions/include/bgp-timers-holdtime.xml.i b/interface-definitions/include/bgp/bgp-timers-holdtime.xml.i
index 09924574b..09924574b 100644
--- a/interface-definitions/include/bgp-timers-holdtime.xml.i
+++ b/interface-definitions/include/bgp/bgp-timers-holdtime.xml.i
diff --git a/interface-definitions/include/bgp-timers-keepalive.xml.i b/interface-definitions/include/bgp/bgp-timers-keepalive.xml.i
index 7d294c9d6..7d294c9d6 100644
--- a/interface-definitions/include/bgp-timers-keepalive.xml.i
+++ b/interface-definitions/include/bgp/bgp-timers-keepalive.xml.i
diff --git a/interface-definitions/include/bgp-ttl-security.xml.i b/interface-definitions/include/bgp/bgp-ttl-security.xml.i
index 3f4d1786d..3f4d1786d 100644
--- a/interface-definitions/include/bgp-ttl-security.xml.i
+++ b/interface-definitions/include/bgp/bgp-ttl-security.xml.i
diff --git a/interface-definitions/include/bgp-update-source.xml.i b/interface-definitions/include/bgp/bgp-update-source.xml.i
index 3bb79598d..3bb79598d 100644
--- a/interface-definitions/include/bgp-update-source.xml.i
+++ b/interface-definitions/include/bgp/bgp-update-source.xml.i