Refactored ServiceCatalog to contain only beans
ServiceCatalog refactoring idea dropped back