Package file simplification