Added grouping helpers and grouped all music