Merge back CatalogService and AddonsManager into AddonService
Format code