Merge "Refactor PackageParser (1/n)"