diff --git a/wiki/arch-linux/installation.md b/wiki/linux/arch-linux/installation.md
similarity index 100%
rename from wiki/arch-linux/installation.md
rename to wiki/linux/arch-linux/installation.md
diff --git a/wiki/arch-linux/device-specific/thinkpad_x220.md b/wiki/linux/arch-linux/thinkpad_x220.md
similarity index 100%
rename from wiki/arch-linux/device-specific/thinkpad_x220.md
rename to wiki/linux/arch-linux/thinkpad_x220.md
diff --git a/wiki/disk-management.md b/wiki/linux/disk-management.md
similarity index 100%
rename from wiki/disk-management.md
rename to wiki/linux/disk-management.md
diff --git a/wiki/khal.md b/wiki/linux/khal.md
similarity index 100%
rename from wiki/khal.md
rename to wiki/linux/khal.md
diff --git a/wiki/khard.md b/wiki/linux/khard.md
similarity index 100%
rename from wiki/khard.md
rename to wiki/linux/khard.md
diff --git a/wiki/neomutt.md b/wiki/linux/neomutt.md
similarity index 100%
rename from wiki/neomutt.md
rename to wiki/linux/neomutt.md
diff --git a/wiki/sc-im.md b/wiki/linux/sc-im.md
similarity index 100%
rename from wiki/sc-im.md
rename to wiki/linux/sc-im.md
diff --git a/wiki/shells.md b/wiki/linux/shells.md
similarity index 100%
rename from wiki/shells.md
rename to wiki/linux/shells.md
diff --git a/wiki/wine.md b/wiki/linux/wine.md
similarity index 95%
rename from wiki/wine.md
rename to wiki/linux/wine.md
index adf03c1..8fd1017 100644
--- a/wiki/wine.md
+++ b/wiki/linux/wine.md
@@ -4,8 +4,6 @@ Wine is a compatibility layer to run windows programs on linux machines.
 
 ## Setup
 
-### Arch-Linux
-
 - Enable multilib support in pacman
 	-	`vim /etc/pacman.conf` - Uncomment the following lines
 		```
@@ -14,7 +12,7 @@ Wine is a compatibility layer to run windows programs on linux machines.
 		```
 - `pacman -S wine winetricks` - Install wine and configuration helper
 
-### Configuration
+## Configuration
 
 - Set the global variable `WINEPREFIX` to your liking, standard is `$HOME/.wine`
 - `winetricks` - run the installation of basic windows dependencies to the wine directory
diff --git a/wiki/arch-linux/intel-graphics.md b/wiki/linux/x11.md
similarity index 100%
rename from wiki/arch-linux/intel-graphics.md
rename to wiki/linux/x11.md