Reorganized class library.