47 files changed, 114 insertions, 114 deletions
diff --git a/interface-definitions/include/interface-ipv4-options.xml.i b/interface-definitions/include/interface-ipv4-options.xml.i
deleted file mode 100644
index 64672f164..000000000
--- a/interface-definitions/include/interface-ipv4-options.xml.i
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- include start from interface-ipv4-options.xml.i -->
-<node name="ip">
-  <properties>
-    <help>IPv4 routing parameters</help>
-  </properties>
-  <children>
-    #include <include/interface-arp-cache-timeout.xml.i>
-    #include <include/interface-disable-arp-filter.xml.i>
-    #include <include/interface-disable-forwarding.xml.i>
-    #include <include/interface-enable-arp-accept.xml.i>
-    #include <include/interface-enable-arp-announce.xml.i>
-    #include <include/interface-enable-arp-ignore.xml.i>
-    #include <include/interface-enable-proxy-arp.xml.i>
-    #include <include/interface-proxy-arp-pvlan.xml.i>
-    #include <include/interface-source-validation.xml.i>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-ipv6-options.xml.i b/interface-definitions/include/interface-ipv6-options.xml.i
deleted file mode 100644
index a15aea9c1..000000000
--- a/interface-definitions/include/interface-ipv6-options.xml.i
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- include start from interface-ipv6-options.xml.i -->
-<node name="ipv6">
-  <properties>
-    <help>IPv6 routing parameters</help>
-  </properties>
-  <children>
-    #include <include/ipv6-address.xml.i>
-    #include <include/ipv6-disable-forwarding.xml.i>
-    #include <include/ipv6-dup-addr-detect-transmits.xml.i>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i b/interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i
index b9dd59bea..b9dd59bea 100644
--- a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
+++ b/interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i
diff --git a/interface-definitions/include/address-ipv4-ipv6.xml.i b/interface-definitions/include/interface/address-ipv4-ipv6.xml.i
index 519622050..519622050 100644
--- a/interface-definitions/include/address-ipv4-ipv6.xml.i
+++ b/interface-definitions/include/interface/address-ipv4-ipv6.xml.i
diff --git a/interface-definitions/include/dhcp-options.xml.i b/interface-definitions/include/interface/dhcp-options.xml.i
index 8972b53e9..bd327da2d 100644
--- a/interface-definitions/include/dhcp-options.xml.i
+++ b/interface-definitions/include/interface/dhcp-options.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from dhcp-options.xml.i -->
+<!-- include start from interface/dhcp-options.xml.i -->
 <node name="dhcp-options">
   <properties>
     <help>DHCP client settings/options</help>
diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/interface/dhcpv6-options.xml.i
index a569659a4..ca478a3eb 100644
--- a/interface-definitions/include/dhcpv6-options.xml.i
+++ b/interface-definitions/include/interface/dhcpv6-options.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from dhcpv6-options.xml.i -->
+<!-- include start from interface/dhcpv6-options.xml.i -->
 <node name="dhcpv6-options">
   <properties>
     <help>DHCPv6 client settings/options</help>
diff --git a/interface-definitions/include/interface-arp-cache-timeout.xml.i b/interface-definitions/include/interface/interface-arp-cache-timeout.xml.i
index 09fd70afc..b269fecd8 100644
--- a/interface-definitions/include/interface-arp-cache-timeout.xml.i
+++ b/interface-definitions/include/interface/interface-arp-cache-timeout.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-arp-cache-timeout.xml.i -->
+<!-- include start from interface/interface-arp-cache-timeout.xml.i -->
 <leafNode name="arp-cache-timeout">
   <properties>
     <help>ARP cache entry timeout in seconds</help>
diff --git a/interface-definitions/include/interface-description.xml.i b/interface-definitions/include/interface/interface-description.xml.i
index b16c562bb..d618b50d2 100644
--- a/interface-definitions/include/interface-description.xml.i
+++ b/interface-definitions/include/interface/interface-description.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-description.xml.i -->
+<!-- include start from interface/interface-description.xml.i -->
 <leafNode name="description">
   <properties>
     <help>Interface specific description</help>
diff --git a/interface-definitions/include/interface-dial-on-demand.xml.i b/interface-definitions/include/interface/interface-dial-on-demand.xml.i
index 5067e45df..66edd9678 100644
--- a/interface-definitions/include/interface-dial-on-demand.xml.i
+++ b/interface-definitions/include/interface/interface-dial-on-demand.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-dial-on-demand.xml.i -->
+<!-- include start from interface/interface-dial-on-demand.xml.i -->
 <leafNode name="connect-on-demand">
   <properties>
     <help>Establishment connection automatically when traffic is sent</help>
diff --git a/interface-definitions/include/interface-disable-arp-filter.xml.i b/interface-definitions/include/interface/interface-disable-arp-filter.xml.i
index 5f118d49c..49cddaf76 100644
--- a/interface-definitions/include/interface-disable-arp-filter.xml.i
+++ b/interface-definitions/include/interface/interface-disable-arp-filter.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-disable-arp-filter.xml.i -->
+<!-- include start from interface/interface-disable-arp-filter.xml.i -->
 <leafNode name="disable-arp-filter">
   <properties>
     <help>Disable ARP filter on this interface</help>
diff --git a/interface-definitions/include/interface-disable-forwarding.xml.i b/interface-definitions/include/interface/interface-disable-forwarding.xml.i
index fdce8f846..cb6ef0475 100644
--- a/interface-definitions/include/interface-disable-forwarding.xml.i
+++ b/interface-definitions/include/interface/interface-disable-forwarding.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-disable-forwarding.xml.i -->
+<!-- include start from interface/interface-disable-forwarding.xml.i -->
 <leafNode name="disable-forwarding">
   <properties>
     <help>Disable IPv4 forwarding on this interface</help>
diff --git a/interface-definitions/include/interface-disable-link-detect.xml.i b/interface-definitions/include/interface/interface-disable-link-detect.xml.i
index 60c5f635b..c528885b2 100644
--- a/interface-definitions/include/interface-disable-link-detect.xml.i
+++ b/interface-definitions/include/interface/interface-disable-link-detect.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-disable-link-detect.xml.i -->
+<!-- include start from interface/interface-disable-link-detect.xml.i -->
 <leafNode name="disable-link-detect">
   <properties>
     <help>Ignore link state changes</help>
diff --git a/interface-definitions/include/interface-disable.xml.i b/interface-definitions/include/interface/interface-disable.xml.i
index 5a058df01..d90e6395b 100644
--- a/interface-definitions/include/interface-disable.xml.i
+++ b/interface-definitions/include/interface/interface-disable.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-disable.xml.i -->
+<!-- include start from interface/interface-disable.xml.i -->
 <leafNode name="disable">
   <properties>
     <help>Administratively disable interface</help>
diff --git a/interface-definitions/include/interface-eapol.xml.i b/interface-definitions/include/interface/interface-eapol.xml.i
index fafa75f1a..92b7a3f35 100644
--- a/interface-definitions/include/interface-eapol.xml.i
+++ b/interface-definitions/include/interface/interface-eapol.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-eapol.xml.i -->
+<!-- include start from interface/interface-eapol.xml.i -->
 <node name="eapol">
   <properties>
      <help>Extensible Authentication Protocol over Local Area Network</help>
diff --git a/interface-definitions/include/interface-enable-arp-accept.xml.i b/interface-definitions/include/interface/interface-enable-arp-accept.xml.i
index bec08a708..7c5d51857 100644
--- a/interface-definitions/include/interface-enable-arp-accept.xml.i
+++ b/interface-definitions/include/interface/interface-enable-arp-accept.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-enable-arp-accept.xml.i -->
+<!-- include start from interface/interface-enable-arp-accept.xml.i -->
 <leafNode name="enable-arp-accept">
   <properties>
     <help>Enable ARP accept on this interface</help>
diff --git a/interface-definitions/include/interface-enable-arp-announce.xml.i b/interface-definitions/include/interface/interface-enable-arp-announce.xml.i
index ef9e5db1e..f44599c54 100644
--- a/interface-definitions/include/interface-enable-arp-announce.xml.i
+++ b/interface-definitions/include/interface/interface-enable-arp-announce.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-enable-arp-announce.xml.i -->
+<!-- include start from interface/interface-enable-arp-announce.xml.i -->
 <leafNode name="enable-arp-announce">
   <properties>
     <help>Enable ARP announce on this interface</help>
diff --git a/interface-definitions/include/interface-enable-arp-ignore.xml.i b/interface-definitions/include/interface/interface-enable-arp-ignore.xml.i
index 0a33a2c9a..3ea39613c 100644
--- a/interface-definitions/include/interface-enable-arp-ignore.xml.i
+++ b/interface-definitions/include/interface/interface-enable-arp-ignore.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-enable-arp-ignore.xml.i -->
+<!-- include start from interface/interface-enable-arp-ignore.xml.i -->
 <leafNode name="enable-arp-ignore">
   <properties>
     <help>Enable ARP ignore on this interface</help>
diff --git a/interface-definitions/include/interface-enable-proxy-arp.xml.i b/interface-definitions/include/interface/interface-enable-proxy-arp.xml.i
index a0993539f..dbdeeb7a7 100644
--- a/interface-definitions/include/interface-enable-proxy-arp.xml.i
+++ b/interface-definitions/include/interface/interface-enable-proxy-arp.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-enable-proxy-arp.xml.i -->
+<!-- include start from interface/interface-enable-proxy-arp.xml.i -->
 <leafNode name="enable-proxy-arp">
   <properties>
     <help>Enable proxy-arp on this interface</help>
diff --git a/interface-definitions/include/interface-hw-id.xml.i b/interface-definitions/include/interface/interface-hw-id.xml.i
index 78e8613d8..989cd9cb7 100644
--- a/interface-definitions/include/interface-hw-id.xml.i
+++ b/interface-definitions/include/interface/interface-hw-id.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-hw-id.xml.i -->
+<!-- include start from interface/interface-hw-id.xml.i -->
 <leafNode name="hw-id">
   <properties>
     <help>Associate Ethernet Interface with given Media Access Control (MAC) address</help>
diff --git a/interface-definitions/include/interface/interface-ipv4-options.xml.i b/interface-definitions/include/interface/interface-ipv4-options.xml.i
new file mode 100644
index 000000000..c2d0677b7
--- /dev/null
+++ b/interface-definitions/include/interface/interface-ipv4-options.xml.i
@@ -0,0 +1,18 @@
+<!-- include start from interface/interface-ipv4-options.xml.i -->
+<node name="ip">
+  <properties>
+    <help>IPv4 routing parameters</help>
+  </properties>
+  <children>
+    #include <include/interface/interface-arp-cache-timeout.xml.i>
+    #include <include/interface/interface-disable-arp-filter.xml.i>
+    #include <include/interface/interface-disable-forwarding.xml.i>
+    #include <include/interface/interface-enable-arp-accept.xml.i>
+    #include <include/interface/interface-enable-arp-announce.xml.i>
+    #include <include/interface/interface-enable-arp-ignore.xml.i>
+    #include <include/interface/interface-enable-proxy-arp.xml.i>
+    #include <include/interface/interface-proxy-arp-pvlan.xml.i>
+    #include <include/interface/interface-source-validation.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-ipv6-options.xml.i b/interface-definitions/include/interface/interface-ipv6-options.xml.i
new file mode 100644
index 000000000..dcd5a8710
--- /dev/null
+++ b/interface-definitions/include/interface/interface-ipv6-options.xml.i
@@ -0,0 +1,12 @@
+<!-- include start from interface/interface-ipv6-options.xml.i -->
+<node name="ipv6">
+  <properties>
+    <help>IPv6 routing parameters</help>
+  </properties>
+  <children>
+    #include <include/interface/ipv6-address.xml.i>
+    #include <include/interface/ipv6-disable-forwarding.xml.i>
+    #include <include/interface/ipv6-dup-addr-detect-transmits.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface-mac.xml.i b/interface-definitions/include/interface/interface-mac.xml.i
index 160b42b2e..d7107ad23 100644
--- a/interface-definitions/include/interface-mac.xml.i
+++ b/interface-definitions/include/interface/interface-mac.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from mac.xml.i -->
+<!-- include start from interface/interface-mac.xml.i -->
 <leafNode name="mac">
   <properties>
     <help>Media Access Control (MAC) address</help>
diff --git a/interface-definitions/include/interface-mirror.xml.i b/interface-definitions/include/interface/interface-mirror.xml.i
index 445e214fe..b3b45fb43 100644
--- a/interface-definitions/include/interface-mirror.xml.i
+++ b/interface-definitions/include/interface/interface-mirror.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-mirror.xml.i -->
+<!-- include start from interface/interface-mirror.xml.i -->
 <node name="mirror">
   <properties>
     <help>Incoming/outgoing packet mirroring destination</help>
diff --git a/interface-definitions/include/interface-mtu-1200-16000.xml.i b/interface-definitions/include/interface/interface-mtu-1200-16000.xml.i
index 0187c5991..3241ba912 100644
--- a/interface-definitions/include/interface-mtu-1200-16000.xml.i
+++ b/interface-definitions/include/interface/interface-mtu-1200-16000.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-mtu-1200-16000.xml.i -->
+<!-- include start from interface/interface-mtu-1200-16000.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
diff --git a/interface-definitions/include/interface-mtu-1450-16000.xml.i b/interface-definitions/include/interface/interface-mtu-1450-16000.xml.i
index 84268586e..0a35bbbaa 100644
--- a/interface-definitions/include/interface-mtu-1450-16000.xml.i
+++ b/interface-definitions/include/interface/interface-mtu-1450-16000.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-mtu-1450-16000.xml.i -->
+<!-- include start from interface/interface-mtu-1450-16000.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
diff --git a/interface-definitions/include/interface-mtu-64-8024.xml.i b/interface-definitions/include/interface/interface-mtu-64-8024.xml.i
index 6a7ab8a80..f75de02ba 100644
--- a/interface-definitions/include/interface-mtu-64-8024.xml.i
+++ b/interface-definitions/include/interface/interface-mtu-64-8024.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-mtu-68-8024.xml.i -->
+<!-- include start from interface/interface-mtu-68-8024.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
diff --git a/interface-definitions/include/interface-mtu-68-1500.xml.i b/interface-definitions/include/interface/interface-mtu-68-1500.xml.i
index ea333edcc..9e6fe8760 100644
--- a/interface-definitions/include/interface-mtu-68-1500.xml.i
+++ b/interface-definitions/include/interface/interface-mtu-68-1500.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-mtu-68-1500.xml.i -->
+<!-- include start from interface/interface-mtu-68-1500.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
diff --git a/interface-definitions/include/interface-mtu-68-16000.xml.i b/interface-definitions/include/interface/interface-mtu-68-16000.xml.i
index a9107c027..83af7bbd4 100644
--- a/interface-definitions/include/interface-mtu-68-16000.xml.i
+++ b/interface-definitions/include/interface/interface-mtu-68-16000.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-mtu-68-16000.xml.i -->
+<!-- include start from interface/interface-mtu-68-16000.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
diff --git a/interface-definitions/include/interface-parameters-dont-fragment.xml.i b/interface-definitions/include/interface/interface-parameters-dont-fragment.xml.i
index d6c276d67..166c31115 100644
--- a/interface-definitions/include/interface-parameters-dont-fragment.xml.i
+++ b/interface-definitions/include/interface/interface-parameters-dont-fragment.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-parameters-df.xml.i -->
+<!-- include start from interface/interface-parameters-df.xml.i -->
 <leafNode name="dont-fragment">
   <properties>
     <help>Specifies the usage of the dont fragment (DF) bit</help>
diff --git a/interface-definitions/include/interface-parameters-flowlabel.xml.i b/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i
index dc651bc9c..ed075e40d 100644
--- a/interface-definitions/include/interface-parameters-flowlabel.xml.i
+++ b/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-parameters-flowlabel.xml.i -->
+<!-- include start from interface/interface-parameters-flowlabel.xml.i -->
 <leafNode name="flowlabel">
   <properties>
     <help>Specifies the flow label to use in outgoing packets</help>
diff --git a/interface-definitions/include/interface-parameters-key.xml.i b/interface-definitions/include/interface/interface-parameters-key.xml.i
index 1891b44b0..1b1d67174 100644
--- a/interface-definitions/include/interface-parameters-key.xml.i
+++ b/interface-definitions/include/interface/interface-parameters-key.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-parameters-key.xml.i -->
+<!-- include start from interface/interface-parameters-key.xml.i -->
 <leafNode name="key">
   <properties>
     <help>Tunnel key</help>
diff --git a/interface-definitions/include/interface-parameters-tos.xml.i b/interface-definitions/include/interface/interface-parameters-tos.xml.i
index 06ec2febb..83b4e0671 100644
--- a/interface-definitions/include/interface-parameters-tos.xml.i
+++ b/interface-definitions/include/interface/interface-parameters-tos.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from tunnel-parameters-tos.xml.i -->
+<!-- include start from interface/tunnel-parameters-tos.xml.i -->
 <leafNode name="tos">
   <properties>
     <help>Specifies TOS value to use in outgoing packets</help>
diff --git a/interface-definitions/include/interface-parameters-ttl.xml.i b/interface-definitions/include/interface/interface-parameters-ttl.xml.i
index a2e13d8d1..df193cf24 100644
--- a/interface-definitions/include/interface-parameters-ttl.xml.i
+++ b/interface-definitions/include/interface/interface-parameters-ttl.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-parameters-ttl.xml.i -->
+<!-- include start from interface/interface-parameters-ttl.xml.i -->
 <leafNode name="ttl">
   <properties>
     <help>Specifies TTL value to use in outgoing packets</help>
diff --git a/interface-definitions/include/interface-proxy-arp-pvlan.xml.i b/interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i
index 484f8fd69..153dfc072 100644
--- a/interface-definitions/include/interface-proxy-arp-pvlan.xml.i
+++ b/interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-proxy-arp-pvlan.xml.i -->
+<!-- include start from interface/interface-proxy-arp-pvlan.xml.i -->
 <leafNode name="proxy-arp-pvlan">
   <properties>
     <help>Enable private VLAN proxy ARP on this interface</help>
diff --git a/interface-definitions/include/interface-source-validation.xml.i b/interface-definitions/include/interface/interface-source-validation.xml.i
index be58bce87..70914f2e9 100644
--- a/interface-definitions/include/interface-source-validation.xml.i
+++ b/interface-definitions/include/interface/interface-source-validation.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-source-validation.xml.i -->
+<!-- include start from interface/interface-source-validation.xml.i -->
 <leafNode name="source-validation">
   <properties>
     <help>Source validation by reversed path (RFC3704)</help>
diff --git a/interface-definitions/include/interface-vrf.xml.i b/interface-definitions/include/interface/interface-vrf.xml.i
index 81ca0972b..ef6ca1241 100644
--- a/interface-definitions/include/interface-vrf.xml.i
+++ b/interface-definitions/include/interface/interface-vrf.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-vrf.xml.i -->
+<!-- include start from interface/interface-vrf.xml.i -->
 <leafNode name="vrf">
   <properties>
     <help>VRF instance name</help>
diff --git a/interface-definitions/include/interface-xdp.xml.i b/interface-definitions/include/interface/interface-xdp.xml.i
index 21fcf131d..0253f6dad 100644
--- a/interface-definitions/include/interface-xdp.xml.i
+++ b/interface-definitions/include/interface/interface-xdp.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface-vrf.xml.i -->
+<!-- include start from interface/interface-xdp.xml.i -->
 <leafNode name="xdp">
   <properties>
     <help>Enable eXpress Data Path</help>
diff --git a/interface-definitions/include/ipv6-address-autoconf.xml.i b/interface-definitions/include/interface/ipv6-address-autoconf.xml.i
index a84293067..cd1483bc1 100644
--- a/interface-definitions/include/ipv6-address-autoconf.xml.i
+++ b/interface-definitions/include/interface/ipv6-address-autoconf.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from ipv6-address-autoconf.xml.i -->
+<!-- include start from interface/ipv6-address-autoconf.xml.i -->
 <leafNode name="autoconf">
   <properties>
     <help>Enable acquisition of IPv6 address using stateless autoconfig (SLAAC)</help>
diff --git a/interface-definitions/include/ipv6-address-eui64.xml.i b/interface-definitions/include/interface/ipv6-address-eui64.xml.i
index e06e88d52..7bc1ee2e4 100644
--- a/interface-definitions/include/ipv6-address-eui64.xml.i
+++ b/interface-definitions/include/interface/ipv6-address-eui64.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from ipv6-address-eui64.xml.i -->
+<!-- include start from interface/ipv6-address-eui64.xml.i -->
 <leafNode name="eui64">
   <properties>
     <help>Prefix for IPv6 address with MAC-based EUI-64</help>
diff --git a/interface-definitions/include/ipv6-address-no-default-link-local.xml.i b/interface-definitions/include/interface/ipv6-address-no-default-link-local.xml.i
index e803a4d60..012490edc 100644
--- a/interface-definitions/include/ipv6-address-no-default-link-local.xml.i
+++ b/interface-definitions/include/interface/ipv6-address-no-default-link-local.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from ipv6-address-no-default-link-local.xml.i -->
+<!-- include start from interface/ipv6-address-no-default-link-local.xml.i -->
 <leafNode name="no-default-link-local">
   <properties>
     <help>Remove the default link-local address from the interface</help>
diff --git a/interface-definitions/include/interface/ipv6-address.xml.i b/interface-definitions/include/interface/ipv6-address.xml.i
new file mode 100644
index 000000000..e1bdf02fd
--- /dev/null
+++ b/interface-definitions/include/interface/ipv6-address.xml.i
@@ -0,0 +1,12 @@
+<!-- include start from interface/ipv6-address.xml.i -->
+<node name="address">
+  <properties>
+    <help>IPv6 address configuration modes</help>
+  </properties>
+  <children>
+    #include <include/interface/ipv6-address-autoconf.xml.i>
+    #include <include/interface/ipv6-address-eui64.xml.i>
+    #include <include/interface/ipv6-address-no-default-link-local.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/ipv6-disable-forwarding.xml.i b/interface-definitions/include/interface/ipv6-disable-forwarding.xml.i
index 5f368256b..4adb77d1b 100644
--- a/interface-definitions/include/ipv6-disable-forwarding.xml.i
+++ b/interface-definitions/include/interface/ipv6-disable-forwarding.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from ipv6-disable-forwarding.xml.i -->
+<!-- include start from interface/ipv6-disable-forwarding.xml.i -->
 <leafNode name="disable-forwarding">
   <properties>
     <help>Disable IPv6 forwarding on this interface</help>
diff --git a/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i b/interface-definitions/include/interface/ipv6-dup-addr-detect-transmits.xml.i
index c6265d71a..2b5ec0281 100644
--- a/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i
+++ b/interface-definitions/include/interface/ipv6-dup-addr-detect-transmits.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from ipv6-dup-addr-detect-transmits.xml.i -->
+<!-- include start from interface/ipv6-dup-addr-detect-transmits.xml.i -->
 <leafNode name="dup-addr-detect-transmits">
   <properties>
     <help>Number of NS messages to send while performing DAD (default: 1)</help>
diff --git a/interface-definitions/include/tunnel-remote.xml.i b/interface-definitions/include/interface/tunnel-remote.xml.i
index 324d100d4..1ba9b0382 100644
--- a/interface-definitions/include/tunnel-remote.xml.i
+++ b/interface-definitions/include/interface/tunnel-remote.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from tunnel-remote.xml.i -->
+<!-- include start from rip/tunnel-remote.xml.i -->
 <leafNode name="remote">
   <properties>
     <help>Tunnel remote address</help>
diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i
index 5760bb000..045fd3e24 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/interface/vif-s.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from vif-s.xml.i -->
+<!-- include start from interface/vif-s.xml.i -->
 <tagNode name="vif-s">
   <properties>
     <help>QinQ TAG-S Virtual Local Area Network (VLAN) ID</help>
@@ -8,12 +8,12 @@
     <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>
   </properties>
   <children>
-    #include <include/address-ipv4-ipv6-dhcp.xml.i>
-    #include <include/interface-description.xml.i>
-    #include <include/dhcp-options.xml.i>
-    #include <include/dhcpv6-options.xml.i>
-    #include <include/interface-disable-link-detect.xml.i>
-    #include <include/interface-disable.xml.i>
+    #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
+    #include <include/interface/interface-description.xml.i>
+    #include <include/interface/dhcp-options.xml.i>
+    #include <include/interface/dhcpv6-options.xml.i>
+    #include <include/interface/interface-disable-link-detect.xml.i>
+    #include <include/interface/interface-disable.xml.i>
     <leafNode name="protocol">
       <properties>
         <help>Protocol used for service VLAN (default: 802.1ad)</help>
@@ -35,10 +35,10 @@
       </properties>
       <defaultValue>802.1ad</defaultValue>
     </leafNode>
-    #include <include/interface-ipv4-options.xml.i>
-    #include <include/interface-ipv6-options.xml.i>
-    #include <include/interface-mac.xml.i>
-    #include <include/interface-mtu-68-16000.xml.i>
+    #include <include/interface/interface-ipv4-options.xml.i>
+    #include <include/interface/interface-ipv6-options.xml.i>
+    #include <include/interface/interface-mac.xml.i>
+    #include <include/interface/interface-mtu-68-16000.xml.i>
     <tagNode name="vif-c">
       <properties>
         <help>QinQ TAG-C Virtual Local Area Network (VLAN) ID</help>
@@ -48,20 +48,20 @@
         <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>
       </properties>
       <children>
-        #include <include/address-ipv4-ipv6-dhcp.xml.i>
-        #include <include/interface-description.xml.i>
-        #include <include/dhcp-options.xml.i>
-        #include <include/dhcpv6-options.xml.i>
-        #include <include/interface-disable-link-detect.xml.i>
-        #include <include/interface-disable.xml.i>
-        #include <include/interface-ipv4-options.xml.i>
-        #include <include/interface-ipv6-options.xml.i>
-        #include <include/interface-mac.xml.i>
-        #include <include/interface-mtu-68-16000.xml.i>
-        #include <include/interface-vrf.xml.i>
+        #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
+        #include <include/interface/interface-description.xml.i>
+        #include <include/interface/dhcp-options.xml.i>
+        #include <include/interface/dhcpv6-options.xml.i>
+        #include <include/interface/interface-disable-link-detect.xml.i>
+        #include <include/interface/interface-disable.xml.i>
+        #include <include/interface/interface-ipv4-options.xml.i>
+        #include <include/interface/interface-ipv6-options.xml.i>
+        #include <include/interface/interface-mac.xml.i>
+        #include <include/interface/interface-mtu-68-16000.xml.i>
+        #include <include/interface/interface-vrf.xml.i>
       </children>
     </tagNode>
-    #include <include/interface-vrf.xml.i>
+    #include <include/interface/interface-vrf.xml.i>
   </children>
 </tagNode>
 <!-- include end -->
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/interface/vif.xml.i
index 0f09b993d..0355054a4 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/interface/vif.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from vif.xml.i -->
+<!-- include start from interface/vif.xml.i -->
 <tagNode name="vif">
   <properties>
     <help>Virtual Local Area Network (VLAN) ID</help>
@@ -12,13 +12,13 @@
     <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>
   </properties>
   <children>
-    #include <include/address-ipv4-ipv6-dhcp.xml.i>
-    #include <include/interface-description.xml.i>
-    #include <include/dhcp-options.xml.i>
-    #include <include/dhcpv6-options.xml.i>
-    #include <include/interface-disable-link-detect.xml.i>
-    #include <include/interface-disable.xml.i>
-    #include <include/interface-vrf.xml.i>
+    #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
+    #include <include/interface/interface-description.xml.i>
+    #include <include/interface/dhcp-options.xml.i>
+    #include <include/interface/dhcpv6-options.xml.i>
+    #include <include/interface/interface-disable-link-detect.xml.i>
+    #include <include/interface/interface-disable.xml.i>
+    #include <include/interface/interface-vrf.xml.i>
     <leafNode name="egress-qos">
       <properties>
         <help>VLAN egress QoS</help>
@@ -43,10 +43,10 @@
         <constraintErrorMessage>QoS mapping should be in the format of '0:7 2:3' with numbers 0-9</constraintErrorMessage>
       </properties>
     </leafNode>
-    #include <include/interface-ipv4-options.xml.i>
-    #include <include/interface-ipv6-options.xml.i>
-    #include <include/interface-mac.xml.i>
-    #include <include/interface-mtu-68-16000.xml.i>
+    #include <include/interface/interface-ipv4-options.xml.i>
+    #include <include/interface/interface-ipv6-options.xml.i>
+    #include <include/interface/interface-mac.xml.i>
+    #include <include/interface/interface-mtu-68-16000.xml.i>
   </children>
 </tagNode>
 <!-- include end -->
diff --git a/interface-definitions/include/ipv6-address.xml.i b/interface-definitions/include/ipv6-address.xml.i
deleted file mode 100644
index d934f9021..000000000
--- a/interface-definitions/include/ipv6-address.xml.i
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- include start from ipv6-address.xml.i -->
-<node name="address">
-  <properties>
-    <help>IPv6 address configuration modes</help>
-  </properties>
-  <children>
-    #include <include/ipv6-address-autoconf.xml.i>
-    #include <include/ipv6-address-eui64.xml.i>
-    #include <include/ipv6-address-no-default-link-local.xml.i>
-  </children>
-</node>
-<!-- include end -->