removed EndpointService, endpoints are now constants in EndpointConstants
more endpoint changes
some refactoring