Port packages to the new package builder
Re-add scripts