Catalog tree refactoring