Simplify action set and package making