Refactor / partials / routeProvider