Deprecating catalog/catalog-web split

Pulling a bunch of the catalog-web entries into catalog and discarding catalog-web.