[Refactoring] refactoring Util package

fix unused h files and replace include