Separated controllers, complete routes (some todos left)