Refactored catalog's structure