Added router, controller and config system classes