Fix add remove sets to account for profile selection.
Embed Function in PackageFunction for a cleaner interface.
Use pointers for all package elements.
Minor clean-up.