client.go                           | 4 ++--
 client_test.go                      | 2 +-
 cmd/magnet-metainfo/main.go         | 2 +-
 cmd/torrent-create/main.go          | 2 +-
 cmd/torrent-infohash/main.go        | 2 +-
 cmd/torrent-magnet/main.go          | 2 +-
 cmd/torrent-metainfo-pprint/main.go | 2 +-
 cmd/torrent-verify/main.go          | 2 +-
 cmd/torrent/main.go                 | 2 +-
 cmd/tracker-announce/main.go        | 2 +-
 connection.go                       | 2 +-
 data/blob/blob.go                   | 2 +-
 data/blob/store.go                  | 2 +-
 data/data.go                        | 2 +-
 data/file/file.go                   | 2 +-
 data/mmap/mmap.go                   | 2 +-
 dht/dht.go                          | 2 +-
 file.go                             | 2 +-
 fs/torrentfs.go                     | 2 +-
 fs/torrentfs_test.go                | 2 +-
 internal/testutil/testutil.go       | 2 +-
 metainfo/builder.go                 | 2 +-
 metainfo/metainfo.go                | 2 +-
 metainfo/metainfo_test.go           | 2 +-
 torrent.go                          | 4 ++--
 tracker/http.go                     | 2 +-
 util/dirwatch/dirwatch.go           | 2 +-
 util/types.go                       | 2 +-

diff --git a/client.go b/client.go
index fbc7a51185304e85981bbcbcbfc1dc6ca26b62a7..578294fb742f5ec47827d231ae9cd030c27872cf 100644
--- a/client.go
+++ b/client.go
@@ -38,8 +38,8 @@ 	"strings"
 	"syscall"
 	"time"
 
-	"github.com/anacrolix/libtorgo/bencode"
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/bencode"
+	"github.com/anacrolix/torrent/metainfo"
 	"github.com/anacrolix/sync"
 	"github.com/anacrolix/utp"
 	"github.com/bradfitz/iter"
diff --git a/client_test.go b/client_test.go
index 05d7c90924e505c2e67ec3dfab292aa4b6a814fd..ccaf5a10d142a05fdfb49a33bb3ff7774a481130 100644
--- a/client_test.go
+++ b/client_test.go
@@ -10,7 +10,7 @@ 	"os"
 	"testing"
 	"time"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 	"github.com/anacrolix/utp"
 	"github.com/bradfitz/iter"
 	"gopkg.in/check.v1"
diff --git a/cmd/magnet-metainfo/main.go b/cmd/magnet-metainfo/main.go
index e7f643fe34c5ab682254a51e11ac0a967af9e8d8..079f38b751a1cdcef9742144a80c5e8ccece9c8d 100644
--- a/cmd/magnet-metainfo/main.go
+++ b/cmd/magnet-metainfo/main.go
@@ -7,7 +7,7 @@ 	"log"
 	"os"
 	"sync"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 
 	"github.com/anacrolix/torrent"
 )
diff --git a/cmd/torrent-create/main.go b/cmd/torrent-create/main.go
index b5d3828f085b8981408f0626d3d29e55ceb5ca95..65978b76f7ab2e854ff037c835fb9669c18d8c1a 100644
--- a/cmd/torrent-create/main.go
+++ b/cmd/torrent-create/main.go
@@ -7,7 +7,7 @@ 	"os"
 	"path/filepath"
 	"runtime"
 
-	torrent "github.com/anacrolix/libtorgo/metainfo"
+	torrent "github.com/anacrolix/torrent/metainfo"
 )
 
 var (
diff --git a/cmd/torrent-infohash/main.go b/cmd/torrent-infohash/main.go
index d79662034677bab62c528cee50af3fc9977a6b7d..bcbf08ec9efde655efb16065dcbc50a70b3f8045 100644
--- a/cmd/torrent-infohash/main.go
+++ b/cmd/torrent-infohash/main.go
@@ -5,7 +5,7 @@ 	"flag"
 	"fmt"
 	"log"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 )
 
 func main() {
diff --git a/cmd/torrent-magnet/main.go b/cmd/torrent-magnet/main.go
index 2fcd8cd0ec0768bf9c933aefb849f40b4fffa9b1..292f957148ed17cdd658e5ade4e594a405a669df 100644
--- a/cmd/torrent-magnet/main.go
+++ b/cmd/torrent-magnet/main.go
@@ -5,7 +5,7 @@ 	"flag"
 	"fmt"
 	"os"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 
 	"github.com/anacrolix/torrent"
 )
diff --git a/cmd/torrent-metainfo-pprint/main.go b/cmd/torrent-metainfo-pprint/main.go
index 342bba201b0dd55d11f69fb85bed262fd1d94c18..ca8896b796bb286f9373ab6b3f438521ff411b28 100644
--- a/cmd/torrent-metainfo-pprint/main.go
+++ b/cmd/torrent-metainfo-pprint/main.go
@@ -5,7 +5,7 @@ 	"flag"
 	"fmt"
 	"log"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 )
 
 func main() {
diff --git a/cmd/torrent-verify/main.go b/cmd/torrent-verify/main.go
index a3d97b247d3d9eafb20e53a6a62aaba358659f85..d70788cd9bbe9c026c252942a9aa11532a7e3196 100644
--- a/cmd/torrent-verify/main.go
+++ b/cmd/torrent-verify/main.go
@@ -9,7 +9,7 @@ 	"log"
 	"os"
 	"path/filepath"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 	"launchpad.net/gommap"
 
 	"github.com/anacrolix/torrent/mmap_span"
diff --git a/cmd/torrent/main.go b/cmd/torrent/main.go
index b973db1c8d458a4898e5ad235690b0c86f8bba7b..116b33b94eb05cf19d51553722f31fb029df38fd 100644
--- a/cmd/torrent/main.go
+++ b/cmd/torrent/main.go
@@ -12,7 +12,7 @@ 	"strings"
 	"time"
 
 	_ "github.com/anacrolix/envpprof"
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 	"github.com/dustin/go-humanize"
 	"github.com/jessevdk/go-flags"
 
diff --git a/cmd/tracker-announce/main.go b/cmd/tracker-announce/main.go
index f435521bd880a7b6ca3b62ce33574c5bfca049f7..c735a12d395a6dc0f00a068dff9d34afccfb1f80 100644
--- a/cmd/tracker-announce/main.go
+++ b/cmd/tracker-announce/main.go
@@ -6,7 +6,7 @@ 	"log"
 	"math"
 	"strings"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/tracker"
diff --git a/connection.go b/connection.go
index 25a834708a41773949bbe40312738a7078fa3422..f8d104ab955975961b4fec5d8ca6ae6a6d55bc1a 100644
--- a/connection.go
+++ b/connection.go
@@ -12,7 +12,7 @@ 	"net"
 	"sync"
 	"time"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 
 	"github.com/anacrolix/torrent/internal/pieceordering"
 	pp "github.com/anacrolix/torrent/peer_protocol"
diff --git a/data/blob/blob.go b/data/blob/blob.go
index 934bbc4826fe473f6547e0238fb4ceb813b23db8..d0741ed6f3446274cba852db360d4393cab71504 100644
--- a/data/blob/blob.go
+++ b/data/blob/blob.go
@@ -5,7 +5,7 @@ 	"encoding/hex"
 	"io"
 	"log"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 )
 
 type data struct {
diff --git a/data/blob/store.go b/data/blob/store.go
index b1b1139385cdc7ea782c141a842fefbbe1a8f6c0..7ae2af25b201f9b900d4eeaf240bab2e2ccfda5e 100644
--- a/data/blob/store.go
+++ b/data/blob/store.go
@@ -13,7 +13,7 @@ 	"sort"
 	"sync"
 	"time"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 
 	dataPkg "github.com/anacrolix/torrent/data"
 )
diff --git a/data/data.go b/data/data.go
index bc61d25b7931f4a41b3529b93dd19638f0d273f2..f783279ddf0a654b92f521ff54dafc7b42b8b732 100644
--- a/data/data.go
+++ b/data/data.go
@@ -3,7 +3,7 @@
 import (
 	"io"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 )
 
 type Store interface {
diff --git a/data/file/file.go b/data/file/file.go
index e9741b06f754168b3f1fefc5e627dd2468888e9e..0c30bc50c14aa7c289eb871a6c9aa10df4c6faf6 100644
--- a/data/file/file.go
+++ b/data/file/file.go
@@ -5,7 +5,7 @@ 	"io"
 	"os"
 	"path/filepath"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 )
 
 type data struct {
diff --git a/data/mmap/mmap.go b/data/mmap/mmap.go
index d222366289c9ae3fa4b7141db033d919c976880c..8a29c8a44cfc04fd2f679f5846ef5cc4e6c5e2e2 100644
--- a/data/mmap/mmap.go
+++ b/data/mmap/mmap.go
@@ -5,7 +5,7 @@ 	"fmt"
 	"os"
 	"path/filepath"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 	"launchpad.net/gommap"
 
 	"github.com/anacrolix/torrent/mmap_span"
diff --git a/dht/dht.go b/dht/dht.go
index b9ea3ee7be07b5b76761707a31f7e3f2d0240d44..f014e7c14c14bc7843bd4d34755d8c38f3b354b6 100644
--- a/dht/dht.go
+++ b/dht/dht.go
@@ -19,7 +19,7 @@ 	"net"
 	"os"
 	"time"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 	"github.com/anacrolix/sync"
 
 	"github.com/anacrolix/torrent/iplist"
diff --git a/file.go b/file.go
index 1ec0d21dbf7d447cba0bb1c9c554235e5550c46e..d663a2f64d659fe7a186e02d4e09d8c011e84905 100644
--- a/file.go
+++ b/file.go
@@ -1,6 +1,6 @@
 package torrent
 
-import "github.com/anacrolix/libtorgo/metainfo"
+import "github.com/anacrolix/torrent/metainfo"
 
 // Provides access to regions of torrent data that correspond to its files.
 type File struct {
diff --git a/fs/torrentfs.go b/fs/torrentfs.go
index ffb9df68b11e05186c0fcb4e7f78ba8d498dd2a4..b7988313f3a9ce653da5abee8c59f660b08a2212 100644
--- a/fs/torrentfs.go
+++ b/fs/torrentfs.go
@@ -10,7 +10,7 @@ 	"sync"
 
 	"bazil.org/fuse"
 	fusefs "bazil.org/fuse/fs"
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 	"golang.org/x/net/context"
 
 	"github.com/anacrolix/torrent"
diff --git a/fs/torrentfs_test.go b/fs/torrentfs_test.go
index 0ac72afc1733e6fbceedab1c322d95afceaeccaf..1f39ac07cc791f38fe8c24b737bdb3e1e371537d 100644
--- a/fs/torrentfs_test.go
+++ b/fs/torrentfs_test.go
@@ -17,7 +17,7 @@ 	"time"
 
 	"bazil.org/fuse"
 	fusefs "bazil.org/fuse/fs"
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 	"golang.org/x/net/context"
 
 	"github.com/anacrolix/torrent"
diff --git a/internal/testutil/testutil.go b/internal/testutil/testutil.go
index af1230f6f0f8bfff82efc5afe22c9b2a6e80d34a..552f9a8eb39a555a6f7d3bed51a5dca80df823f1 100644
--- a/internal/testutil/testutil.go
+++ b/internal/testutil/testutil.go
@@ -12,7 +12,7 @@ 	"io/ioutil"
 	"os"
 	"path/filepath"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 )
 
 const GreetingFileContents = "hello, world\n"
diff --git a/metainfo/builder.go b/metainfo/builder.go
index 98c89f16db211129fa02dded0ade6972199be4f1..76873048a42a24c8f3cec72f8891ba1f08f54d60 100644
--- a/metainfo/builder.go
+++ b/metainfo/builder.go
@@ -3,7 +3,7 @@
 import (
 	"crypto/sha1"
 	"errors"
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 	"hash"
 	"io"
 	"os"
diff --git a/metainfo/metainfo.go b/metainfo/metainfo.go
index a9a6e00971f77c1d0bdf9f7d4aed08b0e6d2e29b..2f15cacce7978689f09893f9595b656d32669ae8 100644
--- a/metainfo/metainfo.go
+++ b/metainfo/metainfo.go
@@ -5,7 +5,7 @@ 	"crypto/sha1"
 	"io"
 	"os"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 )
 
 // Information specific to a single file inside the MetaInfo structure.
diff --git a/metainfo/metainfo_test.go b/metainfo/metainfo_test.go
index 98489656bc9a8b85a9946c39acbcd7aaad018e9b..d346a0b386c88c056cc872b5565037923f50ddb7 100644
--- a/metainfo/metainfo_test.go
+++ b/metainfo/metainfo_test.go
@@ -5,7 +5,7 @@ 	"bytes"
 	"path"
 	"testing"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 )
 
 func test_file(t *testing.T, filename string) {
diff --git a/torrent.go b/torrent.go
index 72d0b1299e9607035d9a4bdb69da3deff4ef7d20..8886364634201e5286b92948fe062697454bd11a 100644
--- a/torrent.go
+++ b/torrent.go
@@ -10,8 +10,8 @@ 	"sort"
 	"sync"
 	"time"
 
-	"github.com/anacrolix/libtorgo/bencode"
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/bencode"
+	"github.com/anacrolix/torrent/metainfo"
 	"github.com/bradfitz/iter"
 
 	"github.com/anacrolix/torrent/data"
diff --git a/tracker/http.go b/tracker/http.go
index 59e9b9aec6df749e568cf8caace2441a9ded4a58..290aa28ea295ed00feb7e3d26911e966de5299e1 100644
--- a/tracker/http.go
+++ b/tracker/http.go
@@ -10,7 +10,7 @@ 	"net/http"
 	"net/url"
 	"strconv"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 
 	"github.com/anacrolix/torrent/util"
 )
diff --git a/util/dirwatch/dirwatch.go b/util/dirwatch/dirwatch.go
index 9669e8343c98ff4aab78ac6c579a70916caef695..eb952f9c6efe8eee637c301b28b3c9d2f0c19c9d 100644
--- a/util/dirwatch/dirwatch.go
+++ b/util/dirwatch/dirwatch.go
@@ -9,7 +9,7 @@ 	"os"
 	"path/filepath"
 	"strings"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 	"github.com/go-fsnotify/fsnotify"
 
 	"github.com/anacrolix/torrent"
diff --git a/util/types.go b/util/types.go
index cbf2872b7c48deaf14b4dc263f28ddd2ef650458..1ffff796c667dbbe405bc8c077a900b6188caa13 100644
--- a/util/types.go
+++ b/util/types.go
@@ -7,7 +7,7 @@ 	"encoding/binary"
 	"fmt"
 	"io"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 )
 
 type CompactPeers []CompactPeer