diff --git a/docs/en/020_Getting_Started/020_Download_and_Installation.md b/docs/en/020_Getting_Started/020_Download_and_Installation.md
index e5362b3..38381d0 100644
--- a/docs/en/020_Getting_Started/020_Download_and_Installation.md
+++ b/docs/en/020_Getting_Started/020_Download_and_Installation.md
@@ -51,4 +51,4 @@ It's also possible to instead use a cron job to schedule newsfeed checks, but us
 
 In order for the various synchronization protocols to work, a Web server [must be configured](Web_Server_Configuration), and in order for The Arsse to serve users, those users [must be created](Managing_Users). The following manual pages provide details on how to get this set up.
 
-You may also want to review the `config.defaults.php` file included in the download package and create [a configuration file](/en/Configuring_The_Arsse), though The Arsse can function even without using a configuration file.
+You may also want to review the `config.defaults.php` file included in the download package and create [a configuration file](Configuration), though The Arsse can function even without using a configuration file.
diff --git a/docs/en/020_Getting_Started/040_Database_Setup/000_SQLite.md b/docs/en/020_Getting_Started/040_Database_Setup/000_SQLite.md
index c359b48..c63f20d 100644
--- a/docs/en/020_Getting_Started/040_Database_Setup/000_SQLite.md
+++ b/docs/en/020_Getting_Started/040_Database_Setup/000_SQLite.md
@@ -8,9 +8,9 @@
     <dt>Minimum version</dt>
         <dd>3.8.3</dd>
     <dt>Configuration</dt>
-        <dd><a href="/en/Configuring_The_Arsse#page_Database-settings">General</a>, <a href="/en/Configuring_The_Arsse#page_Database-settings-specific-to-SQLite-3">Specific</a></dd>
+        <dd><a href="/en/Getting_Started/Configuration#page_Database-settings">General</a>, <a href="/en/Getting_Started/Configuration#page_Database-settings-specific-to-SQLite-3">Specific</a></dd>
 </dl>
 
-SQLite requires very little set-up. By default the database will be created at the root of The Arsse's program directory (e.g. `/usr/share/arsse/arsse.db`), but this can be changed with the [`dbSQLite3File` setting](/en/Configuring_The_Arsse#page_dbSQLite3File). 
+SQLite requires very little set-up. By default the database will be created at the root of The Arsse's program directory (e.g. `/usr/share/arsse/arsse.db`), but this can be changed with the [`dbSQLite3File` setting](/en/Getting_Started/Configuration#page_dbSQLite3File). 
 
 Regardless of the location chosen, The Arsse **must** be able to both read from and write to the database file, as well as create files in its directory. This is because SQLite also creates a write-ahead log file and a shared-memory file during operation.
diff --git a/docs/en/020_Getting_Started/040_Database_Setup/010_PostgreSQL.md b/docs/en/020_Getting_Started/040_Database_Setup/010_PostgreSQL.md
index 3f1d3f1..5aeb859 100644
--- a/docs/en/020_Getting_Started/040_Database_Setup/010_PostgreSQL.md
+++ b/docs/en/020_Getting_Started/040_Database_Setup/010_PostgreSQL.md
@@ -8,7 +8,7 @@
     <dt>Minimum version</dt>
         <dd>10</dd>
     <dt>Configuration</dt>
-        <dd><a href="/en/Configuring_The_Arsse#page_Database-settings">General</a>, <a href="/en/Configuring_The_Arsse#page_Database-settings-specific-to-PostgreSQL">Specific</a></dd>
+        <dd><a href="/en/Getting_Started/Configuration#page_Database-settings">General</a>, <a href="/en/Getting_Started/Configuration#page_Database-settings-specific-to-PostgreSQL">Specific</a></dd>
 </dl>
 
 If for whatever reason an SQLite database does not suit your configuration, PostgreSQL is the best alternative. It is functionally equivalent to SQLite in every way.
@@ -22,7 +22,7 @@ sudo -u postgres psql -c "CREATE USER arsseuser WITH PASSWORD 'super secret pass
 sudo -u postgres psql -c "CREATE DATABASE arssedb WITH OWNER arsseuser"
 ```
 
-Tha Arsse must then be configured to use the created database. A suitable [configuration file](/en/Configuring_The_Arsse) might look like this:
+Tha Arsse must then be configured to use the created database. A suitable [configuration file](/en/Getting_Started/Configuration) might look like this:
 
 ```php
 <?php
diff --git a/docs/en/020_Getting_Started/040_Database_Setup/020_MySQL.md b/docs/en/020_Getting_Started/040_Database_Setup/020_MySQL.md
index 1fc424d..510624b 100644
--- a/docs/en/020_Getting_Started/040_Database_Setup/020_MySQL.md
+++ b/docs/en/020_Getting_Started/040_Database_Setup/020_MySQL.md
@@ -8,7 +8,7 @@
     <dt>Minimum version</dt>
         <dd>8.0.11</dd>
     <dt>Configuration</dt>
-        <dd><a href="/en/Configuring_The_Arsse#page_Database-settings">General</a>, <a href="/en/Configuring_The_Arsse#page_Database-settings-specific-to-MySQL">Specific</a></dd>
+        <dd><a href="/en/Getting_Started/Configuration#page_Database-settings">General</a>, <a href="/en/Getting_Started/Configuration#page_Database-settings-specific-to-MySQL">Specific</a></dd>
 </dl>
 
 While MySQL can be used as a database for The Arsse, this is **not recommended** due to MySQL's technical limitations. It is fully functional, but may fail with some newsfeeds where other database systems do not. Additionally, it is particularly important before upgrading from one version of The Arsse to the next to back up your database: a failure in a database upgrade can corrupt your database much more easily than when using other database systems.
@@ -25,7 +25,7 @@ sudo mysql -e "CREATE DATABASE arssedb"
 sudo mysql -e "GRANT ALL ON arssedb.* TO 'arsseuser'@'localhost'"
 ```
 
-Tha Arsse must then be configured to use the created database. A suitable [configuration file](/en/Configuring_The_Arsse) might look like this:
+Tha Arsse must then be configured to use the created database. A suitable [configuration file](/en/Getting_Started/Configuration) might look like this:
 
 ```php
 <?php
diff --git a/docs/en/050_Configuring_The_Arsse.md b/docs/en/020_Getting_Started/050_Configuration.md
similarity index 99%
rename from docs/en/050_Configuring_The_Arsse.md
rename to docs/en/020_Getting_Started/050_Configuration.md
index 25bab84..29e216d 100644
--- a/docs/en/050_Configuring_The_Arsse.md
+++ b/docs/en/020_Getting_Started/050_Configuration.md
@@ -1,3 +1,7 @@
+# The Configuration File
+
+# List of All Settings
+
 ## General settings
 
 ### lang
diff --git a/docs/en/020_Getting_Started/050_Managing_Users.md b/docs/en/025_Using_The_Arsse/010_Managing_Users.md
similarity index 100%
rename from docs/en/020_Getting_Started/050_Managing_Users.md
rename to docs/en/025_Using_The_Arsse/010_Managing_Users.md
diff --git a/docs/en/060_Command-Line_Functionality.md b/docs/en/025_Using_The_Arsse/020_Keeping_Newsfeeds_Up_to_Date.md
similarity index 100%
rename from docs/en/060_Command-Line_Functionality.md
rename to docs/en/025_Using_The_Arsse/020_Keeping_Newsfeeds_Up_to_Date.md
diff --git a/docs/en/070_Contributing/010_Reporting_Bugs.md b/docs/en/025_Using_The_Arsse/030_Upgrading_to_a_New_Version.md
similarity index 100%
rename from docs/en/070_Contributing/010_Reporting_Bugs.md
rename to docs/en/025_Using_The_Arsse/030_Upgrading_to_a_New_Version.md
diff --git a/docs/en/070_Contributing/020_Writing_Code.md b/docs/en/070_Contributing/020_Writing_Code.md
deleted file mode 100644
index e69de29..0000000