[#51607875] Split up the volunteer classes into sub-packages before
making the skills changed. Rename Category to SkillCategory to make the
meaning clearer