Reorganized class