Refactoring of folder names