Adjusting the package files to be more generic.

Includes fixes committed as part of pull request rephorm/xuserrrun #3.