Refactored towards single Catalog instance
Server should return CatalogDefinition and full dictionary of ships.
(intermediate version, not working)