reorganized classes to match aggie mobile more closely