Moved the controller building its own controller factory class