Moved unit and validator objects to inside the cc object. Closes #8, closes #9.