Following the restructuring of the last commits.

The name "controller" is used in the MVC pattern context here, so we
should rather go with another name.