Fixed the cutil.h problems as well as modified some cmake files, there will most likely need to be more work on the cmake files