moved enums to separate file, and added mod class