Convert controller classes to controller providers

Group routing and controller code into the same classes.