diff --git a/building-guides/building-archlinux-template.md b/docs/building/building-archlinux-template.md
similarity index 100%
rename from building-guides/building-archlinux-template.md
rename to docs/building/building-archlinux-template.md
diff --git a/building-guides/building-non-fedora-template.md b/docs/building/building-non-fedora-template.md
similarity index 100%
rename from building-guides/building-non-fedora-template.md
rename to docs/building/building-non-fedora-template.md
diff --git a/building-guides/building-whonix-template.md b/docs/building/building-whonix-template.md
similarity index 100%
rename from building-guides/building-whonix-template.md
rename to docs/building/building-whonix-template.md
diff --git a/configuration-guides/change-time-zone.md b/docs/configuration/change-time-zone.md
similarity index 100%
rename from configuration-guides/change-time-zone.md
rename to docs/configuration/change-time-zone.md
diff --git a/configuration-guides/disk-trim.md b/docs/configuration/disk-trim.md
similarity index 100%
rename from configuration-guides/disk-trim.md
rename to docs/configuration/disk-trim.md
diff --git a/configuration-guides/external-audio.md b/docs/configuration/external-audio.md
similarity index 100%
rename from configuration-guides/external-audio.md
rename to docs/configuration/external-audio.md
diff --git a/configuration-guides/fetchmail.md b/docs/configuration/fetchmail.md
similarity index 100%
rename from configuration-guides/fetchmail.md
rename to docs/configuration/fetchmail.md
diff --git a/configuration-guides/install-nvidia-driver.md b/docs/configuration/install-nvidia-driver.md
similarity index 100%
rename from configuration-guides/install-nvidia-driver.md
rename to docs/configuration/install-nvidia-driver.md
diff --git a/configuration-guides/multiboot.md b/docs/configuration/multiboot.md
similarity index 100%
rename from configuration-guides/multiboot.md
rename to docs/configuration/multiboot.md
diff --git a/configuration-guides/multimedia.md b/docs/configuration/multimedia.md
similarity index 100%
rename from configuration-guides/multimedia.md
rename to docs/configuration/multimedia.md
diff --git a/configuration-guides/mutt.md b/docs/configuration/mutt.md
similarity index 100%
rename from configuration-guides/mutt.md
rename to docs/configuration/mutt.md
diff --git a/configuration-guides/network-bridge-support.md b/docs/configuration/network-bridge-support.md
similarity index 100%
rename from configuration-guides/network-bridge-support.md
rename to docs/configuration/network-bridge-support.md
diff --git a/configuration-guides/network-printer.md b/docs/configuration/network-printer.md
similarity index 100%
rename from configuration-guides/network-printer.md
rename to docs/configuration/network-printer.md
diff --git a/configuration-guides/postfix.md b/docs/configuration/postfix.md
similarity index 100%
rename from configuration-guides/postfix.md
rename to docs/configuration/postfix.md
diff --git a/configuration-guides/rxvt.md b/docs/configuration/rxvt.md
similarity index 100%
rename from configuration-guides/rxvt.md
rename to docs/configuration/rxvt.md
diff --git a/configuration-guides/tips-and-tricks.md b/docs/configuration/tips-and-tricks.md
similarity index 100%
rename from configuration-guides/tips-and-tricks.md
rename to docs/configuration/tips-and-tricks.md
diff --git a/configuration-guides/vpn.md b/docs/configuration/vpn.md
similarity index 100%
rename from configuration-guides/vpn.md
rename to docs/configuration/vpn.md
diff --git a/configuration-guides/w3m.md b/docs/configuration/w3m.md
similarity index 100%
rename from configuration-guides/w3m.md
rename to docs/configuration/w3m.md
diff --git a/configuration-guides/zfs.md b/docs/configuration/zfs.md
similarity index 100%
rename from configuration-guides/zfs.md
rename to docs/configuration/zfs.md
diff --git a/customization-guides/dark-theme.md b/docs/customization/dark-theme.md
similarity index 100%
rename from customization-guides/dark-theme.md
rename to docs/customization/dark-theme.md
diff --git a/customization-guides/fedora-minimal-template-customization.md b/docs/customization/fedora-minimal-template-customization.md
similarity index 100%
rename from customization-guides/fedora-minimal-template-customization.md
rename to docs/customization/fedora-minimal-template-customization.md
diff --git a/customization-guides/language-localization.md b/docs/customization/language-localization.md
similarity index 100%
rename from customization-guides/language-localization.md
rename to docs/customization/language-localization.md
diff --git a/customization-guides/removing-templatevm-packages.md b/docs/customization/removing-templatevm-packages.md
similarity index 100%
rename from customization-guides/removing-templatevm-packages.md
rename to docs/customization/removing-templatevm-packages.md
diff --git a/customization-guides/windows-template-customization.md b/docs/customization/windows-template-customization.md
similarity index 100%
rename from customization-guides/windows-template-customization.md
rename to docs/customization/windows-template-customization.md
diff --git a/os-guides/centos.md b/docs/os/centos.md
similarity index 100%
rename from os-guides/centos.md
rename to docs/os/centos.md
diff --git a/os-guides/gentoo.md b/docs/os/gentoo.md
similarity index 100%
rename from os-guides/gentoo.md
rename to docs/os/gentoo.md
diff --git a/os-guides/linux-hvm-tips.md b/docs/os/linux-hvm-tips.md
similarity index 100%
rename from os-guides/linux-hvm-tips.md
rename to docs/os/linux-hvm-tips.md
diff --git a/os-guides/netbsd.md b/docs/os/netbsd.md
similarity index 100%
rename from os-guides/netbsd.md
rename to docs/os/netbsd.md
diff --git a/os-guides/pentesting.md b/docs/os/pentesting.md
similarity index 100%
rename from os-guides/pentesting.md
rename to docs/os/pentesting.md
diff --git a/os-guides/pentesting/blackarch.md b/docs/os/pentesting/blackarch.md
similarity index 100%
rename from os-guides/pentesting/blackarch.md
rename to docs/os/pentesting/blackarch.md
diff --git a/os-guides/pentesting/kali.md b/docs/os/pentesting/kali.md
similarity index 100%
rename from os-guides/pentesting/kali.md
rename to docs/os/pentesting/kali.md
diff --git a/os-guides/pentesting/ptf.md b/docs/os/pentesting/ptf.md
similarity index 100%
rename from os-guides/pentesting/ptf.md
rename to docs/os/pentesting/ptf.md
diff --git a/os-guides/ubuntu.md b/docs/os/ubuntu.md
similarity index 100%
rename from os-guides/ubuntu.md
rename to docs/os/ubuntu.md
diff --git a/os-guides/windows/windows-tools.md b/docs/os/windows/windows-tools.md
similarity index 100%
rename from os-guides/windows/windows-tools.md
rename to docs/os/windows/windows-tools.md
diff --git a/os-guides/windows/windows-vm.md b/docs/os/windows/windows-vm.md
similarity index 100%
rename from os-guides/windows/windows-vm.md
rename to docs/os/windows/windows-vm.md
diff --git a/privacy-guides/anonymizing-your-mac-address.md b/docs/privacy/anonymizing-your-mac-address.md
similarity index 100%
rename from privacy-guides/anonymizing-your-mac-address.md
rename to docs/privacy/anonymizing-your-mac-address.md
diff --git a/privacy-guides/signal.md b/docs/privacy/signal.md
similarity index 100%
rename from privacy-guides/signal.md
rename to docs/privacy/signal.md
diff --git a/privacy-guides/tails.md b/docs/privacy/tails.md
similarity index 100%
rename from privacy-guides/tails.md
rename to docs/privacy/tails.md
diff --git a/privacy-guides/torvm.md b/docs/privacy/torvm.md
similarity index 100%
rename from privacy-guides/torvm.md
rename to docs/privacy/torvm.md
diff --git a/privacy-guides/whonix.md b/docs/privacy/whonix.md
similarity index 100%
rename from privacy-guides/whonix.md
rename to docs/privacy/whonix.md
diff --git a/security-guides/multifactor-authentication.md b/docs/security/multifactor-authentication.md
similarity index 100%
rename from security-guides/multifactor-authentication.md
rename to docs/security/multifactor-authentication.md
diff --git a/security-guides/security-guidelines.md b/docs/security/security-guidelines.md
similarity index 100%
rename from security-guides/security-guidelines.md
rename to docs/security/security-guidelines.md
diff --git a/security-guides/split-bitcoin.md b/docs/security/split-bitcoin.md
similarity index 100%
rename from security-guides/split-bitcoin.md
rename to docs/security/split-bitcoin.md
diff --git a/troubleshooting/application-troubleshooting.md b/docs/troubleshooting/application-troubleshooting.md
similarity index 100%
rename from troubleshooting/application-troubleshooting.md
rename to docs/troubleshooting/application-troubleshooting.md
diff --git a/troubleshooting/intel-igfx-troubleshooting.md b/docs/troubleshooting/intel-igfx-troubleshooting.md
similarity index 100%
rename from troubleshooting/intel-igfx-troubleshooting.md
rename to docs/troubleshooting/intel-igfx-troubleshooting.md
diff --git a/troubleshooting/macbook-troubleshooting.md b/docs/troubleshooting/macbook-troubleshooting.md
similarity index 100%
rename from troubleshooting/macbook-troubleshooting.md
rename to docs/troubleshooting/macbook-troubleshooting.md
diff --git a/troubleshooting/nvidia-troubleshooting.md b/docs/troubleshooting/nvidia-troubleshooting.md
similarity index 100%
rename from troubleshooting/nvidia-troubleshooting.md
rename to docs/troubleshooting/nvidia-troubleshooting.md
diff --git a/troubleshooting/sony-vaio-tinkering.md b/docs/troubleshooting/sony-vaio-tinkering.md
similarity index 100%
rename from troubleshooting/sony-vaio-tinkering.md
rename to docs/troubleshooting/sony-vaio-tinkering.md
diff --git a/troubleshooting/tails-troubleshooting.md b/docs/troubleshooting/tails-troubleshooting.md
similarity index 100%
rename from troubleshooting/tails-troubleshooting.md
rename to docs/troubleshooting/tails-troubleshooting.md
diff --git a/troubleshooting/thinkpad-troubleshooting.md b/docs/troubleshooting/thinkpad-troubleshooting.md
similarity index 100%
rename from troubleshooting/thinkpad-troubleshooting.md
rename to docs/troubleshooting/thinkpad-troubleshooting.md