Reorg dirs: disentangle Models from Views (cont.)

t.knopffrequested to merge
reorg_dirs into develop

In this MR the last dependencies of Models on Views have been resolved.

Merge request reports