adding CHallenge* classes (part of refactor/rename)