Minor comment change
Major refactoring for renaming pkginfos