move classes to OPL namespace