I think class is the wrong word to use.

We have Disciplines which focus on mastery of a weapon type, and it sounds like we are getting Jobs which would be a role you fulfill.

Based on this approach what Disciplines should be added and which Jobs should be added and what does their relationship look like.?