Simplify package file format