refactor util class package