WIP: more refactoring

Jonathan Klimtrequested to merge
refactor_main into master

this still needs some work. This should definitely include more verification than last time.

Edited by Niklas Eiling

Merge request reports