Refactored Enums to separate folder