refactor paths