Basic refactor of the routing.