Change model structure

Andrey Veltischev requested to merge andre/model_changes into master

Merge request reports