Do bid router refactor