moving ZincCatalog to zinc.catalog module