- Removed custom listeners
+ Added enums in their own files