Moved enums out of class

...ed enums outside of class