Refactor directory added