Moved DiagServer into nr::diag