Annotation related code now moved back into annotation-service module

Annotation related code now moved back into annotation-service module.