When you move all of this stuff to components/implementation/torrent/*, be sure to remove all of these existing files, and update the tests (in the future).