From adea0e05a56cb25a9e40b46e30a7648c99907031 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 14 Mar 2021 15:53:52 +0100
Subject: 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.
---
 .../include/address-ipv4-ipv6-dhcp.xml.i           |  31 -------
 .../include/address-ipv4-ipv6.xml.i                |  19 ----
 interface-definitions/include/dhcp-options.xml.i   |  42 ---------
 interface-definitions/include/dhcpv6-options.xml.i | 100 ---------------------
 .../include/interface-arp-cache-timeout.xml.i      |  16 ----
 .../include/interface-description.xml.i            |  11 ---
 .../include/interface-dial-on-demand.xml.i         |   8 --
 .../include/interface-disable-arp-filter.xml.i     |   8 --
 .../include/interface-disable-forwarding.xml.i     |   8 --
 .../include/interface-disable-link-detect.xml.i    |   8 --
 .../include/interface-disable.xml.i                |   8 --
 .../include/interface-eapol.xml.i                  |  12 ---
 .../include/interface-enable-arp-accept.xml.i      |   8 --
 .../include/interface-enable-arp-announce.xml.i    |   8 --
 .../include/interface-enable-arp-ignore.xml.i      |   8 --
 .../include/interface-enable-proxy-arp.xml.i       |   8 --
 .../include/interface-hw-id.xml.i                  |  14 ---
 .../include/interface-ipv4-options.xml.i           |  18 ----
 .../include/interface-ipv6-options.xml.i           |  12 ---
 interface-definitions/include/interface-mac.xml.i  |  14 ---
 .../include/interface-mirror.xml.i                 |  25 ------
 .../include/interface-mtu-1200-16000.xml.i         |  16 ----
 .../include/interface-mtu-1450-16000.xml.i         |  16 ----
 .../include/interface-mtu-64-8024.xml.i            |  16 ----
 .../include/interface-mtu-68-1500.xml.i            |  16 ----
 .../include/interface-mtu-68-16000.xml.i           |  16 ----
 .../interface-parameters-dont-fragment.xml.i       |   8 --
 .../include/interface-parameters-flowlabel.xml.i   |  15 ----
 .../include/interface-parameters-key.xml.i         |  15 ----
 .../include/interface-parameters-tos.xml.i         |  16 ----
 .../include/interface-parameters-ttl.xml.i         |  20 -----
 .../include/interface-proxy-arp-pvlan.xml.i        |   8 --
 .../include/interface-source-validation.xml.i      |  25 ------
 interface-definitions/include/interface-vrf.xml.i  |  14 ---
 interface-definitions/include/interface-xdp.xml.i  |   8 --
 .../include/interface/address-ipv4-ipv6-dhcp.xml.i |  31 +++++++
 .../include/interface/address-ipv4-ipv6.xml.i      |  19 ++++
 .../include/interface/dhcp-options.xml.i           |  42 +++++++++
 .../include/interface/dhcpv6-options.xml.i         | 100 +++++++++++++++++++++
 .../interface/interface-arp-cache-timeout.xml.i    |  16 ++++
 .../include/interface/interface-description.xml.i  |  11 +++
 .../interface/interface-dial-on-demand.xml.i       |   8 ++
 .../interface/interface-disable-arp-filter.xml.i   |   8 ++
 .../interface/interface-disable-forwarding.xml.i   |   8 ++
 .../interface/interface-disable-link-detect.xml.i  |   8 ++
 .../include/interface/interface-disable.xml.i      |   8 ++
 .../include/interface/interface-eapol.xml.i        |  12 +++
 .../interface/interface-enable-arp-accept.xml.i    |   8 ++
 .../interface/interface-enable-arp-announce.xml.i  |   8 ++
 .../interface/interface-enable-arp-ignore.xml.i    |   8 ++
 .../interface/interface-enable-proxy-arp.xml.i     |   8 ++
 .../include/interface/interface-hw-id.xml.i        |  14 +++
 .../include/interface/interface-ipv4-options.xml.i |  18 ++++
 .../include/interface/interface-ipv6-options.xml.i |  12 +++
 .../include/interface/interface-mac.xml.i          |  14 +++
 .../include/interface/interface-mirror.xml.i       |  25 ++++++
 .../interface/interface-mtu-1200-16000.xml.i       |  16 ++++
 .../interface/interface-mtu-1450-16000.xml.i       |  16 ++++
 .../include/interface/interface-mtu-64-8024.xml.i  |  16 ++++
 .../include/interface/interface-mtu-68-1500.xml.i  |  16 ++++
 .../include/interface/interface-mtu-68-16000.xml.i |  16 ++++
 .../interface-parameters-dont-fragment.xml.i       |   8 ++
 .../interface/interface-parameters-flowlabel.xml.i |  15 ++++
 .../interface/interface-parameters-key.xml.i       |  15 ++++
 .../interface/interface-parameters-tos.xml.i       |  16 ++++
 .../interface/interface-parameters-ttl.xml.i       |  20 +++++
 .../interface/interface-proxy-arp-pvlan.xml.i      |   8 ++
 .../interface/interface-source-validation.xml.i    |  25 ++++++
 .../include/interface/interface-vrf.xml.i          |  14 +++
 .../include/interface/interface-xdp.xml.i          |   8 ++
 .../include/interface/ipv6-address-autoconf.xml.i  |   8 ++
 .../include/interface/ipv6-address-eui64.xml.i     |  15 ++++
 .../ipv6-address-no-default-link-local.xml.i       |   8 ++
 .../include/interface/ipv6-address.xml.i           |  12 +++
 .../interface/ipv6-disable-forwarding.xml.i        |   8 ++
 .../interface/ipv6-dup-addr-detect-transmits.xml.i |  18 ++++
 .../include/interface/tunnel-remote.xml.i          |  18 ++++
 .../include/interface/vif-s.xml.i                  |  67 ++++++++++++++
 interface-definitions/include/interface/vif.xml.i  |  52 +++++++++++
 .../include/ipv6-address-autoconf.xml.i            |   8 --
 .../include/ipv6-address-eui64.xml.i               |  15 ----
 .../ipv6-address-no-default-link-local.xml.i       |   8 --
 interface-definitions/include/ipv6-address.xml.i   |  12 ---
 .../include/ipv6-disable-forwarding.xml.i          |   8 --
 .../include/ipv6-dup-addr-detect-transmits.xml.i   |  18 ----
 interface-definitions/include/tunnel-remote.xml.i  |  18 ----
 interface-definitions/include/vif-s.xml.i          |  67 --------------
 interface-definitions/include/vif.xml.i            |  52 -----------
 interface-definitions/interfaces-bonding.xml.in    |  30 +++----
 interface-definitions/interfaces-bridge.xml.in     |  26 +++---
 interface-definitions/interfaces-dummy.xml.in      |  10 +--
 interface-definitions/interfaces-erspan.xml.in     |  16 ++--
 interface-definitions/interfaces-ethernet.xml.in   |  34 +++----
 interface-definitions/interfaces-geneve.xml.in     |  24 ++---
 interface-definitions/interfaces-l2tpv3.xml.in     |  16 ++--
 interface-definitions/interfaces-loopback.xml.in   |   6 +-
 interface-definitions/interfaces-macsec.xml.in     |  14 +--
 interface-definitions/interfaces-openvpn.xml.in    |   8 +-
 interface-definitions/interfaces-pppoe.xml.in      |  16 ++--
 .../interfaces-pseudo-ethernet.xml.in              |  26 +++---
 interface-definitions/interfaces-tunnel.xml.in     |  26 +++---
 interface-definitions/interfaces-vxlan.xml.in      |  24 ++---
 interface-definitions/interfaces-wireguard.xml.in  |  14 +--
 interface-definitions/interfaces-wireless.xml.in   |  26 +++---
 .../interfaces-wirelessmodem.xml.in                |  16 ++--
 interface-definitions/ntp.xml.in                   |   2 +-
 .../service_console-server.xml.in                  |   2 +-
 interface-definitions/snmp.xml.in                  |   2 +-
 interface-definitions/ssh.xml.in                   |   2 +-
 interface-definitions/system-login.xml.in          |   2 +-
 interface-definitions/vpn_sstp.xml.in              |   2 +-
 interface-definitions/vrf.xml.in                   |   4 +-
 112 files changed, 975 insertions(+), 975 deletions(-)
 delete mode 100644 interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
 delete mode 100644 interface-definitions/include/address-ipv4-ipv6.xml.i
 delete mode 100644 interface-definitions/include/dhcp-options.xml.i
 delete mode 100644 interface-definitions/include/dhcpv6-options.xml.i
 delete mode 100644 interface-definitions/include/interface-arp-cache-timeout.xml.i
 delete mode 100644 interface-definitions/include/interface-description.xml.i
 delete mode 100644 interface-definitions/include/interface-dial-on-demand.xml.i
 delete mode 100644 interface-definitions/include/interface-disable-arp-filter.xml.i
 delete mode 100644 interface-definitions/include/interface-disable-forwarding.xml.i
 delete mode 100644 interface-definitions/include/interface-disable-link-detect.xml.i
 delete mode 100644 interface-definitions/include/interface-disable.xml.i
 delete mode 100644 interface-definitions/include/interface-eapol.xml.i
 delete mode 100644 interface-definitions/include/interface-enable-arp-accept.xml.i
 delete mode 100644 interface-definitions/include/interface-enable-arp-announce.xml.i
 delete mode 100644 interface-definitions/include/interface-enable-arp-ignore.xml.i
 delete mode 100644 interface-definitions/include/interface-enable-proxy-arp.xml.i
 delete mode 100644 interface-definitions/include/interface-hw-id.xml.i
 delete mode 100644 interface-definitions/include/interface-ipv4-options.xml.i
 delete mode 100644 interface-definitions/include/interface-ipv6-options.xml.i
 delete mode 100644 interface-definitions/include/interface-mac.xml.i
 delete mode 100644 interface-definitions/include/interface-mirror.xml.i
 delete mode 100644 interface-definitions/include/interface-mtu-1200-16000.xml.i
 delete mode 100644 interface-definitions/include/interface-mtu-1450-16000.xml.i
 delete mode 100644 interface-definitions/include/interface-mtu-64-8024.xml.i
 delete mode 100644 interface-definitions/include/interface-mtu-68-1500.xml.i
 delete mode 100644 interface-definitions/include/interface-mtu-68-16000.xml.i
 delete mode 100644 interface-definitions/include/interface-parameters-dont-fragment.xml.i
 delete mode 100644 interface-definitions/include/interface-parameters-flowlabel.xml.i
 delete mode 100644 interface-definitions/include/interface-parameters-key.xml.i
 delete mode 100644 interface-definitions/include/interface-parameters-tos.xml.i
 delete mode 100644 interface-definitions/include/interface-parameters-ttl.xml.i
 delete mode 100644 interface-definitions/include/interface-proxy-arp-pvlan.xml.i
 delete mode 100644 interface-definitions/include/interface-source-validation.xml.i
 delete mode 100644 interface-definitions/include/interface-vrf.xml.i
 delete mode 100644 interface-definitions/include/interface-xdp.xml.i
 create mode 100644 interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i
 create mode 100644 interface-definitions/include/interface/address-ipv4-ipv6.xml.i
 create mode 100644 interface-definitions/include/interface/dhcp-options.xml.i
 create mode 100644 interface-definitions/include/interface/dhcpv6-options.xml.i
 create mode 100644 interface-definitions/include/interface/interface-arp-cache-timeout.xml.i
 create mode 100644 interface-definitions/include/interface/interface-description.xml.i
 create mode 100644 interface-definitions/include/interface/interface-dial-on-demand.xml.i
 create mode 100644 interface-definitions/include/interface/interface-disable-arp-filter.xml.i
 create mode 100644 interface-definitions/include/interface/interface-disable-forwarding.xml.i
 create mode 100644 interface-definitions/include/interface/interface-disable-link-detect.xml.i
 create mode 100644 interface-definitions/include/interface/interface-disable.xml.i
 create mode 100644 interface-definitions/include/interface/interface-eapol.xml.i
 create mode 100644 interface-definitions/include/interface/interface-enable-arp-accept.xml.i
 create mode 100644 interface-definitions/include/interface/interface-enable-arp-announce.xml.i
 create mode 100644 interface-definitions/include/interface/interface-enable-arp-ignore.xml.i
 create mode 100644 interface-definitions/include/interface/interface-enable-proxy-arp.xml.i
 create mode 100644 interface-definitions/include/interface/interface-hw-id.xml.i
 create mode 100644 interface-definitions/include/interface/interface-ipv4-options.xml.i
 create mode 100644 interface-definitions/include/interface/interface-ipv6-options.xml.i
 create mode 100644 interface-definitions/include/interface/interface-mac.xml.i
 create mode 100644 interface-definitions/include/interface/interface-mirror.xml.i
 create mode 100644 interface-definitions/include/interface/interface-mtu-1200-16000.xml.i
 create mode 100644 interface-definitions/include/interface/interface-mtu-1450-16000.xml.i
 create mode 100644 interface-definitions/include/interface/interface-mtu-64-8024.xml.i
 create mode 100644 interface-definitions/include/interface/interface-mtu-68-1500.xml.i
 create mode 100644 interface-definitions/include/interface/interface-mtu-68-16000.xml.i
 create mode 100644 interface-definitions/include/interface/interface-parameters-dont-fragment.xml.i
 create mode 100644 interface-definitions/include/interface/interface-parameters-flowlabel.xml.i
 create mode 100644 interface-definitions/include/interface/interface-parameters-key.xml.i
 create mode 100644 interface-definitions/include/interface/interface-parameters-tos.xml.i
 create mode 100644 interface-definitions/include/interface/interface-parameters-ttl.xml.i
 create mode 100644 interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i
 create mode 100644 interface-definitions/include/interface/interface-source-validation.xml.i
 create mode 100644 interface-definitions/include/interface/interface-vrf.xml.i
 create mode 100644 interface-definitions/include/interface/interface-xdp.xml.i
 create mode 100644 interface-definitions/include/interface/ipv6-address-autoconf.xml.i
 create mode 100644 interface-definitions/include/interface/ipv6-address-eui64.xml.i
 create mode 100644 interface-definitions/include/interface/ipv6-address-no-default-link-local.xml.i
 create mode 100644 interface-definitions/include/interface/ipv6-address.xml.i
 create mode 100644 interface-definitions/include/interface/ipv6-disable-forwarding.xml.i
 create mode 100644 interface-definitions/include/interface/ipv6-dup-addr-detect-transmits.xml.i
 create mode 100644 interface-definitions/include/interface/tunnel-remote.xml.i
 create mode 100644 interface-definitions/include/interface/vif-s.xml.i
 create mode 100644 interface-definitions/include/interface/vif.xml.i
 delete mode 100644 interface-definitions/include/ipv6-address-autoconf.xml.i
 delete mode 100644 interface-definitions/include/ipv6-address-eui64.xml.i
 delete mode 100644 interface-definitions/include/ipv6-address-no-default-link-local.xml.i
 delete mode 100644 interface-definitions/include/ipv6-address.xml.i
 delete mode 100644 interface-definitions/include/ipv6-disable-forwarding.xml.i
 delete mode 100644 interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i
 delete mode 100644 interface-definitions/include/tunnel-remote.xml.i
 delete mode 100644 interface-definitions/include/vif-s.xml.i
 delete mode 100644 interface-definitions/include/vif.xml.i

diff --git a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
deleted file mode 100644
index b9dd59bea..000000000
--- a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- include start from address-ipv4-ipv6-dhcp.xml.i -->
-<leafNode name="address">
-  <properties>
-    <help>IP address</help>
-    <completionHelp>
-      <list>dhcp dhcpv6</list>
-    </completionHelp>
-    <valueHelp>
-      <format>ipv4net</format>
-      <description>IPv4 address and prefix length</description>
-    </valueHelp>
-    <valueHelp>
-      <format>ipv6net</format>
-      <description>IPv6 address and prefix length</description>
-    </valueHelp>
-    <valueHelp>
-      <format>dhcp</format>
-      <description>Dynamic Host Configuration Protocol</description>
-    </valueHelp>
-    <valueHelp>
-      <format>dhcpv6</format>
-      <description>Dynamic Host Configuration Protocol for IPv6</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ip-host"/>
-      <regex>(dhcp|dhcpv6)</regex>
-    </constraint>
-    <multi/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/address-ipv4-ipv6.xml.i b/interface-definitions/include/address-ipv4-ipv6.xml.i
deleted file mode 100644
index 519622050..000000000
--- a/interface-definitions/include/address-ipv4-ipv6.xml.i
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- include start from address-ipv4-ipv6.xml.i -->
-<leafNode name="address">
-  <properties>
-    <help>IP address</help>
-    <valueHelp>
-      <format>ipv4net</format>
-      <description>IPv4 address and prefix length</description>
-    </valueHelp>
-    <valueHelp>
-      <format>ipv6net</format>
-      <description>IPv6 address and prefix length</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ip-host"/>
-    </constraint>
-    <multi/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/dhcp-options.xml.i b/interface-definitions/include/dhcp-options.xml.i
deleted file mode 100644
index 8972b53e9..000000000
--- a/interface-definitions/include/dhcp-options.xml.i
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- include start from dhcp-options.xml.i -->
-<node name="dhcp-options">
-  <properties>
-    <help>DHCP client settings/options</help>
-  </properties>
-  <children>
-    <leafNode name="client-id">
-      <properties>
-        <help>Identifier used by client to identify itself to the DHCP server</help>
-      </properties>
-    </leafNode>
-    <leafNode name="host-name">
-      <properties>
-        <help>Override system host-name sent to DHCP server</help>
-      </properties>
-    </leafNode>
-    <leafNode name="vendor-class-id">
-      <properties>
-        <help>Identify the vendor client type to the DHCP server</help>
-      </properties>
-    </leafNode>
-    <leafNode name="no-default-route">
-      <properties>
-        <help>Do not request routers from DHCP server</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="default-route-distance">
-      <properties>
-        <help>Distance for the default route from DHCP server</help>
-        <valueHelp>
-          <format>u32:1-255</format>
-          <description>Distance for the default route from DHCP server (default 210)</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-255"/>
-        </constraint>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i
deleted file mode 100644
index a569659a4..000000000
--- a/interface-definitions/include/dhcpv6-options.xml.i
+++ /dev/null
@@ -1,100 +0,0 @@
-<!-- include start from dhcpv6-options.xml.i -->
-<node name="dhcpv6-options">
-  <properties>
-    <help>DHCPv6 client settings/options</help>
-  </properties>
-  <children>
-    <leafNode name="duid">
-      <properties>
-        <help>DHCP unique identifier (DUID) to be sent by dhcpv6 client</help>
-        <valueHelp>
-          <format>duid</format>
-          <description>DHCP unique identifier (DUID)</description>
-        </valueHelp>
-        <constraint>
-          <validator name="ipv6-duid"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="parameters-only">
-      <properties>
-        <help>Acquire only config parameters, no address</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <tagNode name="pd">
-      <properties>
-        <help>DHCPv6 prefix delegation interface statement</help>
-        <valueHelp>
-          <format>instance number</format>
-          <description>Prefix delegation instance (>= 0)</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--non-negative"/>
-        </constraint>
-      </properties>
-      <children>
-        <leafNode name="length">
-          <properties>
-            <help>Request IPv6 prefix length from peer</help>
-            <valueHelp>
-              <format>32-64</format>
-              <description>Length of delegated prefix</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 32-64"/>
-            </constraint>
-          </properties>
-          <defaultValue>64</defaultValue>
-        </leafNode>
-        <tagNode name="interface">
-          <properties>
-            <help>Delegate IPv6 prefix from provider to this interface</help>
-            <completionHelp>
-              <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
-            </completionHelp>
-          </properties>
-          <children>
-            <leafNode name="address">
-              <properties>
-                <help>Local interface address assigned to interface</help>
-                <valueHelp>
-                  <format>&gt;0</format>
-                  <description>Used to form IPv6 interface address (default: EUI-64)</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="numeric" argument="--non-negative"/>
-                </constraint>
-              </properties>
-            </leafNode>
-            <leafNode name="sla-id">
-              <properties>
-                <help>Interface site-Level aggregator (SLA)</help>
-                <valueHelp>
-                  <format>0-128</format>
-                  <description>Decimal integer which fits in the length of SLA IDs</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="numeric" argument="--range 0-128"/>
-                </constraint>
-              </properties>
-            </leafNode>
-          </children>
-        </tagNode>
-      </children>
-    </tagNode>
-    <leafNode name="rapid-commit">
-      <properties>
-        <help>Wait for immediate reply instead of advertisements</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="temporary">
-      <properties>
-        <help>IPv6 temporary address</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-arp-cache-timeout.xml.i b/interface-definitions/include/interface-arp-cache-timeout.xml.i
deleted file mode 100644
index 09fd70afc..000000000
--- a/interface-definitions/include/interface-arp-cache-timeout.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface-arp-cache-timeout.xml.i -->
-<leafNode name="arp-cache-timeout">
-  <properties>
-    <help>ARP cache entry timeout in seconds</help>
-    <valueHelp>
-      <format>1-86400</format>
-      <description>ARP cache entry timout in seconds (default 30)</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 1-86400"/>
-    </constraint>
-    <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage>
-  </properties>
-  <defaultValue>30</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-description.xml.i b/interface-definitions/include/interface-description.xml.i
deleted file mode 100644
index b16c562bb..000000000
--- a/interface-definitions/include/interface-description.xml.i
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- include start from interface-description.xml.i -->
-<leafNode name="description">
-  <properties>
-    <help>Interface specific description</help>
-    <constraint>
-      <regex>.{1,256}$</regex>
-    </constraint>
-    <constraintErrorMessage>Description too long (limit 256 characters)</constraintErrorMessage>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-dial-on-demand.xml.i b/interface-definitions/include/interface-dial-on-demand.xml.i
deleted file mode 100644
index 5067e45df..000000000
--- a/interface-definitions/include/interface-dial-on-demand.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface-dial-on-demand.xml.i -->
-<leafNode name="connect-on-demand">
-  <properties>
-    <help>Establishment connection automatically when traffic is sent</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-disable-arp-filter.xml.i b/interface-definitions/include/interface-disable-arp-filter.xml.i
deleted file mode 100644
index 5f118d49c..000000000
--- a/interface-definitions/include/interface-disable-arp-filter.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface-disable-arp-filter.xml.i -->
-<leafNode name="disable-arp-filter">
-  <properties>
-    <help>Disable ARP filter on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-disable-forwarding.xml.i b/interface-definitions/include/interface-disable-forwarding.xml.i
deleted file mode 100644
index fdce8f846..000000000
--- a/interface-definitions/include/interface-disable-forwarding.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface-disable-forwarding.xml.i -->
-<leafNode name="disable-forwarding">
-  <properties>
-    <help>Disable IPv4 forwarding on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-disable-link-detect.xml.i b/interface-definitions/include/interface-disable-link-detect.xml.i
deleted file mode 100644
index 60c5f635b..000000000
--- a/interface-definitions/include/interface-disable-link-detect.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface-disable-link-detect.xml.i -->
-<leafNode name="disable-link-detect">
-  <properties>
-    <help>Ignore link state changes</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-disable.xml.i b/interface-definitions/include/interface-disable.xml.i
deleted file mode 100644
index 5a058df01..000000000
--- a/interface-definitions/include/interface-disable.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface-disable.xml.i -->
-<leafNode name="disable">
-  <properties>
-    <help>Administratively disable interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-eapol.xml.i b/interface-definitions/include/interface-eapol.xml.i
deleted file mode 100644
index fafa75f1a..000000000
--- a/interface-definitions/include/interface-eapol.xml.i
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- include start from interface-eapol.xml.i -->
-<node name="eapol">
-  <properties>
-     <help>Extensible Authentication Protocol over Local Area Network</help>
-  </properties>
-  <children>
-    #include <include/certificate.xml.i>
-    #include <include/certificate-ca.xml.i>
-    #include <include/certificate-key.xml.i>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-enable-arp-accept.xml.i b/interface-definitions/include/interface-enable-arp-accept.xml.i
deleted file mode 100644
index bec08a708..000000000
--- a/interface-definitions/include/interface-enable-arp-accept.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface-enable-arp-accept.xml.i -->
-<leafNode name="enable-arp-accept">
-  <properties>
-    <help>Enable ARP accept on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-enable-arp-announce.xml.i b/interface-definitions/include/interface-enable-arp-announce.xml.i
deleted file mode 100644
index ef9e5db1e..000000000
--- a/interface-definitions/include/interface-enable-arp-announce.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface-enable-arp-announce.xml.i -->
-<leafNode name="enable-arp-announce">
-  <properties>
-    <help>Enable ARP announce on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-enable-arp-ignore.xml.i b/interface-definitions/include/interface-enable-arp-ignore.xml.i
deleted file mode 100644
index 0a33a2c9a..000000000
--- a/interface-definitions/include/interface-enable-arp-ignore.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface-enable-arp-ignore.xml.i -->
-<leafNode name="enable-arp-ignore">
-  <properties>
-    <help>Enable ARP ignore on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-enable-proxy-arp.xml.i b/interface-definitions/include/interface-enable-proxy-arp.xml.i
deleted file mode 100644
index a0993539f..000000000
--- a/interface-definitions/include/interface-enable-proxy-arp.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface-enable-proxy-arp.xml.i -->
-<leafNode name="enable-proxy-arp">
-  <properties>
-    <help>Enable proxy-arp on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-hw-id.xml.i b/interface-definitions/include/interface-hw-id.xml.i
deleted file mode 100644
index 78e8613d8..000000000
--- a/interface-definitions/include/interface-hw-id.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- include start from interface-hw-id.xml.i -->
-<leafNode name="hw-id">
-  <properties>
-    <help>Associate Ethernet Interface with given Media Access Control (MAC) address</help>
-    <valueHelp>
-      <format>macaddr</format>
-      <description>Hardware (MAC) address</description>
-    </valueHelp>
-    <constraint>
-      <validator name="mac-address"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
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/interface-mac.xml.i b/interface-definitions/include/interface-mac.xml.i
deleted file mode 100644
index 160b42b2e..000000000
--- a/interface-definitions/include/interface-mac.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- include start from mac.xml.i -->
-<leafNode name="mac">
-  <properties>
-    <help>Media Access Control (MAC) address</help>
-    <valueHelp>
-      <format>macaddr</format>
-      <description>Hardware (MAC) address</description>
-    </valueHelp>
-    <constraint>
-      <validator name="mac-address"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-mirror.xml.i b/interface-definitions/include/interface-mirror.xml.i
deleted file mode 100644
index 445e214fe..000000000
--- a/interface-definitions/include/interface-mirror.xml.i
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- include start from interface-mirror.xml.i -->
-<node name="mirror">
-  <properties>
-    <help>Incoming/outgoing packet mirroring destination</help>
-  </properties>
-  <children>
-    <leafNode name="ingress">
-      <properties>
-        <help>Mirror the ingress traffic of the interface to the destination interface</help>
-        <completionHelp>
-            <script>${vyos_completion_dir}/list_interfaces.py</script>
-        </completionHelp>
-      </properties>
-    </leafNode>
-    <leafNode name="egress">
-      <properties>
-        <help>Mirror the egress traffic of the interface to the destination interface</help>
-        <completionHelp>
-            <script>${vyos_completion_dir}/list_interfaces.py</script>
-        </completionHelp>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-mtu-1200-16000.xml.i b/interface-definitions/include/interface-mtu-1200-16000.xml.i
deleted file mode 100644
index 0187c5991..000000000
--- a/interface-definitions/include/interface-mtu-1200-16000.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface-mtu-1200-16000.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>1200-16000</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 1200-16000"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 1200 and 16000</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-mtu-1450-16000.xml.i b/interface-definitions/include/interface-mtu-1450-16000.xml.i
deleted file mode 100644
index 84268586e..000000000
--- a/interface-definitions/include/interface-mtu-1450-16000.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface-mtu-1450-16000.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>1450-16000</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 1450-16000"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 1450 and 16000</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-mtu-64-8024.xml.i b/interface-definitions/include/interface-mtu-64-8024.xml.i
deleted file mode 100644
index 6a7ab8a80..000000000
--- a/interface-definitions/include/interface-mtu-64-8024.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface-mtu-68-8024.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>64-8024</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 64-8024"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 64 and 8024</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-mtu-68-1500.xml.i b/interface-definitions/include/interface-mtu-68-1500.xml.i
deleted file mode 100644
index ea333edcc..000000000
--- a/interface-definitions/include/interface-mtu-68-1500.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface-mtu-68-1500.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>68-1500</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 68-1500"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 68 and 1500</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-mtu-68-16000.xml.i b/interface-definitions/include/interface-mtu-68-16000.xml.i
deleted file mode 100644
index a9107c027..000000000
--- a/interface-definitions/include/interface-mtu-68-16000.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface-mtu-68-16000.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>68-16000</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 68-16000"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 68 and 16000</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-parameters-dont-fragment.xml.i b/interface-definitions/include/interface-parameters-dont-fragment.xml.i
deleted file mode 100644
index d6c276d67..000000000
--- a/interface-definitions/include/interface-parameters-dont-fragment.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface-parameters-df.xml.i -->
-<leafNode name="dont-fragment">
-  <properties>
-    <help>Specifies the usage of the dont fragment (DF) bit</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-parameters-flowlabel.xml.i b/interface-definitions/include/interface-parameters-flowlabel.xml.i
deleted file mode 100644
index dc651bc9c..000000000
--- a/interface-definitions/include/interface-parameters-flowlabel.xml.i
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- include start from interface-parameters-flowlabel.xml.i -->
-<leafNode name="flowlabel">
-  <properties>
-    <help>Specifies the flow label to use in outgoing packets</help>
-    <valueHelp>
-      <format>0x0-0x0FFFFF</format>
-      <description>Tunnel key, 'inherit' or hex value</description>
-    </valueHelp>
-    <constraint>
-      <regex>^((0x){0,1}(0?[0-9A-Fa-f]{1,5})|inherit)$</regex>
-    </constraint>
-    <constraintErrorMessage>Must be 'inherit' or a number</constraintErrorMessage>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-parameters-key.xml.i b/interface-definitions/include/interface-parameters-key.xml.i
deleted file mode 100644
index 1891b44b0..000000000
--- a/interface-definitions/include/interface-parameters-key.xml.i
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- include start from interface-parameters-key.xml.i -->
-<leafNode name="key">
-  <properties>
-    <help>Tunnel key</help>
-    <valueHelp>
-      <format>u32</format>
-      <description>Tunnel key</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 0-4294967295"/>
-    </constraint>
-    <constraintErrorMessage>key must be between 0-4294967295</constraintErrorMessage>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-parameters-tos.xml.i b/interface-definitions/include/interface-parameters-tos.xml.i
deleted file mode 100644
index 06ec2febb..000000000
--- a/interface-definitions/include/interface-parameters-tos.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from tunnel-parameters-tos.xml.i -->
-<leafNode name="tos">
-  <properties>
-    <help>Specifies TOS value to use in outgoing packets</help>
-    <valueHelp>
-      <format>0-99</format>
-      <description>Type of Service (TOS)</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 0-99"/>
-    </constraint>
-    <constraintErrorMessage>TOS must be between 0 and 99</constraintErrorMessage>
-  </properties>
-  <defaultValue>inherit</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-parameters-ttl.xml.i b/interface-definitions/include/interface-parameters-ttl.xml.i
deleted file mode 100644
index a2e13d8d1..000000000
--- a/interface-definitions/include/interface-parameters-ttl.xml.i
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- include start from interface-parameters-ttl.xml.i -->
-<leafNode name="ttl">
-  <properties>
-    <help>Specifies TTL value to use in outgoing packets</help>
-    <valueHelp>
-      <format>0</format>
-      <description>Inherit - copy value from original IP header</description>
-    </valueHelp>
-    <valueHelp>
-      <format>1-255</format>
-      <description>Time to Live</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 0-255"/>
-    </constraint>
-    <constraintErrorMessage>TTL must be between 0 and 255</constraintErrorMessage>
-  </properties>
-  <defaultValue>0</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-proxy-arp-pvlan.xml.i b/interface-definitions/include/interface-proxy-arp-pvlan.xml.i
deleted file mode 100644
index 484f8fd69..000000000
--- a/interface-definitions/include/interface-proxy-arp-pvlan.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface-proxy-arp-pvlan.xml.i -->
-<leafNode name="proxy-arp-pvlan">
-  <properties>
-    <help>Enable private VLAN proxy ARP on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-source-validation.xml.i b/interface-definitions/include/interface-source-validation.xml.i
deleted file mode 100644
index be58bce87..000000000
--- a/interface-definitions/include/interface-source-validation.xml.i
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- include start from interface-source-validation.xml.i -->
-<leafNode name="source-validation">
-  <properties>
-    <help>Source validation by reversed path (RFC3704)</help>
-    <completionHelp>
-      <list>strict loose disable</list>
-    </completionHelp>
-    <valueHelp>
-      <format>strict</format>
-      <description>Enable Strict Reverse Path Forwarding as defined in RFC3704</description>
-    </valueHelp>
-    <valueHelp>
-      <format>loose</format>
-      <description>Enable Loose Reverse Path Forwarding as defined in RFC3704</description>
-    </valueHelp>
-    <valueHelp>
-      <format>disable</format>
-      <description>No source validation</description>
-    </valueHelp>
-    <constraint>
-      <regex>^(strict|loose|disable)$</regex>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-vrf.xml.i b/interface-definitions/include/interface-vrf.xml.i
deleted file mode 100644
index 81ca0972b..000000000
--- a/interface-definitions/include/interface-vrf.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- include start from interface-vrf.xml.i -->
-<leafNode name="vrf">
-  <properties>
-    <help>VRF instance name</help>
-    <valueHelp>
-      <format>text</format>
-      <description>VRF instance name</description>
-    </valueHelp>
-    <completionHelp>
-      <path>vrf name</path>
-    </completionHelp>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface-xdp.xml.i b/interface-definitions/include/interface-xdp.xml.i
deleted file mode 100644
index 21fcf131d..000000000
--- a/interface-definitions/include/interface-xdp.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface-vrf.xml.i -->
-<leafNode name="xdp">
-  <properties>
-    <help>Enable eXpress Data Path</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i b/interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i
new file mode 100644
index 000000000..b9dd59bea
--- /dev/null
+++ b/interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i
@@ -0,0 +1,31 @@
+<!-- include start from address-ipv4-ipv6-dhcp.xml.i -->
+<leafNode name="address">
+  <properties>
+    <help>IP address</help>
+    <completionHelp>
+      <list>dhcp dhcpv6</list>
+    </completionHelp>
+    <valueHelp>
+      <format>ipv4net</format>
+      <description>IPv4 address and prefix length</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6net</format>
+      <description>IPv6 address and prefix length</description>
+    </valueHelp>
+    <valueHelp>
+      <format>dhcp</format>
+      <description>Dynamic Host Configuration Protocol</description>
+    </valueHelp>
+    <valueHelp>
+      <format>dhcpv6</format>
+      <description>Dynamic Host Configuration Protocol for IPv6</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ip-host"/>
+      <regex>(dhcp|dhcpv6)</regex>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/address-ipv4-ipv6.xml.i b/interface-definitions/include/interface/address-ipv4-ipv6.xml.i
new file mode 100644
index 000000000..519622050
--- /dev/null
+++ b/interface-definitions/include/interface/address-ipv4-ipv6.xml.i
@@ -0,0 +1,19 @@
+<!-- include start from address-ipv4-ipv6.xml.i -->
+<leafNode name="address">
+  <properties>
+    <help>IP address</help>
+    <valueHelp>
+      <format>ipv4net</format>
+      <description>IPv4 address and prefix length</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6net</format>
+      <description>IPv6 address and prefix length</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ip-host"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/dhcp-options.xml.i b/interface-definitions/include/interface/dhcp-options.xml.i
new file mode 100644
index 000000000..bd327da2d
--- /dev/null
+++ b/interface-definitions/include/interface/dhcp-options.xml.i
@@ -0,0 +1,42 @@
+<!-- include start from interface/dhcp-options.xml.i -->
+<node name="dhcp-options">
+  <properties>
+    <help>DHCP client settings/options</help>
+  </properties>
+  <children>
+    <leafNode name="client-id">
+      <properties>
+        <help>Identifier used by client to identify itself to the DHCP server</help>
+      </properties>
+    </leafNode>
+    <leafNode name="host-name">
+      <properties>
+        <help>Override system host-name sent to DHCP server</help>
+      </properties>
+    </leafNode>
+    <leafNode name="vendor-class-id">
+      <properties>
+        <help>Identify the vendor client type to the DHCP server</help>
+      </properties>
+    </leafNode>
+    <leafNode name="no-default-route">
+      <properties>
+        <help>Do not request routers from DHCP server</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="default-route-distance">
+      <properties>
+        <help>Distance for the default route from DHCP server</help>
+        <valueHelp>
+          <format>u32:1-255</format>
+          <description>Distance for the default route from DHCP server (default 210)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-255"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/dhcpv6-options.xml.i b/interface-definitions/include/interface/dhcpv6-options.xml.i
new file mode 100644
index 000000000..ca478a3eb
--- /dev/null
+++ b/interface-definitions/include/interface/dhcpv6-options.xml.i
@@ -0,0 +1,100 @@
+<!-- include start from interface/dhcpv6-options.xml.i -->
+<node name="dhcpv6-options">
+  <properties>
+    <help>DHCPv6 client settings/options</help>
+  </properties>
+  <children>
+    <leafNode name="duid">
+      <properties>
+        <help>DHCP unique identifier (DUID) to be sent by dhcpv6 client</help>
+        <valueHelp>
+          <format>duid</format>
+          <description>DHCP unique identifier (DUID)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv6-duid"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="parameters-only">
+      <properties>
+        <help>Acquire only config parameters, no address</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <tagNode name="pd">
+      <properties>
+        <help>DHCPv6 prefix delegation interface statement</help>
+        <valueHelp>
+          <format>instance number</format>
+          <description>Prefix delegation instance (>= 0)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--non-negative"/>
+        </constraint>
+      </properties>
+      <children>
+        <leafNode name="length">
+          <properties>
+            <help>Request IPv6 prefix length from peer</help>
+            <valueHelp>
+              <format>32-64</format>
+              <description>Length of delegated prefix</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 32-64"/>
+            </constraint>
+          </properties>
+          <defaultValue>64</defaultValue>
+        </leafNode>
+        <tagNode name="interface">
+          <properties>
+            <help>Delegate IPv6 prefix from provider to this interface</help>
+            <completionHelp>
+              <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
+            </completionHelp>
+          </properties>
+          <children>
+            <leafNode name="address">
+              <properties>
+                <help>Local interface address assigned to interface</help>
+                <valueHelp>
+                  <format>&gt;0</format>
+                  <description>Used to form IPv6 interface address (default: EUI-64)</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="numeric" argument="--non-negative"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            <leafNode name="sla-id">
+              <properties>
+                <help>Interface site-Level aggregator (SLA)</help>
+                <valueHelp>
+                  <format>0-128</format>
+                  <description>Decimal integer which fits in the length of SLA IDs</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="numeric" argument="--range 0-128"/>
+                </constraint>
+              </properties>
+            </leafNode>
+          </children>
+        </tagNode>
+      </children>
+    </tagNode>
+    <leafNode name="rapid-commit">
+      <properties>
+        <help>Wait for immediate reply instead of advertisements</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="temporary">
+      <properties>
+        <help>IPv6 temporary address</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-arp-cache-timeout.xml.i b/interface-definitions/include/interface/interface-arp-cache-timeout.xml.i
new file mode 100644
index 000000000..b269fecd8
--- /dev/null
+++ b/interface-definitions/include/interface/interface-arp-cache-timeout.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/interface-arp-cache-timeout.xml.i -->
+<leafNode name="arp-cache-timeout">
+  <properties>
+    <help>ARP cache entry timeout in seconds</help>
+    <valueHelp>
+      <format>1-86400</format>
+      <description>ARP cache entry timout in seconds (default 30)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-86400"/>
+    </constraint>
+    <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage>
+  </properties>
+  <defaultValue>30</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-description.xml.i b/interface-definitions/include/interface/interface-description.xml.i
new file mode 100644
index 000000000..d618b50d2
--- /dev/null
+++ b/interface-definitions/include/interface/interface-description.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from interface/interface-description.xml.i -->
+<leafNode name="description">
+  <properties>
+    <help>Interface specific description</help>
+    <constraint>
+      <regex>.{1,256}$</regex>
+    </constraint>
+    <constraintErrorMessage>Description too long (limit 256 characters)</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-dial-on-demand.xml.i b/interface-definitions/include/interface/interface-dial-on-demand.xml.i
new file mode 100644
index 000000000..66edd9678
--- /dev/null
+++ b/interface-definitions/include/interface/interface-dial-on-demand.xml.i
@@ -0,0 +1,8 @@
+<!-- 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>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-disable-arp-filter.xml.i b/interface-definitions/include/interface/interface-disable-arp-filter.xml.i
new file mode 100644
index 000000000..49cddaf76
--- /dev/null
+++ b/interface-definitions/include/interface/interface-disable-arp-filter.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-disable-arp-filter.xml.i -->
+<leafNode name="disable-arp-filter">
+  <properties>
+    <help>Disable ARP filter on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-disable-forwarding.xml.i b/interface-definitions/include/interface/interface-disable-forwarding.xml.i
new file mode 100644
index 000000000..cb6ef0475
--- /dev/null
+++ b/interface-definitions/include/interface/interface-disable-forwarding.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-disable-forwarding.xml.i -->
+<leafNode name="disable-forwarding">
+  <properties>
+    <help>Disable IPv4 forwarding on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-disable-link-detect.xml.i b/interface-definitions/include/interface/interface-disable-link-detect.xml.i
new file mode 100644
index 000000000..c528885b2
--- /dev/null
+++ b/interface-definitions/include/interface/interface-disable-link-detect.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-disable-link-detect.xml.i -->
+<leafNode name="disable-link-detect">
+  <properties>
+    <help>Ignore link state changes</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-disable.xml.i b/interface-definitions/include/interface/interface-disable.xml.i
new file mode 100644
index 000000000..d90e6395b
--- /dev/null
+++ b/interface-definitions/include/interface/interface-disable.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-disable.xml.i -->
+<leafNode name="disable">
+  <properties>
+    <help>Administratively disable interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-eapol.xml.i b/interface-definitions/include/interface/interface-eapol.xml.i
new file mode 100644
index 000000000..92b7a3f35
--- /dev/null
+++ b/interface-definitions/include/interface/interface-eapol.xml.i
@@ -0,0 +1,12 @@
+<!-- include start from interface/interface-eapol.xml.i -->
+<node name="eapol">
+  <properties>
+     <help>Extensible Authentication Protocol over Local Area Network</help>
+  </properties>
+  <children>
+    #include <include/certificate.xml.i>
+    #include <include/certificate-ca.xml.i>
+    #include <include/certificate-key.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-enable-arp-accept.xml.i b/interface-definitions/include/interface/interface-enable-arp-accept.xml.i
new file mode 100644
index 000000000..7c5d51857
--- /dev/null
+++ b/interface-definitions/include/interface/interface-enable-arp-accept.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-enable-arp-accept.xml.i -->
+<leafNode name="enable-arp-accept">
+  <properties>
+    <help>Enable ARP accept on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-enable-arp-announce.xml.i b/interface-definitions/include/interface/interface-enable-arp-announce.xml.i
new file mode 100644
index 000000000..f44599c54
--- /dev/null
+++ b/interface-definitions/include/interface/interface-enable-arp-announce.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-enable-arp-announce.xml.i -->
+<leafNode name="enable-arp-announce">
+  <properties>
+    <help>Enable ARP announce on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-enable-arp-ignore.xml.i b/interface-definitions/include/interface/interface-enable-arp-ignore.xml.i
new file mode 100644
index 000000000..3ea39613c
--- /dev/null
+++ b/interface-definitions/include/interface/interface-enable-arp-ignore.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-enable-arp-ignore.xml.i -->
+<leafNode name="enable-arp-ignore">
+  <properties>
+    <help>Enable ARP ignore on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-enable-proxy-arp.xml.i b/interface-definitions/include/interface/interface-enable-proxy-arp.xml.i
new file mode 100644
index 000000000..dbdeeb7a7
--- /dev/null
+++ b/interface-definitions/include/interface/interface-enable-proxy-arp.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-enable-proxy-arp.xml.i -->
+<leafNode name="enable-proxy-arp">
+  <properties>
+    <help>Enable proxy-arp on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-hw-id.xml.i b/interface-definitions/include/interface/interface-hw-id.xml.i
new file mode 100644
index 000000000..989cd9cb7
--- /dev/null
+++ b/interface-definitions/include/interface/interface-hw-id.xml.i
@@ -0,0 +1,14 @@
+<!-- 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>
+    <valueHelp>
+      <format>macaddr</format>
+      <description>Hardware (MAC) address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="mac-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
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/interface-mac.xml.i b/interface-definitions/include/interface/interface-mac.xml.i
new file mode 100644
index 000000000..d7107ad23
--- /dev/null
+++ b/interface-definitions/include/interface/interface-mac.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from interface/interface-mac.xml.i -->
+<leafNode name="mac">
+  <properties>
+    <help>Media Access Control (MAC) address</help>
+    <valueHelp>
+      <format>macaddr</format>
+      <description>Hardware (MAC) address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="mac-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mirror.xml.i b/interface-definitions/include/interface/interface-mirror.xml.i
new file mode 100644
index 000000000..b3b45fb43
--- /dev/null
+++ b/interface-definitions/include/interface/interface-mirror.xml.i
@@ -0,0 +1,25 @@
+<!-- include start from interface/interface-mirror.xml.i -->
+<node name="mirror">
+  <properties>
+    <help>Incoming/outgoing packet mirroring destination</help>
+  </properties>
+  <children>
+    <leafNode name="ingress">
+      <properties>
+        <help>Mirror the ingress traffic of the interface to the destination interface</help>
+        <completionHelp>
+            <script>${vyos_completion_dir}/list_interfaces.py</script>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="egress">
+      <properties>
+        <help>Mirror the egress traffic of the interface to the destination interface</help>
+        <completionHelp>
+            <script>${vyos_completion_dir}/list_interfaces.py</script>
+        </completionHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-1200-16000.xml.i b/interface-definitions/include/interface/interface-mtu-1200-16000.xml.i
new file mode 100644
index 000000000..3241ba912
--- /dev/null
+++ b/interface-definitions/include/interface/interface-mtu-1200-16000.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/interface-mtu-1200-16000.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>1200-16000</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1200-16000"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 1200 and 16000</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-1450-16000.xml.i b/interface-definitions/include/interface/interface-mtu-1450-16000.xml.i
new file mode 100644
index 000000000..0a35bbbaa
--- /dev/null
+++ b/interface-definitions/include/interface/interface-mtu-1450-16000.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/interface-mtu-1450-16000.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>1450-16000</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1450-16000"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 1450 and 16000</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-64-8024.xml.i b/interface-definitions/include/interface/interface-mtu-64-8024.xml.i
new file mode 100644
index 000000000..f75de02ba
--- /dev/null
+++ b/interface-definitions/include/interface/interface-mtu-64-8024.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/interface-mtu-68-8024.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>64-8024</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 64-8024"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 64 and 8024</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-68-1500.xml.i b/interface-definitions/include/interface/interface-mtu-68-1500.xml.i
new file mode 100644
index 000000000..9e6fe8760
--- /dev/null
+++ b/interface-definitions/include/interface/interface-mtu-68-1500.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/interface-mtu-68-1500.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>68-1500</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 68-1500"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 68 and 1500</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-68-16000.xml.i b/interface-definitions/include/interface/interface-mtu-68-16000.xml.i
new file mode 100644
index 000000000..83af7bbd4
--- /dev/null
+++ b/interface-definitions/include/interface/interface-mtu-68-16000.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/interface-mtu-68-16000.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>68-16000</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 68-16000"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 68 and 16000</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-parameters-dont-fragment.xml.i b/interface-definitions/include/interface/interface-parameters-dont-fragment.xml.i
new file mode 100644
index 000000000..166c31115
--- /dev/null
+++ b/interface-definitions/include/interface/interface-parameters-dont-fragment.xml.i
@@ -0,0 +1,8 @@
+<!-- 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>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i b/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i
new file mode 100644
index 000000000..ed075e40d
--- /dev/null
+++ b/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from interface/interface-parameters-flowlabel.xml.i -->
+<leafNode name="flowlabel">
+  <properties>
+    <help>Specifies the flow label to use in outgoing packets</help>
+    <valueHelp>
+      <format>0x0-0x0FFFFF</format>
+      <description>Tunnel key, 'inherit' or hex value</description>
+    </valueHelp>
+    <constraint>
+      <regex>^((0x){0,1}(0?[0-9A-Fa-f]{1,5})|inherit)$</regex>
+    </constraint>
+    <constraintErrorMessage>Must be 'inherit' or a number</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-parameters-key.xml.i b/interface-definitions/include/interface/interface-parameters-key.xml.i
new file mode 100644
index 000000000..1b1d67174
--- /dev/null
+++ b/interface-definitions/include/interface/interface-parameters-key.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from interface/interface-parameters-key.xml.i -->
+<leafNode name="key">
+  <properties>
+    <help>Tunnel key</help>
+    <valueHelp>
+      <format>u32</format>
+      <description>Tunnel key</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-4294967295"/>
+    </constraint>
+    <constraintErrorMessage>key must be between 0-4294967295</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-parameters-tos.xml.i b/interface-definitions/include/interface/interface-parameters-tos.xml.i
new file mode 100644
index 000000000..83b4e0671
--- /dev/null
+++ b/interface-definitions/include/interface/interface-parameters-tos.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/tunnel-parameters-tos.xml.i -->
+<leafNode name="tos">
+  <properties>
+    <help>Specifies TOS value to use in outgoing packets</help>
+    <valueHelp>
+      <format>0-99</format>
+      <description>Type of Service (TOS)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-99"/>
+    </constraint>
+    <constraintErrorMessage>TOS must be between 0 and 99</constraintErrorMessage>
+  </properties>
+  <defaultValue>inherit</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-parameters-ttl.xml.i b/interface-definitions/include/interface/interface-parameters-ttl.xml.i
new file mode 100644
index 000000000..df193cf24
--- /dev/null
+++ b/interface-definitions/include/interface/interface-parameters-ttl.xml.i
@@ -0,0 +1,20 @@
+<!-- include start from interface/interface-parameters-ttl.xml.i -->
+<leafNode name="ttl">
+  <properties>
+    <help>Specifies TTL value to use in outgoing packets</help>
+    <valueHelp>
+      <format>0</format>
+      <description>Inherit - copy value from original IP header</description>
+    </valueHelp>
+    <valueHelp>
+      <format>1-255</format>
+      <description>Time to Live</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-255"/>
+    </constraint>
+    <constraintErrorMessage>TTL must be between 0 and 255</constraintErrorMessage>
+  </properties>
+  <defaultValue>0</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i b/interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i
new file mode 100644
index 000000000..153dfc072
--- /dev/null
+++ b/interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i
@@ -0,0 +1,8 @@
+<!-- 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>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-source-validation.xml.i b/interface-definitions/include/interface/interface-source-validation.xml.i
new file mode 100644
index 000000000..70914f2e9
--- /dev/null
+++ b/interface-definitions/include/interface/interface-source-validation.xml.i
@@ -0,0 +1,25 @@
+<!-- include start from interface/interface-source-validation.xml.i -->
+<leafNode name="source-validation">
+  <properties>
+    <help>Source validation by reversed path (RFC3704)</help>
+    <completionHelp>
+      <list>strict loose disable</list>
+    </completionHelp>
+    <valueHelp>
+      <format>strict</format>
+      <description>Enable Strict Reverse Path Forwarding as defined in RFC3704</description>
+    </valueHelp>
+    <valueHelp>
+      <format>loose</format>
+      <description>Enable Loose Reverse Path Forwarding as defined in RFC3704</description>
+    </valueHelp>
+    <valueHelp>
+      <format>disable</format>
+      <description>No source validation</description>
+    </valueHelp>
+    <constraint>
+      <regex>^(strict|loose|disable)$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-vrf.xml.i b/interface-definitions/include/interface/interface-vrf.xml.i
new file mode 100644
index 000000000..ef6ca1241
--- /dev/null
+++ b/interface-definitions/include/interface/interface-vrf.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from interface/interface-vrf.xml.i -->
+<leafNode name="vrf">
+  <properties>
+    <help>VRF instance name</help>
+    <valueHelp>
+      <format>text</format>
+      <description>VRF instance name</description>
+    </valueHelp>
+    <completionHelp>
+      <path>vrf name</path>
+    </completionHelp>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-xdp.xml.i b/interface-definitions/include/interface/interface-xdp.xml.i
new file mode 100644
index 000000000..0253f6dad
--- /dev/null
+++ b/interface-definitions/include/interface/interface-xdp.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-xdp.xml.i -->
+<leafNode name="xdp">
+  <properties>
+    <help>Enable eXpress Data Path</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv6-address-autoconf.xml.i b/interface-definitions/include/interface/ipv6-address-autoconf.xml.i
new file mode 100644
index 000000000..cd1483bc1
--- /dev/null
+++ b/interface-definitions/include/interface/ipv6-address-autoconf.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/ipv6-address-autoconf.xml.i -->
+<leafNode name="autoconf">
+  <properties>
+    <help>Enable acquisition of IPv6 address using stateless autoconfig (SLAAC)</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv6-address-eui64.xml.i b/interface-definitions/include/interface/ipv6-address-eui64.xml.i
new file mode 100644
index 000000000..7bc1ee2e4
--- /dev/null
+++ b/interface-definitions/include/interface/ipv6-address-eui64.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from interface/ipv6-address-eui64.xml.i -->
+<leafNode name="eui64">
+  <properties>
+    <help>Prefix for IPv6 address with MAC-based EUI-64</help>
+    <valueHelp>
+      <format>ipv6net</format>
+      <description>IPv6 network and prefix length</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv6-prefix"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv6-address-no-default-link-local.xml.i b/interface-definitions/include/interface/ipv6-address-no-default-link-local.xml.i
new file mode 100644
index 000000000..012490edc
--- /dev/null
+++ b/interface-definitions/include/interface/ipv6-address-no-default-link-local.xml.i
@@ -0,0 +1,8 @@
+<!-- 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>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
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/interface/ipv6-disable-forwarding.xml.i b/interface-definitions/include/interface/ipv6-disable-forwarding.xml.i
new file mode 100644
index 000000000..4adb77d1b
--- /dev/null
+++ b/interface-definitions/include/interface/ipv6-disable-forwarding.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/ipv6-disable-forwarding.xml.i -->
+<leafNode name="disable-forwarding">
+  <properties>
+    <help>Disable IPv6 forwarding on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv6-dup-addr-detect-transmits.xml.i b/interface-definitions/include/interface/ipv6-dup-addr-detect-transmits.xml.i
new file mode 100644
index 000000000..2b5ec0281
--- /dev/null
+++ b/interface-definitions/include/interface/ipv6-dup-addr-detect-transmits.xml.i
@@ -0,0 +1,18 @@
+<!-- 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>
+    <valueHelp>
+      <format>1-n</format>
+      <description>Number of NS messages to send while performing DAD</description>
+    </valueHelp>
+    <valueHelp>
+      <format>0</format>
+      <description>Disable Duplicate Address Dectection (DAD)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--non-negative"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/tunnel-remote.xml.i b/interface-definitions/include/interface/tunnel-remote.xml.i
new file mode 100644
index 000000000..1ba9b0382
--- /dev/null
+++ b/interface-definitions/include/interface/tunnel-remote.xml.i
@@ -0,0 +1,18 @@
+<!-- include start from rip/tunnel-remote.xml.i -->
+<leafNode name="remote">
+  <properties>
+    <help>Tunnel remote address</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>Tunnel remote IPv4 address</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>Tunnel remote IPv6 address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ip-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i
new file mode 100644
index 000000000..045fd3e24
--- /dev/null
+++ b/interface-definitions/include/interface/vif-s.xml.i
@@ -0,0 +1,67 @@
+<!-- include start from interface/vif-s.xml.i -->
+<tagNode name="vif-s">
+  <properties>
+    <help>QinQ TAG-S Virtual Local Area Network (VLAN) ID</help>
+    <constraint>
+      <validator name="numeric" argument="--range 0-4094"/>
+    </constraint>
+    <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>
+  </properties>
+  <children>
+    #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>
+        <completionHelp>
+          <list>802.1ad 802.1q</list>
+        </completionHelp>
+        <valueHelp>
+          <format>802.1ad</format>
+          <description>Provider Bridging (IEEE 802.1ad, Q-inQ), ethertype 0x88a8</description>
+        </valueHelp>
+        <valueHelp>
+          <format>802.1q</format>
+          <description>VLAN-tagged frame (IEEE 802.1q), ethertype 0x8100</description>
+        </valueHelp>
+        <constraint>
+          <regex>(802.1q|802.1ad)</regex>
+        </constraint>
+        <constraintErrorMessage>Ethertype must be 802.1ad or 802.1q</constraintErrorMessage>
+      </properties>
+      <defaultValue>802.1ad</defaultValue>
+    </leafNode>
+    #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>
+        <constraint>
+          <validator name="numeric" argument="--range 0-4094"/>
+        </constraint>
+        <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>
+      </properties>
+      <children>
+        #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/interface-vrf.xml.i>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/vif.xml.i b/interface-definitions/include/interface/vif.xml.i
new file mode 100644
index 000000000..0355054a4
--- /dev/null
+++ b/interface-definitions/include/interface/vif.xml.i
@@ -0,0 +1,52 @@
+<!-- include start from interface/vif.xml.i -->
+<tagNode name="vif">
+  <properties>
+    <help>Virtual Local Area Network (VLAN) ID</help>
+    <valueHelp>
+      <format>0-4094</format>
+      <description>Virtual Local Area Network (VLAN) ID</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-4094"/>
+    </constraint>
+    <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>
+  </properties>
+  <children>
+    #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>
+        <completionHelp>
+          <script>echo Format for qos mapping, e.g.: '0:1 1:6 7:6'</script>
+        </completionHelp>
+        <constraint>
+          <regex>[:0-7 ]+$</regex>
+        </constraint>
+        <constraintErrorMessage>QoS mapping should be in the format of '0:7 2:3' with numbers 0-9</constraintErrorMessage>
+      </properties>
+    </leafNode>
+    <leafNode name="ingress-qos">
+      <properties>
+        <help>VLAN ingress QoS</help>
+        <completionHelp>
+          <script>echo Format for qos mapping '0:1 1:6 7:6'</script>
+        </completionHelp>
+        <constraint>
+          <regex>[:0-7 ]+$</regex>
+        </constraint>
+        <constraintErrorMessage>QoS mapping should be in the format of '0:7 2:3' with numbers 0-9</constraintErrorMessage>
+      </properties>
+    </leafNode>
+    #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-autoconf.xml.i b/interface-definitions/include/ipv6-address-autoconf.xml.i
deleted file mode 100644
index a84293067..000000000
--- a/interface-definitions/include/ipv6-address-autoconf.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from ipv6-address-autoconf.xml.i -->
-<leafNode name="autoconf">
-  <properties>
-    <help>Enable acquisition of IPv6 address using stateless autoconfig (SLAAC)</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/ipv6-address-eui64.xml.i b/interface-definitions/include/ipv6-address-eui64.xml.i
deleted file mode 100644
index e06e88d52..000000000
--- a/interface-definitions/include/ipv6-address-eui64.xml.i
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- include start from ipv6-address-eui64.xml.i -->
-<leafNode name="eui64">
-  <properties>
-    <help>Prefix for IPv6 address with MAC-based EUI-64</help>
-    <valueHelp>
-      <format>ipv6net</format>
-      <description>IPv6 network and prefix length</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ipv6-prefix"/>
-    </constraint>
-    <multi/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/ipv6-address-no-default-link-local.xml.i b/interface-definitions/include/ipv6-address-no-default-link-local.xml.i
deleted file mode 100644
index e803a4d60..000000000
--- a/interface-definitions/include/ipv6-address-no-default-link-local.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from 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>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- 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/include/ipv6-disable-forwarding.xml.i b/interface-definitions/include/ipv6-disable-forwarding.xml.i
deleted file mode 100644
index 5f368256b..000000000
--- a/interface-definitions/include/ipv6-disable-forwarding.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from ipv6-disable-forwarding.xml.i -->
-<leafNode name="disable-forwarding">
-  <properties>
-    <help>Disable IPv6 forwarding on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i b/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i
deleted file mode 100644
index c6265d71a..000000000
--- a/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- include start from 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>
-    <valueHelp>
-      <format>1-n</format>
-      <description>Number of NS messages to send while performing DAD</description>
-    </valueHelp>
-    <valueHelp>
-      <format>0</format>
-      <description>Disable Duplicate Address Dectection (DAD)</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--non-negative"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/tunnel-remote.xml.i b/interface-definitions/include/tunnel-remote.xml.i
deleted file mode 100644
index 324d100d4..000000000
--- a/interface-definitions/include/tunnel-remote.xml.i
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- include start from tunnel-remote.xml.i -->
-<leafNode name="remote">
-  <properties>
-    <help>Tunnel remote address</help>
-    <valueHelp>
-      <format>ipv4</format>
-      <description>Tunnel remote IPv4 address</description>
-    </valueHelp>
-    <valueHelp>
-      <format>ipv6</format>
-      <description>Tunnel remote IPv6 address</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ip-address"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i
deleted file mode 100644
index 5760bb000..000000000
--- a/interface-definitions/include/vif-s.xml.i
+++ /dev/null
@@ -1,67 +0,0 @@
-<!-- include start from vif-s.xml.i -->
-<tagNode name="vif-s">
-  <properties>
-    <help>QinQ TAG-S Virtual Local Area Network (VLAN) ID</help>
-    <constraint>
-      <validator name="numeric" argument="--range 0-4094"/>
-    </constraint>
-    <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>
-    <leafNode name="protocol">
-      <properties>
-        <help>Protocol used for service VLAN (default: 802.1ad)</help>
-        <completionHelp>
-          <list>802.1ad 802.1q</list>
-        </completionHelp>
-        <valueHelp>
-          <format>802.1ad</format>
-          <description>Provider Bridging (IEEE 802.1ad, Q-inQ), ethertype 0x88a8</description>
-        </valueHelp>
-        <valueHelp>
-          <format>802.1q</format>
-          <description>VLAN-tagged frame (IEEE 802.1q), ethertype 0x8100</description>
-        </valueHelp>
-        <constraint>
-          <regex>(802.1q|802.1ad)</regex>
-        </constraint>
-        <constraintErrorMessage>Ethertype must be 802.1ad or 802.1q</constraintErrorMessage>
-      </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>
-    <tagNode name="vif-c">
-      <properties>
-        <help>QinQ TAG-C Virtual Local Area Network (VLAN) ID</help>
-        <constraint>
-          <validator name="numeric" argument="--range 0-4094"/>
-        </constraint>
-        <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>
-      </children>
-    </tagNode>
-    #include <include/interface-vrf.xml.i>
-  </children>
-</tagNode>
-<!-- include end -->
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
deleted file mode 100644
index 0f09b993d..000000000
--- a/interface-definitions/include/vif.xml.i
+++ /dev/null
@@ -1,52 +0,0 @@
-<!-- include start from vif.xml.i -->
-<tagNode name="vif">
-  <properties>
-    <help>Virtual Local Area Network (VLAN) ID</help>
-    <valueHelp>
-      <format>0-4094</format>
-      <description>Virtual Local Area Network (VLAN) ID</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 0-4094"/>
-    </constraint>
-    <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>
-    <leafNode name="egress-qos">
-      <properties>
-        <help>VLAN egress QoS</help>
-        <completionHelp>
-          <script>echo Format for qos mapping, e.g.: '0:1 1:6 7:6'</script>
-        </completionHelp>
-        <constraint>
-          <regex>[:0-7 ]+$</regex>
-        </constraint>
-        <constraintErrorMessage>QoS mapping should be in the format of '0:7 2:3' with numbers 0-9</constraintErrorMessage>
-      </properties>
-    </leafNode>
-    <leafNode name="ingress-qos">
-      <properties>
-        <help>VLAN ingress QoS</help>
-        <completionHelp>
-          <script>echo Format for qos mapping '0:1 1:6 7:6'</script>
-        </completionHelp>
-        <constraint>
-          <regex>[:0-7 ]+$</regex>
-        </constraint>
-        <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>
-  </children>
-</tagNode>
-<!-- include end -->
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index f6ceefcaa..4382433b2 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/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-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>
+          #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,9 +163,9 @@
               </completionHelp>
             </properties>
           </leafNode>
-          #include <include/vif-s.xml.i>
-          #include <include/vif.xml.i>
-          #include <include/interface-xdp.xml.i>
+          #include <include/interface/vif-s.xml.i>
+          #include <include/interface/vif.xml.i>
+          #include <include/interface/interface-xdp.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index 63c543f33..c6de58424 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/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-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>
+          #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="enable-vlan">
             <properties>
               <help>Enable VLAN aware bridge</help>
@@ -202,7 +202,7 @@
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/vif.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-erspan.xml.in b/interface-definitions/interfaces-erspan.xml.in
index 2394d3534..769899415 100644
--- a/interface-definitions/interfaces-erspan.xml.in
+++ b/interface-definitions/interfaces-erspan.xml.in
@@ -16,12 +16,12 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/interface-description.xml.i>
-          #include <include/interface-disable.xml.i>
-          #include <include/interface-disable-link-detect.xml.i>
-          #include <include/interface-mtu-64-8024.xml.i>
+          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/interface-disable.xml.i>
+          #include <include/interface/interface-disable-link-detect.xml.i>
+          #include <include/interface/interface-mtu-64-8024.xml.i>
           #include <include/source-address-ipv4-ipv6.xml.i>
-          #include <include/tunnel-remote.xml.i>
+          #include <include/interface/tunnel-remote.xml.i>
           <leafNode name="encapsulation">
             <properties>
               <help>Encapsulation of this tunnel interface</help>
@@ -52,9 +52,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>
               <leafNode name="version">
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index be44072a6..f00f65364 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -16,18 +16,18 @@
           </valueHelp>
         </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/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>
           <leafNode name="disable-flow-control">
             <properties>
               <help>Disable Ethernet flow control (pause frames)</help>
               <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,10 +191,10 @@
               </leafNode>
             </children>
           </node>
-          #include <include/vif-s.xml.i>
-          #include <include/vif.xml.i>
-          #include <include/interface-vrf.xml.i>
-          #include <include/interface-xdp.xml.i>
+          #include <include/interface/vif-s.xml.i>
+          #include <include/interface/vif.xml.i>
+          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/interface-xdp.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in
index 25308c8ef..bdcbc3f5e 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>
           <node name="parameters">
             <properties>
               <help>GENEVE tunnel parameters</help>
@@ -33,9 +33,9 @@
                   <help>IPv4 specific tunnel parameters</help>
                 </properties>
                 <children>
-                  #include <include/interface-parameters-dont-fragment.xml.i>
-                  #include <include/interface-parameters-tos.xml.i>
-                  #include <include/interface-parameters-ttl.xml.i>
+                  #include <include/interface/interface-parameters-dont-fragment.xml.i>
+                  #include <include/interface/interface-parameters-tos.xml.i>
+                  #include <include/interface/interface-parameters-ttl.xml.i>
                 </children>
               </node>
               <node name="ipv6">
@@ -43,12 +43,12 @@
                   <help>IPv6 specific tunnel parameters</help>
                 </properties>
                 <children>
-                  #include <include/interface-parameters-flowlabel.xml.i>
+                  #include <include/interface/interface-parameters-flowlabel.xml.i>
                 </children>
               </node>
             </children>
           </node>
-          #include <include/tunnel-remote.xml.i>
+          #include <include/interface/tunnel-remote.xml.i>
           #include <include/vni.xml.i>
         </children>
       </tagNode>
diff --git a/interface-definitions/interfaces-l2tpv3.xml.in b/interface-definitions/interfaces-l2tpv3.xml.in
index 68ac15861..831b9b47a 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,10 +53,10 @@
             </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>
           #include <include/source-address-ipv4-ipv6.xml.i>
-          #include <include/interface-mtu-68-16000.xml.i>
+          #include <include/interface/interface-mtu-68-16000.xml.i>
           <leafNode name="mtu">
             <defaultValue>1488</defaultValue>
           </leafNode>
@@ -84,8 +84,8 @@
               </constraint>
             </properties>
           </leafNode>
-          #include <include/interface-mtu-68-16000.xml.i>
-          #include <include/tunnel-remote.xml.i>
+          #include <include/interface/interface-mtu-68-16000.xml.i>
+          #include <include/interface/tunnel-remote.xml.i>
           <leafNode name="session-id">
             <properties>
               <help>Session identifier</help>
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..a8e371f85 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>
@@ -68,10 +68,10 @@
             </properties>
             <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/dhcpv6-options.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..9e3e0cb26 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/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/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>
+          #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 c169d877d..e3aad2719 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -16,19 +16,19 @@
           </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>
           #include <include/source-address-ipv4-ipv6.xml.i>
-          #include <include/tunnel-remote.xml.i>
+          #include <include/interface/tunnel-remote.xml.i>
           <leafNode name="source-interface">
             <properties>
               <help>Physical Interface used for underlaying traffic</help>
@@ -156,9 +156,9 @@
                       <valueless/>
                     </properties>
                   </leafNode>
-                  #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">
@@ -188,7 +188,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 97a40a9dc..7a286eaf2 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>
@@ -52,9 +52,9 @@
                   <help>IPv4 specific tunnel parameters</help>
                 </properties>
                 <children>
-                  #include <include/interface-parameters-dont-fragment.xml.i>
-                  #include <include/interface-parameters-tos.xml.i>
-                  #include <include/interface-parameters-ttl.xml.i>
+                  #include <include/interface/interface-parameters-dont-fragment.xml.i>
+                  #include <include/interface/interface-parameters-tos.xml.i>
+                  #include <include/interface/interface-parameters-ttl.xml.i>
                   <leafNode name="ttl">
                     <defaultValue>16</defaultValue>
                   </leafNode>
@@ -65,7 +65,7 @@
                   <help>IPv6 specific tunnel parameters</help>
                 </properties>
                 <children>
-                  #include <include/interface-parameters-flowlabel.xml.i>
+                  #include <include/interface/interface-parameters-flowlabel.xml.i>
                 </children>
               </node>
               <leafNode name="nolearning">
@@ -91,7 +91,7 @@
           </leafNode>
           #include <include/source-address-ipv4-ipv6.xml.i>
           #include <include/source-interface.xml.i>
-          #include <include/tunnel-remote.xml.i>
+          #include <include/interface/tunnel-remote.xml.i>
           #include <include/vni.xml.i>
         </children>
       </tagNode>
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..aaeb285f1 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,34 +464,34 @@
               <constraintErrorMessage>Invalid ISO/IEC 3166-1 Country Code</constraintErrorMessage>
             </properties>
           </leafNode>
-          #include <include/interface-description.xml.i>
-          #include <include/dhcp-options.xml.i>
-          #include <include/dhcpv6-options.xml.i>
+          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/dhcp-options.xml.i>
+          #include <include/interface/dhcpv6-options.xml.i>
           <leafNode name="disable-broadcast-ssid">
             <properties>
               <help>Disable broadcast of SSID from access-point</help>
               <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 b1d25926e..0a5e5c121 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -26,8 +26,8 @@
           </valueHelp>
         </properties>
         <children>
-          #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>
           <node name="protocols">
             <properties>
               <help>Routing protocol parameters</help>
-- 
cgit v1.2.3