Util makefile/header files fix; remote util directory