fix package layout