Refactored ControllerRouter class, now there is a Controller class too