Draft: Refactor control model

Christina Maria Mayr requested to merge refactor_control_model into master

Clean ControlModel and sub classes. Related issues #329 (closed) .

Merge request reports