moving some classes over to util.h
Adding file-conflict check to integrity check