Renamed generator-cpp back to generator.