Refactoring of services. Tests updated to reflect the refactoring. Changed the URI of the api to /s/annotation