Feature/#401 proper folder structure

Jan Delemberrequested to merge
feature/#401_proper_folder_structure into master

Random review. Closes #401.

Merge request reports