Refine package structure - Part two