+ Move some stuff from network-bittorrent.