move groups into their own pacakge
more group cleanup