removed all std::string
extracted MoperatorGeneral out of Geometry struct