Util splitt to Util and Lib