Move group-list related code to a separate file and keep the group name in the group...