Reorganized class ordering for more logical groupings