Initial commit of Util refactor