Resolve "tidy up main and config files"

Florian Gothrequested to merge
161-tidy-up-main-and-config-files into master

Closes #161 (closed)

Edited by Florian Goth

Merge request reports