Move the category directories.

This moves the category directories into a new '/packages' directory.
This also removes underscores from category directory names for
consistency.