refactor categories

This is cleanup from today's dojo and does not include a refactoring of the whole categories concept like we discussed.