Rename misleading HeaderSet annotation; update directories; update utilities