add Group and GroupState classes to model package