refactor controllers to single CvController