Move all utility methods into new Util library