Refactor paths