Added separate files for the different kind of things main does at the moment
Merge remote-tracking branch 'origin/master'