Renamed namespace NNTP to Nntp. Cleanup old code