Refactoring catalog files and their references.