Separated route loading from routing, upped version.