Reorganized classes for corvariant lesson