Many packaging fixes. Support for categories.
11 files changed