improved package layout