Reorganized class folders