fixed packaging for g1, g2, will do g3-g9 right now