Added definitions and refactored includes.
Working on the service tests.
An issue with NEAR service.