Re-organized packages sections into one.

Combined package sections into one header, re-named them to be more
specific ("Enable Package Support") and more concise ("Specific
Packages").