Reorganized class structure.