Move eventservice-rpc back to compile scope