Reorganize & rename enums