Switch to pkg format