Refactor, reorder enums