Reorganized utility classes.