Draft: Refactor control model

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

Merge request reports

Loading