Switch to structs

Merged Ruben Vorderman requested to merge BIOWDL-85 into develop

Created by: ffinfo

Merge request reports