Remove some basic group types and add pack association
Update demo bundle reference