improving package layout