[Refactoring] repair Util package