simplify and correct package file