[CSM-58] Define categories

This is now ready for merging @dkayiwa