Refactor controllers + routes