moving icon structure around, splitting HS and EMC2, and tweaking standalones for copmilation.