Converted classes and modules into RBO