Modified AbstractService, unit tests.
Merge pull request #10 from MedicoreNL/feature/restructure

Modified AbstractService, unit tests.