Flatten <group> hierarchies

0repo does not merge our original hierarchies nicely
Version restrictions for shimmed feeds