AS-6416 add Category classes to generated BeanFactory

Let me know if you want me to issue a separate pull request for master.