Move routing to it's own package