Generic code cleanup

Jan David Molrequested to merge
2021-04-07-cleanup into master

Moves files around a bit, cleans up some syntax.

Merge request reports