Rewrite some classes, add test cases on new COO class, and delete some classes.