improve package layout