MVC: Solve some design feedback (filter selector in catalog) CatalogApi: Move models from infrastructure to Model folder.