Util reorganization