Reorganize utils