refactoring: Util split to Util and Lib