Restructuring

Merged Martin Reinecke requested to merge restructuring into master

Merge request reports