add metadata.h, remove utility.h
2 files changed