Move Enums to dedicated files
Move Enums to dedicated files
Merge pull request #19 from tomb50/to-upstream

Refactor enums