From e7edd9229dd6b870f892e419ffc671d4873a5540 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 14 Mar 2021 16:44:55 +0100
Subject: xml: accel-ppp: move building blocks to subfolder

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/accel-auth-local-users.xml.i           |  51 -------
 .../include/accel-auth-mode.xml.i                  |  22 ---
 .../include/accel-auth-protocols.xml.i             |  31 -----
 .../include/accel-client-ip-pool-start-stop.xml.i  |  18 ---
 .../include/accel-client-ip-pool-subnet.xml.i      |  16 ---
 .../include/accel-client-ipv6-pool.xml.i           |  61 --------
 .../include/accel-gateway-address.xml.i            |  15 --
 .../include/accel-lcp-echo-interval-failure.xml.i  |  20 ---
 .../include/accel-lcp-echo-timeout.xml.i           |  11 --
 .../include/accel-mtu-128-16384.xml.i              |  11 --
 .../include/accel-name-server.xml.i                |  20 ---
 interface-definitions/include/accel-ppp-mppe.xml.i |  26 ----
 .../include/accel-ppp/auth-local-users.xml.i       |  51 +++++++
 .../include/accel-ppp/auth-mode.xml.i              |  22 +++
 .../include/accel-ppp/auth-protocols.xml.i         |  31 +++++
 .../accel-ppp/client-ip-pool-start-stop.xml.i      |  18 +++
 .../include/accel-ppp/client-ip-pool-subnet.xml.i  |  16 +++
 .../include/accel-ppp/client-ipv6-pool.xml.i       |  61 ++++++++
 .../include/accel-ppp/gateway-address.xml.i        |  15 ++
 .../accel-ppp/lcp-echo-interval-failure.xml.i      |  20 +++
 .../include/accel-ppp/lcp-echo-timeout.xml.i       |  11 ++
 .../include/accel-ppp/mtu-128-16384.xml.i          |  11 ++
 .../include/accel-ppp/name-server.xml.i            |  20 +++
 .../include/accel-ppp/ppp-mppe.xml.i               |  26 ++++
 .../radius-additions-disable-accounting.xml.i      |   8 ++
 .../accel-ppp/radius-additions-rate-limit.xml.i    |  26 ++++
 .../include/accel-ppp/radius-additions.xml.i       | 153 +++++++++++++++++++++
 .../include/accel-ppp/wins-server.xml.i            |  15 ++
 ...accel-radius-additions-disable-accounting.xml.i |   8 --
 .../accel-radius-additions-rate-limit.xml.i        |  26 ----
 .../include/accel-radius-additions.xml.i           | 153 ---------------------
 .../include/accel-wins-server.xml.i                |  15 --
 interface-definitions/service_ipoe-server.xml.in   |   6 +-
 interface-definitions/service_pppoe-server.xml.in  |  30 ++--
 interface-definitions/vpn_l2tp.xml.in              |  24 ++--
 interface-definitions/vpn_openconnect.xml.in       |   2 +-
 interface-definitions/vpn_pptp.xml.in              |  12 +-
 interface-definitions/vpn_sstp.xml.in              |  24 ++--
 38 files changed, 553 insertions(+), 553 deletions(-)
 delete mode 100644 interface-definitions/include/accel-auth-local-users.xml.i
 delete mode 100644 interface-definitions/include/accel-auth-mode.xml.i
 delete mode 100644 interface-definitions/include/accel-auth-protocols.xml.i
 delete mode 100644 interface-definitions/include/accel-client-ip-pool-start-stop.xml.i
 delete mode 100644 interface-definitions/include/accel-client-ip-pool-subnet.xml.i
 delete mode 100644 interface-definitions/include/accel-client-ipv6-pool.xml.i
 delete mode 100644 interface-definitions/include/accel-gateway-address.xml.i
 delete mode 100644 interface-definitions/include/accel-lcp-echo-interval-failure.xml.i
 delete mode 100644 interface-definitions/include/accel-lcp-echo-timeout.xml.i
 delete mode 100644 interface-definitions/include/accel-mtu-128-16384.xml.i
 delete mode 100644 interface-definitions/include/accel-name-server.xml.i
 delete mode 100644 interface-definitions/include/accel-ppp-mppe.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/auth-local-users.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/auth-mode.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/auth-protocols.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/client-ip-pool-start-stop.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/client-ip-pool-subnet.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/client-ipv6-pool.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/gateway-address.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/lcp-echo-interval-failure.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/lcp-echo-timeout.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/mtu-128-16384.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/name-server.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/ppp-mppe.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/radius-additions-disable-accounting.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/radius-additions-rate-limit.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/radius-additions.xml.i
 create mode 100644 interface-definitions/include/accel-ppp/wins-server.xml.i
 delete mode 100644 interface-definitions/include/accel-radius-additions-disable-accounting.xml.i
 delete mode 100644 interface-definitions/include/accel-radius-additions-rate-limit.xml.i
 delete mode 100644 interface-definitions/include/accel-radius-additions.xml.i
 delete mode 100644 interface-definitions/include/accel-wins-server.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/accel-auth-local-users.xml.i b/interface-definitions/include/accel-auth-local-users.xml.i
deleted file mode 100644
index 70a08c10e..000000000
--- a/interface-definitions/include/accel-auth-local-users.xml.i
+++ /dev/null
@@ -1,51 +0,0 @@
-<!-- include start from accel-auth-local-users.xml.i -->
-<node name="local-users">
-  <properties>
-    <help>Local user authentication for PPPoE server</help>
-  </properties>
-  <children>
-    <tagNode name="username">
-      <properties>
-        <help>User name for authentication</help>
-      </properties>
-      <children>
-        #include <include/generic-disable-node.xml.i>
-        <leafNode name="password">
-          <properties>
-            <help>Password for authentication</help>
-          </properties>
-        </leafNode>
-        <leafNode name="static-ip">
-          <properties>
-            <help>Static client IP address</help>
-          </properties>
-          <defaultValue>*</defaultValue>
-        </leafNode>
-        <node name="rate-limit">
-          <properties>
-            <help>Upload/Download speed limits</help>
-          </properties>
-          <children>
-            <leafNode name="upload">
-              <properties>
-                <help>Upload bandwidth limit in kbits/sec</help>
-                <constraint>
-                  <validator name="numeric" argument="--range 1-10000000"/>
-                </constraint>
-              </properties>
-            </leafNode>
-            <leafNode name="download">
-              <properties>
-                <help>Download bandwidth limit in kbits/sec</help>
-                <constraint>
-                  <validator name="numeric" argument="--range 1-10000000"/>
-                </constraint>
-              </properties>
-            </leafNode>
-          </children>
-        </node>
-      </children>
-    </tagNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-auth-mode.xml.i b/interface-definitions/include/accel-auth-mode.xml.i
deleted file mode 100644
index 81d687182..000000000
--- a/interface-definitions/include/accel-auth-mode.xml.i
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- include start from accel-auth-mode.xml.i -->
-<leafNode name="mode">
-  <properties>
-    <help>Authentication mode used by this server</help>
-    <valueHelp>
-      <format>local</format>
-      <description>Use local username/password configuration</description>
-    </valueHelp>
-    <valueHelp>
-      <format>radius</format>
-      <description>Use RADIUS server for user autentication</description>
-    </valueHelp>
-    <constraint>
-      <regex>(local|radius)</regex>
-    </constraint>
-    <completionHelp>
-      <list>local radius</list>
-    </completionHelp>
-  </properties>
-  <defaultValue>local</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-auth-protocols.xml.i b/interface-definitions/include/accel-auth-protocols.xml.i
deleted file mode 100644
index c5cf743c6..000000000
--- a/interface-definitions/include/accel-auth-protocols.xml.i
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- include start from accel-auth-protocols.xml.i -->
-<leafNode name="protocols">
-  <properties>
-    <help>Authentication protocol for remote access peer SSTP VPN</help>
-    <completionHelp>
-      <list>pap chap mschap mschap-v2</list>
-    </completionHelp>
-    <valueHelp>
-      <format>pap</format>
-      <description>Authentication via PAP (Password Authentication Protocol)</description>
-    </valueHelp>
-    <valueHelp>
-      <format>chap</format>
-      <description>Authentication via CHAP (Challenge Handshake Authentication Protocol)</description>
-    </valueHelp>
-    <valueHelp>
-      <format>mschap</format>
-      <description>Authentication via MS-CHAP (Microsoft Challenge Handshake Authentication Protocol)</description>
-    </valueHelp>
-    <valueHelp>
-      <format>mschap-v2</format>
-      <description>Authentication via MS-CHAPv2 (Microsoft Challenge Handshake Authentication Protocol, version 2)</description>
-    </valueHelp>
-    <constraint>
-      <regex>(pap|chap|mschap|mschap-v2)</regex>
-    </constraint>
-    <multi/>
-  </properties>
-  <defaultValue>pap chap mschap mschap-v2</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i b/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i
deleted file mode 100644
index b0668f93f..000000000
--- a/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- include start from accel-client-ip-pool-start-stop.xml.i -->
-<leafNode name="start">
-  <properties>
-    <help>First IP address in the pool</help>
-    <constraint>
-      <validator name="ipv4-address"/>
-    </constraint>
-  </properties>
-</leafNode>
-<leafNode name="stop">
-  <properties>
-    <help>Last IP address in the pool</help>
-    <constraint>
-      <validator name="ipv4-address"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-client-ip-pool-subnet.xml.i b/interface-definitions/include/accel-client-ip-pool-subnet.xml.i
deleted file mode 100644
index 72f660c39..000000000
--- a/interface-definitions/include/accel-client-ip-pool-subnet.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from accel-client-ip-pool-subnet.xml.i -->
-<leafNode name="subnet">
-  <properties>
-    <help>Client IP subnet (CIDR notation)</help>
-    <valueHelp>
-      <format>ipv4net</format>
-      <description>IPv4 address and prefix length</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ipv4-prefix"/>
-    </constraint>
-    <constraintErrorMessage>Not a valid CIDR formatted prefix</constraintErrorMessage>
-    <multi />
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-client-ipv6-pool.xml.i b/interface-definitions/include/accel-client-ipv6-pool.xml.i
deleted file mode 100644
index 3608c2a0b..000000000
--- a/interface-definitions/include/accel-client-ipv6-pool.xml.i
+++ /dev/null
@@ -1,61 +0,0 @@
-<!-- include start from accel-client-ipv6-pool.xml.i -->
-<node name="client-ipv6-pool">
-  <properties>
-    <help>Pool of client IPv6 addresses</help>
-  </properties>
-  <children>
-    <tagNode name="prefix">
-      <properties>
-        <help>Pool of addresses used to assign to clients</help>
-        <valueHelp>
-          <format>ipv6net</format>
-          <description>IPv6 address and prefix length</description>
-        </valueHelp>
-        <constraint>
-          <validator name="ipv6-prefix"/>
-        </constraint>
-      </properties>
-      <children>
-          <leafNode name="mask">
-            <properties>
-              <help>Prefix length used for individual client</help>
-              <valueHelp>
-                <format>u32:48-128</format>
-                <description>Client prefix length (default: 64)</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 48-128"/>
-              </constraint>
-            </properties>
-          </leafNode>
-      </children>
-    </tagNode>
-    <tagNode name="delegate">
-      <properties>
-        <help>Subnet used to delegate prefix through DHCPv6-PD (RFC3633)</help>
-        <valueHelp>
-          <format>ipv6net</format>
-          <description>IPv6 address and prefix length</description>
-        </valueHelp>
-        <constraint>
-          <validator name="ipv6-prefix"/>
-        </constraint>
-      </properties>
-      <children>
-          <leafNode name="delegation-prefix">
-            <properties>
-              <help>Prefix length delegated to client</help>
-              <valueHelp>
-                <format>u32:32-64</format>
-                <description>Delegated prefix length</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 32-64"/>
-              </constraint>
-            </properties>
-          </leafNode>
-      </children>
-    </tagNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-gateway-address.xml.i b/interface-definitions/include/accel-gateway-address.xml.i
deleted file mode 100644
index f7f9c721d..000000000
--- a/interface-definitions/include/accel-gateway-address.xml.i
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- include start from accel-gateway-address.xml.i -->
-<leafNode name="gateway-address">
-  <properties>
-    <help>Gateway IP address</help>
-    <constraint>
-      <validator name="ipv4-address"/>
-    </constraint>
-    <constraintErrorMessage>invalid IPv4 address</constraintErrorMessage>
-    <valueHelp>
-      <format>ipv4</format>
-      <description>Default Gateway send to the client</description>
-    </valueHelp>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-lcp-echo-interval-failure.xml.i b/interface-definitions/include/accel-lcp-echo-interval-failure.xml.i
deleted file mode 100644
index 26f010916..000000000
--- a/interface-definitions/include/accel-lcp-echo-interval-failure.xml.i
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- include start from accel-lcp-echo-interval-failure.xml.i -->
-<leafNode name="lcp-echo-interval">
-  <properties>
-    <help>LCP echo-requests/sec</help>
-    <constraint>
-      <validator name="numeric" argument="--positive"/>
-    </constraint>
-  </properties>
-  <defaultValue>30</defaultValue>
-</leafNode>
-<leafNode name="lcp-echo-failure">
-  <properties>
-    <help>Maximum number of Echo-Requests may be sent without valid reply</help>
-    <constraint>
-      <validator name="numeric" argument="--positive"/>
-    </constraint>
-  </properties>
-  <defaultValue>3</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-lcp-echo-timeout.xml.i b/interface-definitions/include/accel-lcp-echo-timeout.xml.i
deleted file mode 100644
index a60ca7ace..000000000
--- a/interface-definitions/include/accel-lcp-echo-timeout.xml.i
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- include start from accel-lcp-echo-timeout.xml.i -->
-<leafNode name="lcp-echo-timeout">
-  <properties>
-    <help>Timeout in seconds to wait for any peer activity. If this option specified it turns on adaptive lcp echo functionality and "lcp-echo-failure" is not used.</help>
-    <constraint>
-      <validator name="numeric" argument="--positive"/>
-    </constraint>
-  </properties>
-  <defaultValue>0</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-mtu-128-16384.xml.i b/interface-definitions/include/accel-mtu-128-16384.xml.i
deleted file mode 100644
index c9cac8e45..000000000
--- a/interface-definitions/include/accel-mtu-128-16384.xml.i
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- include start from accel-mtu-128-16384.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU) - default 1492</help>
-    <constraint>
-      <validator name="numeric" argument="--range 128-16384"/>
-    </constraint>
-  </properties>
-  <defaultValue>1492</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-name-server.xml.i b/interface-definitions/include/accel-name-server.xml.i
deleted file mode 100644
index 68e4ae418..000000000
--- a/interface-definitions/include/accel-name-server.xml.i
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- include start from accel-name-server.xml.i -->
-<leafNode name="name-server">
-  <properties>
-    <help>Domain Name Server (DNS) propagated to client</help>
-    <valueHelp>
-      <format>ipv4</format>
-      <description>Domain Name Server (DNS) IPv4 address</description>
-    </valueHelp>
-    <valueHelp>
-      <format>ipv6</format>
-      <description>Domain Name Server (DNS) IPv6 address</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ipv4-address"/>
-      <validator name="ipv6-address"/>
-    </constraint>
-    <multi/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp-mppe.xml.i b/interface-definitions/include/accel-ppp-mppe.xml.i
deleted file mode 100644
index dbf231ebe..000000000
--- a/interface-definitions/include/accel-ppp-mppe.xml.i
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- include start from accel-ppp-mppe.xml.i -->
-<leafNode name="mppe">
-  <properties>
-    <help>Specifies mppe negotiation preferences</help>
-    <completionHelp>
-      <list>require prefer deny</list>
-    </completionHelp>
-    <valueHelp>
-      <format>require</format>
-      <description>send mppe request, if client rejects, drop the connection</description>
-    </valueHelp>
-    <valueHelp>
-      <format>prefer</format>
-      <description>send mppe request, if client rejects continue</description>
-    </valueHelp>
-    <valueHelp>
-      <format>deny</format>
-      <description>drop all mppe</description>
-    </valueHelp>
-    <constraint>
-      <regex>^(require|prefer|deny)$</regex>
-    </constraint>
-  </properties>
-  <defaultValue>prefer</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/auth-local-users.xml.i b/interface-definitions/include/accel-ppp/auth-local-users.xml.i
new file mode 100644
index 000000000..308d6510d
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/auth-local-users.xml.i
@@ -0,0 +1,51 @@
+<!-- include start from accel-ppp/auth-local-users.xml.i -->
+<node name="local-users">
+  <properties>
+    <help>Local user authentication for PPPoE server</help>
+  </properties>
+  <children>
+    <tagNode name="username">
+      <properties>
+        <help>User name for authentication</help>
+      </properties>
+      <children>
+        #include <include/generic-disable-node.xml.i>
+        <leafNode name="password">
+          <properties>
+            <help>Password for authentication</help>
+          </properties>
+        </leafNode>
+        <leafNode name="static-ip">
+          <properties>
+            <help>Static client IP address</help>
+          </properties>
+          <defaultValue>*</defaultValue>
+        </leafNode>
+        <node name="rate-limit">
+          <properties>
+            <help>Upload/Download speed limits</help>
+          </properties>
+          <children>
+            <leafNode name="upload">
+              <properties>
+                <help>Upload bandwidth limit in kbits/sec</help>
+                <constraint>
+                  <validator name="numeric" argument="--range 1-10000000"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            <leafNode name="download">
+              <properties>
+                <help>Download bandwidth limit in kbits/sec</help>
+                <constraint>
+                  <validator name="numeric" argument="--range 1-10000000"/>
+                </constraint>
+              </properties>
+            </leafNode>
+          </children>
+        </node>
+      </children>
+    </tagNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/auth-mode.xml.i b/interface-definitions/include/accel-ppp/auth-mode.xml.i
new file mode 100644
index 000000000..c1a87cfe3
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/auth-mode.xml.i
@@ -0,0 +1,22 @@
+<!-- include start from accel-ppp/auth-mode.xml.i -->
+<leafNode name="mode">
+  <properties>
+    <help>Authentication mode used by this server</help>
+    <valueHelp>
+      <format>local</format>
+      <description>Use local username/password configuration</description>
+    </valueHelp>
+    <valueHelp>
+      <format>radius</format>
+      <description>Use RADIUS server for user autentication</description>
+    </valueHelp>
+    <constraint>
+      <regex>(local|radius)</regex>
+    </constraint>
+    <completionHelp>
+      <list>local radius</list>
+    </completionHelp>
+  </properties>
+  <defaultValue>local</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/auth-protocols.xml.i b/interface-definitions/include/accel-ppp/auth-protocols.xml.i
new file mode 100644
index 000000000..d43266152
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/auth-protocols.xml.i
@@ -0,0 +1,31 @@
+<!-- include start from accel-ppp/auth-protocols.xml.i -->
+<leafNode name="protocols">
+  <properties>
+    <help>Authentication protocol for remote access peer SSTP VPN</help>
+    <completionHelp>
+      <list>pap chap mschap mschap-v2</list>
+    </completionHelp>
+    <valueHelp>
+      <format>pap</format>
+      <description>Authentication via PAP (Password Authentication Protocol)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>chap</format>
+      <description>Authentication via CHAP (Challenge Handshake Authentication Protocol)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>mschap</format>
+      <description>Authentication via MS-CHAP (Microsoft Challenge Handshake Authentication Protocol)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>mschap-v2</format>
+      <description>Authentication via MS-CHAPv2 (Microsoft Challenge Handshake Authentication Protocol, version 2)</description>
+    </valueHelp>
+    <constraint>
+      <regex>(pap|chap|mschap|mschap-v2)</regex>
+    </constraint>
+    <multi/>
+  </properties>
+  <defaultValue>pap chap mschap mschap-v2</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/client-ip-pool-start-stop.xml.i b/interface-definitions/include/accel-ppp/client-ip-pool-start-stop.xml.i
new file mode 100644
index 000000000..5f4132d13
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/client-ip-pool-start-stop.xml.i
@@ -0,0 +1,18 @@
+<!-- include start from accel-ppp/client-ip-pool-start-stop.xml.i -->
+<leafNode name="start">
+  <properties>
+    <help>First IP address in the pool</help>
+    <constraint>
+      <validator name="ipv4-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="stop">
+  <properties>
+    <help>Last IP address in the pool</help>
+    <constraint>
+      <validator name="ipv4-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/client-ip-pool-subnet.xml.i b/interface-definitions/include/accel-ppp/client-ip-pool-subnet.xml.i
new file mode 100644
index 000000000..2dc71d3f9
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/client-ip-pool-subnet.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from accel-ppp/client-ip-pool-subnet.xml.i -->
+<leafNode name="subnet">
+  <properties>
+    <help>Client IP subnet (CIDR notation)</help>
+    <valueHelp>
+      <format>ipv4net</format>
+      <description>IPv4 address and prefix length</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-prefix"/>
+    </constraint>
+    <constraintErrorMessage>Not a valid CIDR formatted prefix</constraintErrorMessage>
+    <multi />
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/client-ipv6-pool.xml.i b/interface-definitions/include/accel-ppp/client-ipv6-pool.xml.i
new file mode 100644
index 000000000..bd3dadf8d
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/client-ipv6-pool.xml.i
@@ -0,0 +1,61 @@
+<!-- include start from accel-ppp/client-ipv6-pool.xml.i -->
+<node name="client-ipv6-pool">
+  <properties>
+    <help>Pool of client IPv6 addresses</help>
+  </properties>
+  <children>
+    <tagNode name="prefix">
+      <properties>
+        <help>Pool of addresses used to assign to clients</help>
+        <valueHelp>
+          <format>ipv6net</format>
+          <description>IPv6 address and prefix length</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv6-prefix"/>
+        </constraint>
+      </properties>
+      <children>
+          <leafNode name="mask">
+            <properties>
+              <help>Prefix length used for individual client</help>
+              <valueHelp>
+                <format>u32:48-128</format>
+                <description>Client prefix length (default: 64)</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 48-128"/>
+              </constraint>
+            </properties>
+          </leafNode>
+      </children>
+    </tagNode>
+    <tagNode name="delegate">
+      <properties>
+        <help>Subnet used to delegate prefix through DHCPv6-PD (RFC3633)</help>
+        <valueHelp>
+          <format>ipv6net</format>
+          <description>IPv6 address and prefix length</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv6-prefix"/>
+        </constraint>
+      </properties>
+      <children>
+          <leafNode name="delegation-prefix">
+            <properties>
+              <help>Prefix length delegated to client</help>
+              <valueHelp>
+                <format>u32:32-64</format>
+                <description>Delegated prefix length</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 32-64"/>
+              </constraint>
+            </properties>
+          </leafNode>
+      </children>
+    </tagNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/gateway-address.xml.i b/interface-definitions/include/accel-ppp/gateway-address.xml.i
new file mode 100644
index 000000000..59f8b5023
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/gateway-address.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from accel-ppp/gateway-address.xml.i -->
+<leafNode name="gateway-address">
+  <properties>
+    <help>Gateway IP address</help>
+    <constraint>
+      <validator name="ipv4-address"/>
+    </constraint>
+    <constraintErrorMessage>invalid IPv4 address</constraintErrorMessage>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>Default Gateway send to the client</description>
+    </valueHelp>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/lcp-echo-interval-failure.xml.i b/interface-definitions/include/accel-ppp/lcp-echo-interval-failure.xml.i
new file mode 100644
index 000000000..dd7ae1276
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/lcp-echo-interval-failure.xml.i
@@ -0,0 +1,20 @@
+<!-- include start from accel-ppp/lcp-echo-interval-failure.xml.i -->
+<leafNode name="lcp-echo-interval">
+  <properties>
+    <help>LCP echo-requests/sec</help>
+    <constraint>
+      <validator name="numeric" argument="--positive"/>
+    </constraint>
+  </properties>
+  <defaultValue>30</defaultValue>
+</leafNode>
+<leafNode name="lcp-echo-failure">
+  <properties>
+    <help>Maximum number of Echo-Requests may be sent without valid reply</help>
+    <constraint>
+      <validator name="numeric" argument="--positive"/>
+    </constraint>
+  </properties>
+  <defaultValue>3</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/lcp-echo-timeout.xml.i b/interface-definitions/include/accel-ppp/lcp-echo-timeout.xml.i
new file mode 100644
index 000000000..a630bec32
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/lcp-echo-timeout.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from accel-ppp/lcp-echo-timeout.xml.i -->
+<leafNode name="lcp-echo-timeout">
+  <properties>
+    <help>Timeout in seconds to wait for any peer activity. If this option specified it turns on adaptive lcp echo functionality and "lcp-echo-failure" is not used.</help>
+    <constraint>
+      <validator name="numeric" argument="--positive"/>
+    </constraint>
+  </properties>
+  <defaultValue>0</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/mtu-128-16384.xml.i b/interface-definitions/include/accel-ppp/mtu-128-16384.xml.i
new file mode 100644
index 000000000..b4008a63b
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/mtu-128-16384.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from accel-ppp/mtu-128-16384.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU) - default 1492</help>
+    <constraint>
+      <validator name="numeric" argument="--range 128-16384"/>
+    </constraint>
+  </properties>
+  <defaultValue>1492</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/name-server.xml.i b/interface-definitions/include/accel-ppp/name-server.xml.i
new file mode 100644
index 000000000..e744b384f
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/name-server.xml.i
@@ -0,0 +1,20 @@
+<!-- include start from accel-ppp/name-server.xml.i -->
+<leafNode name="name-server">
+  <properties>
+    <help>Domain Name Server (DNS) propagated to client</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>Domain Name Server (DNS) IPv4 address</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>Domain Name Server (DNS) IPv6 address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+      <validator name="ipv6-address"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/ppp-mppe.xml.i b/interface-definitions/include/accel-ppp/ppp-mppe.xml.i
new file mode 100644
index 000000000..e8370180b
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/ppp-mppe.xml.i
@@ -0,0 +1,26 @@
+<!-- include start from accel-ppp/ppp-mppe.xml.i -->
+<leafNode name="mppe">
+  <properties>
+    <help>Specifies mppe negotiation preferences</help>
+    <completionHelp>
+      <list>require prefer deny</list>
+    </completionHelp>
+    <valueHelp>
+      <format>require</format>
+      <description>send mppe request, if client rejects, drop the connection</description>
+    </valueHelp>
+    <valueHelp>
+      <format>prefer</format>
+      <description>send mppe request, if client rejects continue</description>
+    </valueHelp>
+    <valueHelp>
+      <format>deny</format>
+      <description>drop all mppe</description>
+    </valueHelp>
+    <constraint>
+      <regex>^(require|prefer|deny)$</regex>
+    </constraint>
+  </properties>
+  <defaultValue>prefer</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/radius-additions-disable-accounting.xml.i b/interface-definitions/include/accel-ppp/radius-additions-disable-accounting.xml.i
new file mode 100644
index 000000000..c723c3174
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/radius-additions-disable-accounting.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from accel-ppp/radius-additions-disable-accounting.xml.i -->
+<leafNode name="disable-accounting">
+  <properties>
+    <help>Disable accounting</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/radius-additions-rate-limit.xml.i b/interface-definitions/include/accel-ppp/radius-additions-rate-limit.xml.i
new file mode 100644
index 000000000..be49fce5a
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/radius-additions-rate-limit.xml.i
@@ -0,0 +1,26 @@
+<!-- include start from accel-ppp/radius-additions-rate-limit.xml.i -->
+<node name="rate-limit">
+  <properties>
+    <help>Upload/Download speed limits</help>
+  </properties>
+  <children>
+    <leafNode name="attribute">
+      <properties>
+        <help>Specifies which radius attribute contains rate information. (default is Filter-Id)</help>
+      </properties>
+      <defaultValue>Filter-Id</defaultValue>
+    </leafNode>
+    <leafNode name="vendor">
+      <properties>
+        <help>Specifies the vendor dictionary. (dictionary needs to be in /usr/share/accel-ppp/radius)</help>
+      </properties>
+    </leafNode>
+    <leafNode name="enable">
+      <properties>
+        <help>Enables Bandwidth shaping via RADIUS</help>
+        <valueless />
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/radius-additions.xml.i b/interface-definitions/include/accel-ppp/radius-additions.xml.i
new file mode 100644
index 000000000..e65088c43
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/radius-additions.xml.i
@@ -0,0 +1,153 @@
+<!-- include start from accel-ppp/radius-additions.xml.i -->
+<node name="radius">
+  <children>
+    <leafNode name="acct-interim-jitter">
+      <properties>
+        <help>Maximum jitter value in seconds to be applied to accounting information interval</help>
+        <valueHelp>
+          <format>1-60</format>
+          <description>Maximum jitter value in seconds</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-60"/>
+        </constraint>
+        <constraintErrorMessage>Jitter value must be between 1 and 60 seconds</constraintErrorMessage>
+      </properties>
+    </leafNode>
+    <tagNode name="server">
+      <children>
+        <leafNode name="acct-port">
+          <properties>
+            <help>Accounting port</help>
+            <valueHelp>
+              <format>1-65535</format>
+              <description>Numeric IP port (default: 1813)</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 1-65535"/>
+            </constraint>
+          </properties>
+          <defaultValue>1813</defaultValue>
+        </leafNode>
+        #include <include/accel-ppp/radius-additions-disable-accounting.xml.i>
+        <leafNode name="fail-time">
+          <properties>
+            <help>Mark server unavailable for &lt;n&gt; seconds on failure</help>
+            <valueHelp>
+              <format>0-600</format>
+              <description>Fail time penalty</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 0-600"/>
+            </constraint>
+            <constraintErrorMessage>Fail time must be between 0 and 600 seconds</constraintErrorMessage>
+          </properties>
+          <defaultValue>0</defaultValue>
+        </leafNode>
+      </children>
+    </tagNode>
+    <leafNode name="timeout">
+      <properties>
+        <help>Timeout in seconds to wait response from RADIUS server</help>
+        <valueHelp>
+          <format>1-60</format>
+          <description>Timeout in seconds</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-60"/>
+        </constraint>
+        <constraintErrorMessage>Timeout must be between 1 and 60 seconds</constraintErrorMessage>
+      </properties>
+      <defaultValue>3</defaultValue>
+    </leafNode>
+    <leafNode name="acct-timeout">
+      <properties>
+        <help>Timeout for Interim-Update packets, terminate session afterwards (default 3 seconds)</help>
+        <valueHelp>
+          <format>0-60</format>
+          <description>Timeout in seconds, 0 to keep active</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-60"/>
+        </constraint>
+        <constraintErrorMessage>Timeout must be between 0 and 60 seconds</constraintErrorMessage>
+      </properties>
+      <defaultValue>3</defaultValue>
+    </leafNode>
+    <leafNode name="max-try">
+      <properties>
+        <help>Number of tries to send Access-Request/Accounting-Request queries</help>
+        <valueHelp>
+          <format>1-20</format>
+          <description>Maximum tries</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-20"/>
+        </constraint>
+        <constraintErrorMessage>Maximum tries must be between 1 and 20</constraintErrorMessage>
+      </properties>
+      <defaultValue>3</defaultValue>
+    </leafNode>
+    <leafNode name="nas-identifier">
+      <properties>
+        <help>NAS-Identifier attribute sent to RADIUS</help>
+      </properties>
+    </leafNode>
+    <leafNode name="nas-ip-address">
+      <properties>
+        <help>NAS-IP-Address attribute sent to RADIUS</help>
+         <constraint>
+          <validator name="ipv4-address"/>
+        </constraint>
+        <valueHelp>
+          <format>ipv4</format>
+          <description>NAS-IP-Address attribute</description>
+        </valueHelp>
+       </properties>
+     </leafNode>
+    <leafNode name="preallocate-vif">
+      <properties>
+        <help>Enable attribute NAS-Port-Id in Access-Request</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <node name="dynamic-author">
+      <properties>
+        <help>Dynamic Authorization Extension/Change of Authorization server</help>
+      </properties>
+      <children>
+        <leafNode name="server">
+          <properties>
+            <help>IP address for Dynamic Authorization Extension server (DM/CoA)</help>
+            <constraint>
+              <validator name="ipv4-address"/>
+            </constraint>
+            <valueHelp>
+              <format>ipv4</format>
+              <description>IPv4 address for aynamic authorization server</description>
+            </valueHelp>
+          </properties>
+        </leafNode>
+        <leafNode name="port">
+          <properties>
+            <help>Port for Dynamic Authorization Extension server (DM/CoA) (default: 1700)</help>
+            <valueHelp>
+              <format>u32:1-65535</format>
+              <description>TCP port</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 1-65535"/>
+            </constraint>
+          </properties>
+          <defaultValue>1700</defaultValue>
+        </leafNode>
+        <leafNode name="key">
+          <properties>
+            <help>Shared secret for Dynamic Authorization Extension server</help>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/wins-server.xml.i b/interface-definitions/include/accel-ppp/wins-server.xml.i
new file mode 100644
index 000000000..f7f483f59
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/wins-server.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from accel-ppp/wins-server.xml.i -->
+<leafNode name="wins-server">
+  <properties>
+    <help>Windows Internet Name Service (WINS) servers propagated to client</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>Domain Name Server (DNS) IPv4 address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-radius-additions-disable-accounting.xml.i b/interface-definitions/include/accel-radius-additions-disable-accounting.xml.i
deleted file mode 100644
index 209f7a5f8..000000000
--- a/interface-definitions/include/accel-radius-additions-disable-accounting.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from accel-radius-additions-disable-accounting.xml.i -->
-<leafNode name="disable-accounting">
-  <properties>
-    <help>Disable accounting</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-radius-additions-rate-limit.xml.i b/interface-definitions/include/accel-radius-additions-rate-limit.xml.i
deleted file mode 100644
index 8c37c62d1..000000000
--- a/interface-definitions/include/accel-radius-additions-rate-limit.xml.i
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- include start from accel-radius-additions-rate-limit.xml.i -->
-<node name="rate-limit">
-  <properties>
-    <help>Upload/Download speed limits</help>
-  </properties>
-  <children>
-    <leafNode name="attribute">
-      <properties>
-        <help>Specifies which radius attribute contains rate information. (default is Filter-Id)</help>
-      </properties>
-      <defaultValue>Filter-Id</defaultValue>
-    </leafNode>
-    <leafNode name="vendor">
-      <properties>
-        <help>Specifies the vendor dictionary. (dictionary needs to be in /usr/share/accel-ppp/radius)</help>
-      </properties>
-    </leafNode>
-    <leafNode name="enable">
-      <properties>
-        <help>Enables Bandwidth shaping via RADIUS</help>
-        <valueless />
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-radius-additions.xml.i b/interface-definitions/include/accel-radius-additions.xml.i
deleted file mode 100644
index 3df0f88fa..000000000
--- a/interface-definitions/include/accel-radius-additions.xml.i
+++ /dev/null
@@ -1,153 +0,0 @@
-<!-- include start from accel-radius-additions.xml.i -->
-<node name="radius">
-  <children>
-    <leafNode name="acct-interim-jitter">
-      <properties>
-        <help>Maximum jitter value in seconds to be applied to accounting information interval</help>
-        <valueHelp>
-          <format>1-60</format>
-          <description>Maximum jitter value in seconds</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-60"/>
-        </constraint>
-        <constraintErrorMessage>Jitter value must be between 1 and 60 seconds</constraintErrorMessage>
-      </properties>
-    </leafNode>
-    <tagNode name="server">
-      <children>
-        <leafNode name="acct-port">
-          <properties>
-            <help>Accounting port</help>
-            <valueHelp>
-              <format>1-65535</format>
-              <description>Numeric IP port (default: 1813)</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-          <defaultValue>1813</defaultValue>
-        </leafNode>
-        #include <include/accel-radius-additions-disable-accounting.xml.i>
-        <leafNode name="fail-time">
-          <properties>
-            <help>Mark server unavailable for &lt;n&gt; seconds on failure</help>
-            <valueHelp>
-              <format>0-600</format>
-              <description>Fail time penalty</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 0-600"/>
-            </constraint>
-            <constraintErrorMessage>Fail time must be between 0 and 600 seconds</constraintErrorMessage>
-          </properties>
-          <defaultValue>0</defaultValue>
-        </leafNode>
-      </children>
-    </tagNode>
-    <leafNode name="timeout">
-      <properties>
-        <help>Timeout in seconds to wait response from RADIUS server</help>
-        <valueHelp>
-          <format>1-60</format>
-          <description>Timeout in seconds</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-60"/>
-        </constraint>
-        <constraintErrorMessage>Timeout must be between 1 and 60 seconds</constraintErrorMessage>
-      </properties>
-      <defaultValue>3</defaultValue>
-    </leafNode>
-    <leafNode name="acct-timeout">
-      <properties>
-        <help>Timeout for Interim-Update packets, terminate session afterwards (default 3 seconds)</help>
-        <valueHelp>
-          <format>0-60</format>
-          <description>Timeout in seconds, 0 to keep active</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 0-60"/>
-        </constraint>
-        <constraintErrorMessage>Timeout must be between 0 and 60 seconds</constraintErrorMessage>
-      </properties>
-      <defaultValue>3</defaultValue>
-    </leafNode>
-    <leafNode name="max-try">
-      <properties>
-        <help>Number of tries to send Access-Request/Accounting-Request queries</help>
-        <valueHelp>
-          <format>1-20</format>
-          <description>Maximum tries</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-20"/>
-        </constraint>
-        <constraintErrorMessage>Maximum tries must be between 1 and 20</constraintErrorMessage>
-      </properties>
-      <defaultValue>3</defaultValue>
-    </leafNode>
-    <leafNode name="nas-identifier">
-      <properties>
-        <help>NAS-Identifier attribute sent to RADIUS</help>
-      </properties>
-    </leafNode>
-    <leafNode name="nas-ip-address">
-      <properties>
-        <help>NAS-IP-Address attribute sent to RADIUS</help>
-         <constraint>
-          <validator name="ipv4-address"/>
-        </constraint>
-        <valueHelp>
-          <format>ipv4</format>
-          <description>NAS-IP-Address attribute</description>
-        </valueHelp>
-       </properties>
-     </leafNode>
-    <leafNode name="preallocate-vif">
-      <properties>
-        <help>Enable attribute NAS-Port-Id in Access-Request</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="dynamic-author">
-      <properties>
-        <help>Dynamic Authorization Extension/Change of Authorization server</help>
-      </properties>
-      <children>
-        <leafNode name="server">
-          <properties>
-            <help>IP address for Dynamic Authorization Extension server (DM/CoA)</help>
-            <constraint>
-              <validator name="ipv4-address"/>
-            </constraint>
-            <valueHelp>
-              <format>ipv4</format>
-              <description>IPv4 address for aynamic authorization server</description>
-            </valueHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="port">
-          <properties>
-            <help>Port for Dynamic Authorization Extension server (DM/CoA) (default: 1700)</help>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>TCP port</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-          <defaultValue>1700</defaultValue>
-        </leafNode>
-        <leafNode name="key">
-          <properties>
-            <help>Shared secret for Dynamic Authorization Extension server</help>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/accel-wins-server.xml.i b/interface-definitions/include/accel-wins-server.xml.i
deleted file mode 100644
index 6d5d3d301..000000000
--- a/interface-definitions/include/accel-wins-server.xml.i
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- include start from accel-wins-server.xml.i -->
-<leafNode name="wins-server">
-  <properties>
-    <help>Windows Internet Name Service (WINS) servers propagated to client</help>
-    <valueHelp>
-      <format>ipv4</format>
-      <description>Domain Name Server (DNS) IPv4 address</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ipv4-address"/>
-    </constraint>
-    <multi/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/service_ipoe-server.xml.in b/interface-definitions/service_ipoe-server.xml.in
index c54de58f5..d0a05aea6 100644
--- a/interface-definitions/service_ipoe-server.xml.in
+++ b/interface-definitions/service_ipoe-server.xml.in
@@ -111,8 +111,8 @@
               </leafNode>
             </children>
           </tagNode>
-          #include <include/accel-name-server.xml.i>
-          #include <include/accel-client-ipv6-pool.xml.i>
+          #include <include/accel-ppp/name-server.xml.i>
+          #include <include/accel-ppp/client-ipv6-pool.xml.i>
           <node name="authentication">
             <properties>
               <help>Client authentication methods</help>
@@ -198,7 +198,7 @@
                 </children>
               </tagNode>
               #include <include/radius-server-ipv4.xml.i>
-              #include <include/accel-radius-additions.xml.i>
+              #include <include/accel-ppp/radius-additions.xml.i>
             </children>
           </node>
         </children>
diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in
index 5c0a66527..1d3e8ba29 100644
--- a/interface-definitions/service_pppoe-server.xml.in
+++ b/interface-definitions/service_pppoe-server.xml.in
@@ -23,14 +23,14 @@
               <help>Authentication for remote access PPPoE Server</help>
             </properties>
             <children>
-              #include <include/accel-auth-local-users.xml.i>
-              #include <include/accel-auth-mode.xml.i>
-              #include <include/accel-auth-protocols.xml.i>
+              #include <include/accel-ppp/auth-local-users.xml.i>
+              #include <include/accel-ppp/auth-mode.xml.i>
+              #include <include/accel-ppp/auth-protocols.xml.i>
               #include <include/radius-server-ipv4.xml.i>
-              #include <include/accel-radius-additions.xml.i>
+              #include <include/accel-ppp/radius-additions.xml.i>
               <node name="radius">
                 <children>
-                  #include <include/accel-radius-additions-rate-limit.xml.i>
+                  #include <include/accel-ppp/radius-additions-rate-limit.xml.i>
                   <leafNode name="called-sid-format">
                     <properties>
                       <help>Format of Called-Station-Id attribute</help>
@@ -60,12 +60,12 @@
               <help>Pool of client IP addresses (must be within a /24)</help>
             </properties>
             <children>
-              #include <include/accel-client-ip-pool-start-stop.xml.i>
-              #include <include/accel-client-ip-pool-subnet.xml.i>
+              #include <include/accel-ppp/client-ip-pool-start-stop.xml.i>
+              #include <include/accel-ppp/client-ip-pool-subnet.xml.i>
             </children>
           </node>
-          #include <include/accel-client-ipv6-pool.xml.i>
-          #include <include/accel-name-server.xml.i>
+          #include <include/accel-ppp/client-ipv6-pool.xml.i>
+          #include <include/accel-ppp/name-server.xml.i>
           <tagNode name="interface">
             <properties>
               <help>interface(s) to listen on</help>
@@ -95,8 +95,8 @@
               </leafNode>
             </children>
           </tagNode>
-          #include <include/accel-gateway-address.xml.i>
-          #include <include/accel-mtu-128-16384.xml.i>
+          #include <include/accel-ppp/gateway-address.xml.i>
+          #include <include/accel-ppp/mtu-128-16384.xml.i>
           <node name="limits">
             <properties>
               <help>Limits the connection rate from a single source</help>
@@ -133,7 +133,7 @@
               <multi/>
             </properties>
           </leafNode>
-          #include <include/accel-wins-server.xml.i>
+          #include <include/accel-ppp/wins-server.xml.i>
           <node name="ppp-options">
             <properties>
               <help>Advanced protocol options</help>
@@ -161,9 +161,9 @@
                   <valueless />
                 </properties>
               </leafNode>
-              #include <include/accel-ppp-mppe.xml.i>
-              #include <include/accel-lcp-echo-interval-failure.xml.i>
-              #include <include/accel-lcp-echo-timeout.xml.i>
+              #include <include/accel-ppp/ppp-mppe.xml.i>
+              #include <include/accel-ppp/lcp-echo-interval-failure.xml.i>
+              #include <include/accel-ppp/lcp-echo-timeout.xml.i>
               <leafNode name="ipv4">
                 <properties>
                   <help>IPv4 (IPCP) negotiation algorithm</help>
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in
index 3a6c8a992..2d8a8503d 100644
--- a/interface-definitions/vpn_l2tp.xml.in
+++ b/interface-definitions/vpn_l2tp.xml.in
@@ -12,7 +12,7 @@
               <help>Remote access L2TP VPN</help>
             </properties>
             <children>
-              #include <include/accel-mtu-128-16384.xml.i>
+              #include <include/accel-ppp/mtu-128-16384.xml.i>
               <leafNode name="outside-address">
                 <properties>
                   <help>External IP address to which VPN clients will connect</help>
@@ -21,8 +21,8 @@
                   </constraint>
                 </properties>
               </leafNode>
-              #include <include/accel-gateway-address.xml.i>
-              #include <include/accel-name-server.xml.i>
+              #include <include/accel-ppp/gateway-address.xml.i>
+              #include <include/accel-ppp/name-server.xml.i>
               <node name="lns">
                 <properties>
                   <help>L2TP Network Server (LNS)</help>
@@ -143,17 +143,17 @@
                   </leafNode>
                 </children>
               </node>
-              #include <include/accel-wins-server.xml.i>
+              #include <include/accel-ppp/wins-server.xml.i>
               <node name="client-ip-pool">
                 <properties>
                   <help>Pool of client IP addresses (must be within a /24)</help>
                 </properties>
                 <children>
-                  #include <include/accel-client-ip-pool-start-stop.xml.i>
-                  #include <include/accel-client-ip-pool-subnet.xml.i>
+                  #include <include/accel-ppp/client-ip-pool-start-stop.xml.i>
+                  #include <include/accel-ppp/client-ip-pool-subnet.xml.i>
                 </children>
               </node>
-              #include <include/accel-client-ipv6-pool.xml.i>
+              #include <include/accel-ppp/client-ipv6-pool.xml.i>
               <leafNode name="description">
                 <properties>
                   <help>Description for L2TP remote-access settings</help>
@@ -209,15 +209,15 @@
                       <multi />
                     </properties>
                   </leafNode>
-                  #include <include/accel-ppp-mppe.xml.i>
-                  #include <include/accel-auth-mode.xml.i>
-                  #include <include/accel-auth-local-users.xml.i>
+                  #include <include/accel-ppp/ppp-mppe.xml.i>
+                  #include <include/accel-ppp/auth-mode.xml.i>
+                  #include <include/accel-ppp/auth-local-users.xml.i>
                   #include <include/radius-server-ipv4.xml.i>
                   <node name="radius">
                     <children>
                       <tagNode name="server">
                         <children>
-                          #include <include/accel-radius-additions-disable-accounting.xml.i>
+                          #include <include/accel-ppp/radius-additions-disable-accounting.xml.i>
                           <leafNode name="fail-time">
                             <properties>
                               <help>Mark server unavailable for &lt;n&gt; seconds on failure</help>
@@ -307,7 +307,7 @@
                   <help>Advanced protocol options</help>
                 </properties>
                 <children>
-                  #include <include/accel-lcp-echo-interval-failure.xml.i>
+                  #include <include/accel-ppp/lcp-echo-interval-failure.xml.i>
                 </children>
               </node>
             </children>
diff --git a/interface-definitions/vpn_openconnect.xml.in b/interface-definitions/vpn_openconnect.xml.in
index 054e027fc..f64aa7f23 100644
--- a/interface-definitions/vpn_openconnect.xml.in
+++ b/interface-definitions/vpn_openconnect.xml.in
@@ -190,7 +190,7 @@
                   </leafNode>
                 </children>
               </node>
-              #include <include/accel-name-server.xml.i>
+              #include <include/accel-ppp/name-server.xml.i>
             </children>
           </node>
       </children>
diff --git a/interface-definitions/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in
index 72eda8752..7cf584a18 100644
--- a/interface-definitions/vpn_pptp.xml.in
+++ b/interface-definitions/vpn_pptp.xml.in
@@ -12,7 +12,7 @@
               <help>Remote access PPTP VPN</help>
             </properties>
             <children>
-              #include <include/accel-mtu-128-16384.xml.i>
+              #include <include/accel-ppp/mtu-128-16384.xml.i>
               <leafNode name="outside-address">
                 <properties>
                   <help>External IP address to which VPN clients will connect</help>
@@ -34,16 +34,16 @@
                   <multi/>
                 </properties>
               </leafNode>
-              #include <include/accel-wins-server.xml.i>
+              #include <include/accel-ppp/wins-server.xml.i>
               <node name="client-ip-pool">
                 <properties>
                   <help>Pool of client IP addresses (must be within a /24)</help>
                 </properties>
                 <children>
-                  #include <include/accel-client-ip-pool-start-stop.xml.i>
+                  #include <include/accel-ppp/client-ip-pool-start-stop.xml.i>
                 </children>
               </node>
-              #include <include/accel-gateway-address.xml.i>
+              #include <include/accel-ppp/gateway-address.xml.i>
               <node name="authentication">
                 <properties>
                   <help>Authentication for remote access PPTP VPN</help>
@@ -93,7 +93,7 @@
                       </completionHelp>
                     </properties>
                   </leafNode>
-                  #include <include/accel-auth-mode.xml.i>
+                  #include <include/accel-ppp/auth-mode.xml.i>
                   <node name="local-users">
                     <properties>
                       <help>Local user authentication for remote access PPTP VPN</help>
@@ -120,7 +120,7 @@
                     </children>
                   </node>
                   #include <include/radius-server-ipv4.xml.i>
-                  #include <include/accel-radius-additions.xml.i>
+                  #include <include/accel-ppp/radius-additions.xml.i>
                 </children>
               </node>
             </children>
diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in
index 45d65b3e7..e4ade844d 100644
--- a/interface-definitions/vpn_sstp.xml.in
+++ b/interface-definitions/vpn_sstp.xml.in
@@ -13,38 +13,38 @@
               <help>Authentication for remote access SSTP Server</help>
             </properties>
             <children>
-              #include <include/accel-auth-local-users.xml.i>
-              #include <include/accel-auth-mode.xml.i>
-              #include <include/accel-auth-protocols.xml.i>
+              #include <include/accel-ppp/auth-local-users.xml.i>
+              #include <include/accel-ppp/auth-mode.xml.i>
+              #include <include/accel-ppp/auth-protocols.xml.i>
               #include <include/radius-server-ipv4.xml.i>
-              #include <include/accel-radius-additions.xml.i>
+              #include <include/accel-ppp/radius-additions.xml.i>
               <node name="radius">
                 <children>
-                  #include <include/accel-radius-additions-rate-limit.xml.i>
+                  #include <include/accel-ppp/radius-additions-rate-limit.xml.i>
                 </children>
               </node>
             </children>
           </node>
           #include <include/interface/interface-mtu-68-1500.xml.i>
-          #include <include/accel-gateway-address.xml.i>
-          #include <include/accel-name-server.xml.i>
+          #include <include/accel-ppp/gateway-address.xml.i>
+          #include <include/accel-ppp/name-server.xml.i>
           <node name="client-ip-pool">
             <properties>
               <help>Client IP pools and gateway setting</help>
             </properties>
             <children>
-              #include <include/accel-client-ip-pool-subnet.xml.i>
+              #include <include/accel-ppp/client-ip-pool-subnet.xml.i>
             </children>
           </node>
-          #include <include/accel-client-ipv6-pool.xml.i>
+          #include <include/accel-ppp/client-ipv6-pool.xml.i>
           <node name="ppp-options">
             <properties>
               <help>PPP (Point-to-Point Protocol) settings</help>
             </properties>
             <children>
-              #include <include/accel-ppp-mppe.xml.i>
-              #include <include/accel-lcp-echo-interval-failure.xml.i>
-              #include <include/accel-lcp-echo-timeout.xml.i>
+              #include <include/accel-ppp/ppp-mppe.xml.i>
+              #include <include/accel-ppp/lcp-echo-interval-failure.xml.i>
+              #include <include/accel-ppp/lcp-echo-timeout.xml.i>
             </children>
           </node>
           <node name="ssl">
-- 
cgit v1.2.3