Refactor the routing out to polymore/more-routing