Starting migration to C++ classes