Extened doc information.  Renamed cim related classes.