Refactor directory/file