67 files changed, 97 insertions, 97 deletions
diff --git a/docs/hcl/c201.md b/docs/hardware/c201.md
index 1aede14a..1aede14a 100644
--- a/docs/hcl/c201.md
+++ b/docs/hardware/c201.md
diff --git a/docs/hcl/d510mo.md b/docs/hardware/d510mo.md
index d71e054d..d71e054d 100644
--- a/docs/hcl/d510mo.md
+++ b/docs/hardware/d510mo.md
diff --git a/docs/hcl/d945gclf.md b/docs/hardware/d945gclf.md
index 2f4a41bc..2f4a41bc 100644
--- a/docs/hcl/d945gclf.md
+++ b/docs/hardware/d945gclf.md
diff --git a/docs/hcl/ga-g41m-es2l.md b/docs/hardware/ga-g41m-es2l.md
index bfa73e91..bfa73e91 100644
--- a/docs/hcl/ga-g41m-es2l.md
+++ b/docs/hardware/ga-g41m-es2l.md
diff --git a/docs/hcl/gm45_remove_me.md b/docs/hardware/gm45_remove_me.md
index 9d2209f4..9d2209f4 100644
--- a/docs/hcl/gm45_remove_me.md
+++ b/docs/hardware/gm45_remove_me.md
diff --git a/docs/hcl/hwdumps/x200/biosdecode.err.log b/docs/hardware/hwdumps/x200/biosdecode.err.log
index e69de29b..e69de29b 100644
--- a/docs/hcl/hwdumps/x200/biosdecode.err.log
+++ b/docs/hardware/hwdumps/x200/biosdecode.err.log
diff --git a/docs/hcl/hwdumps/x200/biosdecode.log b/docs/hardware/hwdumps/x200/biosdecode.log
index bfeaba39..bfeaba39 100644
--- a/docs/hcl/hwdumps/x200/biosdecode.log
+++ b/docs/hardware/hwdumps/x200/biosdecode.log
diff --git a/docs/hcl/hwdumps/x200/codec#0 b/docs/hardware/hwdumps/x200/codec#0
index 2b9d6f35..2b9d6f35 100644
--- a/docs/hcl/hwdumps/x200/codec#0
+++ b/docs/hardware/hwdumps/x200/codec#0
diff --git a/docs/hcl/hwdumps/x200/cpuinfo.err.log b/docs/hardware/hwdumps/x200/cpuinfo.err.log
index e69de29b..e69de29b 100644
--- a/docs/hcl/hwdumps/x200/cpuinfo.err.log
+++ b/docs/hardware/hwdumps/x200/cpuinfo.err.log
diff --git a/docs/hcl/hwdumps/x200/cpuinfo.log b/docs/hardware/hwdumps/x200/cpuinfo.log
index 8b01059e..8b01059e 100644
--- a/docs/hcl/hwdumps/x200/cpuinfo.log
+++ b/docs/hardware/hwdumps/x200/cpuinfo.log
diff --git a/docs/hcl/hwdumps/x200/dmesg.err.log b/docs/hardware/hwdumps/x200/dmesg.err.log
index e69de29b..e69de29b 100644
--- a/docs/hcl/hwdumps/x200/dmesg.err.log
+++ b/docs/hardware/hwdumps/x200/dmesg.err.log
diff --git a/docs/hcl/hwdumps/x200/dmesg.log b/docs/hardware/hwdumps/x200/dmesg.log
index 64eb5805..64eb5805 100644
--- a/docs/hcl/hwdumps/x200/dmesg.log
+++ b/docs/hardware/hwdumps/x200/dmesg.log
diff --git a/docs/hcl/hwdumps/x200/dmidecode.err.log b/docs/hardware/hwdumps/x200/dmidecode.err.log
index e69de29b..e69de29b 100644
--- a/docs/hcl/hwdumps/x200/dmidecode.err.log
+++ b/docs/hardware/hwdumps/x200/dmidecode.err.log
diff --git a/docs/hcl/hwdumps/x200/dmidecode.log b/docs/hardware/hwdumps/x200/dmidecode.log
index a5a19616..a5a19616 100644
--- a/docs/hcl/hwdumps/x200/dmidecode.log
+++ b/docs/hardware/hwdumps/x200/dmidecode.log
diff --git a/docs/hcl/hwdumps/x200/ectool.err.log b/docs/hardware/hwdumps/x200/ectool.err.log
index 452503e5..452503e5 100644
--- a/docs/hcl/hwdumps/x200/ectool.err.log
+++ b/docs/hardware/hwdumps/x200/ectool.err.log
diff --git a/docs/hcl/hwdumps/x200/ectool.log b/docs/hardware/hwdumps/x200/ectool.log
index e69de29b..e69de29b 100644
--- a/docs/hcl/hwdumps/x200/ectool.log
+++ b/docs/hardware/hwdumps/x200/ectool.log
diff --git a/docs/hcl/hwdumps/x200/flashrom_info.err.log b/docs/hardware/hwdumps/x200/flashrom_info.err.log
index 933ac573..933ac573 100644
--- a/docs/hcl/hwdumps/x200/flashrom_info.err.log
+++ b/docs/hardware/hwdumps/x200/flashrom_info.err.log
diff --git a/docs/hcl/hwdumps/x200/flashrom_info.log b/docs/hardware/hwdumps/x200/flashrom_info.log
index d9a82f8b..d9a82f8b 100644
--- a/docs/hcl/hwdumps/x200/flashrom_info.log
+++ b/docs/hardware/hwdumps/x200/flashrom_info.log
diff --git a/docs/hcl/hwdumps/x200/flashrom_read.err.log b/docs/hardware/hwdumps/x200/flashrom_read.err.log
index 0a7925d7..0a7925d7 100644
--- a/docs/hcl/hwdumps/x200/flashrom_read.err.log
+++ b/docs/hardware/hwdumps/x200/flashrom_read.err.log
diff --git a/docs/hcl/hwdumps/x200/flashrom_read.log b/docs/hardware/hwdumps/x200/flashrom_read.log
index 0c78c81c..0c78c81c 100644
--- a/docs/hcl/hwdumps/x200/flashrom_read.log
+++ b/docs/hardware/hwdumps/x200/flashrom_read.log
diff --git a/docs/hcl/hwdumps/x200/input_bustypes.log b/docs/hardware/hwdumps/x200/input_bustypes.log
index ebce5d5b..ebce5d5b 100644
--- a/docs/hcl/hwdumps/x200/input_bustypes.log
+++ b/docs/hardware/hwdumps/x200/input_bustypes.log
diff --git a/docs/hcl/hwdumps/x200/inteltool.err.log b/docs/hardware/hwdumps/x200/inteltool.err.log
index b192da99..b192da99 100644
--- a/docs/hcl/hwdumps/x200/inteltool.err.log
+++ b/docs/hardware/hwdumps/x200/inteltool.err.log
diff --git a/docs/hcl/hwdumps/x200/inteltool.log b/docs/hardware/hwdumps/x200/inteltool.log
index e69de29b..e69de29b 100644
--- a/docs/hcl/hwdumps/x200/inteltool.log
+++ b/docs/hardware/hwdumps/x200/inteltool.log
diff --git a/docs/hcl/hwdumps/x200/ioports.err.log b/docs/hardware/hwdumps/x200/ioports.err.log
index e69de29b..e69de29b 100644
--- a/docs/hcl/hwdumps/x200/ioports.err.log
+++ b/docs/hardware/hwdumps/x200/ioports.err.log
diff --git a/docs/hcl/hwdumps/x200/ioports.log b/docs/hardware/hwdumps/x200/ioports.log
index 54e3a06a..54e3a06a 100644
--- a/docs/hcl/hwdumps/x200/ioports.log
+++ b/docs/hardware/hwdumps/x200/ioports.log
diff --git a/docs/hcl/hwdumps/x200/lspci.err.log b/docs/hardware/hwdumps/x200/lspci.err.log
index e69de29b..e69de29b 100644
--- a/docs/hcl/hwdumps/x200/lspci.err.log
+++ b/docs/hardware/hwdumps/x200/lspci.err.log
diff --git a/docs/hcl/hwdumps/x200/lspci.log b/docs/hardware/hwdumps/x200/lspci.log
index df6b6ccd..df6b6ccd 100644
--- a/docs/hcl/hwdumps/x200/lspci.log
+++ b/docs/hardware/hwdumps/x200/lspci.log
diff --git a/docs/hcl/hwdumps/x200/lspnp.err.log b/docs/hardware/hwdumps/x200/lspnp.err.log
index 9c0cb27f..9c0cb27f 100644
--- a/docs/hcl/hwdumps/x200/lspnp.err.log
+++ b/docs/hardware/hwdumps/x200/lspnp.err.log
diff --git a/docs/hcl/hwdumps/x200/lspnp.log b/docs/hardware/hwdumps/x200/lspnp.log
index e69de29b..e69de29b 100644
--- a/docs/hcl/hwdumps/x200/lspnp.log
+++ b/docs/hardware/hwdumps/x200/lspnp.log
diff --git a/docs/hcl/hwdumps/x200/lsusb.err.log b/docs/hardware/hwdumps/x200/lsusb.err.log
index e69de29b..e69de29b 100644
--- a/docs/hcl/hwdumps/x200/lsusb.err.log
+++ b/docs/hardware/hwdumps/x200/lsusb.err.log
diff --git a/docs/hcl/hwdumps/x200/lsusb.log b/docs/hardware/hwdumps/x200/lsusb.log
index e64c87dd..e64c87dd 100644
--- a/docs/hcl/hwdumps/x200/lsusb.log
+++ b/docs/hardware/hwdumps/x200/lsusb.log
diff --git a/docs/hcl/hwdumps/x200/msrtool.err.log b/docs/hardware/hwdumps/x200/msrtool.err.log
index 14418aae..14418aae 100644
--- a/docs/hcl/hwdumps/x200/msrtool.err.log
+++ b/docs/hardware/hwdumps/x200/msrtool.err.log
diff --git a/docs/hcl/hwdumps/x200/msrtool.log b/docs/hardware/hwdumps/x200/msrtool.log
index e69de29b..e69de29b 100644
--- a/docs/hcl/hwdumps/x200/msrtool.log
+++ b/docs/hardware/hwdumps/x200/msrtool.log
diff --git a/docs/hcl/hwdumps/x200/nvramtool.err.log b/docs/hardware/hwdumps/x200/nvramtool.err.log
index fb45ec80..fb45ec80 100644
--- a/docs/hcl/hwdumps/x200/nvramtool.err.log
+++ b/docs/hardware/hwdumps/x200/nvramtool.err.log
diff --git a/docs/hcl/hwdumps/x200/nvramtool.log b/docs/hardware/hwdumps/x200/nvramtool.log
index e69de29b..e69de29b 100644
--- a/docs/hcl/hwdumps/x200/nvramtool.log
+++ b/docs/hardware/hwdumps/x200/nvramtool.log
diff --git a/docs/hcl/hwdumps/x200/pin_hwC0D0 b/docs/hardware/hwdumps/x200/pin_hwC0D0
index 7a212707..7a212707 100644
--- a/docs/hcl/hwdumps/x200/pin_hwC0D0
+++ b/docs/hardware/hwdumps/x200/pin_hwC0D0
diff --git a/docs/hcl/hwdumps/x200/superiotool.err.log b/docs/hardware/hwdumps/x200/superiotool.err.log
index a45039d4..a45039d4 100644
--- a/docs/hcl/hwdumps/x200/superiotool.err.log
+++ b/docs/hardware/hwdumps/x200/superiotool.err.log
diff --git a/docs/hcl/hwdumps/x200/superiotool.log b/docs/hardware/hwdumps/x200/superiotool.log
index e69de29b..e69de29b 100644
--- a/docs/hcl/hwdumps/x200/superiotool.log
+++ b/docs/hardware/hwdumps/x200/superiotool.log
diff --git a/docs/hcl/imac52.md b/docs/hardware/imac52.md
index a868b128..a868b128 100644
--- a/docs/hcl/imac52.md
+++ b/docs/hardware/imac52.md
diff --git a/docs/hcl/images/x200/gpio33_location.jpg b/docs/hardware/images/x200/gpio33_location.jpg
index 2f36bda8..2f36bda8 100644
--- a/docs/hcl/images/x200/gpio33_location.jpg
+++ b/docs/hardware/images/x200/gpio33_location.jpg
diff --git a/docs/hcl/index.md b/docs/hardware/index.md
index 7e41ad35..7e41ad35 100644
--- a/docs/hcl/index.md
+++ b/docs/hardware/index.md
diff --git a/docs/hcl/kcma-d8.md b/docs/hardware/kcma-d8.md
index 9745c9a1..9745c9a1 100644
--- a/docs/hcl/kcma-d8.md
+++ b/docs/hardware/kcma-d8.md
diff --git a/docs/hcl/kfsn4-dre.md b/docs/hardware/kfsn4-dre.md
index f180f3f0..f180f3f0 100644
--- a/docs/hcl/kfsn4-dre.md
+++ b/docs/hardware/kfsn4-dre.md
diff --git a/docs/hcl/kgpe-d16.md b/docs/hardware/kgpe-d16.md
index 04a8c9be..04a8c9be 100644
--- a/docs/hcl/kgpe-d16.md
+++ b/docs/hardware/kgpe-d16.md
diff --git a/docs/hcl/r400.md b/docs/hardware/r400.md
index 09b98464..09b98464 100644
--- a/docs/hcl/r400.md
+++ b/docs/hardware/r400.md
diff --git a/docs/hcl/t400.md b/docs/hardware/t400.md
index 2ff2c836..2ff2c836 100644
--- a/docs/hcl/t400.md
+++ b/docs/hardware/t400.md
diff --git a/docs/hcl/t500.md b/docs/hardware/t500.md
index be919227..be919227 100644
--- a/docs/hcl/t500.md
+++ b/docs/hardware/t500.md
diff --git a/docs/hcl/text/kfsn4-dre/bootlog.txt b/docs/hardware/text/kfsn4-dre/bootlog.txt
index ea6722d8..ea6722d8 100644
--- a/docs/hcl/text/kfsn4-dre/bootlog.txt
+++ b/docs/hardware/text/kfsn4-dre/bootlog.txt
diff --git a/docs/hcl/text/x200s/cblog00.txt b/docs/hardware/text/x200s/cblog00.txt
index 331cb643..331cb643 100644
--- a/docs/hcl/text/x200s/cblog00.txt
+++ b/docs/hardware/text/x200s/cblog00.txt
diff --git a/docs/hcl/text/x200s/cblog01.txt b/docs/hardware/text/x200s/cblog01.txt
index afad2fed..afad2fed 100644
--- a/docs/hcl/text/x200s/cblog01.txt
+++ b/docs/hardware/text/x200s/cblog01.txt
diff --git a/docs/hcl/text/x200s/cblog02.txt b/docs/hardware/text/x200s/cblog02.txt
index 3a590dc2..3a590dc2 100644
--- a/docs/hcl/text/x200s/cblog02.txt
+++ b/docs/hardware/text/x200s/cblog02.txt
diff --git a/docs/hcl/text/x200s/cblog03.txt b/docs/hardware/text/x200s/cblog03.txt
index d078a48a..d078a48a 100644
--- a/docs/hcl/text/x200s/cblog03.txt
+++ b/docs/hardware/text/x200s/cblog03.txt
diff --git a/docs/hcl/x200.md b/docs/hardware/x200.md
index 9e476cf1..9e476cf1 100644
--- a/docs/hcl/x200.md
+++ b/docs/hardware/x200.md
diff --git a/docs/index.md b/docs/index.md
index 01163a8a..d93852a0 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -11,7 +11,7 @@ Libreboot](../faq/).
 Installing libreboot
 ====================
 
--   [What systems can I use libreboot on?](hcl/)
+-   [What systems can I use libreboot on?](hardware/)
 -   [How to install libreboot](install/)
 
 Installing operating systems
diff --git a/docs/install/d945gclf.md b/docs/install/d945gclf.md
index ebf2dbf5..98a67e35 100644
--- a/docs/install/d945gclf.md
+++ b/docs/install/d945gclf.md
@@ -6,7 +6,7 @@ This guide is for those who want libreboot on their Intel D945GCLF
 motherboard while they still have the original BIOS present.
 
 For information about this board, go to
-[../hcl/d945gclf.html](../hcl/d945gclf.html)
+[../hardware/d945gclf.html](../hardware/d945gclf.html)
 
 Flashing instructions {#clip}
 =====================
diff --git a/docs/install/index.md b/docs/install/index.md
index bc6ab58e..02a6d4be 100644
--- a/docs/install/index.md
+++ b/docs/install/index.md
@@ -12,7 +12,7 @@ that has CONFIG\_STRICT\_DEVMEM not enabled.
 Which systems are Libreboot compatible with?
 --------------------------------------------
 
--   [Information about Libreboot hardware compatibility](../hcl/)
+-   [Information about Libreboot hardware compatibility](../hardware/)
 
 General information
 -------------------
@@ -152,7 +152,7 @@ highly recommended, in case of bricks.
 extractor. These can be found online. See
 <http://www.coreboot.org/Developer_Manual/Tools#Chip_removal_tools>**
 
-Do check the HCL entry: [../hcl/kfsn4-dre.html](../hcl/kfsn4-dre.html)
+Do check the HCL entry: [../hardware/kfsn4-dre.html](../hardware/kfsn4-dre.html)
 
 ASUS KGPE-D16?
 --------------
@@ -168,7 +168,7 @@ see link above).
 extractor. These can be found online. See
 <http://www.coreboot.org/Developer_Manual/Tools#Chip_removal_tools>**
 
-Do check the HCL entry: [../hcl/kgpe-d16.html](../hcl/kgpe-d16.html)
+Do check the HCL entry: [../hardware/kgpe-d16.html](../hardware/kgpe-d16.html)
 
 ASUS KCMA-D8?
 -------------
@@ -184,7 +184,7 @@ see link above).
 extractor. These can be found online. See
 <http://www.coreboot.org/Developer_Manual/Tools#Chip_removal_tools>**
 
-Do check the HCL entry: [../hcl/kcma-d8.html](../hcl/kcma-d8.html)
+Do check the HCL entry: [../hardware/kcma-d8.html](../hardware/kcma-d8.html)
 
 Intel D945GCLF?
 ---------------
@@ -225,7 +225,7 @@ onboard ethernet chipset is located inside the flash chip. Libreboot ROM
 images for these laptops contain a generic MAC address by default, but
 this is not what you want. *Make sure to change the MAC address inside
 the ROM image, before flashing it. The instructions on
-[../hcl/gm45\_remove\_me.html\#ich9gen](../hcl/gm45_remove_me.html#ich9gen)
+[../hardware/gm45\_remove\_me.html\#ich9gen](../hardware/gm45_remove_me.html#ich9gen)
 show how to do this.*
 
 It is important that you change the default MAC address, before
@@ -287,7 +287,7 @@ already have coreboot or libreboot running, then go to
 [\#flashrom](#flashrom) instead!**
 
 **If you are flashing a Lenovo ThinkPad T60, be sure to read
-[../hcl/\#supported\_t60\_list](../hcl/#supported_t60_list)**
+[../hardware/\#supported\_t60\_list](../hardware/#supported_t60_list)**
 
 **If you are using libreboot\_src or git, then make sure that you built
 the sources first (see [../git/\#build](../git/#build)).**
@@ -342,14 +342,14 @@ MacBook2,1: Initial installation guide (if running the proprietary firmware) {#f
 ============================================================================
 
 **If you have a MacBook1,1, refer to
-[../hcl/\#macbook11](../hcl/#macbook11) for flashing instructions.**
+[../hardware/\#macbook11](../hardware/#macbook11) for flashing instructions.**
 
 **This is for the MacBook2,1 while running Apple EFI firmware. If you
 already have coreboot or libreboot running, then go to
 [\#flashrom](#flashrom) instead!**
 
 Be sure to read the information in
-[../hcl/\#macbook21](../hcl/#macbook21).
+[../hardware/\#macbook21](../hardware/#macbook21).
 
 **Warning: this guide will not instruct the user how to backup the
 original Apple EFI firmware. For that, please refer to
diff --git a/docs/install/kcma-d8.md b/docs/install/kcma-d8.md
index bf8f3ae1..90d511fa 100644
--- a/docs/install/kcma-d8.md
+++ b/docs/install/kcma-d8.md
@@ -13,7 +13,7 @@ know how to recover.
 recommend avoiding Kingston modules.**
 
 For more general information about this board, refer to
-[../hcl/kcma-d8.html](../hcl/kcma-d8.html).
+[../hardware/kcma-d8.html](../hardware/kcma-d8.html).
 
 TODO: show photos here, and other info.
 
diff --git a/docs/install/kgpe-d16.md b/docs/install/kgpe-d16.md
index 91931fe7..efbf8ce3 100644
--- a/docs/install/kgpe-d16.md
+++ b/docs/install/kgpe-d16.md
@@ -13,7 +13,7 @@ know how to recover.
 recommend avoiding Kingston modules.**
 
 For more general information about this board, refer to
-[../hcl/kgpe-d16.html](../hcl/kgpe-d16.html).
+[../hardware/kgpe-d16.html](../hardware/kgpe-d16.html).
 
 TODO: show photos here, and other info.
 
diff --git a/docs/install/r400_external.md b/docs/install/r400_external.md
index b986f5ad..4243ba56 100644
--- a/docs/install/r400_external.md
+++ b/docs/install/r400_external.md
@@ -247,7 +247,7 @@ behaviour in the original firmware that could be replicated in coreboot
 and libreboot.
 
 Follow the instructions at
-[../hcl/gm45\_remove\_me.html\#ich9gen](../hcl/gm45_remove_me.html#ich9gen)
+[../hardware/gm45\_remove\_me.html\#ich9gen](../hardware/gm45_remove_me.html#ich9gen)
 to change the MAC address inside the libreboot ROM image, before
 flashing it. Although there is a default MAC address inside the ROM
 image, this is not what you want. **Make sure to always change the MAC
@@ -301,7 +301,7 @@ Wifi
 The R400 typically comes with an Intel wifi chipset, which does not work
 without proprietary software. For a list of wifi chipsets that work
 without proprietary software, see
-[../hcl/\#recommended\_wifi](../hcl/#recommended_wifi).
+[../hardware/\#recommended\_wifi](../hardware/#recommended_wifi).
 
 Some R400 laptops might come with an Atheros chipset, but this is
 802.11g only.
diff --git a/docs/install/t400_external.md b/docs/install/t400_external.md
index 324873ec..eebdb96c 100644
--- a/docs/install/t400_external.md
+++ b/docs/install/t400_external.md
@@ -253,7 +253,7 @@ behaviour in the original firmware that could be replicated in coreboot
 and libreboot.
 
 Follow the instructions at
-[../hcl/gm45\_remove\_me.html\#ich9gen](../hcl/gm45_remove_me.html#ich9gen)
+[../hardware/gm45\_remove\_me.html\#ich9gen](../hardware/gm45_remove_me.html#ich9gen)
 to change the MAC address inside the libreboot ROM image, before
 flashing it. Although there is a default MAC address inside the ROM
 image, this is not what you want. **Make sure to always change the MAC
@@ -307,7 +307,7 @@ Wifi
 The T400 typically comes with an Intel wifi chipset, which does not work
 without proprietary software. For a list of wifi chipsets that work
 without proprietary software, see
-[../hcl/\#recommended\_wifi](../hcl/#recommended_wifi).
+[../hardware/\#recommended\_wifi](../hardware/#recommended_wifi).
 
 Some T400 laptops might come with an Atheros chipset, but this is
 802.11g only.
diff --git a/docs/install/t500_external.md b/docs/install/t500_external.md
index 107c8698..a0b75e1c 100644
--- a/docs/install/t500_external.md
+++ b/docs/install/t500_external.md
@@ -258,7 +258,7 @@ behaviour in the original firmware that could be replicated in coreboot
 and libreboot.
 
 Follow the instructions at
-[../hcl/gm45\_remove\_me.html\#ich9gen](../hcl/gm45_remove_me.html#ich9gen)
+[../hardware/gm45\_remove\_me.html\#ich9gen](../hardware/gm45_remove_me.html#ich9gen)
 to change the MAC address inside the libreboot ROM image, before
 flashing it. Although there is a default MAC address inside the ROM
 image, this is not what you want. **Make sure to always change the MAC
@@ -312,7 +312,7 @@ Wifi
 The T500 typically comes with an Intel wifi chipset, which does not work
 without proprietary software. For a list of wifi chipsets that work
 without proprietary software, see
-[../hcl/\#recommended\_wifi](../hcl/#recommended_wifi).
+[../hardware/\#recommended\_wifi](../hardware/#recommended_wifi).
 
 Some T500 laptops might come with an Atheros chipset, but this is
 802.11g only.
diff --git a/docs/install/x200_external.md b/docs/install/x200_external.md
index e1333ec3..2bb1e850 100644
--- a/docs/install/x200_external.md
+++ b/docs/install/x200_external.md
@@ -36,7 +36,7 @@ Use this to find out:
 The X200S and X200 Tablet will use a WSON-8 flash chip, on the bottom of
 the motherboard (this requires removal of the motherboard). **Not all
 X200S/X200T are supported; see
-[../hcl/x200.html\#x200s](../hcl/x200.html#x200s).**
+[../hardware/x200.html\#x200s](../hardware/x200.html#x200s).**
 
 MAC address {#macaddress}
 ===========
@@ -101,7 +101,7 @@ The following image shows how this is done:**\
 In this image, a pin header was soldered onto the WSON. Another solution
 might be to de-solder the WSON-8 chip and put a SOIC-8 there instead.
 Check the list of SOIC-8 flash chips at
-[../hcl/gm45\_remove\_me.html\#flashchips](../hcl/gm45_remove_me.html#flashchips)
+[../hardware/gm45\_remove\_me.html\#flashchips](../hardware/gm45_remove_me.html#flashchips)
 but do note that these are only 4MiB (32Mb) chips. The only X200 SPI
 chips with 8MiB capacity are SOIC-16. For 8MiB capacity in this case,
 the X201 SOIC-8 flash chip (Macronix 25L6445E) might work.
@@ -191,7 +191,7 @@ behaviour in the original firmware that could be replicated in coreboot
 and libreboot.
 
 Follow the instructions at
-[../hcl/gm45\_remove\_me.html\#ich9gen](../hcl/gm45_remove_me.html#ich9gen)
+[../hardware/gm45\_remove\_me.html\#ich9gen](../hardware/gm45_remove_me.html#ich9gen)
 to change the MAC address inside the libreboot ROM image, before
 flashing it. Although there is a default MAC address inside the ROM
 image, this is not what you want. **Make sure to always change the MAC
@@ -228,7 +228,7 @@ Wifi
 The X200 typically comes with an Intel wifi chipset, which does not work
 without proprietary software. For a list of wifi chipsets that work
 without proprietary software, see
-[../hcl/\#recommended\_wifi](../hcl/#recommended_wifi).
+[../hardware/\#recommended\_wifi](../hardware/#recommended_wifi).
 
 Some X200 laptops come with an Atheros chipset, but this is 802.11g
 only.
@@ -286,7 +286,7 @@ starting (which itself interferes with flashing attempts). The theory
 was proven correct; however, it is still useless in practise.
 
 Look just above the 7 in TP37 (that's GPIO33):\
-![](../hcl/images/x200/gpio33_location.jpg)
+![](../hardware/images/x200/gpio33_location.jpg)
 
 By default we would see this in lenovobios, when trying flashrom -p
 internal -w rom.rom:
@@ -316,7 +316,7 @@ here:
 
 On a related note, libreboot has a utility that could help with
 investigating this:
-[../hcl/gm45\_remove\_me.html\#demefactory](../hcl/gm45_remove_me.html#demefactory)
+[../hardware/gm45\_remove\_me.html\#demefactory](../hardware/gm45_remove_me.html#demefactory)
 
 Copyright © 2014, 2015 Leah Rowe <info@minifree.org>\
 This page is available under the [CC BY SA 4.0](../cc-by-sa-4.0.txt)
diff --git a/docs/release.md b/docs/release.md
index 0ee091b8..737f5c3f 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -43,63 +43,63 @@ Machines supported in this release:
 -----------------------------------
 
 -   **ASUS Chromebook C201**
-    -   Check notes in ***docs/hcl/c201.html***
+    -   Check notes in ***docs/hardware/c201.html***
 -   **Gigabyte GA-G41M-ES2L desktop motherboard**
-    -   Check notes in ***docs/hcl/ga-g41m-es2l.html***
+    -   Check notes in ***docs/hardware/ga-g41m-es2l.html***
 -   **Intel D510MO desktop motherboard**
-    -   Check notes in ***docs/hcl/d510mo.html***
+    -   Check notes in ***docs/hardware/d510mo.html***
 -   **Intel D945GCLF desktop motherboard**
-    -   Check notes in ***docs/hcl/d945gclf.html***
+    -   Check notes in ***docs/hardware/d945gclf.html***
 -   **Apple iMac 5,2**
-    -   Check notes in ***docs/hcl/imac52.html***
+    -   Check notes in ***docs/hardware/imac52.html***
 -   **ASUS KFSN4-DRE server board**
     -   PCB revision 1.05G is the best version (can use 6-core CPUs)
-    -   Check notes in ***docs/hcl/kfsn4-dre.html***
+    -   Check notes in ***docs/hardware/kfsn4-dre.html***
 -   **ASUS KGPE-D16 server board**
-    -   Check notes in ***docs/hcl/kgpe-d16.html***
+    -   Check notes in ***docs/hardware/kgpe-d16.html***
 -   **ASUS KCMA-D8 desktop/workstation board**
-    -   Check notes in ***docs/hcl/kcma-d8.html***
+    -   Check notes in ***docs/hardware/kcma-d8.html***
 -   **ThinkPad X60/X60s**
     -   You can also remove the motherboard from an X61/X61s and replace
         it with an X60/X60s motherboard. An X60 Tablet motherboard will
         also fit inside an X60/X60s.
 -   **ThinkPad X60 Tablet** (1024x768 and 1400x1050) with digitizer
     support
-    -   See ***docs/hcl/\#supported\_x60t\_list*** for list of supported
+    -   See ***docs/hardware/\#supported\_x60t\_list*** for list of supported
         LCD panels
     -   It is unknown whether an X61 Tablet can have it's mainboard
         replaced with an X60 Tablet motherboard.
 -   **ThinkPad T60** (Intel GPU) (there are issues; see below):
     -   See notes below for exceptions, and
-        ***docs/hcl/\#supported\_t60\_list*** for known working LCD
+        ***docs/hardware/\#supported\_t60\_list*** for known working LCD
         panels.
     -   It is unknown whether a T61 can have it's mainboard replaced
         with a T60 motherboard.
     -   See ***docs/future/\#t60\_cpu\_microcode***.
     -   T60P (and T60 laptops with ATI GPU) will likely never be
-        supported: ***docs/hcl/\#t60\_ati\_intel***
+        supported: ***docs/hardware/\#t60\_ati\_intel***
 -   **ThinkPad X200**
     -   X200S and X200 Tablet are also supported, conditionally; see
-        ***docs/hcl/x200.html\#x200s***
+        ***docs/hardware/x200.html\#x200s***
     -   **ME/AMT**: libreboot removes this, permanently.
-        ***docs/hcl/gm45\_remove\_me.html***
+        ***docs/hardware/gm45\_remove\_me.html***
 -   **ThinkPad R400**
-    -   See ***docs/hcl/r400.html***
+    -   See ***docs/hardware/r400.html***
     -   **ME/AMT**: libreboot removes this, permanently.
-        ***docs/hcl/gm45\_remove\_me.html***
+        ***docs/hardware/gm45\_remove\_me.html***
 -   **ThinkPad T400**
-    -   See ***docs/hcl/t400.html***
+    -   See ***docs/hardware/t400.html***
     -   **ME/AMT**: libreboot removes this, permanently.
-        ***docs/hcl/gm45\_remove\_me.html***
+        ***docs/hardware/gm45\_remove\_me.html***
 -   **ThinkPad T500**
-    -   See ***docs/hcl/t500.html***
+    -   See ***docs/hardware/t500.html***
     -   **ME/AMT**: libreboot removes this, permanently.
-        ***docs/hcl/gm45\_remove\_me.html***
+        ***docs/hardware/gm45\_remove\_me.html***
 -   **Apple MacBook1,1** (MA255LL/A, MA254LL/A, MA472LL/A)
-    -   See ***docs/hcl/\#macbook11***.
+    -   See ***docs/hardware/\#macbook11***.
 -   **Apple MacBook2,1** (MA699LL/A, MA701LL/A, MB061LL/A, MA700LL/A,
     MB063LL/A, MB062LL/A)
-    -   See ***docs/hcl/\#macbook21***.
+    -   See ***docs/hardware/\#macbook21***.
 
 Changes for this release, relative to r20150518 (earliest changes last, recent changes first)
 ---------------------------------------------------------------------------------------------
@@ -216,41 +216,41 @@ Machines supported in this release:
         also fit inside an X60/X60s.
 -   **ThinkPad X60 Tablet** (1024x768 and 1400x1050) with digitizer
     support
-    -   See ***docs/hcl/\#supported\_x60t\_list*** for list of supported
+    -   See ***docs/hardware/\#supported\_x60t\_list*** for list of supported
         LCD panels
     -   It is unknown whether an X61 Tablet can have it's mainboard
         replaced with an X60 Tablet motherboard.
 -   **ThinkPad T60** (Intel GPU) (there are issues; see below):
     -   See notes below for exceptions, and
-        ***docs/hcl/\#supported\_t60\_list*** for known working LCD
+        ***docs/hardware/\#supported\_t60\_list*** for known working LCD
         panels.
     -   It is unknown whether a T61 can have it's mainboard replaced
         with a T60 motherboard.
     -   See ***docs/future/\#t60\_cpu\_microcode***.
     -   T60P (and T60 laptops with ATI GPU) will likely never be
-        supported: ***docs/hcl/\#t60\_ati\_intel***
+        supported: ***docs/hardware/\#t60\_ati\_intel***
 -   **ThinkPad X200**
     -   X200S and X200 Tablet are also supported, conditionally; see
-        ***docs/hcl/x200.html\#x200s***
+        ***docs/hardware/x200.html\#x200s***
     -   **ME/AMT**: libreboot removes this, permanently.
-        ***docs/hcl/gm45\_remove\_me.html***
+        ***docs/hardware/gm45\_remove\_me.html***
 -   **ThinkPad R400**
-    -   See ***docs/hcl/r400.html***
+    -   See ***docs/hardware/r400.html***
     -   **ME/AMT**: libreboot removes this, permanently.
-        ***docs/hcl/gm45\_remove\_me.html***
+        ***docs/hardware/gm45\_remove\_me.html***
 -   **ThinkPad T400**
-    -   See ***docs/hcl/t400.html***
+    -   See ***docs/hardware/t400.html***
     -   **ME/AMT**: libreboot removes this, permanently.
-        ***docs/hcl/gm45\_remove\_me.html***
+        ***docs/hardware/gm45\_remove\_me.html***
 -   **ThinkPad T500**
-    -   See ***docs/hcl/t500.html***
+    -   See ***docs/hardware/t500.html***
     -   **ME/AMT**: libreboot removes this, permanently.
-        ***docs/hcl/gm45\_remove\_me.html***
+        ***docs/hardware/gm45\_remove\_me.html***
 -   **Apple MacBook1,1** (MA255LL/A, MA254LL/A, MA472LL/A)
-    -   See ***docs/hcl/\#macbook11***.
+    -   See ***docs/hardware/\#macbook11***.
 -   **Apple MacBook2,1** (MA699LL/A, MA701LL/A, MB061LL/A, MA700LL/A,
     MB063LL/A, MB062LL/A)
-    -   See ***docs/hcl/\#macbook21***.
+    -   See ***docs/hardware/\#macbook21***.
 
 Changes for this release, relative to r20150208 (earliest changes last, recent changes first)
 ---------------------------------------------------------------------------------------------
@@ -280,10 +280,10 @@ Changes for this release, relative to r20150208 (earliest changes last, recent c
     repository exist)
 -   docs/install/bbb\_setup.html: Add info about wp/hold and pinouts
 -   docs/: improve the description of libreboot
--   docs/hcl/gm45\_remove\_me.html: notes about the demefactory utility
+-   docs/hardware/gm45\_remove\_me.html: notes about the demefactory utility
 -   docs/install/bbb\_setup.html: EHCI debug: recommend linux-libre
 -   docs/install/bbb\_setup.html: EHCI Debug logging setup guide
--   docs/hcl/t500.html: Add screen compatibility report (TODO: fix
+-   docs/hardware/t500.html: Add screen compatibility report (TODO: fix
     incompatible screens)
 -   Update coreboot(again) + merge GM45 hybrid GPU patches - means that
     T400/T500 with the ATI+Intel hybrid GPU setup will work (ATI
@@ -293,7 +293,7 @@ Changes for this release, relative to r20150208 (earliest changes last, recent c
     now the default debug dongle on all boards (compatible with BBB).
 -   demefactory (new utility): create GM45 factory.rom without the ME
 -   ich9deblob: re-factor descriptor.c functions
--   docs/hcl/t500.html: add hardware logs
+-   docs/hardware/t500.html: add hardware logs
 -   docs/gnulinux/encrypted\_\*.html: No password for default entry
 -   docs/git/: Add more details about BUC.TS
 -   grub.cfg: Also scan for grub2/grub.cfg, not just grub/grub.cfg
@@ -305,21 +305,21 @@ Changes for this release, relative to r20150208 (earliest changes last, recent c
 -   docs/install/\*\_external.html: add disclaimer about thermal paste
 -   docs/install/bbb\_setup.html: Fix broken links
 -   docs/install/bbb\_setup.html: preliminary notes about EHCI debug
--   docs/hcl/gm45\_remove\_me.html: Link to websites talking about the
+-   docs/hardware/gm45\_remove\_me.html: Link to websites talking about the
     ME
 -   docs/install/{t400,t500,r400}\_external.html: Notes about CPU
     compatibility
 -   Delete the ich9macchange script. It's useless, and confuses people
--   docs/hcl/gm45\_remove\_me.html: prioritize ich9gen executable path
--   docs/hcl/gm45\_remove\_me.html: prioritize changing mac address
--   docs/hcl/gm45\_remove\_me.html: less confusing notes about ich9gen
+-   docs/hardware/gm45\_remove\_me.html: prioritize ich9gen executable path
+-   docs/hardware/gm45\_remove\_me.html: prioritize changing mac address
+-   docs/hardware/gm45\_remove\_me.html: less confusing notes about ich9gen
 -   build/dependencies/parabola: Add dependencies for x86\_64
 -   scripts/dependencies/paraboladependencies: build dependencies
     (32-bit Parabola)
 -   **New board**: ThinkPad T500
 -   Add diffs for descriptor/gbe differences between T500 and X200
 -   coreboot-libre: provide better blob categorization
--   docs/hcl/gm45\_remove\_me.html: add notes about flash write protect
+-   docs/hardware/gm45\_remove\_me.html: add notes about flash write protect
 -   **New board**: ThinkPad T400
 -   GRUB: add partial vesamenu.c32 support (fixes tails ISOLINUX menu)
 -   Update GRUB (to revision fa07d919d1ff868b18d8a42276d094b63a58e299)
@@ -359,8 +359,8 @@ Changes for this release, relative to r20150208 (earliest changes last, recent c
 -   docs/gnulinux/grub\_cbfs.html: Remove redundant instructions
 -   docs/install/x200\_external.html: Mark pins in the images
 -   docs/install/bbb\_setup.html: Replace 3.3V PSU photo with ATX PSU
--   docs/hcl/x200.html: Add dumps from 4-MiB X200 with Lenovo BIOS 3.22
--   docs/hcl/x200.html: Add dumps from 4-MiB X200 with Lenovo BIOS 3.18
+-   docs/hardware/x200.html: Add dumps from 4-MiB X200 with Lenovo BIOS 3.22
+-   docs/hardware/x200.html: Add dumps from 4-MiB X200 with Lenovo BIOS 3.18
 -   grub.cfg: add syslinux\_configfile menuentry for ahci0
 -   grub.cfg: Add more paths for syslinux\_configfile
 -   docs/future.html: T60: Add EDID dump from LG-Philips LP150E05-A2K1
@@ -417,7 +417,7 @@ Changes for this release, relative to r20150208 (earliest changes last, recent c
 -   i945-pwm: add clean command to Makefile
 -   i945-pwm: add -lz to Makefile
 -   docs/install/x200\_external: Mention GPIO33 non-descriptor mode
--   docs/hcl/: Remove redundant links
+-   docs/hardware/: Remove redundant links
 -   ich9macchange: Add R400
 -   build-release: Separate ROM images into individual archives
 -   build-release: rename libreboot\_bin to libreboot\_util
@@ -440,32 +440,32 @@ Machines supported in this release:
         also fit inside an X60/X60s.
 -   **Lenovo ThinkPad X60 Tablet** (1024x768 and 1400x1050) with
     digitizer support
-    -   See **hcl/\#supported\_x60t\_list** for list of supported LCD
+    -   See **hardware/\#supported\_x60t\_list** for list of supported LCD
         panels
     -   It is unknown whether an X61 Tablet can have it's mainboard
         replaced with an X60 Tablet motherboard.
 -   **Lenovo ThinkPad T60** (Intel GPU) (there are
     issuesinstall/x200\_external.html; see below):
     -   See notes below for exceptions, and
-        **hcl/\#supported\_t60\_list** for known working LCD panels.
+        **hardware/\#supported\_t60\_list** for known working LCD panels.
     -   It is unknown whether a T61 can have it's mainboard replaced
         with a T60 motherboard.
     -   See **future/\#t60\_cpu\_microcode**.
     -   T60P (and T60 laptops with ATI GPU) will likely never be
-        supported: **hcl/\#t60\_ati\_intel**
+        supported: **hardware/\#t60\_ati\_intel**
 -   **Lenovo ThinkPad X200**
     -   X200S and X200 Tablet are also supported, conditionally; see
-        **hcl/x200.html\#x200s**
+        **hardware/x200.html\#x200s**
     -   **ME/AMT**: libreboot removes this, permanently.
-        **hcl/gm45\_remove\_me.html**
+        **hardware/gm45\_remove\_me.html**
 -   **Lenovo ThinkPad R400** (r20150208 and later, only)
     -   **ME/AMT**: libreboot removes this, permanently.
-        **hcl/gm45\_remove\_me.html**
+        **hardware/gm45\_remove\_me.html**
 -   **Apple MacBook1,1** (MA255LL/A, MA254LL/A, MA472LL/A)
-    -   See **hcl/\#macbook11**.
+    -   See **hardware/\#macbook11**.
 -   **Apple MacBook2,1** (MA699LL/A, MA701LL/A, MB061LL/A, MA700LL/A,
     MB063LL/A, MB062LL/A)
-    -   See **hcl/\#macbook21**.
+    -   See **hardware/\#macbook21**.
 
 Revisions for r20150208 (relative to r20150126)
 -----------------------------------------------
@@ -481,7 +481,7 @@ installed r20150126 don't really need to update to this release.
 -   buildrom-withgrub: Put background.jpg in CBFS, not GRUB memdisk
 -   grub-assemble: merge scripts into a single script gen.sh
 -   Documentation: implement theme, drastically improve readability
--   docs/hcl/: update list of compatible T60 LCD panels
+-   docs/hardware/: update list of compatible T60 LCD panels
 -   docs/: more clarification of libreboot's stated purpose.
 -   build-release: include the commitid file in the release archives
 -   docs/: Further emphasize the GNU+Linux requirement.
@@ -651,23 +651,23 @@ Machines supported in this release:
         also fit inside an X60/X60s.
 -   **Lenovo ThinkPad X60 Tablet** (1024x768 and 1400x1050) with
     digitizer support
-    -   See **hcl/\#supported\_x60t\_list** for list of supported LCD
+    -   See **hardware/\#supported\_x60t\_list** for list of supported LCD
         panels
     -   It is unknown whether an X61 Tablet can have its mainboard
         replaced with an X60 Tablet motherboard.
 -   **Lenovo ThinkPad T60** (Intel GPU) (there are issues; see below):
     -   See notes below for exceptions, and
-        **hcl/\#supported\_t60\_list** for known working LCD panels.
+        **hardware/\#supported\_t60\_list** for known working LCD panels.
     -   It is unknown whether a T61 can have its mainboard replaced with
         a T60 motherboard.
     -   See **future/\#t60\_cpu\_microcode**.
     -   T60P (and T60s with ATI GPU) will likely never be supported:
-        **hcl/\#t60\_ati\_intel**
+        **hardware/\#t60\_ati\_intel**
 -   **Apple MacBook1,1** (MA255LL/A, MA254LL/A, MA472LL/A)
-    -   See **hcl/\#macbook11**.
+    -   See **hardware/\#macbook11**.
 -   **Apple MacBook2,1** (MA699LL/A, MA701LL/A, MB061LL/A, MA700LL/A,
     MB063LL/A, MB062LL/A)
-    -   See **hcl/\#macbook21**.
+    -   See **hardware/\#macbook21**.
 
 Changes for this release (latest changes first, earliest changes last)
 ----------------------------------------------------------------------
@@ -731,22 +731,22 @@ New systems supported in this release:
 
 -   **Lenovo ThinkPad X60 Tablet** (1024x768 and 1400x1050) with
     digitizer support
-    -   See **hcl/\#supported\_x60t\_list** for list of supported LCD
+    -   See **hardware/\#supported\_x60t\_list** for list of supported LCD
         panels
     -   It is unknown whether an X61 Tablet can have its mainboard
         replaced with an X60 Tablet motherboard.
 -   **Lenovo ThinkPad T60** (Intel GPU) (there are issues; see below)
     -   See notes below for exceptions, and
-        **hcl/\#supported\_t60\_list** for known working LCD panels.
+        **hardware/\#supported\_t60\_list** for known working LCD panels.
     -   It is unknown whether a T61 can have its mainboard replaced with
         a T60 motherboard.
     -   T60P (and T60s with ATI GPU) will likely never be supported:
-        **hcl/\#t60\_ati\_intel**
+        **hardware/\#t60\_ati\_intel**
 -   **Apple MacBook1,1** (MA255LL/A, MA254LL/A, MA472LL/A)
-    -   See **hcl/\#macbook11**.
+    -   See **hardware/\#macbook11**.
 -   **Apple MacBook2,1** (MA699LL/A, MA701LL/A, MB061LL/A, MA700LL/A,
     MB063LL/A, MB062LL/A)
-    -   See **hcl/\#macbook21**.
+    -   See **hardware/\#macbook21**.
 
 Machines no longer supported (compared to previous release):
 ------------------------------------------------------------
@@ -785,7 +785,7 @@ Revisions for r20140903 (6th beta) (3rd September 2014)
     buildpac\* scripts for Parabola users.
 -   Documentation: added information showing how to enable or disable
     bluetooth on the X60
--   MacBook1,1 tested! See **hcl/\#macbook11**
+-   MacBook1,1 tested! See **hardware/\#macbook11**
 -   Documentation: fixed typo in \#get\_edid\_panelname (get-edit
     changed to get-edid)
 -   Documentation: added images/x60\_lcd\_change/ (pics only for now)
diff --git a/resources/utilities/ich9deblob/src/descriptor/descriptor.h b/resources/utilities/ich9deblob/src/descriptor/descriptor.h
index 38a55df8..7fb5c257 100644
--- a/resources/utilities/ich9deblob/src/descriptor/descriptor.h
+++ b/resources/utilities/ich9deblob/src/descriptor/descriptor.h
@@ -29,7 +29,7 @@
  */
  
 /*
- * See docs/hcl/x200_remove_me.html for info plus links to datasheet (also linked below)
+ * See docs/hardware/x200_remove_me.html for info plus links to datasheet (also linked below)
  * 
  * Info about flash descriptor (read page 845 onwards):
  * http://www.intel.co.uk/content/dam/doc/datasheet/io-controller-hub-9-datasheet.pdf
diff --git a/resources/utilities/ich9deblob/src/gbe/gbe.h b/resources/utilities/ich9deblob/src/gbe/gbe.h
index 49474942..a1350fdd 100644
--- a/resources/utilities/ich9deblob/src/gbe/gbe.h
+++ b/resources/utilities/ich9deblob/src/gbe/gbe.h
@@ -31,7 +31,7 @@
  */
  
  /*
- * See docs/hcl/x200_remove_me.html for info plus links to datasheet (also linked below)
+ * See docs/hardware/x200_remove_me.html for info plus links to datasheet (also linked below)
  * 
  * Info about Gbe region (read whole datasheet):
  * http://www.intel.co.uk/content/dam/doc/application-note/i-o-controller-hub-9m-82567lf-lm-v-nvm-map-appl-note.pdf
diff --git a/resources/utilities/ich9deblob/src/ich9deblob.c b/resources/utilities/ich9deblob/src/ich9deblob.c
index cc904d9c..d79a3a89 100644
--- a/resources/utilities/ich9deblob/src/ich9deblob.c
+++ b/resources/utilities/ich9deblob/src/ich9deblob.c
@@ -35,7 +35,7 @@
  */
  
 /*
- * See docs/hcl/x200_remove_me.html for info plus links to datasheet (also linked below)
+ * See docs/hardware/x200_remove_me.html for info plus links to datasheet (also linked below)
  * 
  * Info about flash descriptor (read page 845 onwards):
  * http://www.intel.co.uk/content/dam/doc/datasheet/io-controller-hub-9-datasheet.pdf
diff --git a/www/faq.md b/www/faq.md
index b773cbe4..1536a148 100644
--- a/www/faq.md
+++ b/www/faq.md
@@ -68,7 +68,7 @@ Hardware compatibility
 What systems are compatible with libreboot?
 -----------------------------------------------------------------------------------
 
-See [../docs/hcl/](docs/hcl/).
+See [../docs/hardware/](docs/hardware/).
 
 Why is the latest Intel hardware unsupported in libreboot? {#intel}
 -----------------------------------------------------------
@@ -180,7 +180,7 @@ privacy that can't be ignored.
 Before version 6.0 (that is, on systems from 2008/2009 and earlier), the
 ME can be disabled by setting a couple of values in the SPI flash
 memory. The ME firmware can then be removed entirely from the flash
-memory space. libreboot [does this](../docs/hcl/gm45_remove_me.html) on
+memory space. libreboot [does this](../docs/hardware/gm45_remove_me.html) on
 the Intel 4 Series systems that it supports, such as the [Libreboot
 X200](../docs/install/x200_external.html) and [Libreboot
 T400](../docs/install/t400_external.html). ME firmware versions 6.0 and
@@ -463,7 +463,7 @@ Will desktop/server hardware be supported?
 ------------------------------------------------------------------------
 
 Libreboot now supports desktop hardware:
-[../docs/hcl/\#supported\_desktops\_x86amdintel](../docs/hcl/#supported_desktops_x86/intel)
+[../docs/hardware/\#supported\_desktops\_x86amdintel](../docs/hardware/#supported_desktops_x86/intel)
 (with full native video initialization).
 
 A common issue with desktop hardware is the Video BIOS, when no onboard
@@ -503,7 +503,7 @@ What about ARM?
 
 Libreboot has support for some ARM based laptops, using the *Rockchip
 RK3288* SoC. Check the libreboot [hardware compatibility
-list](../docs/hcl/#supported_list), for more information.
+list](../docs/hardware/#supported_list), for more information.
 
 General questions
 =================
@@ -543,7 +543,7 @@ On some systems, it is possible to write-protect the firmware, such that
 it is rendered read-only at the OS level (external flashing is still
 possible, using dedicated hardware). For example, on current GM45
 laptops (e.g. ThinkPad X200, T400), you can write-protect (see
-[../docs/hcl/gm45\_remove\_me.html\#ich9gen](../docs/hcl/gm45_remove_me.html#ich9gen)).
+[../docs/hardware/gm45\_remove\_me.html\#ich9gen](../docs/hardware/gm45_remove_me.html#ich9gen)).
 
 It's possible to write-protect on all libreboot systems, but the instructions
 need to be written. The documentation is in the main git repository, so you are