Moved some definitions away from controller class, and adaped references them through all code.

2018-02-19, Edouard Tisserant