Refactor setup routes.
Merge branch 'routingAlt'