diff --git a/developer/releases/2_0/release-notes.md b/developer/releases/2_0/release-notes.md
index 735c0e39..09d95953 100644
--- a/developer/releases/2_0/release-notes.md
+++ b/developer/releases/2_0/release-notes.md
@@ -55,7 +55,7 @@ See [Installation Guide](/doc/installation-guide/).
 
 ### From Qubes R2 rc1
 
-Upgrading from Qubes R2 rc1 should be a simple matter of installing updates for [dom0](/doc/software-update-dom0/) and [VMs](/doc/software-update-vm/).
+Upgrading from Qubes R2 rc1 should be a simple matter of installing updates for [dom0](/doc/how-to-install-software-in-dom0/) and [VMs](/doc/software-update-vm/).
 
 ### From Qubes R2 beta 3 and older
 
diff --git a/developer/releases/3_1/release-notes.md b/developer/releases/3_1/release-notes.md
index 0cddc92b..1b0bafcd 100644
--- a/developer/releases/3_1/release-notes.md
+++ b/developer/releases/3_1/release-notes.md
@@ -15,7 +15,7 @@ title: Qubes R3.1 release notes
 * LIVE edition (still alpha, not part of R3.1-rc1)
 * Updated GPU drivers in dom0
 * Colorful window application icons (instead of just colorful lock icon)
-* PV Grub support ([documentation](/doc/managing-vm-kernel/))
+* PV Grub support ([documentation](/doc/managing-vm-kernels/))
 * Out of the box USB VM setup, including [handling USB mouse](https://github.com/QubesOS/qubes-app-linux-input-proxy/blob/master/README.md)
 * Xen upgraded to 4.6, for better hardware support (especially Skylake platform)
 * Improve updates proxy flexibility - especially repositories served over HTTPS
diff --git a/developer/services/qrexec.md b/developer/services/qrexec.md
index 1ffe4257..80cee059 100644
--- a/developer/services/qrexec.md
+++ b/developer/services/qrexec.md
@@ -201,7 +201,7 @@ This is why `qubes.StartApp` uses our standard `qrexec` argument grammar to stri
 ### Service policies with arguments
 
 Sometimes a service name alone isn't enough to make reasonable qrexec policy.
-One example of such a situation is [qrexec-based USB passthrough](/doc/usb-devices/).
+One example of such a situation is [qrexec-based USB passthrough](/doc/how-to-use-usb-devices/).
 Using just a service name would make it difficult to express the policy "allow access to devices X and Y, but deny to all others."
 It isn't feasible to create a separate service for every device: we would need to change the code in multiple files any time we wanted to update the service.
 
diff --git a/introduction/faq.md b/introduction/faq.md
index d0c59f06..70d90fe4 100644
--- a/introduction/faq.md
+++ b/introduction/faq.md
@@ -251,7 +251,7 @@ Please refer to [this page](/doc/vm-sudo/).
 
 Please see:
 
-- [Installing and updating software in dom0](/doc/software-update-dom0/)
+- [Installing and updating software in dom0](/doc/how-to-install-software-in-dom0/)
 - [Note on dom0 and EOL](/doc/supported-versions/#note-on-dom0-and-eol)
 
 ### Do you recommend coreboot as an alternative to vendor BIOS?
@@ -503,7 +503,7 @@ For Debian:
 For Fedora:
 
 1. (Recommended) Clone an existing Fedora TemplateVM
-2. [Enable the appropriate RPMFusion repos in the desired Fedora TemplateVM](/doc/software-update-domu/#rpmfusion-for-fedora-templatevms).
+2. [Enable the appropriate RPMFusion repos in the desired Fedora TemplateVM](/doc/how-to-install-software/#rpmfusion-for-fedora-templatevms).
 3. Install VLC in that TemplateVM:
 
     ```bash_session
@@ -525,7 +525,7 @@ From the top part of the list, click on the drive you want to attach, then selec
 Although you can also attach the entire USB device to a qube by selecting it from the bottom part of the list, in general this approach should not be used because you are exposing the target qube to unnecessary additional attack surface.
 
 Although external media such as external hard drives or flash drives plugged in via USB are available in the USB qube, it is not recommended to access them directly from inside the USB qube.
-See [Block (Storage) Devices](/doc/block-devices/) for more information.
+See [Block (Storage) Devices](/doc/how-to-use-block-storage-devices/) for more information.
 
 ### My encrypted drive doesn't appear in Debian qube.
 
diff --git a/introduction/reporting-bugs.md b/introduction/reporting-bugs.md
index 7716246d..a6a2fda2 100644
--- a/introduction/reporting-bugs.md
+++ b/introduction/reporting-bugs.md
@@ -104,7 +104,7 @@ The Qubes team will classify your issue according to its type.
 
 ### New issues should include all relevant information ###
 
-When you file a new issue, you should be sure to include the version of Qubes you're using, as well as versions of related software packages ([how to copy information out of dom0](/doc/copy-from-dom0/)).
+When you file a new issue, you should be sure to include the version of Qubes you're using, as well as versions of related software packages ([how to copy information out of dom0](/doc/how-to-copy-from-dom0/)).
 If your issue is related to hardware, provide as many details as possible about the hardware.
 A great way to do this is by [generating and submitting a Hardware Compatibility List (HCL) report](/doc/hcl/#generating-and-submitting-new-reports), then linking to it in your issue.
 You may also need to use command-line tools such as `lspci`.
diff --git a/project-security/verifying-signatures.md b/project-security/verifying-signatures.md
index 3f7376ea..c7485320 100644
--- a/project-security/verifying-signatures.md
+++ b/project-security/verifying-signatures.md
@@ -215,7 +215,7 @@ The filename of the Release Signing Key for your version is usually `qubes-relea
 There are several ways to get the Release Signing Key for your Qubes release.
 
 - If you have access to an existing Qubes installation, the release keys are available in dom0 in `/etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-*`.
-  These can be [copied](/doc/copy-from-dom0/#copying-from-dom0) into other VMs for further use.
+  These can be [copied](/doc/how-to-copy-from-dom0/#copying-from-dom0) into other VMs for further use.
   In addition, every other VM contains the release key corresponding to that installation's release in `/etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-*`.
   If you wish to use one of these keys, make sure to import it into your keyring, e.g.:
 
diff --git a/user/advanced-topics/how-to-install-software-in-dom0.md b/user/advanced-topics/how-to-install-software-in-dom0.md
index ce260645..be426e6c 100644
--- a/user/advanced-topics/how-to-install-software-in-dom0.md
+++ b/user/advanced-topics/how-to-install-software-in-dom0.md
@@ -144,7 +144,7 @@ In the `current-testing` repository:
 ### domU
 
 The packages `kernel-qubes-vm` and `kernel-latest-qubes-vm` are for domUs.
-See [Managing VM kernel](/doc/managing-vm-kernel/) for more information.
+See [Managing VM kernel](/doc/managing-vm-kernels/) for more information.
 
 ### Example
 
diff --git a/user/advanced-topics/i3.md b/user/advanced-topics/i3.md
index 57cd668c..43cfed2b 100644
--- a/user/advanced-topics/i3.md
+++ b/user/advanced-topics/i3.md
@@ -12,7 +12,7 @@ title: i3 (window manager)
 
 
 i3 is part of the stable repository (as of Qubes R3.1) and can be installed by
-using the [dom0 update mechanism](/doc/software-update-dom0/). To install the i3
+using the [dom0 update mechanism](/doc/how-to-install-software-in-dom0/). To install the i3
 window manager and the its Qubes specific configuration:
 
 ```shell_session
diff --git a/user/advanced-topics/managing-vm-kernels.md b/user/advanced-topics/managing-vm-kernels.md
index 346eefe8..c3753a6b 100644
--- a/user/advanced-topics/managing-vm-kernels.md
+++ b/user/advanced-topics/managing-vm-kernels.md
@@ -11,7 +11,7 @@ title: Managing VM Kernels
 
 
 By default, VMs kernels are provided by dom0.
-(See [here](/doc/software-update-dom0/#kernel-upgrade) for information about upgrading kernels in dom0.)
+(See [here](/doc/how-to-install-software-in-dom0/#kernel-upgrade) for information about upgrading kernels in dom0.)
 This means that:
 
 1. You can select the kernel version (using GUI VM Settings tool or `qvm-prefs` commandline tool);
diff --git a/user/advanced-topics/usb-qubes.md b/user/advanced-topics/usb-qubes.md
index 59cb65d6..1e20bd82 100644
--- a/user/advanced-topics/usb-qubes.md
+++ b/user/advanced-topics/usb-qubes.md
@@ -26,7 +26,7 @@ If you find yourself in this situation, see this [issue](https://github.com/Qube
 A USB qube acts as a secure handler for potentially malicious USB devices, preventing them from coming into contact with dom0 (which could otherwise be fatal to the security of the whole system). It thereby mitigates some of the [security implications](/doc/device-handling-security/#usb-security) of using USB devices.
 With a USB qube, every time you connect an untrusted USB drive to a USB port managed by that USB controller, you will have to attach it to the qube in which you wish to use it (if different from the USB qube itself), either by using Qubes VM Manager or the command line (see instructions above).
 The USB controller may be assigned on the **Devices** tab of a qube's settings page in Qubes VM Manager or by using the [qvm-pci](/doc/how-to-use-pci-devices/) command.
-For guidance on finding the correct USB controller, see the [according passage on PCI-devices](/doc/usb-devices/#finding-the-right-usb-controller).
+For guidance on finding the correct USB controller, see the [according passage on PCI-devices](/doc/how-to-use-usb-devices/#finding-the-right-usb-controller).
 You can create a USB qube using the management stack by performing the following steps as root in dom0:
 
 ```
@@ -65,7 +65,7 @@ Those steps are not performed by default, because of risk explained in [Security
 
 ### Automatic setup ###
 
-To allow USB keyboard usage (including early boot for LUKS passphrase), make sure you have the latest `qubes-mgmt-salt-dom0-virtual-machines` package (simply [install dom0 updates](/doc/software-update-dom0/#how-to-update-dom0)) and execute in dom0:
+To allow USB keyboard usage (including early boot for LUKS passphrase), make sure you have the latest `qubes-mgmt-salt-dom0-virtual-machines` package (simply [install dom0 updates](/doc/how-to-install-software-in-dom0/#how-to-update-dom0)) and execute in dom0:
 
 ```
 sudo qubesctl state.sls qvm.usb-keyboard
diff --git a/user/downloading-installing-upgrading/testing.md b/user/downloading-installing-upgrading/testing.md
index b0fa2f58..93a7059a 100644
--- a/user/downloading-installing-upgrading/testing.md
+++ b/user/downloading-installing-upgrading/testing.md
@@ -35,8 +35,8 @@ Updates
 
 How to test updates:
 
-* Enable [dom0 testing repositories](/doc/software-update-dom0/#testing-repositories).
-* Enable [TemplateVM testing repositories](/doc/software-update-domu/#testing-repositories).
+* Enable [dom0 testing repositories](/doc/how-to-install-software-in-dom0/#testing-repositories).
+* Enable [TemplateVM testing repositories](/doc/how-to-install-software/#testing-repositories).
 
 Every new update is first uploaded to the `security-testing` repository if it is a security update or `current-testing` if it is a normal update.
 The update remains in `security-testing` or `current-testing` for a minimum of one week.
diff --git a/user/how-to-guides/how-to-copy-and-move-files.md b/user/how-to-guides/how-to-copy-and-move-files.md
index eba82e4e..f7bc105f 100644
--- a/user/how-to-guides/how-to-copy-and-move-files.md
+++ b/user/how-to-guides/how-to-copy-and-move-files.md
@@ -14,8 +14,8 @@ title: How to Copy and Move Files
 
 *This page is about copying and moving files.
 If you wish to simply copy and paste text, that can be done more easily using the inter-qube clipboard.
-See [copying and pasting text between qubes](/doc/copy-paste/).
-For dom0, see [copying from (and to) dom0](/doc/copy-from-dom0/).*
+See [copying and pasting text between qubes](/doc/how-to-copy-and-paste-text/).
+For dom0, see [copying from (and to) dom0](/doc/how-to-copy-from-dom0/).*
 
 Qubes OS supports the secure copying and moving of files and directories (folders) between qubes.
 
diff --git a/user/how-to-guides/how-to-copy-and-paste-text.md b/user/how-to-guides/how-to-copy-and-paste-text.md
index 24e4eaa4..2a492981 100644
--- a/user/how-to-guides/how-to-copy-and-paste-text.md
+++ b/user/how-to-guides/how-to-copy-and-paste-text.md
@@ -13,8 +13,8 @@ title: How to Copy and Paste Text
 
 
 *This page is about copying and pasting plain text.
-If you wish to copy more complex data, such as rich text or images, see [copying and moving files between qubes](/doc/copying-files/).
-For dom0, see [copying from (and to) dom0](/doc/copy-from-dom0/).*
+If you wish to copy more complex data, such as rich text or images, see [copying and moving files between qubes](/doc/how-to-copy-and-move-files/).
+For dom0, see [copying from (and to) dom0](/doc/how-to-copy-from-dom0/).*
 
 Qubes OS features a secure inter-qube clipboard that allows you to copy and paste text between qubes.
 
diff --git a/user/how-to-guides/how-to-copy-from-dom0.md b/user/how-to-guides/how-to-copy-from-dom0.md
index 514fc674..182e7428 100644
--- a/user/how-to-guides/how-to-copy-from-dom0.md
+++ b/user/how-to-guides/how-to-copy-from-dom0.md
@@ -14,7 +14,7 @@ title: How to Copy from Dom0
 
 
 This page covers copying files and clipboard text between [dom0](/doc/glossary/#dom0) and [domUs](/doc/glossary/#domu).
-Since dom0 is special, the processes are different from [copying and pasting text between qubes](/doc/copy-paste/) and [copying and moving files between qubes](/doc/copying-files/).
+Since dom0 is special, the processes are different from [copying and pasting text between qubes](/doc/how-to-copy-and-paste-text/) and [copying and moving files between qubes](/doc/how-to-copy-and-move-files/).
 
 ## Copying **from** dom0
 
diff --git a/user/how-to-guides/how-to-get-started.md b/user/how-to-guides/how-to-get-started.md
index ad319730..72d17eb9 100644
--- a/user/how-to-guides/how-to-get-started.md
+++ b/user/how-to-guides/how-to-get-started.md
@@ -134,7 +134,7 @@ If you plan on using your system for work, then it also depends on what kind of
 
 It's a good idea to start out with the three qubes created automatically by the installer: work, personal, and untrusted.
 If and when you start to feel that some activity just doesn't fit into any of your existing qubes, or you want to partition some part of your life, you can easily create a new qube for it.
-You'll also be able to easily [copy](/doc/copying-files/) any files you need to the newly created qube.
+You'll also be able to easily [copy](/doc/how-to-copy-and-move-files/) any files you need to the newly created qube.
 
 Still not sure?
 You might find it helpful to read [this article](https://blog.invisiblethings.org/2011/03/13/partitioning-my-digital-life-into.html), which describes how one of the Qubes OS architects partitions her digital life into security domains.
@@ -151,12 +151,12 @@ The [Qubes backup system](/doc/backup-restore/) allows you to do this securely a
 Here are some other tasks you're likely to want to perform.
 (A full list is available in the [How-to Guides](/doc/#how-to-guides) section of the documentation.)
 
-- [Copying and Pasting Text Between Domains](/doc/copy-paste/)
-- [Copying and Moving Files Between Domains](/doc/copying-files/)
-- [Copying from (and to) dom0](/doc/copy-from-dom0/)
+- [Copying and Pasting Text Between Domains](/doc/how-to-copy-and-paste-text/)
+- [Copying and Moving Files Between Domains](/doc/how-to-copy-and-move-files/)
+- [Copying from (and to) dom0](/doc/how-to-copy-from-dom0/)
 - [Fullscreen Mode](/doc/full-screen-mode/)
 - [DisposableVMs](/doc/disposablevm/)
-- [Device Handling](/doc/device-handling/) (block, USB, and PCI devices)
+- [Device Handling](/doc/how-to-use-devices/) (block, USB, and PCI devices)
 
 If you encounter any problems, please visit the [Help, Support, and Mailing Lists](/support/) page.
 
diff --git a/user/how-to-guides/how-to-update.md b/user/how-to-guides/how-to-update.md
index c619ffed..cbe53f03 100644
--- a/user/how-to-guides/how-to-update.md
+++ b/user/how-to-guides/how-to-update.md
@@ -32,9 +32,9 @@ It is important to keep your Qubes OS system up-to-date to ensure you have the l
 
 Fully updating your Qubes OS system means updating:
 
-- [Dom0](/doc/software-update-dom0/)
-- [TemplateVMs](/doc/software-update-domu/#updating-software-in-templatevms)
-- [StandaloneVMs](/doc/software-update-domu/#standalonevms) (if you have any)
+- [Dom0](/doc/how-to-install-software-in-dom0/)
+- [TemplateVMs](/doc/how-to-install-software/#updating-software-in-templatevms)
+- [StandaloneVMs](/doc/how-to-install-software/#standalonevms) (if you have any)
 
 You can accomplish this using the **Qubes Update** tool.
 
diff --git a/user/how-to-guides/how-to-use-block-storage-devices.md b/user/how-to-guides/how-to-use-block-storage-devices.md
index 6261f8c8..f8c31be9 100644
--- a/user/how-to-guides/how-to-use-block-storage-devices.md
+++ b/user/how-to-guides/how-to-use-block-storage-devices.md
@@ -13,7 +13,7 @@ title: How to Use Block Storage Devices
 ---
 
 
-*This page is part of [device handling in qubes](/doc/device-handling/).*
+*This page is part of [device handling in qubes](/doc/how-to-use-devices/).*
 
 If you don't know what a "block device" is, just think of it as a fancy way to say "something that stores data".
 
@@ -27,7 +27,7 @@ Qubes OS supports the ability to attach a USB drive (or just its partitions) to
 Attaching USB drives is integrated into the Devices Widget: ![device manager icon](/attachment/wiki/Devices/media-removable.png)
 Simply insert your USB drive and click on the widget.
 You will see multiple entries for your USB drive; typically, `sys-usb:sda`, `sys-usb:sda1`, and `sys-usb:2-1` for example.
-Entries starting with a number (e.g. here `2-1`) are the [whole usb-device](/doc/usb-devices/).
+Entries starting with a number (e.g. here `2-1`) are the [whole usb-device](/doc/how-to-use-usb-devices/).
 Entries without a number (e.g. here `sda`) are the whole block-device.
 Other entries are partitions of that block-device (e.r. here `sda1`).
 
diff --git a/user/how-to-guides/how-to-use-devices.md b/user/how-to-guides/how-to-use-devices.md
index 15f0feca..38c709ad 100644
--- a/user/how-to-guides/how-to-use-devices.md
+++ b/user/how-to-guides/how-to-use-devices.md
@@ -14,7 +14,7 @@ title: How to Use Devices
 
 
 This is an overview of device handling in Qubes OS.
-For specific devices ([block](/doc/block-devices/), [USB](/doc/usb-devices/) and [PCI](/doc/how-to-use-pci-devices/) devices), please visit their respective pages.
+For specific devices ([block](/doc/how-to-use-block-storage-devices/), [USB](/doc/how-to-use-usb-devices/) and [PCI](/doc/how-to-use-pci-devices/) devices), please visit their respective pages.
 
 **Important security warning:** Device handling comes with many security implications.
 Please make sure you carefully read and understand the **[security considerations](/doc/device-handling-security/)**.
diff --git a/user/how-to-guides/how-to-use-optical-discs.md b/user/how-to-guides/how-to-use-optical-discs.md
index ac250054..84ecb060 100644
--- a/user/how-to-guides/how-to-use-optical-discs.md
+++ b/user/how-to-guides/how-to-use-optical-discs.md
@@ -19,7 +19,7 @@ Currently, the only options for reading and recording optical discs (e.g., CDs,
  3. Use a SATA optical drive attached to dom0.
     (**Caution:** This option is [potentially dangerous](https://github.com/Qubes-Community/Contents/blob/master/docs/security/security-guidelines.md#dom0-precautions).)
 
-To access an optical disc via USB follow the [typical procedure for attaching a USB device](/doc/usb-devices/#with-the-command-line-tool), then check with the **Qubes Devices** widget to see what device in the target qube the USB optical drive was attached to.
+To access an optical disc via USB follow the [typical procedure for attaching a USB device](/doc/how-to-use-usb-devices/#with-the-command-line-tool), then check with the **Qubes Devices** widget to see what device in the target qube the USB optical drive was attached to.
 Typically this would be `sr0`.
 For example, if `sys-usb` has device `3-2` attached to the `work` qube's `sr0`, you would mount it with `mount /dev/sr0 /mnt/removable`.
 You could also write to a disc with `wodim -v dev=/dev/sr0 -eject /home/user/Qubes.iso`.
diff --git a/user/how-to-guides/how-to-use-pci-devices.md b/user/how-to-guides/how-to-use-pci-devices.md
index 58a3fb44..47f07ab4 100644
--- a/user/how-to-guides/how-to-use-pci-devices.md
+++ b/user/how-to-guides/how-to-use-pci-devices.md
@@ -13,7 +13,7 @@ title: How to Use PCI Devices
 ---
 
 
-*This page is part of [device handling in qubes](/doc/device-handling/).*
+*This page is part of [device handling in qubes](/doc/how-to-use-devices/).*
 
 **Warning:** Only dom0 exposes PCI devices.
 Some of them are strictly required in dom0 (e.g., the host bridge).
@@ -23,7 +23,7 @@ Please make sure you carefully read and understand the **[security consideration
 
 ## Introduction
 
-Unlike other devices ([USB](/doc/usb-devices/), [block](/doc/block-devices/), mic), PCI devices need to be attached on VM-bootup.
+Unlike other devices ([USB](/doc/how-to-use-usb-devices/), [block](/doc/how-to-use-block-storage-devices/), mic), PCI devices need to be attached on VM-bootup.
 Similar to how you can't attach a new sound-card after your computer booted (and expect it to work properly), attaching PCI devices to already booted VMs isn't supported.
 
 The Qubes installer attaches all network class controllers to `sys-net` and all USB controllers to `sys-usb` by default, if you chose to create the network and USB qube during install.
@@ -59,7 +59,7 @@ There you can attach PCI-devices to a qube.
 ## `qvm-pci` Usage
 
 The `qvm-pci` tool allows PCI attachment and detachment.
-It's a shortcut for [`qvm-device pci`](/doc/device-handling/#general-qubes-device-widget-behavior-and-handling).
+It's a shortcut for [`qvm-device pci`](/doc/how-to-use-devices/#general-qubes-device-widget-behavior-and-handling).
 
 To figure out what device to attach, first list the available PCI devices by running (as user) in dom0:
 
diff --git a/user/how-to-guides/how-to-use-usb-devices.md b/user/how-to-guides/how-to-use-usb-devices.md
index 888e578b..3a3253b8 100644
--- a/user/how-to-guides/how-to-use-usb-devices.md
+++ b/user/how-to-guides/how-to-use-usb-devices.md
@@ -10,15 +10,15 @@ title: How to Use USB Devices
 ---
 
 
-*This page is part of [device handling in qubes](/doc/device-handling/).*
+*This page is part of [device handling in qubes](/doc/how-to-use-devices/).*
 
-If you are looking to handle USB *storage* devices (thumbdrives or USB-drives), please have a look at the [block device](/doc/block-devices/) page.
+If you are looking to handle USB *storage* devices (thumbdrives or USB-drives), please have a look at the [block device](/doc/how-to-use-block-storage-devices/) page.
 
 **Note:** Attaching USB devices to VMs requires a [USB qube](/doc/usb-qubes/).
 
 **Important security warning:** USB passthrough comes with many security implications.
 Please make sure you carefully read and understand the **[security considerations](/doc/device-handling-security/#usb-security)**.
-Whenever possible, attach a [block device](/doc/block-devices/) instead.
+Whenever possible, attach a [block device](/doc/how-to-use-block-storage-devices/) instead.
 
 Examples of valid cases for USB-passthrough:
 
diff --git a/user/templates/debian/debian.md b/user/templates/debian/debian.md
index 7af0a88d..cd4995de 100644
--- a/user/templates/debian/debian.md
+++ b/user/templates/debian/debian.md
@@ -41,7 +41,7 @@ After installing a fresh Debian TemplateVM, we recommend performing the followin
 
 ## Updating
 
-For routine daily TemplateVM updates within a given Debian release, see [Updating software in TemplateVMs](/doc/software-update-domu/#updating-software-in-templatevms).
+For routine daily TemplateVM updates within a given Debian release, see [Updating software in TemplateVMs](/doc/how-to-install-software/#updating-software-in-templatevms).
 
 ## Upgrading
 
diff --git a/user/templates/fedora/fedora.md b/user/templates/fedora/fedora.md
index a530b4b4..2b835585 100644
--- a/user/templates/fedora/fedora.md
+++ b/user/templates/fedora/fedora.md
@@ -33,7 +33,7 @@ After installing a fresh Fedora TemplateVM, we recommend performing the followin
 
 ## Updating
 
-For routine daily updates within a given release, see [Updating software in TemplateVMs](/doc/software-update-domu/#updating-software-in-templatevms).
+For routine daily updates within a given release, see [Updating software in TemplateVMs](/doc/how-to-install-software/#updating-software-in-templatevms).
 
 ## Upgrading
 
diff --git a/user/troubleshooting/hardware-troubleshooting.md b/user/troubleshooting/hardware-troubleshooting.md
index 1d54d2a5..ab2adda5 100644
--- a/user/troubleshooting/hardware-troubleshooting.md
+++ b/user/troubleshooting/hardware-troubleshooting.md
@@ -15,7 +15,7 @@ By default, the kernel that is installed in dom0 comes from the `kernel` package
 For most cases this works fine since the Linux kernel developers backport fixes to this kernel, but for some newer hardware, you may run into issues.
 For example, the audio might not work if the sound card is too new for the LTS kernel.
 To fix this, you can try the `kernel-latest` package -- though be aware that it's less tested!
-(See [here](/doc/software-update-dom0/#kernel-upgrade) for more information about upgrading kernels in dom0).
+(See [here](/doc/how-to-install-software-in-dom0/#kernel-upgrade) for more information about upgrading kernels in dom0).
 In dom0:
 
 ~~~
diff --git a/user/troubleshooting/usb-troubleshooting.md b/user/troubleshooting/usb-troubleshooting.md
index 6495093b..04e5b7a7 100644
--- a/user/troubleshooting/usb-troubleshooting.md
+++ b/user/troubleshooting/usb-troubleshooting.md
@@ -15,12 +15,12 @@ For more details on this issue along with possible solutions, look at [PCI passt
 ## Can't attach a USB device / USB device not showing in qvm-usb
 
 To successfully attach a USB device, you require a VM dedicated to handling the USB input and output.
-For guidance setting up a USB qube, see the [USB documentation](/doc/usb-devices/#creating-and-using-a-usb-qube).
+For guidance setting up a USB qube, see the [USB documentation](/doc/how-to-use-usb-devices/#creating-and-using-a-usb-qube).
 
 Currently (until issue [1082](https://github.com/QubesOS/qubes-issues/issues/1082) gets implemented), if you remove the device before detaching it from the qube, Qubes OS (more precisely, `libvirtd`) will think that the device is still attached to the qube and will not allow attaching further devices under the same name.
 This may be characterized by VM manager crashes and the error message: `Houston, we have a problem`.
 The easiest way to recover from such a situation is to reboot the qube to which the device was attached.
-If this isn't an option, you can manually recover from the situation by following the instructions at the [Block Devices documentation](/doc/block-devices/#what-if-i-removed-the-device-before-detaching-it-from-the-vm)
+If this isn't an option, you can manually recover from the situation by following the instructions at the [Block Devices documentation](/doc/how-to-use-block-storage-devices/#what-if-i-removed-the-device-before-detaching-it-from-the-vm)
 
 ## "Device attach failed" error
 
@@ -80,7 +80,7 @@ Another solution would be to set the pci_strictreset option in dom0:
   ```
 
 These options allow the VM to ignore the error and the VM will start.
-Please review the notes in the `qvm-prefs` man page and [here](/doc/device-handling/) and be aware of the potential risks.
+Please review the notes in the `qvm-prefs` man page and [here](/doc/how-to-use-devices/) and be aware of the potential risks.
 
 ## Can't use keyboard or mouse after creating sys-usb
 
@@ -98,7 +98,7 @@ If your computer has a PS/2 port, you may instead use a PS/2 keyboard to enter t
 
 ## "qubes-usb-proxy not installed in the VM" error
 
-When trying to [create and use a USB qube](/doc/usb-devices/#creating-and-using-a-usb-qube) with the `qubes-usb-proxy` package, you may receive this error: `ERROR: qubes-usb-proxy not installed in the VM`.
+When trying to [create and use a USB qube](/doc/how-to-use-usb-devices/#creating-and-using-a-usb-qube) with the `qubes-usb-proxy` package, you may receive this error: `ERROR: qubes-usb-proxy not installed in the VM`.
 
 If you encounter this error, you can install the `qubes-usb-proxy` with the package manager in the VM you want to attach the USB device to.
 Depending on your operating system, open a terminal in the TemplateVM and enter one of the following commands:
diff --git a/user/troubleshooting/vm-troubleshooting.md b/user/troubleshooting/vm-troubleshooting.md
index bf7248cb..69f057ff 100644
--- a/user/troubleshooting/vm-troubleshooting.md
+++ b/user/troubleshooting/vm-troubleshooting.md
@@ -11,7 +11,7 @@ title: VM Troubleshooting
 
 ## VM Kernel troubleshooting
 
-This troubleshoot applies to the non-default kernel choice described in the [Managing VM docs](/doc/managing-vm-kernel/#using-kernel-installed-in-the-vm).
+This troubleshoot applies to the non-default kernel choice described in the [Managing VM docs](/doc/managing-vm-kernels/#using-kernel-installed-in-the-vm).
 
 In case of problems, you can access the VM console using `qvm-console-dispvm VMNAME` in dom0, then access the GRUB menu.
 You need to call it just after starting the VM (until `GRUB_TIMEOUT` expires); for example, in a separate dom0 terminal window.