refactored routes, preping to remove to luma-routes package