Refactoring of file paths