Continued from previous revision, done all remaining files in the large multi-package modules.