Reorganize files

Merged Andreas Marek requested to merge reorganize_files into master_pre_stage

Merge request reports