Incorporate merge comments.

 1. Use allHandlersWithPkgs instead of duplicating data in allHandlers
 2. Save only the pkg names instead of the whole packages