Gave the enums their own class. It makes calling them shorter
Optimized imports and corrected for the new way of handling the enums