Make the controller a part of the ControllerCollection

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>
Rename controller functions

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>
Pass $app in

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>