Clean up unused exception class. Merge Controller with BaseController.
Modify Controller to setter injection.