Routes refactor

This makes the routes setup easier to read and understand.