Move router to its own class