Structure refact

Federico Sismondirequested to merge
structure_refact into develop

Merge request reports