Change Util to a module