refactor directory names