Removed COut from NameGraphModular (merged with C);
Changed Module and tests based on the removal