Folder name refactored