Adding genutils to eliminate external dependency and updating function references.