[hcatalog] Moving to md