Reorganised Folder into sub-folders for each group