The enitities and containers of the catalog now go into catalog subfolder Models go into model
Also improved the loading code for some catalog tables.