diff --git a/symmetric/src/docbook/user-guide/ch07-administration.xml b/symmetric/src/docbook/user-guide/admin/ch07-administration.xml
similarity index 100%
rename from symmetric/src/docbook/user-guide/ch07-administration.xml
rename to symmetric/src/docbook/user-guide/admin/ch07-administration.xml
diff --git a/symmetric/src/docbook/user-guide/ch08-ip-filtering.xml b/symmetric/src/docbook/user-guide/admin/ch08-ip-filtering.xml
similarity index 100%
rename from symmetric/src/docbook/user-guide/ch08-ip-filtering.xml
rename to symmetric/src/docbook/user-guide/admin/ch08-ip-filtering.xml
diff --git a/symmetric/src/docbook/user-guide/ch06-advanced-configuration.xml b/symmetric/src/docbook/user-guide/advConfig/ch06-advanced-configuration.xml
similarity index 100%
rename from symmetric/src/docbook/user-guide/ch06-advanced-configuration.xml
rename to symmetric/src/docbook/user-guide/advConfig/ch06-advanced-configuration.xml
diff --git a/symmetric/src/docbook/user-guide/ch04-architecture.xml b/symmetric/src/docbook/user-guide/arch/ch04-architecture.xml
similarity index 100%
rename from symmetric/src/docbook/user-guide/ch04-architecture.xml
rename to symmetric/src/docbook/user-guide/arch/ch04-architecture.xml
diff --git a/symmetric/src/docbook/user-guide/ch03-concepts.xml b/symmetric/src/docbook/user-guide/basicConcepts/ch03-concepts.xml
similarity index 88%
rename from symmetric/src/docbook/user-guide/ch03-concepts.xml
rename to symmetric/src/docbook/user-guide/basicConcepts/ch03-concepts.xml
index 3ecddade61..a14ded1204 100644
--- a/symmetric/src/docbook/user-guide/ch03-concepts.xml
+++ b/symmetric/src/docbook/user-guide/basicConcepts/ch03-concepts.xml
@@ -15,7 +15,7 @@
may coexist in the same database. The default prefix is sym_.
-
-
+
+
diff --git a/symmetric/src/docbook/user-guide/ch03/sec01-data-model-config.xml b/symmetric/src/docbook/user-guide/basicConcepts/sec01-data-model-config.xml
similarity index 100%
rename from symmetric/src/docbook/user-guide/ch03/sec01-data-model-config.xml
rename to symmetric/src/docbook/user-guide/basicConcepts/sec01-data-model-config.xml
diff --git a/symmetric/src/docbook/user-guide/ch03/sec02-data-model-runtime.xml b/symmetric/src/docbook/user-guide/basicConcepts/sec02-data-model-runtime.xml
similarity index 100%
rename from symmetric/src/docbook/user-guide/ch03/sec02-data-model-runtime.xml
rename to symmetric/src/docbook/user-guide/basicConcepts/sec02-data-model-runtime.xml
diff --git a/symmetric/src/docbook/user-guide/ch05-basic-configuration.xml b/symmetric/src/docbook/user-guide/basicConfig/ch05-basic-configuration.xml
similarity index 100%
rename from symmetric/src/docbook/user-guide/ch05-basic-configuration.xml
rename to symmetric/src/docbook/user-guide/basicConfig/ch05-basic-configuration.xml
diff --git a/symmetric/src/docbook/user-guide/ch01-introduction.xml b/symmetric/src/docbook/user-guide/intro/ch01-introduction.xml
similarity index 100%
rename from symmetric/src/docbook/user-guide/ch01-introduction.xml
rename to symmetric/src/docbook/user-guide/intro/ch01-introduction.xml
diff --git a/symmetric/src/docbook/user-guide/ch02-getting-started.xml b/symmetric/src/docbook/user-guide/intro/ch02-getting-started.xml
similarity index 100%
rename from symmetric/src/docbook/user-guide/ch02-getting-started.xml
rename to symmetric/src/docbook/user-guide/intro/ch02-getting-started.xml