Moved enums from constants to where they should be, refractoring