updated all classes. The names of the classes always begin with C to avoid confusion
Included list of changes