noad: convert to new package format.