diff --git a/wiki/benchmark.md b/wiki/benchmark.md
index 6d1d288..78ca8e1 100644
--- a/wiki/benchmark.md
+++ b/wiki/benchmark.md
@@ -5,4 +5,4 @@ Benchmarks can use a range of criteria to compare programs with one another.
 
 ## Tools
 
-- [Hyperfine](/wiki/linux/hyperfine.md) is a benchmarking tool for [Linux](/wiki/linux/linux.md).
+- [Hyperfine](/wiki/linux/hyperfine.md) is a benchmarking tool for [Linux](/wiki/linux.md).
diff --git a/wiki/bluetooth.md b/wiki/bluetooth.md
index e58c463..280141a 100644
--- a/wiki/bluetooth.md
+++ b/wiki/bluetooth.md
@@ -3,6 +3,6 @@
 [Bluetooth](https://www.bluetooth.com/) is a short-range technology for wireless
 data transfer.
 
-For [Linux](/wiki/linux/linux.md) based operating systems the
+For [Linux](/wiki/linux.md) based operating systems the
 [bluez package](/wiki/linux/bluez.md) is used as the implementation of the
 bluetooth standard.
diff --git a/wiki/firefox.md b/wiki/firefox.md
index 59fe13f..2f5ccbf 100644
--- a/wiki/firefox.md
+++ b/wiki/firefox.md
@@ -255,8 +255,8 @@ To disable this set the following config.
 network.connectivity-service.enabled = false
 ```
 
-To disable Microsoft Family Safety on [Windows systems](/wiki/windows/windows.md) which can be used
-as a censoring tool set the following config.
+To disable Microsoft Family Safety on [Windows systems](/wiki/windows.md) which can be used as a
+censoring tool set the following config.
 
 ```txt
 security.family_safety.mode = 0
diff --git a/wiki/font.md b/wiki/font.md
index e6f4de7..12e61a3 100644
--- a/wiki/font.md
+++ b/wiki/font.md
@@ -1,7 +1,7 @@
 # Font
 
 A fonts is the particular size, weight and style of a typeface.
-Operating systems based on [Linux](/wiki/linux/linux.md) handle fonts by the
+Operating systems based on [Linux](/wiki/linux.md) handle fonts by the
 [fontconfig package](/wiki/linux/font_configuration.md).
 
 ## Typefaces
diff --git a/wiki/games/bottles.md b/wiki/games/bottles.md
index 56d80d4..7d09ea6 100644
--- a/wiki/games/bottles.md
+++ b/wiki/games/bottles.md
@@ -2,12 +2,12 @@
 
 [Bottles](https://usebottles.com/) is an application similar to
 [Lutris](/wiki/games/lutris.md) that focusses on running both
-[Windows](/wiki/windows/windows.md) applications aswell as games through
+[Windows](/wiki/windows.md) applications aswell as games through
 [WINE](/wiki/linux/wine.md) or their own runner [Caffe](#caffe).
 
 ## Caffe
 
 [Caffe](https://docs.usebottles.com/components/runners) is the official runner
-of [Windows](/wiki/windows/windows.md) programs in Bottles.
+of [Windows](/wiki/windows.md) programs in Bottles.
 It is a patched version of [WINE](/wiki/linux/wine.md) that can have positive
 effects on certain programs.
diff --git a/wiki/games/league_of_legends.md b/wiki/games/league_of_legends.md
index 97d59f5..dc0df3c 100644
--- a/wiki/games/league_of_legends.md
+++ b/wiki/games/league_of_legends.md
@@ -2,16 +2,16 @@
 
 [League of Legends](https://www.leagueoflegends.com/en-us) is a multiplayer
 online battle arena game which is available as a standalone Launcher for
-[Windows](/wiki/windows/windows.md).
+[Windows](/wiki/windows.md).
 It is developed and published by [Riot Games](https://www.riotgames.com/en).
 
 ## Setup
 
 League of Legends is available to download for
-[Windows](/wiki/windows/windows.md) systems on
+[Windows](/wiki/windows.md) systems on
 [the official website](https://signup.leagueoflegends.com/en-us/signup/index#/).
 
-For [Linux](/wiki/linux/linux.md) distributions [Lutris](/wiki/games/lutris.md)
+For [Linux](/wiki/linux.md) distributions [Lutris](/wiki/games/lutris.md)
 and [WINE](/wiki/linux/wine.md) can be used to run the game.
 The correct version can be downloaded using the
 [Lutris website](https://lutris.net/games/league-of-legends/).
diff --git a/wiki/games/lutris.md b/wiki/games/lutris.md
index 3b9696e..e935a17 100644
--- a/wiki/games/lutris.md
+++ b/wiki/games/lutris.md
@@ -1,11 +1,11 @@
 # Lutris
 
 [Lutris](https://lutris.net/) is a free and open source video game platform for
-[Linux](/wiki/linux/linux.md) systems.
+[Linux](/wiki/linux.md) systems.
 It features compatibility with [GOG](https://www.gog.com/),
 [Humble Bundle](https://humblebundle.com/),
 [Epic Games](https://www.epicgames.com/), [Steam](/wiki/games/steam.md) and many
-other [Windows](/wiki/windows/windows.md) games via its own installer that uses
+other [Windows](/wiki/windows.md) games via its own installer that uses
 [WINE](/wiki/linux/wine.md). Lutris can also use [Proton](/wiki/games/proton.md)
 - a patched version of WINE developed by
 [Valve](https://www.valvesoftware.com/).
@@ -115,7 +115,7 @@ be selected.
 
 ### Change WINE/Proton Version
 
-[Windows](/wiki/windows/windows.md) games are handled by
+[Windows](/wiki/windows.md) games are handled by
 [WINE](/wiki/linux/wine.md).
 After right-clicking a game and selecting `Configure` the `Wine version` can be
 changed under the `Runner options` tab.
@@ -139,7 +139,7 @@ This can be easily fixed by inserting `-dx11` in `Arguments` under the
 
 ### Crashes for Windows Games
 
-When it comes to crashes for [Windows](/wiki/windows/windows.md) games that get
+When it comes to crashes for [Windows](/wiki/windows.md) games that get
 handled by [WINE](/wiki/linux/wine.md) one point of failure is the selected
 WINE version.
 Change the version used as explained in
diff --git a/wiki/git.md b/wiki/git.md
index 058839c..9c95a13 100644
--- a/wiki/git.md
+++ b/wiki/git.md
@@ -9,7 +9,7 @@ Git consists of two parts: [a client](#client) and [a server](#server).
 
 ### Client
 
-The Git client for [Linux-based operating systems](/wiki/linux/linux.md) has a
+The Git client for [Linux-based operating systems](/wiki/linux.md) has a
 separate article in this wiki which is called
 [Git client](/wiki/linux/git_\(client\).md).
 
diff --git a/wiki/linux/linux.md b/wiki/linux.md
similarity index 100%
rename from wiki/linux/linux.md
rename to wiki/linux.md
diff --git a/wiki/linux/arch-linux/arch-linux.md b/wiki/linux/arch-linux/arch-linux.md
index 58e454b..345ac56 100644
--- a/wiki/linux/arch-linux/arch-linux.md
+++ b/wiki/linux/arch-linux/arch-linux.md
@@ -1,7 +1,7 @@
 # Arch Linux
 
 [Arch Linux](https://archlinux.org/) is a rolling-release, general-purpose
-[Linux](/wiki/linux/linux.md)
+[Linux](/wiki/linux.md)
 distribution.
 
 ## Package Manager and AUR
diff --git a/wiki/linux/font_configuration.md b/wiki/linux/font_configuration.md
index 36c6e9c..8172888 100644
--- a/wiki/linux/font_configuration.md
+++ b/wiki/linux/font_configuration.md
@@ -1,12 +1,12 @@
 # Font Configuration
 
 This entry addresses the handling of [fonts](/wiki/font.md) for
-[Linux-based](/wiki/linux/linux.md) operating systems.
+[Linux-based](/wiki/linux.md) operating systems.
 
 ## Setup
 
 Fontconfig is the standard library used to customize and configure.
-On most [Linux](/wiki/linux/linux.md) distributions fontconfig can be setup by
+On most [Linux](/wiki/linux.md) distributions fontconfig can be setup by
 installing the package `fontconfig`.
 
 ### Configuration
diff --git a/wiki/linux/git_(client).md b/wiki/linux/git_(client).md
index 0fc3baf..ed5a8f7 100644
--- a/wiki/linux/git_(client).md
+++ b/wiki/linux/git_(client).md
@@ -1,7 +1,7 @@
 # Git (Client)
 
 This entry deals with the Git client used in
-[Linux-based systems](/wiki/linux/linux.md).
+[Linux-based systems](/wiki/linux.md).
 The client is pretty simple to understand.
 With only a handfull of commands you should be able to get your versioning going.
 For servers with web interfaces there are different cli tools to control it
diff --git a/wiki/linux/ntp.md b/wiki/linux/ntp.md
index 30c6d23..6cd9d08 100644
--- a/wiki/linux/ntp.md
+++ b/wiki/linux/ntp.md
@@ -2,7 +2,7 @@
 
 [NTP](https://www.rfc-editor.org/rfc/rfc5905) - short for Network Time Protocol
 - is the most common method to synchronize the software clock of a
-[Linux](/wiki/linux/linux.md) system.
+[Linux](/wiki/linux.md) system.
 
 ## Setup
 
diff --git a/wiki/linux/shell.md b/wiki/linux/shell.md
index e0e7e3b..96df6e0 100644
--- a/wiki/linux/shell.md
+++ b/wiki/linux/shell.md
@@ -53,7 +53,7 @@ Usually both of these commands are packaged withing the `renameutils` package.
 For more information visit the [renameutils website](https://www.nongnu.org/renameutils/).
 
 Another option for bulk renaming is `vidir` which is part of the `moreutils` package for most
-[distributions](/wiki/linux/linux.md#distributions).
+[distributions](/wiki/linux.md#distributions).
 vidir is able to create folders which qmv is not.
 More information can be found on the [moreutils website](https://joeyh.name/code/moreutils/).
 
diff --git a/wiki/picard.md b/wiki/picard.md
index e4e3e38..ab9f5d6 100644
--- a/wiki/picard.md
+++ b/wiki/picard.md
@@ -9,7 +9,7 @@ It is able to tag a wide range of [audio codecs](./audio.md#audio-codecs)
 
 Picard is available on the [official website](https://picard.musicbrainz.org/)
 and [github](https://github.com/metabrainz/picard).
-Additionally for some [Linux distributions](/wiki/linux/linux.md#distributions)
+Additionally for some [Linux distributions](/wiki/linux.md#distributions)
 it is available via a package often called `picard`.
 
 Picard can also be virtualized and accessed over [VNC](/wiki/vnc.md) or
diff --git a/wiki/system_console.md b/wiki/system_console.md
index 3d7698c..60de82e 100644
--- a/wiki/system_console.md
+++ b/wiki/system_console.md
@@ -11,4 +11,4 @@ The following section lists different terminals.
 
 - [suckless' st](/wiki/linux/suckless.md#programs) is a simple terminal
   implementation for [X](/wiki/linux/x_window_system.md) on
-  [Linux](/wiki/linux/linux.md).
+  [Linux](/wiki/linux.md).
diff --git a/wiki/windows/windows.md b/wiki/windows.md
similarity index 100%
rename from wiki/windows/windows.md
rename to wiki/windows.md