Moved CatalogView into appropriate folder.