reorganize groups, remove tmp