xml: T1579: re-arrange xml interface include building blocks

As the amount of include files now has reached a certain amount, it is getting
more and more crowsded, thuse introducing "per topic" subdirectories on the
filesystem to keep a clean structure makes sense.

66 files changed, 243 insertions, 243 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/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-flowlabel.xml.i b/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i
index f37e2ee32..f5e868a64 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 c755529a9..aa7c9d27b 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 (default: 0)</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/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i
index 5760bb000..9d1ddf579 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/interface/vif-s.xml.i
@@ -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/interface/address-ipv4-ipv6-dhcp.xml.i>
+    #include <include/interface/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/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/interface/address-ipv4-ipv6-dhcp.xml.i>
+        #include <include/interface/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/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..60d66f751 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/interface/vif.xml.i
@@ -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/interface/address-ipv4-ipv6-dhcp.xml.i>
+    #include <include/interface/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/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 -->
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index 443503811..30e8deb9c 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -16,7 +16,7 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/address-ipv4-ipv6-dhcp.xml.i>
+          #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
           <node name="arp-monitor">
             <properties>
               <help>ARP link monitoring parameters</help>
@@ -49,13 +49,13 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface-description.xml.i>
+          #include <include/interface/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-mirror.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>
+          #include <include/interface/interface-mirror.xml.i>
           <leafNode name="hash-policy">
             <properties>
               <help>Bonding transmit hash policy</help>
@@ -81,9 +81,9 @@
             </properties>
             <defaultValue>layer2</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/interface-ipv4-options.xml.i>
+          #include <include/interface/interface-ipv6-options.xml.i>
+          #include <include/interface/interface-mac.xml.i>
           <leafNode name="min-links">
             <properties>
               <help>Minimum number of member interfaces required up before enabling bond</help>
@@ -154,7 +154,7 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface-mtu-68-16000.xml.i>
+          #include <include/interface/interface-mtu-68-16000.xml.i>
           <leafNode name="primary">
             <properties>
               <help>Primary device interface</help>
@@ -163,8 +163,8 @@
               </completionHelp>
             </properties>
           </leafNode>
-          #include <include/vif-s.xml.i>
-          #include <include/vif.xml.i>
+          #include <include/interface/vif-s.xml.i>
+          #include <include/interface/vif.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index c32c0ca32..8b68ee992 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -16,7 +16,7 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/address-ipv4-ipv6-dhcp.xml.i>
+          #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
           <leafNode name="aging">
             <properties>
               <help>MAC address aging interval</help>
@@ -34,13 +34,13 @@
             </properties>
             <defaultValue>300</defaultValue>
           </leafNode>
-          #include <include/interface-description.xml.i>
+          #include <include/interface/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-mtu-68-16000.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>
+          #include <include/interface/interface-mtu-68-16000.xml.i>
           <leafNode name="forwarding-delay">
             <properties>
               <help>Forwarding delay</help>
@@ -82,10 +82,10 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface-ipv4-options.xml.i>
-          #include <include/interface-ipv6-options.xml.i>
-          #include <include/interface-mac.xml.i>
-          #include <include/interface-mirror.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-mirror.xml.i>
           <leafNode name="max-age">
             <properties>
               <help>Interval at which neighbor bridges are removed</help>
@@ -196,8 +196,8 @@
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/vif-s.xml.i>
-          #include <include/vif.xml.i>
+          #include <include/interface/vif-s.xml.i>
+          #include <include/interface/vif.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-dummy.xml.in b/interface-definitions/interfaces-dummy.xml.in
index 54de43c7a..84c6903c7 100644
--- a/interface-definitions/interfaces-dummy.xml.in
+++ b/interface-definitions/interfaces-dummy.xml.in
@@ -16,18 +16,18 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/address-ipv4-ipv6.xml.i>
-          #include <include/interface-description.xml.i>
-          #include <include/interface-disable.xml.i>
+          #include <include/interface/address-ipv4-ipv6.xml.i>
+          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/interface-disable.xml.i>
           <node name="ip">
             <properties>
               <help>IPv4 routing parameters</help>
             </properties>
             <children>
-              #include <include/interface-source-validation.xml.i>
+              #include <include/interface/interface-source-validation.xml.i>
             </children>
           </node>
-          #include <include/interface-vrf.xml.i>
+          #include <include/interface/interface-vrf.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index 9df486005..bda44d64c 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -16,8 +16,8 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/address-ipv4-ipv6-dhcp.xml.i>
-          #include <include/interface-description.xml.i>
+          #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
+          #include <include/interface/interface-description.xml.i>
           #include <include/dhcp-options.xml.i>
           #include <include/dhcpv6-options.xml.i>
           <leafNode name="disable-flow-control">
@@ -26,8 +26,8 @@
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/interface-disable-link-detect.xml.i>
-          #include <include/interface-disable.xml.i>
+          #include <include/interface/interface-disable-link-detect.xml.i>
+          #include <include/interface/interface-disable.xml.i>
           <leafNode name="duplex">
             <properties>
               <help>Duplex mode</help>
@@ -53,13 +53,13 @@
             </properties>
             <defaultValue>auto</defaultValue>
           </leafNode>
-          #include <include/interface-eapol.xml.i>
-          #include <include/interface-hw-id.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-mirror.xml.i>
+          #include <include/interface/interface-eapol.xml.i>
+          #include <include/interface/interface-hw-id.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-mirror.xml.i>
           <node name="offload">
             <properties>
               <help>Configurable offload options</help>
@@ -191,9 +191,9 @@
               </leafNode>
             </children>
           </node>
-          #include <include/vif-s.xml.i>
-          #include <include/vif.xml.i>
-          #include <include/interface-vrf.xml.i>
+          #include <include/interface/vif-s.xml.i>
+          #include <include/interface/vif.xml.i>
+          #include <include/interface/interface-vrf.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in
index 1a5b4aafd..50031b8b3 100644
--- a/interface-definitions/interfaces-geneve.xml.in
+++ b/interface-definitions/interfaces-geneve.xml.in
@@ -16,13 +16,13 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/address-ipv4-ipv6.xml.i>
-          #include <include/interface-description.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-1450-16000.xml.i>
+          #include <include/interface/address-ipv4-ipv6.xml.i>
+          #include <include/interface/interface-description.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-1450-16000.xml.i>
           #include <include/tunnel-remote.xml.i>
           <leafNode name="vni">
             <properties>
diff --git a/interface-definitions/interfaces-l2tpv3.xml.in b/interface-definitions/interfaces-l2tpv3.xml.in
index 3853cd339..ba1e07740 100644
--- a/interface-definitions/interfaces-l2tpv3.xml.in
+++ b/interface-definitions/interfaces-l2tpv3.xml.in
@@ -16,8 +16,8 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/address-ipv4-ipv6.xml.i>
-          #include <include/interface-description.xml.i>
+          #include <include/interface/address-ipv4-ipv6.xml.i>
+          #include <include/interface/interface-description.xml.i>
           <leafNode name="destination-port">
             <properties>
               <help>UDP destination port for L2TPv3 tunnel (default: 5000)</help>
@@ -31,7 +31,7 @@
             </properties>
             <defaultValue>5000</defaultValue>
           </leafNode>
-          #include <include/interface-disable.xml.i>
+          #include <include/interface/interface-disable.xml.i>
           <leafNode name="encapsulation">
             <properties>
               <help>Encapsulation type (default: UDP)</help>
@@ -53,8 +53,8 @@
             </properties>
             <defaultValue>udp</defaultValue>
           </leafNode>
-          #include <include/interface-ipv4-options.xml.i>
-          #include <include/interface-ipv6-options.xml.i>
+          #include <include/interface/interface-ipv4-options.xml.i>
+          #include <include/interface/interface-ipv6-options.xml.i>
           <leafNode name="local-ip">
             <properties>
               <help>Local IP address for L2TPv3 tunnel</help>
@@ -71,7 +71,7 @@
               </constraint>
             </properties>
           </leafNode>
-          #include <include/interface-mtu-68-16000.xml.i>
+          #include <include/interface/interface-mtu-68-16000.xml.i>
           <leafNode name="mtu">
             <defaultValue>1488</defaultValue>
           </leafNode>
diff --git a/interface-definitions/interfaces-loopback.xml.in b/interface-definitions/interfaces-loopback.xml.in
index 0fd74f302..5d0ca5b0a 100644
--- a/interface-definitions/interfaces-loopback.xml.in
+++ b/interface-definitions/interfaces-loopback.xml.in
@@ -16,14 +16,14 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/address-ipv4-ipv6.xml.i>
-          #include <include/interface-description.xml.i>
+          #include <include/interface/address-ipv4-ipv6.xml.i>
+          #include <include/interface/interface-description.xml.i>
           <node name="ip">
             <properties>
               <help>IPv4 routing parameters</help>
             </properties>
             <children>
-              #include <include/interface-source-validation.xml.i>
+              #include <include/interface/interface-source-validation.xml.i>
             </children>
           </node>
         </children>
diff --git a/interface-definitions/interfaces-macsec.xml.in b/interface-definitions/interfaces-macsec.xml.in
index 3f2e5bb69..fce88b21c 100644
--- a/interface-definitions/interfaces-macsec.xml.in
+++ b/interface-definitions/interfaces-macsec.xml.in
@@ -16,9 +16,9 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/address-ipv4-ipv6.xml.i>
-          #include <include/interface-ipv4-options.xml.i>
-          #include <include/interface-ipv6-options.xml.i>
+          #include <include/interface/address-ipv4-ipv6.xml.i>
+          #include <include/interface/interface-ipv4-options.xml.i>
+          #include <include/interface/interface-ipv6-options.xml.i>
           <node name="security">
             <properties>
               <help>Security/Encryption Settings</help>
@@ -111,14 +111,14 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface-description.xml.i>
-          #include <include/interface-disable.xml.i>
-          #include <include/interface-mtu-68-16000.xml.i>
+          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/interface-disable.xml.i>
+          #include <include/interface/interface-mtu-68-16000.xml.i>
           <leafNode name="mtu">
             <defaultValue>1460</defaultValue>
           </leafNode>
           #include <include/source-interface-ethernet.xml.i>
-          #include <include/interface-vrf.xml.i>
+          #include <include/interface/interface-vrf.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in
index 527f7fd54..effbdd674 100644
--- a/interface-definitions/interfaces-openvpn.xml.in
+++ b/interface-definitions/interfaces-openvpn.xml.in
@@ -33,7 +33,7 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface-description.xml.i>
+          #include <include/interface/interface-description.xml.i>
           <leafNode name="device-type">
             <properties>
               <help>OpenVPN interface device-type (default: tun)</help>
@@ -54,7 +54,7 @@
             </properties>
             <defaultValue>tun</defaultValue>
           </leafNode>
-          #include <include/interface-disable.xml.i>
+          #include <include/interface/interface-disable.xml.i>
           <node name="encryption">
             <properties>
               <help>Data Encryption settings</help>
@@ -171,7 +171,7 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface-ipv6-options.xml.i>
+          #include <include/interface/interface-ipv6-options.xml.i>
           <leafNode name="hash">
             <properties>
               <help>Hashing Algorithm</help>
@@ -761,7 +761,7 @@
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/interface-vrf.xml.i>
+          #include <include/interface/interface-vrf.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in
index 9bbaae9ea..87ed34a79 100644
--- a/interface-definitions/interfaces-pppoe.xml.in
+++ b/interface-definitions/interfaces-pppoe.xml.in
@@ -42,7 +42,7 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface-dial-on-demand.xml.i>
+          #include <include/interface/interface-dial-on-demand.xml.i>
           <leafNode name="default-route">
             <properties>
               <help>Default route insertion behaviour (default: auto)</help>
@@ -69,9 +69,9 @@
             <defaultValue>auto</defaultValue>
           </leafNode>
           #include <include/dhcpv6-options.xml.i>
-          #include <include/interface-description.xml.i>
-          #include <include/interface-disable.xml.i>
-          #include <include/interface-vrf.xml.i>
+          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/interface-disable.xml.i>
+          #include <include/interface/interface-vrf.xml.i>
           <leafNode name="idle-timeout">
             <properties>
               <help>Delay before disconnecting idle session (in seconds)</help>
@@ -86,7 +86,7 @@
               <help>IPv4 routing parameters</help>
             </properties>
             <children>
-              #include <include/interface-source-validation.xml.i>
+              #include <include/interface/interface-source-validation.xml.i>
             </children>
           </node>
           <node name="ipv6">
@@ -99,7 +99,7 @@
                   <help>IPv6 address configuration modes</help>
                 </properties>
                 <children>
-                  #include <include/ipv6-address-autoconf.xml.i>
+                  #include <include/interface/ipv6-address-autoconf.xml.i>
                 </children>
               </node>
             </children>
@@ -124,7 +124,7 @@
               </constraint>
             </properties>
           </leafNode>
-          #include <include/interface-mtu-68-1500.xml.i>
+          #include <include/interface/interface-mtu-68-1500.xml.i>
           <leafNode name="mtu">
             <defaultValue>1492</defaultValue>
           </leafNode>
diff --git a/interface-definitions/interfaces-pseudo-ethernet.xml.in b/interface-definitions/interfaces-pseudo-ethernet.xml.in
index 32ba5ea01..4a7fbe7fc 100644
--- a/interface-definitions/interfaces-pseudo-ethernet.xml.in
+++ b/interface-definitions/interfaces-pseudo-ethernet.xml.in
@@ -16,17 +16,17 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/address-ipv4-ipv6-dhcp.xml.i>
-          #include <include/interface-description.xml.i>
+          #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
+          #include <include/interface/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-ipv4-options.xml.i>
-          #include <include/interface-ipv6-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>
+          #include <include/interface/interface-ipv4-options.xml.i>
+          #include <include/interface/interface-ipv6-options.xml.i>
           #include <include/source-interface-ethernet.xml.i>
-          #include <include/interface-mac.xml.i>
+          #include <include/interface/interface-mac.xml.i>
           <leafNode name="mode">
             <properties>
               <help>Receive mode (default: private)</help>
@@ -56,9 +56,9 @@
             </properties>
             <defaultValue>private</defaultValue>
           </leafNode>
-          #include <include/interface-mtu-68-16000.xml.i>
-          #include <include/vif-s.xml.i>
-          #include <include/vif.xml.i>
+          #include <include/interface/interface-mtu-68-16000.xml.i>
+          #include <include/interface/vif-s.xml.i>
+          #include <include/interface/vif.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in
index 632464d37..f7af93f42 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -16,17 +16,17 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/interface-description.xml.i>
-          #include <include/address-ipv4-ipv6.xml.i>
-          #include <include/interface-disable.xml.i>
-          #include <include/interface-disable-link-detect.xml.i>
-          #include <include/interface-vrf.xml.i>
-          #include <include/interface-mtu-64-8024.xml.i>
+          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/address-ipv4-ipv6.xml.i>
+          #include <include/interface/interface-disable.xml.i>
+          #include <include/interface/interface-disable-link-detect.xml.i>
+          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/interface-mtu-64-8024.xml.i>
           <leafNode name="mtu">
             <defaultValue>1476</defaultValue>
           </leafNode>
-          #include <include/interface-ipv4-options.xml.i>
-          #include <include/interface-ipv6-options.xml.i>
+          #include <include/interface/interface-ipv4-options.xml.i>
+          #include <include/interface/interface-ipv6-options.xml.i>
           <leafNode name="local-ip">
             <properties>
               <help>Local IP address for this tunnel</help>
@@ -180,9 +180,9 @@
                   <help>IPv4 specific tunnel parameters</help>
                 </properties>
                 <children>
-                  #include <include/interface-parameters-key.xml.i>
-                  #include <include/interface-parameters-tos.xml.i>
-                  #include <include/interface-parameters-ttl.xml.i>
+                  #include <include/interface/interface-parameters-key.xml.i>
+                  #include <include/interface/interface-parameters-tos.xml.i>
+                  #include <include/interface/interface-parameters-ttl.xml.i>
                 </children>
               </node>
               <node name="ipv6">
@@ -212,7 +212,7 @@
                     </properties>
                     <defaultValue>4</defaultValue>
                   </leafNode>
-                  #include <include/interface-parameters-flowlabel.xml.i>
+                  #include <include/interface/interface-parameters-flowlabel.xml.i>
                   <leafNode name="hoplimit">
                     <properties>
                       <help>Hoplimit</help>
diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in
index a6870c3e2..99a90580f 100644
--- a/interface-definitions/interfaces-vxlan.xml.in
+++ b/interface-definitions/interfaces-vxlan.xml.in
@@ -16,9 +16,9 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/address-ipv4-ipv6.xml.i>
-          #include <include/interface-description.xml.i>
-          #include <include/interface-disable.xml.i>
+          #include <include/interface/address-ipv4-ipv6.xml.i>
+          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/interface-disable.xml.i>
           <leafNode name="group">
             <properties>
               <help>Multicast group address for VXLAN interface</help>
@@ -35,10 +35,10 @@
               </constraint>
             </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-1200-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-1200-16000.xml.i>
           <leafNode name="mtu">
             <defaultValue>1450</defaultValue>
           </leafNode>
diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in
index 3f56046c4..378251fed 100644
--- a/interface-definitions/interfaces-wireguard.xml.in
+++ b/interface-definitions/interfaces-wireguard.xml.in
@@ -16,17 +16,17 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/address-ipv4-ipv6.xml.i>
-          #include <include/interface-description.xml.i>
-          #include <include/interface-disable.xml.i>
-          #include <include/interface-vrf.xml.i>
+          #include <include/interface/address-ipv4-ipv6.xml.i>
+          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/interface-disable.xml.i>
+          #include <include/interface/interface-vrf.xml.i>
           #include <include/port-number.xml.i>
-          #include <include/interface-mtu-68-16000.xml.i>
+          #include <include/interface/interface-mtu-68-16000.xml.i>
           <leafNode name="mtu">
             <defaultValue>1420</defaultValue>
           </leafNode>
-          #include <include/interface-ipv4-options.xml.i>
-          #include <include/interface-ipv6-options.xml.i>
+          #include <include/interface/interface-ipv4-options.xml.i>
+          #include <include/interface/interface-ipv6-options.xml.i>
           <leafNode name="fwmark">
             <properties>
               <help>A 32-bit fwmark value set on all outgoing packets</help>
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index f39e5618f..14b4b4bf5 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -16,7 +16,7 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/address-ipv4-ipv6-dhcp.xml.i>
+          #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
           <node name="capabilities">
             <properties>
               <help>HT and VHT capabilities for your card</help>
@@ -464,7 +464,7 @@
               <constraintErrorMessage>Invalid ISO/IEC 3166-1 Country Code</constraintErrorMessage>
             </properties>
           </leafNode>
-          #include <include/interface-description.xml.i>
+          #include <include/interface/interface-description.xml.i>
           #include <include/dhcp-options.xml.i>
           #include <include/dhcpv6-options.xml.i>
           <leafNode name="disable-broadcast-ssid">
@@ -473,25 +473,25 @@
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/interface-disable-link-detect.xml.i>
-          #include <include/interface-disable.xml.i>
-          #include <include/interface-vrf.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="expunge-failing-stations">
             <properties>
               <help>Disassociate stations based on excessive transmission failures</help>
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/interface-ipv4-options.xml.i>
-          #include <include/interface-ipv6-options.xml.i>
-          #include <include/interface-hw-id.xml.i>
+          #include <include/interface/interface-ipv4-options.xml.i>
+          #include <include/interface/interface-ipv6-options.xml.i>
+          #include <include/interface/interface-hw-id.xml.i>
           <leafNode name="isolate-stations">
             <properties>
               <help>Isolate stations on the AP so they cannot see each other</help>
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/interface-mac.xml.i>
+          #include <include/interface/interface-mac.xml.i>
           <leafNode name="max-stations">
             <properties>
               <help>Maximum number of wireless radio stations. Excess stations will be rejected upon authentication request.</help>
@@ -775,8 +775,8 @@
             </properties>
             <defaultValue>monitor</defaultValue>
           </leafNode>
-          #include <include/vif.xml.i>
-          #include <include/vif-s.xml.i>
+          #include <include/interface/vif.xml.i>
+          #include <include/interface/vif-s.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-wirelessmodem.xml.in b/interface-definitions/interfaces-wirelessmodem.xml.in
index 969ff0014..25ac2d6e0 100644
--- a/interface-definitions/interfaces-wirelessmodem.xml.in
+++ b/interface-definitions/interfaces-wirelessmodem.xml.in
@@ -42,9 +42,9 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface-description.xml.i>
-          #include <include/interface-disable.xml.i>
-          #include <include/interface-vrf.xml.i>
+          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/interface-disable.xml.i>
+          #include <include/interface/interface-vrf.xml.i>
           <leafNode name="device">
             <properties>
               <help>Serial device </help>
@@ -65,17 +65,17 @@
               </constraint>
             </properties>
           </leafNode>
-          #include <include/interface-disable-link-detect.xml.i>
-          #include <include/interface-mtu-68-16000.xml.i>
-          #include <include/interface-ipv4-options.xml.i>
-          #include <include/interface-ipv6-options.xml.i>
+          #include <include/interface/interface-disable-link-detect.xml.i>
+          #include <include/interface/interface-mtu-68-16000.xml.i>
+          #include <include/interface/interface-ipv4-options.xml.i>
+          #include <include/interface/interface-ipv6-options.xml.i>
           <leafNode name="no-peer-dns">
             <properties>
               <help>Do not use peer supplied DNS server information</help>
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/interface-dial-on-demand.xml.i>
+          #include <include/interface/interface-dial-on-demand.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/ntp.xml.in b/interface-definitions/ntp.xml.in
index d244b56bb..2bfac900b 100644
--- a/interface-definitions/ntp.xml.in
+++ b/interface-definitions/ntp.xml.in
@@ -82,7 +82,7 @@
             </children>
           </node>
           #include <include/listen-address.xml.i>
-          #include <include/interface-vrf.xml.i>
+          #include <include/interface/interface-vrf.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/service_console-server.xml.in b/interface-definitions/service_console-server.xml.in
index 293ee1ba5..78eb2d0ba 100644
--- a/interface-definitions/service_console-server.xml.in
+++ b/interface-definitions/service_console-server.xml.in
@@ -27,7 +27,7 @@
               </constraint>
             </properties>
             <children>
-              #include <include/interface-description.xml.i>
+              #include <include/interface/interface-description.xml.i>
               <leafNode name="speed">
                 <properties>
                   <help>Serial port baud rate</help>
diff --git a/interface-definitions/snmp.xml.in b/interface-definitions/snmp.xml.in
index 3a993ec9c..f57103eac 100644
--- a/interface-definitions/snmp.xml.in
+++ b/interface-definitions/snmp.xml.in
@@ -626,7 +626,7 @@
               </tagNode>
             </children>
           </node>
-          #include <include/interface-vrf.xml.i>
+          #include <include/interface/interface-vrf.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/ssh.xml.in b/interface-definitions/ssh.xml.in
index a2ce3c1c9..c2d514b09 100644
--- a/interface-definitions/ssh.xml.in
+++ b/interface-definitions/ssh.xml.in
@@ -182,7 +182,7 @@
               </constraint>
             </properties>
           </leafNode>
-          #include <include/interface-vrf.xml.i>
+          #include <include/interface/interface-vrf.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/system-login.xml.in b/interface-definitions/system-login.xml.in
index 919974eeb..86db3f368 100644
--- a/interface-definitions/system-login.xml.in
+++ b/interface-definitions/system-login.xml.in
@@ -145,7 +145,7 @@
                   </leafNode>
                 </children>
               </tagNode>
-              #include <include/interface-vrf.xml.i>
+              #include <include/interface/interface-vrf.xml.i>
             </children>
           </node>
         </children>
diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in
index ebcb77db2..45d65b3e7 100644
--- a/interface-definitions/vpn_sstp.xml.in
+++ b/interface-definitions/vpn_sstp.xml.in
@@ -25,7 +25,7 @@
               </node>
             </children>
           </node>
-          #include <include/interface-mtu-68-1500.xml.i>
+          #include <include/interface/interface-mtu-68-1500.xml.i>
           #include <include/accel-gateway-address.xml.i>
           #include <include/accel-name-server.xml.i>
           <node name="client-ip-pool">
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index 81c89d94b..5fd758a44 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -39,8 +39,8 @@
               <constraintErrorMessage>VRF routing table must be in range from 100 to 2147483647</constraintErrorMessage>
             </properties>
           </leafNode>
-          #include <include/interface-description.xml.i>
-          #include <include/interface-disable.xml.i>
+          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/interface-disable.xml.i>
         </children>
       </tagNode>
     </children>