simplify packaging