Structure fix

mucka97requested to merge
folder_fix into master

Merge request reports