Simplified services
Combined KeyInfoFactoryService and KeyInfoHelperFactoryService to KeyInfoService
Renamed TableFactoryService to TableService
Source file header fix