Refactoring work to make new folder and rename folder share