cleaned the folder - grouped accordingly