Removed class support from inside RR to be ported to external component.
Packaging