Moved enums into separate file