Refactoring; also moved /getVocabulary/{id} to ThesaurusRestService from BaseRestService