consolidate package structure