diff --git a/UserDoc/ConfigFiles.md b/ConfigFiles.md
similarity index 96%
rename from UserDoc/ConfigFiles.md
rename to ConfigFiles.md
index bfee6090..97f1a193 100644
--- a/UserDoc/ConfigFiles.md
+++ b/ConfigFiles.md
@@ -1,8 +1,10 @@
 ---
 layout: doc
 title: ConfigFiles
-permalink: /doc/UserDoc/ConfigFiles/
-redirect_from: /wiki/UserDoc/ConfigFiles/
+permalink: /doc/ConfigFiles/
+redirect_from: \
+  /doc/UserDoc/ConfigFiles/
+  /wiki/UserDoc/ConfigFiles/
 ---
 
 Qubes specific VM config files
diff --git a/UserDoc/DispVMCustomization.md b/DispVMCustomization.md
similarity index 96%
rename from UserDoc/DispVMCustomization.md
rename to DispVMCustomization.md
index 52647a0c..84abc9ea 100644
--- a/UserDoc/DispVMCustomization.md
+++ b/DispVMCustomization.md
@@ -1,8 +1,10 @@
 ---
 layout: doc
 title: DispVMCustomization
-permalink: /doc/UserDoc/DispVMCustomization/
-redirect_from: /wiki/UserDoc/DispVMCustomization/
+permalink: /doc/DispVMCustomization/
+redirect_from: \
+  /doc/UserDoc/DispVMCustomization/
+  /wiki/UserDoc/DispVMCustomization/
 ---
 
 Changing the template used as a basis for Disposable VM
diff --git a/UserDoc/OpenPGP.md b/OpenPGP.md
similarity index 97%
rename from UserDoc/OpenPGP.md
rename to OpenPGP.md
index 533189c5..b9ea0622 100644
--- a/UserDoc/OpenPGP.md
+++ b/OpenPGP.md
@@ -1,8 +1,10 @@
 ---
 layout: doc
 title: OpenPGP
-permalink: /doc/UserDoc/OpenPGP/
-redirect_from: /wiki/UserDoc/OpenPGP/
+permalink: /doc/OpenPGP/
+redirect_from: \
+  /doc/UserDoc/OpenPGP/
+  /wiki/UserDoc/OpenPGP/
 ---
 
 **Note 2014-08-03: This page is deprecated by [SplitGpg](/wiki/UserDoc/SplitGpg). The content of this page has been integrated into that page.**
diff --git a/UserDoc/SplitGpg.md b/SplitGpg.md
similarity index 99%
rename from UserDoc/SplitGpg.md
rename to SplitGpg.md
index d690e7f4..41cda483 100644
--- a/UserDoc/SplitGpg.md
+++ b/SplitGpg.md
@@ -1,8 +1,10 @@
 ---
 layout: doc
 title: SplitGpg
-permalink: /doc/UserDoc/SplitGpg/
-redirect_from: /wiki/UserDoc/SplitGpg/
+permalink: /doc/SplitGpg/
+redirect_from: \
+  /doc/UserDoc/SplitGpg/
+  /wiki/UserDoc/SplitGpg/
 ---
 
 Qubes Split GPG
diff --git a/UserDoc/TorVM.md b/TorVM.md
similarity index 99%
rename from UserDoc/TorVM.md
rename to TorVM.md
index 096c0a27..d431edf6 100644
--- a/UserDoc/TorVM.md
+++ b/TorVM.md
@@ -1,8 +1,10 @@
 ---
 layout: doc
 title: TorVM
-permalink: /doc/UserDoc/TorVM/
-redirect_from: /wiki/UserDoc/TorVM/
+permalink: /doc/TorVM/
+redirect_from: \
+  /doc/UserDoc/TorVM/
+  /wiki/UserDoc/TorVM/
 ---
 
 Known issues:
diff --git a/UserDoc/XFCE.md b/XFCE.md
similarity index 96%
rename from UserDoc/XFCE.md
rename to XFCE.md
index 048f571a..7a3d5635 100644
--- a/UserDoc/XFCE.md
+++ b/XFCE.md
@@ -1,8 +1,10 @@
 ---
 layout: doc
 title: XFCE
-permalink: /doc/UserDoc/XFCE/
-redirect_from: /wiki/UserDoc/XFCE/
+permalink: /doc/XFCE/
+redirect_from: \
+  /doc/UserDoc/XFCE/
+  /wiki/UserDoc/XFCE/
 ---
 
 XFCE installtion in dom0