Refactoring some classes.
Removing cc file.