consolidate more packages