Renamed to SDK and add mocking