Refactor how controller class is defined, injected and assigned
For all the controller classes
Makes the controller definitions much cleaner