Refactors Router to a slightly different style of using Builders.