move enums from global to public