added Util, re-organized sources