follow deep-routes refactoring