Path refactoring