diff --git a/docs/docs/api/routes/scores.md b/docs/docs/api/routes/scores.md
index a68bafc88..a900baf0d 100644
--- a/docs/docs/api/routes/scores.md
+++ b/docs/docs/api/routes/scores.md
@@ -2,7 +2,7 @@
 
 !!! note
 	Scores are *not* personal bests. For more information
-	on the distinction, see [PBs and Scores](../../user/pbs-scores.md).
+	on the distinction, see [PBs and Scores](../../wiki/pbs-scores.md).
 
 *****
 
diff --git a/docs/docs/schemas/score.md b/docs/docs/schemas/score.md
index d67d831a2..a6449444c 100644
--- a/docs/docs/schemas/score.md
+++ b/docs/docs/schemas/score.md
@@ -82,11 +82,11 @@ sub-document.
 | Property | Description |
 | :: | :: |
 | `score` | A number describing the "score" the user got. Depending on the game, this may be bounded between various numbers. |
-| `lamp` | The lamp the user got. For more information on what a lamp is, see [What are Lamps?](../user/lamps.md)
+| `lamp` | The lamp the user got. For more information on what a lamp is, see [What are Lamps?](../wiki/lamps.md)
 | `percent` | The 'percent' the user got. That is, their score scaled to the total amount of score they could have possibly got. There are some oddities with this field.[^1]. |
 | `grade` | The grade the user got. For most games, this is a set of discrete cutoffs for the score's `percent`.[^2] |
 | `lampIndex`, `gradeIndex` | While `lamp` and `grade` are both strings, these are the raw enum values for those fields. This can be used for filters (select scores where lampIndex > lamps.HARD_CLEAR), or other query methods. |
-| `esd` | Some games support ESD. This field contains the ESD for that score. For more information on what ESD is, see [What is ESD?](../user/stats/esd.md)
+| `esd` | Some games support ESD. This field contains the ESD for that score. For more information on what ESD is, see [What is ESD?](../wiki/stats/esd.md)
 | `judgements` | A record of Judgement->Integer values. The keys for this property depend on the game the score is for. |
 | `hitMeta` | 'Meta' information about the user's *hits*. That is, things that aren't *literally* about the score, but are related to how the user played. This contains properties such as `maxCombo` and `fast` and `slow` counts. All the fields here are optional and nullable. Some games extend this to provide things like `gauge`. |
 
diff --git a/docs/docs/schemas/session.md b/docs/docs/schemas/session.md
index 1e31f3abb..c4bc30735 100644
--- a/docs/docs/schemas/session.md
+++ b/docs/docs/schemas/session.md
@@ -36,7 +36,7 @@ interface SessionDocument {
 | `timeInserted` | The time this session was inserted into the database. This is **NOT** when the session started. |
 | `timeStarted` | The time the session started. |
 | `timeEnded` | The time the session ended. Note that if this is less than 2 hours ago, the session may still be extended by future scores. |
-| `calculatedData` | Calculated Statistics about this session. The keys in this object depend on the game and playtype. For more information, see [Statistics](../user/stats/tachi.md).
+| `calculatedData` | Calculated Statistics about this session. The keys in this object depend on the game and playtype. For more information, see [Statistics](../wiki/stats/tachi.md).
 | `highlight` | Whether this session was highlighted or not by the user. |
 | `views` | How many people have viewed this session. |
 
diff --git a/docs/docs/tachi-server/import/sessions.md b/docs/docs/tachi-server/import/sessions.md
index f061e3320..18df19670 100644
--- a/docs/docs/tachi-server/import/sessions.md
+++ b/docs/docs/tachi-server/import/sessions.md
@@ -2,7 +2,7 @@
 
 This page documents how Sessions are constructed.
 For a humanised explaination of sessions, see
-[this page](../../user/features.md#sessions).
+[this page](../../wiki/features.md#sessions).
 
 *****
 
diff --git a/docs/docs/tachi-server/setup/config.md b/docs/docs/tachi-server/setup/config.md
index 0e078e21a..104bb4607 100644
--- a/docs/docs/tachi-server/setup/config.md
+++ b/docs/docs/tachi-server/setup/config.md
@@ -332,7 +332,7 @@ Bokutachi only routes, and `omni` will enable both.
 
 #### GAMES
 
-What games are supported by this server. For more information, see [Games](../../user/games.md).
+What games are supported by this server. For more information, see [Games](../../wiki/games.md).
 
 #### IMPORT_TYPES
 
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index b9e32dd57..59cf9cd18 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -39,18 +39,18 @@ nav:
               - "contributing/tools/vscode.md"
 
   - Wiki:
-      - "user/index.md"
-      - "user/rules.md"
-      - "user/games.md"
-      - "user/features.md"
-      - "user/pbs-scores.md"
-      - "user/filter-directives.md"
-      - "user/lamps.md"
-      - "user/score-oddities.md"
+      - "wiki/index.md"
+      - "wiki/rules.md"
+      - "wiki/games.md"
+      - "wiki/features.md"
+      - "wiki/pbs-scores.md"
+      - "wiki/filter-directives.md"
+      - "wiki/lamps.md"
+      - "wiki/score-oddities.md"
 
       - Statistics:
-          - "user/stats/tachi.md"
-        #     - "user/stats/esd.md"
+          - "wiki/stats/tachi.md"
+        #     - "wiki/stats/esd.md"
 
   - Documents:
       - "schemas/index.md"