Reorganize utils.