Refactoring to convert 'catalogue' concept to 'library', in preparation for new automated library config that will use files in Git repos to replace manual config.