Moved CVS class and subclasses into it's own file.