add include/util. and mv stub header