Categorize decorators

Closes #285