diff --git a/software/applications/mordhau.md b/games-software/setups/mordhau.md
similarity index 100%
rename from software/applications/mordhau.md
rename to games-software/setups/mordhau.md
diff --git a/general-software/file-synchronization.md b/general-software/file-synchronization.md
new file mode 100644
index 0000000..9337058
--- /dev/null
+++ b/general-software/file-synchronization.md
@@ -0,0 +1,23 @@
+# File synchronization
+
+Tools to synchronize data and so called clouds are pretty handy to use files on different machines.
+There are tools with a main server and there are tools that don't need them.
+
+## Synchronizing with main server
+
+The biggest advantage of having a main server contain your data is that - as long as the server is online -
+you can sync as you please.
+You do not need to care which machines are online to get all the files you need.
+If you are talking about a cloud, this is this.
+
+- [Owncloud](setups/owncloud.md) is a self-hostable, open-source file hosting service that can be dockerized.
+- [Onedrive](setups/onedrive.md) is a very popular piece of software despite being proprietary.
+You can not self-host it, but you can run a dockerized client.
+
+## Synchronizing without main server
+
+If you can bare the difficulties ascending due to the mentioned above problems, this is probably a more
+safe way to "host" files.
+There is no single server as point of attack with all your data.
+
+- [Syncthing](setups/syncthing.md) is a free and open-source peer-to-peer file synchronization tool that can be dockerized.
diff --git a/software/git.md b/general-software/git.md
similarity index 58%
rename from software/git.md
rename to general-software/git.md
index 26dc0c2..d15927e 100644
--- a/software/git.md
+++ b/general-software/git.md
@@ -3,15 +3,16 @@
 Git is probably the best version control system (VCS) there is.
 It's easy and can be lightweight, but also has tons of possibilities for using graphical (/web) user interfaces.
 
-## Git with web interface
+## Git server with web interface
 
 Web interfaces for git are quite useful for easily showing code to other people.
 Additionally it is easy to collaborate together.
 
-- [Gitea](applications/gitea.md) is an open-source and selfhosted
+- [Gitea](applications/gitea.md) is an open-source and selfhosted and can be dockerized.
 
-## Git without graphical interface
+## Git server without graphical interface
 
-If you don't need a bloated web-interface the a more [basic idea](applications/bare-git.md)
-is probably what you're looking for.
+If you don't need a bloated web-interface a more basic approach is more than enough.
+
+- [git-server-docker](setups/bare-git.md) is a pretty basic docker-container for git.
 
diff --git a/general-software/mail.md b/general-software/mail.md
new file mode 100644
index 0000000..3570ea7
--- /dev/null
+++ b/general-software/mail.md
@@ -0,0 +1,18 @@
+# Mail
+
+Mail is not dead yet.
+But most of the programs used to interact with them are total trash.
+Nevertheless there are some really nice pieces of software to check out.
+
+## Server
+
+If you want to host your own mail-server there are solutions with and without interfaces.
+
+- [Dovecot](setups/dovecot.md) is a simple mail server that can be dockerized and has no interface.
+
+## Client
+
+If you don't have a built-in web interface for your mail-server you need some software to access your mails.
+And even if you have it can be useful to keep your mails synced locally on your pc.
+
+- [Neomutt](setups/neomutt.md) is a terminal-based mail client, that has a simple interface.
diff --git a/general-software/music.md b/general-software/music.md
new file mode 100644
index 0000000..d5f09ce
--- /dev/null
+++ b/general-software/music.md
@@ -0,0 +1,12 @@
+# Music
+
+Music is a nice to have on your system.
+There are multiple different approaches on how to get it working depending on your needs.
+In general you need to consider if you want the music directly on your pc or access a server for it.
+
+## Server/Client
+
+If you want to keep your system clean of much data, you can use this kind of setup.
+There are differences depending on your preffered client interface.
+
+- [Airsonic](setups/airsonic.md) is a free fork of Subsonic, can be dockerized and has a web-interface.
diff --git a/general-software/office-software.md b/general-software/office-software.md
new file mode 100644
index 0000000..6f77788
--- /dev/null
+++ b/general-software/office-software.md
@@ -0,0 +1,12 @@
+# Office software
+
+To get work done many people prefer office-like software.
+There are numerous possibilities for this.
+The software can vary in coverage and interface type.
+
+## Table calculation
+
+One of the most used file modification is done in csv or similar datatypes.
+
+- [sc-im](setups/sc-im.md) is a simple table calculation program with a terminal based interface.
+
diff --git a/software/applications/airsonic.md b/general-software/setups/airsonic.md
similarity index 100%
rename from software/applications/airsonic.md
rename to general-software/setups/airsonic.md
diff --git a/software/applications/bare-git.md b/general-software/setups/bare-git.md
similarity index 100%
rename from software/applications/bare-git.md
rename to general-software/setups/bare-git.md
diff --git a/software/applications/bind.md b/general-software/setups/bind.md
similarity index 100%
rename from software/applications/bind.md
rename to general-software/setups/bind.md
diff --git a/software/applications/cups.md b/general-software/setups/cups.md
similarity index 100%
rename from software/applications/cups.md
rename to general-software/setups/cups.md
diff --git a/software/applications/dovecot.md b/general-software/setups/dovecot.md
similarity index 100%
rename from software/applications/dovecot.md
rename to general-software/setups/dovecot.md
diff --git a/software/applications/flask.md b/general-software/setups/flask.md
similarity index 100%
rename from software/applications/flask.md
rename to general-software/setups/flask.md
diff --git a/software/applications/foldingathome.md b/general-software/setups/foldingathome.md
similarity index 100%
rename from software/applications/foldingathome.md
rename to general-software/setups/foldingathome.md
diff --git a/software/applications/gitea.md b/general-software/setups/gitea.md
similarity index 100%
rename from software/applications/gitea.md
rename to general-software/setups/gitea.md
diff --git a/software/applications/gopher-proxy.md b/general-software/setups/gopher-proxy.md
similarity index 100%
rename from software/applications/gopher-proxy.md
rename to general-software/setups/gopher-proxy.md
diff --git a/software/applications/gopher-server.md b/general-software/setups/gopher-server.md
similarity index 100%
rename from software/applications/gopher-server.md
rename to general-software/setups/gopher-server.md
diff --git a/software/applications/hastebin.md b/general-software/setups/hastebin.md
similarity index 100%
rename from software/applications/hastebin.md
rename to general-software/setups/hastebin.md
diff --git a/software/applications/homer.md b/general-software/setups/homer.md
similarity index 100%
rename from software/applications/homer.md
rename to general-software/setups/homer.md
diff --git a/software/applications/jellyfin.md b/general-software/setups/jellyfin.md
similarity index 100%
rename from software/applications/jellyfin.md
rename to general-software/setups/jellyfin.md
diff --git a/software/applications/khal.md b/general-software/setups/khal.md
similarity index 100%
rename from software/applications/khal.md
rename to general-software/setups/khal.md
diff --git a/software/applications/khard.md b/general-software/setups/khard.md
similarity index 100%
rename from software/applications/khard.md
rename to general-software/setups/khard.md
diff --git a/software/applications/neomutt.md b/general-software/setups/neomutt.md
similarity index 100%
rename from software/applications/neomutt.md
rename to general-software/setups/neomutt.md
diff --git a/software/applications/nginx.md b/general-software/setups/nginx.md
similarity index 100%
rename from software/applications/nginx.md
rename to general-software/setups/nginx.md
diff --git a/software/applications/onedrive.md b/general-software/setups/onedrive.md
similarity index 100%
rename from software/applications/onedrive.md
rename to general-software/setups/onedrive.md
diff --git a/software/applications/openvpn.md b/general-software/setups/openvpn.md
similarity index 100%
rename from software/applications/openvpn.md
rename to general-software/setups/openvpn.md
diff --git a/software/applications/owncloud.md b/general-software/setups/owncloud.md
similarity index 100%
rename from software/applications/owncloud.md
rename to general-software/setups/owncloud.md
diff --git a/software/applications/pinedocs.md b/general-software/setups/pinedocs.md
similarity index 100%
rename from software/applications/pinedocs.md
rename to general-software/setups/pinedocs.md
diff --git a/software/applications/plex.md b/general-software/setups/plex.md
similarity index 100%
rename from software/applications/plex.md
rename to general-software/setups/plex.md
diff --git a/software/applications/portainer.md b/general-software/setups/portainer.md
similarity index 100%
rename from software/applications/portainer.md
rename to general-software/setups/portainer.md
diff --git a/software/applications/radicale.md b/general-software/setups/radicale.md
similarity index 100%
rename from software/applications/radicale.md
rename to general-software/setups/radicale.md
diff --git a/software/applications/samba.md b/general-software/setups/samba.md
similarity index 100%
rename from software/applications/samba.md
rename to general-software/setups/samba.md
diff --git a/software/applications/sc-im.md b/general-software/setups/sc-im.md
similarity index 100%
rename from software/applications/sc-im.md
rename to general-software/setups/sc-im.md
diff --git a/software/applications/shells.md b/general-software/setups/shells.md
similarity index 100%
rename from software/applications/shells.md
rename to general-software/setups/shells.md
diff --git a/software/applications/syncthing.md b/general-software/setups/syncthing.md
similarity index 100%
rename from software/applications/syncthing.md
rename to general-software/setups/syncthing.md
diff --git a/software/applications/teamspeak.md b/general-software/setups/teamspeak.md
similarity index 100%
rename from software/applications/teamspeak.md
rename to general-software/setups/teamspeak.md
diff --git a/software/applications/todo-list.md b/general-software/setups/todo-list.md
similarity index 100%
rename from software/applications/todo-list.md
rename to general-software/setups/todo-list.md
diff --git a/software/applications/wine.md b/general-software/setups/wine.md
similarity index 100%
rename from software/applications/wine.md
rename to general-software/setups/wine.md
diff --git a/software/applications/yourls.md b/general-software/setups/yourls.md
similarity index 100%
rename from software/applications/yourls.md
rename to general-software/setups/yourls.md
diff --git a/arch-installation/devices/thinkpad_x220.md b/system-software/arch-linux/devices/thinkpad_x220.md
similarity index 100%
rename from arch-installation/devices/thinkpad_x220.md
rename to system-software/arch-linux/devices/thinkpad_x220.md
diff --git a/arch-installation/installation.md b/system-software/arch-linux/installation.md
similarity index 100%
rename from arch-installation/installation.md
rename to system-software/arch-linux/installation.md