Move Enums to dedicated files