Rearranging catalogs - refactoring towards aggregate catalogs