Updated the folder and group names