Added grouping of folders in downloads module