normalize package layout