Refactor out main controller to a new module
Refactor out all controllers to modules