Port packages to the new package builder