Refactored catalogue's structure