Move some modules from torrent-content