A bit of renaming/additional hcatalog work
Sketch out HCatalogSource