Moved more classes to the OpenRR project