"Moved utility classes to a utility file."