Removing the nested folder structure