I moved Catalog to concerns. That means it gets autoloaded so we don't have to restart the server when changes are made.