Update with fileutil.h/cpp