Added more logic for the folder names