Fix util class package