New commit
Move rpc to a single *.h