Break util class into smaller classes