Reorganize and document enums