Resolve "Restructure"

Florian Oppermannrequested to merge
63-restructure into develop

Closes #63

Edited by Gonca Guerses-Tran

Merge request reports