From c2ae70181b8ad136f5139c9fdd53e0bb402c9914 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 14 Mar 2021 15:20:51 +0000
Subject: rip: xml: T2547: 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/rip-access-list.xml.i                  | 39 ------------------
 .../include/rip-access-list6.xml.i                 | 39 ------------------
 .../include/rip-default-information.xml.i          | 15 -------
 .../include/rip-default-metric.xml.i               | 14 -------
 interface-definitions/include/rip-interface.xml.i  | 38 -----------------
 .../include/rip-prefix-list.xml.i                  | 33 ---------------
 .../include/rip-prefix-list6.xml.i                 | 33 ---------------
 .../include/rip-redistribute.xml.i                 | 15 -------
 interface-definitions/include/rip-timers.xml.i     | 48 ----------------------
 .../include/rip/rip-access-list.xml.i              | 39 ++++++++++++++++++
 .../include/rip/rip-access-list6.xml.i             | 39 ++++++++++++++++++
 .../include/rip/rip-default-information.xml.i      | 15 +++++++
 .../include/rip/rip-default-metric.xml.i           | 14 +++++++
 .../include/rip/rip-interface.xml.i                | 38 +++++++++++++++++
 .../include/rip/rip-prefix-list.xml.i              | 33 +++++++++++++++
 .../include/rip/rip-prefix-list6.xml.i             | 33 +++++++++++++++
 .../include/rip/rip-redistribute.xml.i             | 15 +++++++
 interface-definitions/include/rip/rip-timers.xml.i | 48 ++++++++++++++++++++++
 interface-definitions/protocols-rip.xml.in         | 28 ++++++-------
 interface-definitions/protocols-ripng.xml.in       | 26 ++++++------
 20 files changed, 301 insertions(+), 301 deletions(-)
 delete mode 100644 interface-definitions/include/rip-access-list.xml.i
 delete mode 100644 interface-definitions/include/rip-access-list6.xml.i
 delete mode 100644 interface-definitions/include/rip-default-information.xml.i
 delete mode 100644 interface-definitions/include/rip-default-metric.xml.i
 delete mode 100644 interface-definitions/include/rip-interface.xml.i
 delete mode 100644 interface-definitions/include/rip-prefix-list.xml.i
 delete mode 100644 interface-definitions/include/rip-prefix-list6.xml.i
 delete mode 100644 interface-definitions/include/rip-redistribute.xml.i
 delete mode 100644 interface-definitions/include/rip-timers.xml.i
 create mode 100644 interface-definitions/include/rip/rip-access-list.xml.i
 create mode 100644 interface-definitions/include/rip/rip-access-list6.xml.i
 create mode 100644 interface-definitions/include/rip/rip-default-information.xml.i
 create mode 100644 interface-definitions/include/rip/rip-default-metric.xml.i
 create mode 100644 interface-definitions/include/rip/rip-interface.xml.i
 create mode 100644 interface-definitions/include/rip/rip-prefix-list.xml.i
 create mode 100644 interface-definitions/include/rip/rip-prefix-list6.xml.i
 create mode 100644 interface-definitions/include/rip/rip-redistribute.xml.i
 create mode 100644 interface-definitions/include/rip/rip-timers.xml.i

diff --git a/interface-definitions/include/rip-access-list.xml.i b/interface-definitions/include/rip-access-list.xml.i
deleted file mode 100644
index 9d5366a0d..000000000
--- a/interface-definitions/include/rip-access-list.xml.i
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- include start from rip-access-list.xml.i -->
-<node name="access-list">
-  <properties>
-    <help>Access-list</help>
-  </properties>
-  <children>
-    <leafNode name="in">
-      <properties>
-        <help>Access list to apply to input packets</help>
-        <valueHelp>
-          <format>u32</format>
-          <description>Access list to apply to input packets</description>
-        </valueHelp>
-        <completionHelp>
-          <path>policy access-list</path>
-        </completionHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 0-4294967295"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="out">
-      <properties>
-        <help>Access list to apply to output packets</help>
-        <valueHelp>
-          <format>u32</format>
-          <description>Access list to apply to output packets</description>
-        </valueHelp>
-        <completionHelp>
-          <path>policy access-list</path>
-        </completionHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 0-4294967295"/>
-        </constraint>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/rip-access-list6.xml.i b/interface-definitions/include/rip-access-list6.xml.i
deleted file mode 100644
index a57f2038d..000000000
--- a/interface-definitions/include/rip-access-list6.xml.i
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- include start from rip-access-list.xml.i -->
-<node name="access-list">
-  <properties>
-    <help>Access-list</help>
-  </properties>
-  <children>
-    <leafNode name="in">
-      <properties>
-        <help>Access list to apply to input packets</help>
-        <valueHelp>
-          <format>u32</format>
-          <description>Access list to apply to input packets</description>
-        </valueHelp>
-        <completionHelp>
-          <path>policy access-list6</path>
-        </completionHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 0-4294967295"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="out">
-      <properties>
-        <help>Access list to apply to output packets</help>
-        <valueHelp>
-          <format>u32</format>
-          <description>Access list to apply to output packets</description>
-        </valueHelp>
-        <completionHelp>
-          <path>policy access-list6</path>
-        </completionHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 0-4294967295"/>
-        </constraint>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/rip-default-information.xml.i b/interface-definitions/include/rip-default-information.xml.i
deleted file mode 100644
index 9dbe744a1..000000000
--- a/interface-definitions/include/rip-default-information.xml.i
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- include start from rip-default-information.xml.i -->
-<node name="default-information">
-  <properties>
-    <help>Control distribution of default route</help>
-  </properties>
-  <children>
-    <leafNode name="originate">
-      <properties>
-        <help>Distribute a default route</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/rip-default-metric.xml.i b/interface-definitions/include/rip-default-metric.xml.i
deleted file mode 100644
index e021e47dd..000000000
--- a/interface-definitions/include/rip-default-metric.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- include start from rip-default-metric.xml.i -->
-<leafNode name="default-metric">
-  <properties>
-    <help>Metric of redistributed routes</help>
-    <valueHelp>
-      <format>u32:1-16</format>
-      <description>Default metric</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 1-16"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/rip-interface.xml.i b/interface-definitions/include/rip-interface.xml.i
deleted file mode 100644
index 1807a944a..000000000
--- a/interface-definitions/include/rip-interface.xml.i
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- include start from rip-interface.xml.i -->
-<tagNode name="interface">
-  <properties>
-    <help>Interface name</help>
-    <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
-    </completionHelp>
-    <valueHelp>
-      <format>txt</format>
-      <description>Interface name</description>
-    </valueHelp>
-    <constraint>
-      <validator name="interface-name"/>
-    </constraint>
-  </properties>
-  <children>
-    <node name="split-horizon">
-      <properties>
-        <help>Split horizon parameters</help>
-      </properties>
-      <children>
-        <leafNode name="disable">
-          <properties>
-            <help>Disable split horizon on specified interface</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="poison-reverse">
-          <properties>
-            <help>Disable split horizon on specified interface</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-  </children>
-</tagNode>
-<!-- include end -->
diff --git a/interface-definitions/include/rip-prefix-list.xml.i b/interface-definitions/include/rip-prefix-list.xml.i
deleted file mode 100644
index ec8a34266..000000000
--- a/interface-definitions/include/rip-prefix-list.xml.i
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- include start from rip-prefix-list.xml.i -->
-<node name="prefix-list">
-  <properties>
-    <help>Prefix-list</help>
-  </properties>
-  <children>
-    <leafNode name="in">
-      <properties>
-        <help>Prefix-list to apply to input packets</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Prefix-list to apply to input packets</description>
-        </valueHelp>
-        <completionHelp>
-          <path>policy prefix-list</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
-    <leafNode name="out">
-      <properties>
-        <help>Prefix-list to apply to output packets</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Prefix-list to apply to output packets</description>
-        </valueHelp>
-        <completionHelp>
-          <path>policy prefix-list</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/rip-prefix-list6.xml.i b/interface-definitions/include/rip-prefix-list6.xml.i
deleted file mode 100644
index b1026bcd2..000000000
--- a/interface-definitions/include/rip-prefix-list6.xml.i
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- include start from rip-prefix-list.xml.i -->
-<node name="prefix-list">
-  <properties>
-    <help>Prefix-list</help>
-  </properties>
-  <children>
-    <leafNode name="in">
-      <properties>
-        <help>Prefix-list to apply to input packets</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Prefix-list to apply to input packets</description>
-        </valueHelp>
-        <completionHelp>
-          <path>policy prefix-list6</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
-    <leafNode name="out">
-      <properties>
-        <help>Prefix-list to apply to output packets</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Prefix-list to apply to output packets</description>
-        </valueHelp>
-        <completionHelp>
-          <path>policy prefix-list6</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/rip-redistribute.xml.i b/interface-definitions/include/rip-redistribute.xml.i
deleted file mode 100644
index 1e47125e9..000000000
--- a/interface-definitions/include/rip-redistribute.xml.i
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- include start from rip-redistribute.xml.i -->
-<leafNode name="metric">
-  <properties>
-    <help>Metric for redistributed routes</help>
-    <valueHelp>
-      <format>u32:1-16</format>
-      <description>Redistribute route metric</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 1-16"/>
-    </constraint>
-  </properties>
-</leafNode>
-#include <include/route-map.xml.i>
-<!-- include end -->
diff --git a/interface-definitions/include/rip-timers.xml.i b/interface-definitions/include/rip-timers.xml.i
deleted file mode 100644
index f43ea3f5f..000000000
--- a/interface-definitions/include/rip-timers.xml.i
+++ /dev/null
@@ -1,48 +0,0 @@
-<!-- include start from rip-timers.xml.i -->
-<node name="timers">
-  <properties>
-    <help>RIPng timer values</help>
-  </properties>
-  <children>
-    <leafNode name="garbage-collection">
-      <properties>
-        <help>Garbage collection timer</help>
-        <valueHelp>
-          <format>u32:5-2147483647</format>
-          <description>Garbage colletion time (default 120)</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 5-2147483647"/>
-        </constraint>
-      </properties>
-      <defaultValue>120</defaultValue>
-    </leafNode>
-    <leafNode name="timeout">
-      <properties>
-        <help>Routing information timeout timer</help>
-        <valueHelp>
-          <format>u32:5-2147483647</format>
-          <description>Routing information timeout timer (default 180)</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 5-2147483647"/>
-        </constraint>
-      </properties>
-      <defaultValue>180</defaultValue>
-    </leafNode>
-    <leafNode name="update">
-      <properties>
-        <help>Routing table update timer</help>
-        <valueHelp>
-          <format>u32:5-2147483647</format>
-          <description>Routing table update timer in seconds (default 30)</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 5-2147483647"/>
-        </constraint>
-      </properties>
-      <defaultValue>30</defaultValue>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/rip/rip-access-list.xml.i b/interface-definitions/include/rip/rip-access-list.xml.i
new file mode 100644
index 000000000..00ee9b736
--- /dev/null
+++ b/interface-definitions/include/rip/rip-access-list.xml.i
@@ -0,0 +1,39 @@
+<!-- include start from rip/rip-access-list.xml.i -->
+<node name="access-list">
+  <properties>
+    <help>Access-list</help>
+  </properties>
+  <children>
+    <leafNode name="in">
+      <properties>
+        <help>Access list to apply to input packets</help>
+        <valueHelp>
+          <format>u32</format>
+          <description>Access list to apply to input packets</description>
+        </valueHelp>
+        <completionHelp>
+          <path>policy access-list</path>
+        </completionHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-4294967295"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="out">
+      <properties>
+        <help>Access list to apply to output packets</help>
+        <valueHelp>
+          <format>u32</format>
+          <description>Access list to apply to output packets</description>
+        </valueHelp>
+        <completionHelp>
+          <path>policy access-list</path>
+        </completionHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-4294967295"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/rip/rip-access-list6.xml.i b/interface-definitions/include/rip/rip-access-list6.xml.i
new file mode 100644
index 000000000..9e4298bc0
--- /dev/null
+++ b/interface-definitions/include/rip/rip-access-list6.xml.i
@@ -0,0 +1,39 @@
+<!-- include start from rip/rip-access-list.xml.i -->
+<node name="access-list">
+  <properties>
+    <help>Access-list</help>
+  </properties>
+  <children>
+    <leafNode name="in">
+      <properties>
+        <help>Access list to apply to input packets</help>
+        <valueHelp>
+          <format>u32</format>
+          <description>Access list to apply to input packets</description>
+        </valueHelp>
+        <completionHelp>
+          <path>policy access-list6</path>
+        </completionHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-4294967295"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="out">
+      <properties>
+        <help>Access list to apply to output packets</help>
+        <valueHelp>
+          <format>u32</format>
+          <description>Access list to apply to output packets</description>
+        </valueHelp>
+        <completionHelp>
+          <path>policy access-list6</path>
+        </completionHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-4294967295"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/rip/rip-default-information.xml.i b/interface-definitions/include/rip/rip-default-information.xml.i
new file mode 100644
index 000000000..28c540c26
--- /dev/null
+++ b/interface-definitions/include/rip/rip-default-information.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from rip/rip-default-information.xml.i -->
+<node name="default-information">
+  <properties>
+    <help>Control distribution of default route</help>
+  </properties>
+  <children>
+    <leafNode name="originate">
+      <properties>
+        <help>Distribute a default route</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/rip/rip-default-metric.xml.i b/interface-definitions/include/rip/rip-default-metric.xml.i
new file mode 100644
index 000000000..297af5af8
--- /dev/null
+++ b/interface-definitions/include/rip/rip-default-metric.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from rip/rip-default-metric.xml.i -->
+<leafNode name="default-metric">
+  <properties>
+    <help>Metric of redistributed routes</help>
+    <valueHelp>
+      <format>u32:1-16</format>
+      <description>Default metric</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-16"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/rip/rip-interface.xml.i b/interface-definitions/include/rip/rip-interface.xml.i
new file mode 100644
index 000000000..dd3bddd4f
--- /dev/null
+++ b/interface-definitions/include/rip/rip-interface.xml.i
@@ -0,0 +1,38 @@
+<!-- include start from rip/rip-interface.xml.i -->
+<tagNode name="interface">
+  <properties>
+    <help>Interface name</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Interface name</description>
+    </valueHelp>
+    <constraint>
+      <validator name="interface-name"/>
+    </constraint>
+  </properties>
+  <children>
+    <node name="split-horizon">
+      <properties>
+        <help>Split horizon parameters</help>
+      </properties>
+      <children>
+        <leafNode name="disable">
+          <properties>
+            <help>Disable split horizon on specified interface</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+        <leafNode name="poison-reverse">
+          <properties>
+            <help>Disable split horizon on specified interface</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/include/rip/rip-prefix-list.xml.i b/interface-definitions/include/rip/rip-prefix-list.xml.i
new file mode 100644
index 000000000..2569a2a09
--- /dev/null
+++ b/interface-definitions/include/rip/rip-prefix-list.xml.i
@@ -0,0 +1,33 @@
+<!-- include start from rip/rip-prefix-list.xml.i -->
+<node name="prefix-list">
+  <properties>
+    <help>Prefix-list</help>
+  </properties>
+  <children>
+    <leafNode name="in">
+      <properties>
+        <help>Prefix-list to apply to input packets</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Prefix-list to apply to input packets</description>
+        </valueHelp>
+        <completionHelp>
+          <path>policy prefix-list</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="out">
+      <properties>
+        <help>Prefix-list to apply to output packets</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Prefix-list to apply to output packets</description>
+        </valueHelp>
+        <completionHelp>
+          <path>policy prefix-list</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/rip/rip-prefix-list6.xml.i b/interface-definitions/include/rip/rip-prefix-list6.xml.i
new file mode 100644
index 000000000..fcf1499e0
--- /dev/null
+++ b/interface-definitions/include/rip/rip-prefix-list6.xml.i
@@ -0,0 +1,33 @@
+<!-- include start from rip/rip-prefix-list.xml.i -->
+<node name="prefix-list">
+  <properties>
+    <help>Prefix-list</help>
+  </properties>
+  <children>
+    <leafNode name="in">
+      <properties>
+        <help>Prefix-list to apply to input packets</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Prefix-list to apply to input packets</description>
+        </valueHelp>
+        <completionHelp>
+          <path>policy prefix-list6</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="out">
+      <properties>
+        <help>Prefix-list to apply to output packets</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Prefix-list to apply to output packets</description>
+        </valueHelp>
+        <completionHelp>
+          <path>policy prefix-list6</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/rip/rip-redistribute.xml.i b/interface-definitions/include/rip/rip-redistribute.xml.i
new file mode 100644
index 000000000..d7a79b007
--- /dev/null
+++ b/interface-definitions/include/rip/rip-redistribute.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from rip/rip-redistribute.xml.i -->
+<leafNode name="metric">
+  <properties>
+    <help>Metric for redistributed routes</help>
+    <valueHelp>
+      <format>u32:1-16</format>
+      <description>Redistribute route metric</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-16"/>
+    </constraint>
+  </properties>
+</leafNode>
+#include <include/route-map.xml.i>
+<!-- include end -->
diff --git a/interface-definitions/include/rip/rip-timers.xml.i b/interface-definitions/include/rip/rip-timers.xml.i
new file mode 100644
index 000000000..3aaaf8e65
--- /dev/null
+++ b/interface-definitions/include/rip/rip-timers.xml.i
@@ -0,0 +1,48 @@
+<!-- include start from rip/rip-timers.xml.i -->
+<node name="timers">
+  <properties>
+    <help>RIPng timer values</help>
+  </properties>
+  <children>
+    <leafNode name="garbage-collection">
+      <properties>
+        <help>Garbage collection timer</help>
+        <valueHelp>
+          <format>u32:5-2147483647</format>
+          <description>Garbage colletion time (default 120)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 5-2147483647"/>
+        </constraint>
+      </properties>
+      <defaultValue>120</defaultValue>
+    </leafNode>
+    <leafNode name="timeout">
+      <properties>
+        <help>Routing information timeout timer</help>
+        <valueHelp>
+          <format>u32:5-2147483647</format>
+          <description>Routing information timeout timer (default 180)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 5-2147483647"/>
+        </constraint>
+      </properties>
+      <defaultValue>180</defaultValue>
+    </leafNode>
+    <leafNode name="update">
+      <properties>
+        <help>Routing table update timer</help>
+        <valueHelp>
+          <format>u32:5-2147483647</format>
+          <description>Routing table update timer in seconds (default 30)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 5-2147483647"/>
+        </constraint>
+      </properties>
+      <defaultValue>30</defaultValue>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/protocols-rip.xml.in b/interface-definitions/protocols-rip.xml.in
index 1ae3bd8f7..089055021 100644
--- a/interface-definitions/protocols-rip.xml.in
+++ b/interface-definitions/protocols-rip.xml.in
@@ -19,14 +19,14 @@
               </constraint>
             </properties>
           </leafNode>
-          #include <include/rip-default-information.xml.i>
-          #include <include/rip-default-metric.xml.i>
+          #include <include/rip/rip-default-information.xml.i>
+          #include <include/rip/rip-default-metric.xml.i>
           <node name="distribute-list">
             <properties>
               <help>Filter networks in routing updates</help>
             </properties>
             <children>
-              #include <include/rip-access-list.xml.i>
+              #include <include/rip/rip-access-list.xml.i>
               <tagNode name="interface">
                 <properties>
                   <help>Apply filtering to an interface</help>
@@ -42,14 +42,14 @@
                   </constraint>
                 </properties>
                 <children>
-                  #include <include/rip-access-list.xml.i>
-                  #include <include/rip-prefix-list.xml.i>
+                  #include <include/rip/rip-access-list.xml.i>
+                  #include <include/rip/rip-prefix-list.xml.i>
                 </children>
               </tagNode>
-              #include <include/rip-prefix-list.xml.i>
+              #include <include/rip/rip-prefix-list.xml.i>
             </children>
           </node>
-          #include <include/rip-interface.xml.i>
+          #include <include/rip/rip-interface.xml.i>
           <tagNode name="interface">
             <children>
               <node name="authentication">
@@ -165,7 +165,7 @@
                   <help>Redistribute BGP routes</help>
                 </properties>
                 <children>
-                  #include <include/rip-redistribute.xml.i>
+                  #include <include/rip/rip-redistribute.xml.i>
                 </children>
               </node>
               <node name="connected">
@@ -173,7 +173,7 @@
                   <help>Redistribute connected routes</help>
                 </properties>
                 <children>
-                  #include <include/rip-redistribute.xml.i>
+                  #include <include/rip/rip-redistribute.xml.i>
                 </children>
               </node>
               <node name="isis">
@@ -181,7 +181,7 @@
                   <help>Redistribute IS-IS routes</help>
                 </properties>
                 <children>
-                  #include <include/rip-redistribute.xml.i>
+                  #include <include/rip/rip-redistribute.xml.i>
                 </children>
               </node>
               <node name="kernel">
@@ -189,7 +189,7 @@
                   <help>Redistribute kernel routes</help>
                 </properties>
                 <children>
-                  #include <include/rip-redistribute.xml.i>
+                  #include <include/rip/rip-redistribute.xml.i>
                 </children>
               </node>
               <node name="ospf">
@@ -197,7 +197,7 @@
                   <help>Redistribute OSPF routes</help>
                 </properties>
                 <children>
-                  #include <include/rip-redistribute.xml.i>
+                  #include <include/rip/rip-redistribute.xml.i>
                 </children>
               </node>
               <node name="static">
@@ -205,7 +205,7 @@
                   <help>Redistribute static routes</help>
                 </properties>
                 <children>
-                  #include <include/rip-redistribute.xml.i>
+                  #include <include/rip/rip-redistribute.xml.i>
                 </children>
               </node>
             </children>
@@ -223,7 +223,7 @@
               <multi/>
             </properties>
           </leafNode>
-          #include <include/rip-timers.xml.i>
+          #include <include/rip/rip-timers.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/protocols-ripng.xml.in b/interface-definitions/protocols-ripng.xml.in
index 3eac27788..1bd52d18e 100644
--- a/interface-definitions/protocols-ripng.xml.in
+++ b/interface-definitions/protocols-ripng.xml.in
@@ -20,14 +20,14 @@
               <multi/>
             </properties>
           </leafNode>
-          #include <include/rip-default-information.xml.i>
-          #include <include/rip-default-metric.xml.i>
+          #include <include/rip/rip-default-information.xml.i>
+          #include <include/rip/rip-default-metric.xml.i>
           <node name="distribute-list">
             <properties>
               <help>Filter networks in routing updates</help>
             </properties>
             <children>
-              #include <include/rip-access-list6.xml.i>
+              #include <include/rip/rip-access-list6.xml.i>
               <tagNode name="interface">
                 <properties>
                   <help>Apply filtering to an interface</help>
@@ -43,14 +43,14 @@
                   </constraint>
                 </properties>
                 <children>
-                  #include <include/rip-access-list6.xml.i>
-                  #include <include/rip-prefix-list6.xml.i>
+                  #include <include/rip/rip-access-list6.xml.i>
+                  #include <include/rip/rip-prefix-list6.xml.i>
                 </children>
               </tagNode>
-              #include <include/rip-prefix-list6.xml.i>
+              #include <include/rip/rip-prefix-list6.xml.i>
             </children>
           </node>
-          #include <include/rip-interface.xml.i>
+          #include <include/rip/rip-interface.xml.i>
           <leafNode name="network">
             <properties>
               <help>RIPng network</help>
@@ -87,7 +87,7 @@
                   <help>Redistribute BGP routes</help>
                 </properties>
                 <children>
-                  #include <include/rip-redistribute.xml.i>
+                  #include <include/rip/rip-redistribute.xml.i>
                 </children>
               </node>
               <node name="connected">
@@ -95,7 +95,7 @@
                   <help>Redistribute connected routes</help>
                 </properties>
                 <children>
-                  #include <include/rip-redistribute.xml.i>
+                  #include <include/rip/rip-redistribute.xml.i>
                 </children>
               </node>
               <node name="kernel">
@@ -103,7 +103,7 @@
                   <help>Redistribute kernel routes</help>
                 </properties>
                 <children>
-                  #include <include/rip-redistribute.xml.i>
+                  #include <include/rip/rip-redistribute.xml.i>
                 </children>
               </node>
               <node name="ospfv3">
@@ -111,7 +111,7 @@
                   <help>Redistribute OSPFv3 routes</help>
                 </properties>
                 <children>
-                  #include <include/rip-redistribute.xml.i>
+                  #include <include/rip/rip-redistribute.xml.i>
                 </children>
               </node>
               <node name="static">
@@ -119,7 +119,7 @@
                   <help>Redistribute static routes</help>
                 </properties>
                 <children>
-                  #include <include/rip-redistribute.xml.i>
+                  #include <include/rip/rip-redistribute.xml.i>
                 </children>
               </node>
             </children>
@@ -138,7 +138,7 @@
             </properties>
           </leafNode>
           #include <include/route-map.xml.i>
-          #include <include/rip-timers.xml.i>
+          #include <include/rip/rip-timers.xml.i>
         </children>
       </node>
     </children>
-- 
cgit v1.2.3