enums reorganized