Refactor catalog / site relationship.