Heavy-ion people assigned to more specific packages

Rebase to fix conflicts, fix #9.