move util dir
point to new lib location
merge fixes