KRACOEUS-8540: moving controller methods to the proper place
Merge pull request #1289 from leoherbie/KRACOEUS-8535_2

KRACOEUS-8540: moving controller methods to the proper place