Move router to Call

Closes #1943