Move router to builder style