diff --git a/.codeclimate.yml b/.codeclimate.yml
index 8c322035f1..45ae54a993 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -10,7 +10,7 @@ ratings:
     - "**.go"
 exclude_paths:
   - vendor/
-  - internal/gps/_testdata
+  - gps/_testdata
   - cmd/dep/testdata
   - testdata
-  - internal/gps/internal/pb
+  - gps/internal/pb
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index dcc39bc1fa..6bc15ea97d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -22,4 +22,4 @@
 /cmd/dep/graphviz*                        @darkowlzz
 
 # gps caching
-/internal/gps/source_cache* @jmank88
+/gps/source_cache* @jmank88
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d66dc79222..9af8c27b14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ BUG FIXES:
 IMPROVEMENTS:
 
 * Log as dependencies are pre-fetched during dep init ([#1176](https://github.com/golang/dep/pull/1176)).
+* Make the gps package importable ([#1349](https://github.com/golang/dep/pull/1349)).
 
 # v0.3.2
 
diff --git a/analyzer.go b/analyzer.go
index 9872a3aa03..1d0b920ec5 100644
--- a/analyzer.go
+++ b/analyzer.go
@@ -8,8 +8,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
 )
 
 // Analyzer implements gps.ProjectAnalyzer.
diff --git a/appveyor.yml b/appveyor.yml
index d494ea36dc..fb07653a74 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,7 @@
 version: "{build}"
 
 # Source Config
+
 clone_folder: c:\gopath\src\github.com\golang\dep
 
 # Build host
diff --git a/cmd/dep/ensure.go b/cmd/dep/ensure.go
index 6a7c02c403..560f50f9cb 100644
--- a/cmd/dep/ensure.go
+++ b/cmd/dep/ensure.go
@@ -19,9 +19,9 @@ import (
 	"sync"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/paths"
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/paths"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 
diff --git a/cmd/dep/ensure_test.go b/cmd/dep/ensure_test.go
index e8cf300e87..2ff439a6dc 100644
--- a/cmd/dep/ensure_test.go
+++ b/cmd/dep/ensure_test.go
@@ -14,8 +14,8 @@ import (
 	"testing"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal/test"
 )
 
diff --git a/cmd/dep/gopath_scanner.go b/cmd/dep/gopath_scanner.go
index 77d14a0cd2..ad45faee79 100644
--- a/cmd/dep/gopath_scanner.go
+++ b/cmd/dep/gopath_scanner.go
@@ -11,11 +11,11 @@ import (
 	"sync"
 
 	"github.com/golang/dep"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/paths"
+	"github.com/golang/dep/gps/pkgtree"
 	fb "github.com/golang/dep/internal/feedback"
 	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/paths"
-	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 
diff --git a/cmd/dep/gopath_scanner_test.go b/cmd/dep/gopath_scanner_test.go
index 142504ab4a..bfab02e823 100644
--- a/cmd/dep/gopath_scanner_test.go
+++ b/cmd/dep/gopath_scanner_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/test"
 )
 
diff --git a/cmd/dep/hash_in.go b/cmd/dep/hash_in.go
index 09ffbfb368..ed7f356934 100644
--- a/cmd/dep/hash_in.go
+++ b/cmd/dep/hash_in.go
@@ -8,8 +8,8 @@ import (
 	"flag"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 
diff --git a/cmd/dep/init.go b/cmd/dep/init.go
index 3071ca807e..0c6a36a93e 100644
--- a/cmd/dep/init.go
+++ b/cmd/dep/init.go
@@ -14,10 +14,10 @@ import (
 	"time"
 
 	"github.com/golang/dep"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/paths"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/paths"
-	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 
diff --git a/cmd/dep/init_test.go b/cmd/dep/init_test.go
index 18c2fb540f..0d0aff23ba 100644
--- a/cmd/dep/init_test.go
+++ b/cmd/dep/init_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/test"
 )
 
diff --git a/cmd/dep/prune.go b/cmd/dep/prune.go
index db89f24b34..202a0980a6 100644
--- a/cmd/dep/prune.go
+++ b/cmd/dep/prune.go
@@ -15,9 +15,9 @@ import (
 	"strings"
 
 	"github.com/golang/dep"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 
diff --git a/cmd/dep/root_analyzer.go b/cmd/dep/root_analyzer.go
index 249d3bf597..017e5a202b 100644
--- a/cmd/dep/root_analyzer.go
+++ b/cmd/dep/root_analyzer.go
@@ -12,8 +12,8 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	"github.com/golang/dep"
+	"github.com/golang/dep/gps"
 	fb "github.com/golang/dep/internal/feedback"
-	"github.com/golang/dep/internal/gps"
 	"github.com/golang/dep/internal/importers"
 )
 
diff --git a/cmd/dep/status.go b/cmd/dep/status.go
index ff5355f700..a1f9a0a8c1 100644
--- a/cmd/dep/status.go
+++ b/cmd/dep/status.go
@@ -17,9 +17,9 @@ import (
 	"text/tabwriter"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/paths"
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/paths"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 
diff --git a/cmd/dep/status_test.go b/cmd/dep/status_test.go
index 151912a18c..1558343a6e 100644
--- a/cmd/dep/status_test.go
+++ b/cmd/dep/status_test.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 func TestStatusFormatVersion(t *testing.T) {
diff --git a/context.go b/context.go
index ba8007360e..bf2502ddb2 100644
--- a/context.go
+++ b/context.go
@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"runtime"
 
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
 	"github.com/pkg/errors"
 )
 
diff --git a/docs/FAQ.md b/docs/FAQ.md
index 4f0c89e3c1..4a8a582ba5 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -179,7 +179,7 @@ Once you have set that up, dep will automatically use that Token to authenticate
 
 The full algorithm is complex, but the most important thing to understand is
 that `dep` tries versions in a [certain
-order](https://godoc.org/github.com/golang/dep/internal/gps#SortForUpgrade),
+order](https://godoc.org/github.com/golang/dep/gps#SortForUpgrade),
 checking to see a version is acceptable according to specified constraints.
 
 - All semver versions come first, and sort mostly according to the semver 2.0
diff --git a/internal/gps/_testdata/badrepo/README.md b/gps/_testdata/badrepo/README.md
similarity index 100%
rename from internal/gps/_testdata/badrepo/README.md
rename to gps/_testdata/badrepo/README.md
diff --git a/internal/gps/_testdata/badrepo/corrupt_dot_git_directory.tar b/gps/_testdata/badrepo/corrupt_dot_git_directory.tar
similarity index 100%
rename from internal/gps/_testdata/badrepo/corrupt_dot_git_directory.tar
rename to gps/_testdata/badrepo/corrupt_dot_git_directory.tar
diff --git a/internal/gps/_testdata/cmd/echosleep/echosleep.go b/gps/_testdata/cmd/echosleep/echosleep.go
similarity index 100%
rename from internal/gps/_testdata/cmd/echosleep/echosleep.go
rename to gps/_testdata/cmd/echosleep/echosleep.go
diff --git a/internal/gps/_testdata/cmd/stdout_stderr/stdout_stderr.go b/gps/_testdata/cmd/stdout_stderr/stdout_stderr.go
similarity index 100%
rename from internal/gps/_testdata/cmd/stdout_stderr/stdout_stderr.go
rename to gps/_testdata/cmd/stdout_stderr/stdout_stderr.go
diff --git a/internal/gps/_testdata/digest/github.com/alice/match/match.go b/gps/_testdata/digest/github.com/alice/match/match.go
similarity index 100%
rename from internal/gps/_testdata/digest/github.com/alice/match/match.go
rename to gps/_testdata/digest/github.com/alice/match/match.go
diff --git a/internal/gps/_testdata/digest/github.com/alice/mismatch/mismatch.go b/gps/_testdata/digest/github.com/alice/mismatch/mismatch.go
similarity index 100%
rename from internal/gps/_testdata/digest/github.com/alice/mismatch/mismatch.go
rename to gps/_testdata/digest/github.com/alice/mismatch/mismatch.go
diff --git a/internal/gps/_testdata/digest/github.com/alice/notInLock/notInLock.go b/gps/_testdata/digest/github.com/alice/notInLock/notInLock.go
similarity index 100%
rename from internal/gps/_testdata/digest/github.com/alice/notInLock/notInLock.go
rename to gps/_testdata/digest/github.com/alice/notInLock/notInLock.go
diff --git a/internal/gps/_testdata/digest/github.com/bob/emptyDigest/emptyDigest.go b/gps/_testdata/digest/github.com/bob/emptyDigest/emptyDigest.go
similarity index 100%
rename from internal/gps/_testdata/digest/github.com/bob/emptyDigest/emptyDigest.go
rename to gps/_testdata/digest/github.com/bob/emptyDigest/emptyDigest.go
diff --git a/internal/gps/_testdata/digest/github.com/bob/match/match.go b/gps/_testdata/digest/github.com/bob/match/match.go
similarity index 100%
rename from internal/gps/_testdata/digest/github.com/bob/match/match.go
rename to gps/_testdata/digest/github.com/bob/match/match.go
diff --git a/internal/gps/_testdata/digest/launchpad.net/match/match.go b/gps/_testdata/digest/launchpad.net/match/match.go
similarity index 100%
rename from internal/gps/_testdata/digest/launchpad.net/match/match.go
rename to gps/_testdata/digest/launchpad.net/match/match.go
diff --git a/internal/gps/_testdata/src/bad/bad.go b/gps/_testdata/src/bad/bad.go
similarity index 100%
rename from internal/gps/_testdata/src/bad/bad.go
rename to gps/_testdata/src/bad/bad.go
diff --git a/internal/gps/_testdata/src/buildtag/invalid.go b/gps/_testdata/src/buildtag/invalid.go
similarity index 100%
rename from internal/gps/_testdata/src/buildtag/invalid.go
rename to gps/_testdata/src/buildtag/invalid.go
diff --git a/internal/gps/_testdata/src/canon_confl/a.go b/gps/_testdata/src/canon_confl/a.go
similarity index 100%
rename from internal/gps/_testdata/src/canon_confl/a.go
rename to gps/_testdata/src/canon_confl/a.go
diff --git a/internal/gps/_testdata/src/canon_confl/b.go b/gps/_testdata/src/canon_confl/b.go
similarity index 100%
rename from internal/gps/_testdata/src/canon_confl/b.go
rename to gps/_testdata/src/canon_confl/b.go
diff --git a/internal/gps/_testdata/src/canonical/main.go b/gps/_testdata/src/canonical/main.go
similarity index 100%
rename from internal/gps/_testdata/src/canonical/main.go
rename to gps/_testdata/src/canonical/main.go
diff --git a/internal/gps/_testdata/src/canonical/sub/sub.go b/gps/_testdata/src/canonical/sub/sub.go
similarity index 100%
rename from internal/gps/_testdata/src/canonical/sub/sub.go
rename to gps/_testdata/src/canonical/sub/sub.go
diff --git a/internal/gps/_testdata/src/cycle/a.go b/gps/_testdata/src/cycle/a.go
similarity index 86%
rename from internal/gps/_testdata/src/cycle/a.go
rename to gps/_testdata/src/cycle/a.go
index 0965bb7037..443db77985 100644
--- a/internal/gps/_testdata/src/cycle/a.go
+++ b/gps/_testdata/src/cycle/a.go
@@ -7,7 +7,7 @@ package cycle
 import (
 	"cycle/one"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/cycle/one/a.go b/gps/_testdata/src/cycle/one/a.go
similarity index 85%
rename from internal/gps/_testdata/src/cycle/one/a.go
rename to gps/_testdata/src/cycle/one/a.go
index 407c8051c2..055d98db2d 100644
--- a/internal/gps/_testdata/src/cycle/one/a.go
+++ b/gps/_testdata/src/cycle/one/a.go
@@ -7,7 +7,7 @@ package one
 import (
 	"cycle/two"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/cycle/two/a.go b/gps/_testdata/src/cycle/two/a.go
similarity index 85%
rename from internal/gps/_testdata/src/cycle/two/a.go
rename to gps/_testdata/src/cycle/two/a.go
index 98ea406f9c..a44003adf5 100644
--- a/internal/gps/_testdata/src/cycle/two/a.go
+++ b/gps/_testdata/src/cycle/two/a.go
@@ -7,7 +7,7 @@ package two
 import (
 	"cycle"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/disallow/a.go b/gps/_testdata/src/disallow/a.go
similarity index 87%
rename from internal/gps/_testdata/src/disallow/a.go
rename to gps/_testdata/src/disallow/a.go
index 7b2b9c67bd..99dd6f3512 100644
--- a/internal/gps/_testdata/src/disallow/a.go
+++ b/gps/_testdata/src/disallow/a.go
@@ -8,7 +8,7 @@ import (
 	"disallow/testdata"
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/disallow/testdata/another.go b/gps/_testdata/src/disallow/testdata/another.go
similarity index 100%
rename from internal/gps/_testdata/src/disallow/testdata/another.go
rename to gps/_testdata/src/disallow/testdata/another.go
diff --git a/internal/gps/_testdata/src/dotgodir/.go/.gitkeep b/gps/_testdata/src/dotgodir/.go/.gitkeep
similarity index 100%
rename from internal/gps/_testdata/src/dotgodir/.go/.gitkeep
rename to gps/_testdata/src/dotgodir/.go/.gitkeep
diff --git a/internal/gps/_testdata/src/dotgodir/.go/dot.go b/gps/_testdata/src/dotgodir/.go/dot.go
similarity index 100%
rename from internal/gps/_testdata/src/dotgodir/.go/dot.go
rename to gps/_testdata/src/dotgodir/.go/dot.go
diff --git a/internal/gps/_testdata/src/dotgodir/.m1p/a.go b/gps/_testdata/src/dotgodir/.m1p/a.go
similarity index 86%
rename from internal/gps/_testdata/src/dotgodir/.m1p/a.go
rename to gps/_testdata/src/dotgodir/.m1p/a.go
index a5fc8c2e57..6a88c12022 100644
--- a/internal/gps/_testdata/src/dotgodir/.m1p/a.go
+++ b/gps/_testdata/src/dotgodir/.m1p/a.go
@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/dotgodir/.m1p/b.go b/gps/_testdata/src/dotgodir/.m1p/b.go
similarity index 100%
rename from internal/gps/_testdata/src/dotgodir/.m1p/b.go
rename to gps/_testdata/src/dotgodir/.m1p/b.go
diff --git a/internal/gps/_testdata/src/dotgodir/foo.go/.gitkeep b/gps/_testdata/src/dotgodir/foo.go/.gitkeep
similarity index 100%
rename from internal/gps/_testdata/src/dotgodir/foo.go/.gitkeep
rename to gps/_testdata/src/dotgodir/foo.go/.gitkeep
diff --git a/internal/gps/_testdata/src/dotgodir/foo.go/foo.go b/gps/_testdata/src/dotgodir/foo.go/foo.go
similarity index 100%
rename from internal/gps/_testdata/src/dotgodir/foo.go/foo.go
rename to gps/_testdata/src/dotgodir/foo.go/foo.go
diff --git a/internal/gps/_testdata/src/doublenest/a.go b/gps/_testdata/src/doublenest/a.go
similarity index 86%
rename from internal/gps/_testdata/src/doublenest/a.go
rename to gps/_testdata/src/doublenest/a.go
index e99afea031..fca9b43a33 100644
--- a/internal/gps/_testdata/src/doublenest/a.go
+++ b/gps/_testdata/src/doublenest/a.go
@@ -7,7 +7,7 @@ package base
 import (
 	"go/parser"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/m1p/a.go b/gps/_testdata/src/doublenest/namemismatch/m1p/a.go
similarity index 86%
rename from internal/gps/_testdata/src/m1p/a.go
rename to gps/_testdata/src/doublenest/namemismatch/m1p/a.go
index ddfc833eea..78f859bb86 100644
--- a/internal/gps/_testdata/src/m1p/a.go
+++ b/gps/_testdata/src/doublenest/namemismatch/m1p/a.go
@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/doublenest/namemismatch/m1p/b.go b/gps/_testdata/src/doublenest/namemismatch/m1p/b.go
similarity index 100%
rename from internal/gps/_testdata/src/doublenest/namemismatch/m1p/b.go
rename to gps/_testdata/src/doublenest/namemismatch/m1p/b.go
diff --git a/internal/gps/_testdata/src/doublenest/namemismatch/nm.go b/gps/_testdata/src/doublenest/namemismatch/nm.go
similarity index 100%
rename from internal/gps/_testdata/src/doublenest/namemismatch/nm.go
rename to gps/_testdata/src/doublenest/namemismatch/nm.go
diff --git a/internal/gps/_testdata/src/empty/.gitkeep b/gps/_testdata/src/empty/.gitkeep
similarity index 100%
rename from internal/gps/_testdata/src/empty/.gitkeep
rename to gps/_testdata/src/empty/.gitkeep
diff --git a/internal/gps/_testdata/src/github.com/example/varied/locals.go b/gps/_testdata/src/github.com/example/varied/locals.go
similarity index 100%
rename from internal/gps/_testdata/src/github.com/example/varied/locals.go
rename to gps/_testdata/src/github.com/example/varied/locals.go
diff --git a/internal/gps/_testdata/src/varied/m1p/a.go b/gps/_testdata/src/github.com/example/varied/m1p/a.go
similarity index 86%
rename from internal/gps/_testdata/src/varied/m1p/a.go
rename to gps/_testdata/src/github.com/example/varied/m1p/a.go
index b2de8754cb..9fae843c5d 100644
--- a/internal/gps/_testdata/src/varied/m1p/a.go
+++ b/gps/_testdata/src/github.com/example/varied/m1p/a.go
@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/github.com/example/varied/m1p/b.go b/gps/_testdata/src/github.com/example/varied/m1p/b.go
similarity index 100%
rename from internal/gps/_testdata/src/github.com/example/varied/m1p/b.go
rename to gps/_testdata/src/github.com/example/varied/m1p/b.go
diff --git a/internal/gps/_testdata/src/github.com/example/varied/main.go b/gps/_testdata/src/github.com/example/varied/main.go
similarity index 100%
rename from internal/gps/_testdata/src/github.com/example/varied/main.go
rename to gps/_testdata/src/github.com/example/varied/main.go
diff --git a/internal/gps/_testdata/src/github.com/example/varied/namemismatch/nm.go b/gps/_testdata/src/github.com/example/varied/namemismatch/nm.go
similarity index 100%
rename from internal/gps/_testdata/src/github.com/example/varied/namemismatch/nm.go
rename to gps/_testdata/src/github.com/example/varied/namemismatch/nm.go
diff --git a/internal/gps/_testdata/src/github.com/example/varied/otherpath/otherpath_test.go b/gps/_testdata/src/github.com/example/varied/otherpath/otherpath_test.go
similarity index 100%
rename from internal/gps/_testdata/src/github.com/example/varied/otherpath/otherpath_test.go
rename to gps/_testdata/src/github.com/example/varied/otherpath/otherpath_test.go
diff --git a/internal/gps/_testdata/src/github.com/example/varied/simple/another/another.go b/gps/_testdata/src/github.com/example/varied/simple/another/another.go
similarity index 100%
rename from internal/gps/_testdata/src/github.com/example/varied/simple/another/another.go
rename to gps/_testdata/src/github.com/example/varied/simple/another/another.go
diff --git a/internal/gps/_testdata/src/github.com/example/varied/simple/another/another_test.go b/gps/_testdata/src/github.com/example/varied/simple/another/another_test.go
similarity index 100%
rename from internal/gps/_testdata/src/github.com/example/varied/simple/another/another_test.go
rename to gps/_testdata/src/github.com/example/varied/simple/another/another_test.go
diff --git a/internal/gps/_testdata/src/github.com/example/varied/simple/another/locals.go b/gps/_testdata/src/github.com/example/varied/simple/another/locals.go
similarity index 100%
rename from internal/gps/_testdata/src/github.com/example/varied/simple/another/locals.go
rename to gps/_testdata/src/github.com/example/varied/simple/another/locals.go
diff --git a/internal/gps/_testdata/src/github.com/example/varied/simple/locals.go b/gps/_testdata/src/github.com/example/varied/simple/locals.go
similarity index 100%
rename from internal/gps/_testdata/src/github.com/example/varied/simple/locals.go
rename to gps/_testdata/src/github.com/example/varied/simple/locals.go
diff --git a/internal/gps/_testdata/src/github.com/example/varied/simple/simple.go b/gps/_testdata/src/github.com/example/varied/simple/simple.go
similarity index 86%
rename from internal/gps/_testdata/src/github.com/example/varied/simple/simple.go
rename to gps/_testdata/src/github.com/example/varied/simple/simple.go
index 9d0c3445f6..6dfd049488 100644
--- a/internal/gps/_testdata/src/github.com/example/varied/simple/simple.go
+++ b/gps/_testdata/src/github.com/example/varied/simple/simple.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"go/parser"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/igmaint/a.go b/gps/_testdata/src/igmain/a.go
similarity index 86%
rename from internal/gps/_testdata/src/igmaint/a.go
rename to gps/_testdata/src/igmain/a.go
index 2789b659d1..f772b57e72 100644
--- a/internal/gps/_testdata/src/igmaint/a.go
+++ b/gps/_testdata/src/igmain/a.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/igmain/igmain.go b/gps/_testdata/src/igmain/igmain.go
similarity index 100%
rename from internal/gps/_testdata/src/igmain/igmain.go
rename to gps/_testdata/src/igmain/igmain.go
diff --git a/internal/gps/_testdata/src/igmainfirst/igmain.go b/gps/_testdata/src/igmainfirst/igmain.go
similarity index 100%
rename from internal/gps/_testdata/src/igmainfirst/igmain.go
rename to gps/_testdata/src/igmainfirst/igmain.go
diff --git a/internal/gps/_testdata/src/igmainfirst/z.go b/gps/_testdata/src/igmainfirst/z.go
similarity index 86%
rename from internal/gps/_testdata/src/igmainfirst/z.go
rename to gps/_testdata/src/igmainfirst/z.go
index 2789b659d1..f772b57e72 100644
--- a/internal/gps/_testdata/src/igmainfirst/z.go
+++ b/gps/_testdata/src/igmainfirst/z.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/igmainlong/a.go b/gps/_testdata/src/igmainlong/a.go
similarity index 86%
rename from internal/gps/_testdata/src/igmainlong/a.go
rename to gps/_testdata/src/igmainlong/a.go
index 2789b659d1..f772b57e72 100644
--- a/internal/gps/_testdata/src/igmainlong/a.go
+++ b/gps/_testdata/src/igmainlong/a.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/igmainlong/igmain.go b/gps/_testdata/src/igmainlong/igmain.go
similarity index 100%
rename from internal/gps/_testdata/src/igmainlong/igmain.go
rename to gps/_testdata/src/igmainlong/igmain.go
diff --git a/internal/gps/_testdata/src/nest/a.go b/gps/_testdata/src/igmaint/a.go
similarity index 86%
rename from internal/gps/_testdata/src/nest/a.go
rename to gps/_testdata/src/igmaint/a.go
index 2789b659d1..f772b57e72 100644
--- a/internal/gps/_testdata/src/nest/a.go
+++ b/gps/_testdata/src/igmaint/a.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/igmaint/igmain.go b/gps/_testdata/src/igmaint/igmain.go
similarity index 100%
rename from internal/gps/_testdata/src/igmaint/igmain.go
rename to gps/_testdata/src/igmaint/igmain.go
diff --git a/internal/gps/_testdata/src/igmaint/t_test.go b/gps/_testdata/src/igmaint/t_test.go
similarity index 100%
rename from internal/gps/_testdata/src/igmaint/t_test.go
rename to gps/_testdata/src/igmaint/t_test.go
diff --git a/internal/gps/_testdata/src/missing/m1p/a.go b/gps/_testdata/src/m1p/a.go
similarity index 86%
rename from internal/gps/_testdata/src/missing/m1p/a.go
rename to gps/_testdata/src/m1p/a.go
index ddfc833eea..78f859bb86 100644
--- a/internal/gps/_testdata/src/missing/m1p/a.go
+++ b/gps/_testdata/src/m1p/a.go
@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/m1p/b.go b/gps/_testdata/src/m1p/b.go
similarity index 100%
rename from internal/gps/_testdata/src/m1p/b.go
rename to gps/_testdata/src/m1p/b.go
diff --git a/internal/gps/_testdata/src/missing/a.go b/gps/_testdata/src/missing/a.go
similarity index 87%
rename from internal/gps/_testdata/src/missing/a.go
rename to gps/_testdata/src/missing/a.go
index 0cdcb394ba..619b1bc5ca 100644
--- a/internal/gps/_testdata/src/missing/a.go
+++ b/gps/_testdata/src/missing/a.go
@@ -9,7 +9,7 @@ import (
 
 	"missing/missing"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/doublenest/namemismatch/m1p/a.go b/gps/_testdata/src/missing/m1p/a.go
similarity index 86%
rename from internal/gps/_testdata/src/doublenest/namemismatch/m1p/a.go
rename to gps/_testdata/src/missing/m1p/a.go
index ddfc833eea..78f859bb86 100644
--- a/internal/gps/_testdata/src/doublenest/namemismatch/m1p/a.go
+++ b/gps/_testdata/src/missing/m1p/a.go
@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/missing/m1p/b.go b/gps/_testdata/src/missing/m1p/b.go
similarity index 100%
rename from internal/gps/_testdata/src/missing/m1p/b.go
rename to gps/_testdata/src/missing/m1p/b.go
diff --git a/internal/gps/_testdata/src/igmain/a.go b/gps/_testdata/src/nest/a.go
similarity index 86%
rename from internal/gps/_testdata/src/igmain/a.go
rename to gps/_testdata/src/nest/a.go
index 2789b659d1..f772b57e72 100644
--- a/internal/gps/_testdata/src/igmain/a.go
+++ b/gps/_testdata/src/nest/a.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/nest/m1p/a.go b/gps/_testdata/src/nest/m1p/a.go
similarity index 86%
rename from internal/gps/_testdata/src/nest/m1p/a.go
rename to gps/_testdata/src/nest/m1p/a.go
index ddfc833eea..78f859bb86 100644
--- a/internal/gps/_testdata/src/nest/m1p/a.go
+++ b/gps/_testdata/src/nest/m1p/a.go
@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/nest/m1p/b.go b/gps/_testdata/src/nest/m1p/b.go
similarity index 100%
rename from internal/gps/_testdata/src/nest/m1p/b.go
rename to gps/_testdata/src/nest/m1p/b.go
diff --git a/internal/gps/_testdata/src/relimport/a.go b/gps/_testdata/src/relimport/a.go
similarity index 100%
rename from internal/gps/_testdata/src/relimport/a.go
rename to gps/_testdata/src/relimport/a.go
diff --git a/internal/gps/_testdata/src/relimport/dot/a.go b/gps/_testdata/src/relimport/dot/a.go
similarity index 100%
rename from internal/gps/_testdata/src/relimport/dot/a.go
rename to gps/_testdata/src/relimport/dot/a.go
diff --git a/internal/gps/_testdata/src/relimport/dotdot/a.go b/gps/_testdata/src/relimport/dotdot/a.go
similarity index 100%
rename from internal/gps/_testdata/src/relimport/dotdot/a.go
rename to gps/_testdata/src/relimport/dotdot/a.go
diff --git a/internal/gps/_testdata/src/relimport/dotdotslash/a.go b/gps/_testdata/src/relimport/dotdotslash/a.go
similarity index 83%
rename from internal/gps/_testdata/src/relimport/dotdotslash/a.go
rename to gps/_testdata/src/relimport/dotdotslash/a.go
index f1ffb55bdd..b4caf2fab2 100644
--- a/internal/gps/_testdata/src/relimport/dotdotslash/a.go
+++ b/gps/_testdata/src/relimport/dotdotslash/a.go
@@ -5,7 +5,7 @@
 package dotslash
 
 import (
-	"../github.com/golang/dep/internal/gps"
+	"../github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/relimport/dotslash/a.go b/gps/_testdata/src/relimport/dotslash/a.go
similarity index 100%
rename from internal/gps/_testdata/src/relimport/dotslash/a.go
rename to gps/_testdata/src/relimport/dotslash/a.go
diff --git a/gps/_testdata/src/ren/m1p/a.go b/gps/_testdata/src/ren/m1p/a.go
new file mode 100644
index 0000000000..78f859bb86
--- /dev/null
+++ b/gps/_testdata/src/ren/m1p/a.go
@@ -0,0 +1,16 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package m1p
+
+import (
+	"sort"
+
+	"github.com/golang/dep/gps"
+)
+
+var (
+	_ = sort.Strings
+	_ = gps.Solve
+)
diff --git a/internal/gps/_testdata/src/ren/m1p/b.go b/gps/_testdata/src/ren/m1p/b.go
similarity index 100%
rename from internal/gps/_testdata/src/ren/m1p/b.go
rename to gps/_testdata/src/ren/m1p/b.go
diff --git a/gps/_testdata/src/ren/simple/a.go b/gps/_testdata/src/ren/simple/a.go
new file mode 100644
index 0000000000..f772b57e72
--- /dev/null
+++ b/gps/_testdata/src/ren/simple/a.go
@@ -0,0 +1,16 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package simple
+
+import (
+	"sort"
+
+	"github.com/golang/dep/gps"
+)
+
+var (
+	_ = sort.Strings
+	_ = gps.Solve
+)
diff --git a/gps/_testdata/src/simple/a.go b/gps/_testdata/src/simple/a.go
new file mode 100644
index 0000000000..f772b57e72
--- /dev/null
+++ b/gps/_testdata/src/simple/a.go
@@ -0,0 +1,16 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package simple
+
+import (
+	"sort"
+
+	"github.com/golang/dep/gps"
+)
+
+var (
+	_ = sort.Strings
+	_ = gps.Solve
+)
diff --git a/gps/_testdata/src/simpleallt/a.go b/gps/_testdata/src/simpleallt/a.go
new file mode 100644
index 0000000000..f772b57e72
--- /dev/null
+++ b/gps/_testdata/src/simpleallt/a.go
@@ -0,0 +1,16 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package simple
+
+import (
+	"sort"
+
+	"github.com/golang/dep/gps"
+)
+
+var (
+	_ = sort.Strings
+	_ = gps.Solve
+)
diff --git a/internal/gps/_testdata/src/simpleallt/a_test.go b/gps/_testdata/src/simpleallt/a_test.go
similarity index 100%
rename from internal/gps/_testdata/src/simpleallt/a_test.go
rename to gps/_testdata/src/simpleallt/a_test.go
diff --git a/internal/gps/_testdata/src/simpleallt/t_test.go b/gps/_testdata/src/simpleallt/t_test.go
similarity index 100%
rename from internal/gps/_testdata/src/simpleallt/t_test.go
rename to gps/_testdata/src/simpleallt/t_test.go
diff --git a/gps/_testdata/src/simplet/a.go b/gps/_testdata/src/simplet/a.go
new file mode 100644
index 0000000000..f772b57e72
--- /dev/null
+++ b/gps/_testdata/src/simplet/a.go
@@ -0,0 +1,16 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package simple
+
+import (
+	"sort"
+
+	"github.com/golang/dep/gps"
+)
+
+var (
+	_ = sort.Strings
+	_ = gps.Solve
+)
diff --git a/internal/gps/_testdata/src/simplet/t_test.go b/gps/_testdata/src/simplet/t_test.go
similarity index 100%
rename from internal/gps/_testdata/src/simplet/t_test.go
rename to gps/_testdata/src/simplet/t_test.go
diff --git a/gps/_testdata/src/simplext/a.go b/gps/_testdata/src/simplext/a.go
new file mode 100644
index 0000000000..f772b57e72
--- /dev/null
+++ b/gps/_testdata/src/simplext/a.go
@@ -0,0 +1,16 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package simple
+
+import (
+	"sort"
+
+	"github.com/golang/dep/gps"
+)
+
+var (
+	_ = sort.Strings
+	_ = gps.Solve
+)
diff --git a/internal/gps/_testdata/src/simplext/a_test.go b/gps/_testdata/src/simplext/a_test.go
similarity index 100%
rename from internal/gps/_testdata/src/simplext/a_test.go
rename to gps/_testdata/src/simplext/a_test.go
diff --git a/internal/gps/_testdata/src/skip_/_a.go b/gps/_testdata/src/skip_/_a.go
similarity index 100%
rename from internal/gps/_testdata/src/skip_/_a.go
rename to gps/_testdata/src/skip_/_a.go
diff --git a/internal/gps/_testdata/src/skip_/a.go b/gps/_testdata/src/skip_/a.go
similarity index 86%
rename from internal/gps/_testdata/src/skip_/a.go
rename to gps/_testdata/src/skip_/a.go
index cd1dd811ae..fc99a11da5 100644
--- a/internal/gps/_testdata/src/skip_/a.go
+++ b/gps/_testdata/src/skip_/a.go
@@ -7,7 +7,7 @@ package skip
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/t/t_test.go b/gps/_testdata/src/t/t_test.go
similarity index 100%
rename from internal/gps/_testdata/src/t/t_test.go
rename to gps/_testdata/src/t/t_test.go
diff --git a/gps/_testdata/src/twopkgs/a.go b/gps/_testdata/src/twopkgs/a.go
new file mode 100644
index 0000000000..f772b57e72
--- /dev/null
+++ b/gps/_testdata/src/twopkgs/a.go
@@ -0,0 +1,16 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package simple
+
+import (
+	"sort"
+
+	"github.com/golang/dep/gps"
+)
+
+var (
+	_ = sort.Strings
+	_ = gps.Solve
+)
diff --git a/internal/gps/_testdata/src/twopkgs/b.go b/gps/_testdata/src/twopkgs/b.go
similarity index 100%
rename from internal/gps/_testdata/src/twopkgs/b.go
rename to gps/_testdata/src/twopkgs/b.go
diff --git a/internal/gps/_testdata/src/varied/locals.go b/gps/_testdata/src/varied/locals.go
similarity index 100%
rename from internal/gps/_testdata/src/varied/locals.go
rename to gps/_testdata/src/varied/locals.go
diff --git a/internal/gps/_testdata/src/github.com/example/varied/m1p/a.go b/gps/_testdata/src/varied/m1p/a.go
similarity index 86%
rename from internal/gps/_testdata/src/github.com/example/varied/m1p/a.go
rename to gps/_testdata/src/varied/m1p/a.go
index b2de8754cb..9fae843c5d 100644
--- a/internal/gps/_testdata/src/github.com/example/varied/m1p/a.go
+++ b/gps/_testdata/src/varied/m1p/a.go
@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/varied/m1p/b.go b/gps/_testdata/src/varied/m1p/b.go
similarity index 100%
rename from internal/gps/_testdata/src/varied/m1p/b.go
rename to gps/_testdata/src/varied/m1p/b.go
diff --git a/internal/gps/_testdata/src/varied/main.go b/gps/_testdata/src/varied/main.go
similarity index 100%
rename from internal/gps/_testdata/src/varied/main.go
rename to gps/_testdata/src/varied/main.go
diff --git a/internal/gps/_testdata/src/varied/namemismatch/nm.go b/gps/_testdata/src/varied/namemismatch/nm.go
similarity index 100%
rename from internal/gps/_testdata/src/varied/namemismatch/nm.go
rename to gps/_testdata/src/varied/namemismatch/nm.go
diff --git a/internal/gps/_testdata/src/varied/otherpath/otherpath_test.go b/gps/_testdata/src/varied/otherpath/otherpath_test.go
similarity index 100%
rename from internal/gps/_testdata/src/varied/otherpath/otherpath_test.go
rename to gps/_testdata/src/varied/otherpath/otherpath_test.go
diff --git a/internal/gps/_testdata/src/varied/simple/another/another.go b/gps/_testdata/src/varied/simple/another/another.go
similarity index 100%
rename from internal/gps/_testdata/src/varied/simple/another/another.go
rename to gps/_testdata/src/varied/simple/another/another.go
diff --git a/internal/gps/_testdata/src/varied/simple/another/another_test.go b/gps/_testdata/src/varied/simple/another/another_test.go
similarity index 100%
rename from internal/gps/_testdata/src/varied/simple/another/another_test.go
rename to gps/_testdata/src/varied/simple/another/another_test.go
diff --git a/internal/gps/_testdata/src/varied/simple/another/locals.go b/gps/_testdata/src/varied/simple/another/locals.go
similarity index 100%
rename from internal/gps/_testdata/src/varied/simple/another/locals.go
rename to gps/_testdata/src/varied/simple/another/locals.go
diff --git a/internal/gps/_testdata/src/varied/simple/locals.go b/gps/_testdata/src/varied/simple/locals.go
similarity index 100%
rename from internal/gps/_testdata/src/varied/simple/locals.go
rename to gps/_testdata/src/varied/simple/locals.go
diff --git a/internal/gps/_testdata/src/varied/simple/simple.go b/gps/_testdata/src/varied/simple/simple.go
similarity index 86%
rename from internal/gps/_testdata/src/varied/simple/simple.go
rename to gps/_testdata/src/varied/simple/simple.go
index 9d0c3445f6..6dfd049488 100644
--- a/internal/gps/_testdata/src/varied/simple/simple.go
+++ b/gps/_testdata/src/varied/simple/simple.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"go/parser"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/varied_hidden/.onlyfromtests/a.go b/gps/_testdata/src/varied_hidden/.onlyfromtests/a.go
similarity index 87%
rename from internal/gps/_testdata/src/varied_hidden/.onlyfromtests/a.go
rename to gps/_testdata/src/varied_hidden/.onlyfromtests/a.go
index 66e136f943..676dbae1ad 100644
--- a/internal/gps/_testdata/src/varied_hidden/.onlyfromtests/a.go
+++ b/gps/_testdata/src/varied_hidden/.onlyfromtests/a.go
@@ -9,7 +9,7 @@ import (
 
 	_ "varied/_secondorder"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/varied_hidden/.onlyfromtests/b.go b/gps/_testdata/src/varied_hidden/.onlyfromtests/b.go
similarity index 100%
rename from internal/gps/_testdata/src/varied_hidden/.onlyfromtests/b.go
rename to gps/_testdata/src/varied_hidden/.onlyfromtests/b.go
diff --git a/internal/gps/_testdata/src/varied_hidden/_frommain/a.go b/gps/_testdata/src/varied_hidden/_frommain/a.go
similarity index 86%
rename from internal/gps/_testdata/src/varied_hidden/_frommain/a.go
rename to gps/_testdata/src/varied_hidden/_frommain/a.go
index 28ee51be7a..67634a8598 100644
--- a/internal/gps/_testdata/src/varied_hidden/_frommain/a.go
+++ b/gps/_testdata/src/varied_hidden/_frommain/a.go
@@ -7,7 +7,7 @@ package frommain
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/varied_hidden/_never/a.go b/gps/_testdata/src/varied_hidden/_never/a.go
similarity index 86%
rename from internal/gps/_testdata/src/varied_hidden/_never/a.go
rename to gps/_testdata/src/varied_hidden/_never/a.go
index 72c7c99245..f2bdd5b007 100644
--- a/internal/gps/_testdata/src/varied_hidden/_never/a.go
+++ b/gps/_testdata/src/varied_hidden/_never/a.go
@@ -7,7 +7,7 @@ package never
 import (
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/varied_hidden/_secondorder/secondorder.go b/gps/_testdata/src/varied_hidden/_secondorder/secondorder.go
similarity index 100%
rename from internal/gps/_testdata/src/varied_hidden/_secondorder/secondorder.go
rename to gps/_testdata/src/varied_hidden/_secondorder/secondorder.go
diff --git a/internal/gps/_testdata/src/varied_hidden/always/always_test.go b/gps/_testdata/src/varied_hidden/always/always_test.go
similarity index 100%
rename from internal/gps/_testdata/src/varied_hidden/always/always_test.go
rename to gps/_testdata/src/varied_hidden/always/always_test.go
diff --git a/internal/gps/_testdata/src/varied_hidden/dotdotslash/a.go b/gps/_testdata/src/varied_hidden/dotdotslash/a.go
similarity index 83%
rename from internal/gps/_testdata/src/varied_hidden/dotdotslash/a.go
rename to gps/_testdata/src/varied_hidden/dotdotslash/a.go
index f1ffb55bdd..b4caf2fab2 100644
--- a/internal/gps/_testdata/src/varied_hidden/dotdotslash/a.go
+++ b/gps/_testdata/src/varied_hidden/dotdotslash/a.go
@@ -5,7 +5,7 @@
 package dotslash
 
 import (
-	"../github.com/golang/dep/internal/gps"
+	"../github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/varied_hidden/locals.go b/gps/_testdata/src/varied_hidden/locals.go
similarity index 100%
rename from internal/gps/_testdata/src/varied_hidden/locals.go
rename to gps/_testdata/src/varied_hidden/locals.go
diff --git a/internal/gps/_testdata/src/varied_hidden/main.go b/gps/_testdata/src/varied_hidden/main.go
similarity index 100%
rename from internal/gps/_testdata/src/varied_hidden/main.go
rename to gps/_testdata/src/varied_hidden/main.go
diff --git a/internal/gps/_testdata/src/varied_hidden/simple/locals.go b/gps/_testdata/src/varied_hidden/simple/locals.go
similarity index 100%
rename from internal/gps/_testdata/src/varied_hidden/simple/locals.go
rename to gps/_testdata/src/varied_hidden/simple/locals.go
diff --git a/internal/gps/_testdata/src/varied_hidden/simple/simple.go b/gps/_testdata/src/varied_hidden/simple/simple.go
similarity index 86%
rename from internal/gps/_testdata/src/varied_hidden/simple/simple.go
rename to gps/_testdata/src/varied_hidden/simple/simple.go
index 9d0c3445f6..6dfd049488 100644
--- a/internal/gps/_testdata/src/varied_hidden/simple/simple.go
+++ b/gps/_testdata/src/varied_hidden/simple/simple.go
@@ -7,7 +7,7 @@ package simple
 import (
 	"go/parser"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (
diff --git a/internal/gps/_testdata/src/varied_hidden/simple/testdata/another.go b/gps/_testdata/src/varied_hidden/simple/testdata/another.go
similarity index 100%
rename from internal/gps/_testdata/src/varied_hidden/simple/testdata/another.go
rename to gps/_testdata/src/varied_hidden/simple/testdata/another.go
diff --git a/internal/gps/_testdata/src/xt/a_test.go b/gps/_testdata/src/xt/a_test.go
similarity index 100%
rename from internal/gps/_testdata/src/xt/a_test.go
rename to gps/_testdata/src/xt/a_test.go
diff --git a/internal/gps/bridge.go b/gps/bridge.go
similarity index 99%
rename from internal/gps/bridge.go
rename to gps/bridge.go
index a221ccd3ec..819d0ae58b 100644
--- a/internal/gps/bridge.go
+++ b/gps/bridge.go
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"sync/atomic"
 
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 )
 
 // sourceBridge is an adapter to SourceManagers that tailor operations for a
diff --git a/internal/gps/cmd.go b/gps/cmd.go
similarity index 100%
rename from internal/gps/cmd.go
rename to gps/cmd.go
diff --git a/internal/gps/cmd_unix.go b/gps/cmd_unix.go
similarity index 100%
rename from internal/gps/cmd_unix.go
rename to gps/cmd_unix.go
diff --git a/internal/gps/cmd_windows.go b/gps/cmd_windows.go
similarity index 100%
rename from internal/gps/cmd_windows.go
rename to gps/cmd_windows.go
diff --git a/internal/gps/constraint_test.go b/gps/constraint_test.go
similarity index 99%
rename from internal/gps/constraint_test.go
rename to gps/constraint_test.go
index e8f8e9856a..160feaacc8 100644
--- a/internal/gps/constraint_test.go
+++ b/gps/constraint_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/golang/dep/internal/gps/internal/pb"
+	"github.com/golang/dep/gps/internal/pb"
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
 )
diff --git a/internal/gps/constraints.go b/gps/constraints.go
similarity index 99%
rename from internal/gps/constraints.go
rename to gps/constraints.go
index 72fd80984f..b6550700bc 100644
--- a/internal/gps/constraints.go
+++ b/gps/constraints.go
@@ -9,7 +9,7 @@ import (
 	"sort"
 
 	"github.com/Masterminds/semver"
-	"github.com/golang/dep/internal/gps/internal/pb"
+	"github.com/golang/dep/gps/internal/pb"
 )
 
 var (
diff --git a/internal/gps/deduce.go b/gps/deduce.go
similarity index 100%
rename from internal/gps/deduce.go
rename to gps/deduce.go
diff --git a/internal/gps/deduce_test.go b/gps/deduce_test.go
similarity index 100%
rename from internal/gps/deduce_test.go
rename to gps/deduce_test.go
diff --git a/internal/gps/discovery.go b/gps/discovery.go
similarity index 100%
rename from internal/gps/discovery.go
rename to gps/discovery.go
diff --git a/internal/gps/example.go b/gps/example.go
similarity index 97%
rename from internal/gps/example.go
rename to gps/example.go
index 69ad819f96..29657e0f56 100644
--- a/internal/gps/example.go
+++ b/gps/example.go
@@ -14,8 +14,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/pkgtree"
 )
 
 // This is probably the simplest possible implementation of gps. It does the
diff --git a/internal/gps/filesystem_test.go b/gps/filesystem_test.go
similarity index 100%
rename from internal/gps/filesystem_test.go
rename to gps/filesystem_test.go
diff --git a/internal/gps/hash.go b/gps/hash.go
similarity index 100%
rename from internal/gps/hash.go
rename to gps/hash.go
diff --git a/internal/gps/hash_test.go b/gps/hash_test.go
similarity index 99%
rename from internal/gps/hash_test.go
rename to gps/hash_test.go
index 52898e50ae..1be02f6870 100644
--- a/internal/gps/hash_test.go
+++ b/gps/hash_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"text/tabwriter"
 
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 )
 
 func TestHashInputs(t *testing.T) {
diff --git a/internal/gps/identifier.go b/gps/identifier.go
similarity index 100%
rename from internal/gps/identifier.go
rename to gps/identifier.go
diff --git a/internal/gps/internal/pb/pb.go b/gps/internal/pb/pb.go
similarity index 100%
rename from internal/gps/internal/pb/pb.go
rename to gps/internal/pb/pb.go
diff --git a/internal/gps/internal/pb/source_cache.pb.go b/gps/internal/pb/source_cache.pb.go
similarity index 100%
rename from internal/gps/internal/pb/source_cache.pb.go
rename to gps/internal/pb/source_cache.pb.go
diff --git a/internal/gps/internal/pb/source_cache.proto b/gps/internal/pb/source_cache.proto
similarity index 100%
rename from internal/gps/internal/pb/source_cache.proto
rename to gps/internal/pb/source_cache.proto
diff --git a/internal/gps/lock.go b/gps/lock.go
similarity index 100%
rename from internal/gps/lock.go
rename to gps/lock.go
diff --git a/internal/gps/lock_test.go b/gps/lock_test.go
similarity index 100%
rename from internal/gps/lock_test.go
rename to gps/lock_test.go
diff --git a/internal/gps/lockdiff.go b/gps/lockdiff.go
similarity index 100%
rename from internal/gps/lockdiff.go
rename to gps/lockdiff.go
diff --git a/internal/gps/lockdiff_test.go b/gps/lockdiff_test.go
similarity index 98%
rename from internal/gps/lockdiff_test.go
rename to gps/lockdiff_test.go
index 278fc576fd..4647628174 100644
--- a/internal/gps/lockdiff_test.go
+++ b/gps/lockdiff_test.go
@@ -46,8 +46,8 @@ func TestStringDiff_Modify(t *testing.T) {
 }
 
 func TestDiffProjects_NoChange(t *testing.T) {
-	p1 := NewLockedProject(mkPI("github.com/golang/dep/internal/gps"), NewVersion("v0.10.0"), []string{"gps"})
-	p2 := NewLockedProject(mkPI("github.com/golang/dep/internal/gps"), NewVersion("v0.10.0"), []string{"gps"})
+	p1 := NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), []string{"gps"})
+	p2 := NewLockedProject(mkPI("github.com/golang/dep/gps"), NewVersion("v0.10.0"), []string{"gps"})
 
 	diff := DiffProjects(p1, p2)
 	if diff != nil {
diff --git a/internal/gps/manager_test.go b/gps/manager_test.go
similarity index 100%
rename from internal/gps/manager_test.go
rename to gps/manager_test.go
diff --git a/internal/gps/manifest.go b/gps/manifest.go
similarity index 99%
rename from internal/gps/manifest.go
rename to gps/manifest.go
index e13ff95971..d36f893513 100644
--- a/internal/gps/manifest.go
+++ b/gps/manifest.go
@@ -4,7 +4,7 @@
 
 package gps
 
-import "github.com/golang/dep/internal/gps/pkgtree"
+import "github.com/golang/dep/gps/pkgtree"
 
 // Manifest represents manifest-type data for a project at a particular version.
 // The constraints expressed in a manifest determine the set of versions that
diff --git a/internal/gps/manifest_test.go b/gps/manifest_test.go
similarity index 100%
rename from internal/gps/manifest_test.go
rename to gps/manifest_test.go
diff --git a/internal/gps/maybe_source.go b/gps/maybe_source.go
similarity index 100%
rename from internal/gps/maybe_source.go
rename to gps/maybe_source.go
diff --git a/internal/gps/metrics.go b/gps/metrics.go
similarity index 100%
rename from internal/gps/metrics.go
rename to gps/metrics.go
diff --git a/internal/gps/paths/paths.go b/gps/paths/paths.go
similarity index 100%
rename from internal/gps/paths/paths.go
rename to gps/paths/paths.go
diff --git a/internal/gps/paths/paths_test.go b/gps/paths/paths_test.go
similarity index 100%
rename from internal/gps/paths/paths_test.go
rename to gps/paths/paths_test.go
diff --git a/internal/gps/pkgtree/digest.go b/gps/pkgtree/digest.go
similarity index 100%
rename from internal/gps/pkgtree/digest.go
rename to gps/pkgtree/digest.go
diff --git a/internal/gps/pkgtree/digest_test.go b/gps/pkgtree/digest_test.go
similarity index 100%
rename from internal/gps/pkgtree/digest_test.go
rename to gps/pkgtree/digest_test.go
diff --git a/internal/gps/pkgtree/dirwalk.go b/gps/pkgtree/dirwalk.go
similarity index 100%
rename from internal/gps/pkgtree/dirwalk.go
rename to gps/pkgtree/dirwalk.go
diff --git a/internal/gps/pkgtree/ignored_ruleset.go b/gps/pkgtree/ignored_ruleset.go
similarity index 100%
rename from internal/gps/pkgtree/ignored_ruleset.go
rename to gps/pkgtree/ignored_ruleset.go
diff --git a/internal/gps/pkgtree/ignored_ruleset_test.go b/gps/pkgtree/ignored_ruleset_test.go
similarity index 100%
rename from internal/gps/pkgtree/ignored_ruleset_test.go
rename to gps/pkgtree/ignored_ruleset_test.go
diff --git a/internal/gps/pkgtree/pkgtree.go b/gps/pkgtree/pkgtree.go
similarity index 100%
rename from internal/gps/pkgtree/pkgtree.go
rename to gps/pkgtree/pkgtree.go
diff --git a/internal/gps/pkgtree/pkgtree_test.go b/gps/pkgtree/pkgtree_test.go
similarity index 95%
rename from internal/gps/pkgtree/pkgtree_test.go
rename to gps/pkgtree/pkgtree_test.go
index b4844d8201..9aad8a1106 100644
--- a/internal/gps/pkgtree/pkgtree_test.go
+++ b/gps/pkgtree/pkgtree_test.go
@@ -18,8 +18,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/golang/dep/gps/paths"
 	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps/paths"
 )
 
 // PackageTree.ToReachMap() uses an easily separable algorithm, wmToReach(),
@@ -508,7 +508,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "simple",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 							},
 						},
@@ -528,7 +528,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "simple",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 							},
 						},
@@ -590,7 +590,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "simple",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 							},
 							TestImports: []string{
@@ -614,7 +614,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "simple",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 							},
 							TestImports: []string{
@@ -638,7 +638,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "simple",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 							},
 							TestImports: []string{
@@ -663,7 +663,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "m1p",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"os",
 								"sort",
 							},
@@ -684,7 +684,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "simple",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 							},
 						},
@@ -695,7 +695,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "m1p",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"os",
 								"sort",
 							},
@@ -743,7 +743,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "m1p",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"os",
 								"sort",
 							},
@@ -755,7 +755,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "simple",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 							},
 						},
@@ -775,7 +775,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "base",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"go/parser",
 							},
 						},
@@ -797,7 +797,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "m1p",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"os",
 								"sort",
 							},
@@ -818,7 +818,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "base",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"go/parser",
 							},
 						},
@@ -840,7 +840,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "m1p",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"os",
 								"sort",
 							},
@@ -861,7 +861,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "simple",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 								"unicode",
 							},
@@ -882,7 +882,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "simple",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 								"unicode",
 							},
@@ -903,7 +903,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "simple",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 								"unicode",
 							},
@@ -924,7 +924,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "simple",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 								"unicode",
 							},
@@ -950,7 +950,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "simple",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"missing/missing",
 								"sort",
 							},
@@ -962,7 +962,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "m1p",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"os",
 								"sort",
 							},
@@ -987,7 +987,7 @@ func TestListPackages(t *testing.T) {
 							Name:        "cycle",
 							Imports: []string{
 								"cycle/one",
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 							},
 						},
 					},
@@ -998,7 +998,7 @@ func TestListPackages(t *testing.T) {
 							Name:        "one",
 							Imports: []string{
 								"cycle/two",
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 							},
 						},
 					},
@@ -1009,7 +1009,7 @@ func TestListPackages(t *testing.T) {
 							Name:        "two",
 							Imports: []string{
 								"cycle",
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 							},
 						},
 					},
@@ -1030,7 +1030,7 @@ func TestListPackages(t *testing.T) {
 							Name:        "disallow",
 							Imports: []string{
 								"disallow/testdata",
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 							},
 						},
@@ -1098,7 +1098,7 @@ func TestListPackages(t *testing.T) {
 							Dir:        j("relimport/dotdotslash"),
 							ImportPath: "relimport/dotdotslash",
 							LocalImports: []string{
-								"../github.com/golang/dep/internal/gps",
+								"../github.com/golang/dep/gps",
 							},
 						},
 					},
@@ -1117,7 +1117,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "skip",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 							},
 						},
@@ -1163,7 +1163,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "simple",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"go/parser",
 								"varied/simple/another",
 							},
@@ -1200,7 +1200,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "m1p",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"os",
 								"sort",
 							},
@@ -1244,7 +1244,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "onlyfromtests",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"os",
 								"sort",
 								"varied/_secondorder",
@@ -1257,7 +1257,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "simple",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"go/parser",
 								"varied/simple/testdata",
 							},
@@ -1289,7 +1289,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "never",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 							},
 						},
@@ -1300,7 +1300,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "frommain",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"sort",
 							},
 						},
@@ -1310,7 +1310,7 @@ func TestListPackages(t *testing.T) {
 							Dir:        j("varied_hidden/dotdotslash"),
 							ImportPath: "varied/dotdotslash",
 							LocalImports: []string{
-								"../github.com/golang/dep/internal/gps",
+								"../github.com/golang/dep/gps",
 							},
 						},
 					},
@@ -1368,7 +1368,7 @@ func TestListPackages(t *testing.T) {
 							CommentPath: "",
 							Name:        "m1p",
 							Imports: []string{
-								"github.com/golang/dep/internal/gps",
+								"github.com/golang/dep/gps",
 								"os",
 								"sort",
 							},
@@ -1663,7 +1663,7 @@ func TestListPackagesNoPerms(t *testing.T) {
 					CommentPath: "",
 					Name:        "m1p",
 					Imports: []string{
-						"github.com/golang/dep/internal/gps",
+						"github.com/golang/dep/gps",
 						"sort",
 					},
 				},
@@ -1757,12 +1757,12 @@ func TestToReachMap(t *testing.T) {
 	// maps of each internal package, and their expected external and internal
 	// imports in the maximal case.
 	allex := map[string][]string{
-		b(""):               {"encoding/binary", "github.com/Masterminds/semver", "github.com/golang/dep/internal/gps", "go/parser", "hash", "net/http", "os", "sort"},
-		b("m1p"):            {"github.com/golang/dep/internal/gps", "os", "sort"},
+		b(""):               {"encoding/binary", "github.com/Masterminds/semver", "github.com/golang/dep/gps", "go/parser", "hash", "net/http", "os", "sort"},
+		b("m1p"):            {"github.com/golang/dep/gps", "os", "sort"},
 		b("namemismatch"):   {"github.com/Masterminds/semver", "os"},
-		b("otherpath"):      {"github.com/golang/dep/internal/gps", "os", "sort"},
-		b("simple"):         {"encoding/binary", "github.com/golang/dep/internal/gps", "go/parser", "hash", "os", "sort"},
-		b("simple/another"): {"encoding/binary", "github.com/golang/dep/internal/gps", "hash", "os", "sort"},
+		b("otherpath"):      {"github.com/golang/dep/gps", "os", "sort"},
+		b("simple"):         {"encoding/binary", "github.com/golang/dep/gps", "go/parser", "hash", "os", "sort"},
+		b("simple/another"): {"encoding/binary", "github.com/golang/dep/gps", "hash", "os", "sort"},
 	}
 
 	allin := map[string][]string{
@@ -1902,7 +1902,7 @@ func TestToReachMap(t *testing.T) {
 		b("")+" encoding/binary",
 		b("simple")+" encoding/binary",
 		b("simple/another")+" encoding/binary",
-		b("otherpath")+" github.com/golang/dep/internal/gps os sort",
+		b("otherpath")+" github.com/golang/dep/gps os sort",
 	)
 
 	// almost the same as previous, but varied just goes away completely
@@ -1912,7 +1912,7 @@ func TestToReachMap(t *testing.T) {
 		b(""),
 		b("simple")+" encoding/binary",
 		b("simple/another")+" encoding/binary",
-		bl("otherpath", "m1p")+" github.com/golang/dep/internal/gps os sort",
+		bl("otherpath", "m1p")+" github.com/golang/dep/gps os sort",
 	)
 	validate()
 
@@ -1941,7 +1941,7 @@ func TestToReachMap(t *testing.T) {
 	}
 	except(
 		// root pkg loses on everything in varied/simple/another and varied/m1p
-		bl("", "simple", "simple/another", "m1p", "otherpath")+" hash encoding/binary go/parser github.com/golang/dep/internal/gps sort",
+		bl("", "simple", "simple/another", "m1p", "otherpath")+" hash encoding/binary go/parser github.com/golang/dep/gps sort",
 		b("otherpath"),
 		b("simple"),
 	)
@@ -1952,7 +1952,7 @@ func TestToReachMap(t *testing.T) {
 	ignore = append(ignore, b("namemismatch"))
 	except(
 		// root pkg loses on everything in varied/simple/another and varied/m1p
-		bl("", "simple", "simple/another", "m1p", "otherpath", "namemismatch")+" hash encoding/binary go/parser github.com/golang/dep/internal/gps sort os github.com/Masterminds/semver",
+		bl("", "simple", "simple/another", "m1p", "otherpath", "namemismatch")+" hash encoding/binary go/parser github.com/golang/dep/gps sort os github.com/Masterminds/semver",
 		b("otherpath"),
 		b("simple"),
 		b("namemismatch"),
@@ -1970,7 +1970,7 @@ func TestFlattenReachMap(t *testing.T) {
 	all := []string{
 		"encoding/binary",
 		"github.com/Masterminds/semver",
-		"github.com/golang/dep/internal/gps",
+		"github.com/golang/dep/gps",
 		"go/parser",
 		"hash",
 		"net/http",
@@ -2064,7 +2064,7 @@ func TestFlattenReachMap(t *testing.T) {
 			}),
 		},
 		// now drop a more interesting one
-		// we get github.com/golang/dep/internal/gps from m1p, too, so it should still be there
+		// we get github.com/golang/dep/gps from m1p, too, so it should still be there
 		{
 			name:       "ignore simple",
 			expect:     except("go/parser"),
@@ -2124,7 +2124,7 @@ func TestFlattenReachMap(t *testing.T) {
 		// ignore two that should knock out gps
 		{
 			name:       "ignore both importers",
-			expect:     except("sort", "github.com/golang/dep/internal/gps", "go/parser"),
+			expect:     except("sort", "github.com/golang/dep/gps", "go/parser"),
 			isStdLibFn: nil,
 			main:       true,
 			tests:      true,
@@ -2136,12 +2136,12 @@ func TestFlattenReachMap(t *testing.T) {
 		// finally, directly ignore some external packages
 		{
 			name:       "ignore external",
-			expect:     except("sort", "github.com/golang/dep/internal/gps", "go/parser"),
+			expect:     except("sort", "github.com/golang/dep/gps", "go/parser"),
 			isStdLibFn: nil,
 			main:       true,
 			tests:      true,
 			ignore: NewIgnoredRuleset([]string{
-				"github.com/golang/dep/internal/gps",
+				"github.com/golang/dep/gps",
 				"go/parser",
 				"sort",
 			}),
@@ -2158,7 +2158,7 @@ func TestFlattenReachMap(t *testing.T) {
 
 	t.Run("disallowed", testFlattenReachMap(&ptree, &flattenReachMapCase{
 		name:       "disallowed",
-		expect:     []string{"github.com/golang/dep/internal/gps", "hash", "sort"},
+		expect:     []string{"github.com/golang/dep/gps", "hash", "sort"},
 		isStdLibFn: nil,
 		main:       false,
 		tests:      false,
diff --git a/internal/gps/pkgtree/reachmap.go b/gps/pkgtree/reachmap.go
similarity index 100%
rename from internal/gps/pkgtree/reachmap.go
rename to gps/pkgtree/reachmap.go
diff --git a/internal/gps/prune.go b/gps/prune.go
similarity index 100%
rename from internal/gps/prune.go
rename to gps/prune.go
diff --git a/internal/gps/prune_test.go b/gps/prune_test.go
similarity index 100%
rename from internal/gps/prune_test.go
rename to gps/prune_test.go
diff --git a/internal/gps/rootdata.go b/gps/rootdata.go
similarity index 99%
rename from internal/gps/rootdata.go
rename to gps/rootdata.go
index 22e7fecad1..ee78bdf265 100644
--- a/internal/gps/rootdata.go
+++ b/gps/rootdata.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 
 	"github.com/armon/go-radix"
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 )
 
 // rootdata holds static data and constraining rules from the root project for
diff --git a/internal/gps/rootdata_test.go b/gps/rootdata_test.go
similarity index 99%
rename from internal/gps/rootdata_test.go
rename to gps/rootdata_test.go
index 7890669b8b..381fe8c481 100644
--- a/internal/gps/rootdata_test.go
+++ b/gps/rootdata_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 )
 
 func TestRootdataExternalImports(t *testing.T) {
diff --git a/internal/gps/satisfy.go b/gps/satisfy.go
similarity index 100%
rename from internal/gps/satisfy.go
rename to gps/satisfy.go
diff --git a/internal/gps/selection.go b/gps/selection.go
similarity index 100%
rename from internal/gps/selection.go
rename to gps/selection.go
diff --git a/internal/gps/selection_test.go b/gps/selection_test.go
similarity index 100%
rename from internal/gps/selection_test.go
rename to gps/selection_test.go
diff --git a/internal/gps/solution.go b/gps/solution.go
similarity index 100%
rename from internal/gps/solution.go
rename to gps/solution.go
diff --git a/internal/gps/solution_test.go b/gps/solution_test.go
similarity index 100%
rename from internal/gps/solution_test.go
rename to gps/solution_test.go
diff --git a/internal/gps/solve_basic_test.go b/gps/solve_basic_test.go
similarity index 99%
rename from internal/gps/solve_basic_test.go
rename to gps/solve_basic_test.go
index 1936487718..910b9d622b 100644
--- a/internal/gps/solve_basic_test.go
+++ b/gps/solve_basic_test.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/Masterminds/semver"
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 )
 
 var regfrom = regexp.MustCompile(`^(\w*) from (\w*) ([0-9\.\*]*)`)
diff --git a/internal/gps/solve_bimodal_test.go b/gps/solve_bimodal_test.go
similarity index 99%
rename from internal/gps/solve_bimodal_test.go
rename to gps/solve_bimodal_test.go
index e55e875415..7dfa756279 100644
--- a/internal/gps/solve_bimodal_test.go
+++ b/gps/solve_bimodal_test.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 )
 
 // dsp - "depspec with packages"
diff --git a/internal/gps/solve_failures.go b/gps/solve_failures.go
similarity index 100%
rename from internal/gps/solve_failures.go
rename to gps/solve_failures.go
diff --git a/internal/gps/solve_test.go b/gps/solve_test.go
similarity index 100%
rename from internal/gps/solve_test.go
rename to gps/solve_test.go
diff --git a/internal/gps/solver.go b/gps/solver.go
similarity index 99%
rename from internal/gps/solver.go
rename to gps/solver.go
index 78fce51718..bede9d53b4 100644
--- a/internal/gps/solver.go
+++ b/gps/solver.go
@@ -15,8 +15,8 @@ import (
 	"sync/atomic"
 
 	"github.com/armon/go-radix"
-	"github.com/golang/dep/internal/gps/paths"
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/paths"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 
diff --git a/internal/gps/solver_inputs_test.go b/gps/solver_inputs_test.go
similarity index 99%
rename from internal/gps/solver_inputs_test.go
rename to gps/solver_inputs_test.go
index 0393597fdc..b78f01eb35 100644
--- a/internal/gps/solver_inputs_test.go
+++ b/gps/solver_inputs_test.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal/test"
 )
 
diff --git a/internal/gps/source.go b/gps/source.go
similarity index 99%
rename from internal/gps/source.go
rename to gps/source.go
index 737676adf4..54723754d0 100644
--- a/internal/gps/source.go
+++ b/gps/source.go
@@ -10,7 +10,7 @@ import (
 	"log"
 	"sync"
 
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 
diff --git a/internal/gps/source_cache.go b/gps/source_cache.go
similarity index 99%
rename from internal/gps/source_cache.go
rename to gps/source_cache.go
index 0f285ec341..7b5b566064 100644
--- a/internal/gps/source_cache.go
+++ b/gps/source_cache.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 )
 
 // singleSourceCache provides a method set for storing and retrieving data about
diff --git a/internal/gps/source_cache_bolt.go b/gps/source_cache_bolt.go
similarity index 99%
rename from internal/gps/source_cache_bolt.go
rename to gps/source_cache_bolt.go
index f2bae19738..02d700988f 100644
--- a/internal/gps/source_cache_bolt.go
+++ b/gps/source_cache_bolt.go
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/boltdb/bolt"
-	"github.com/golang/dep/internal/gps/internal/pb"
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/internal/pb"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/protobuf/proto"
 	"github.com/jmank88/nuts"
 	"github.com/pkg/errors"
diff --git a/internal/gps/source_cache_bolt_encode.go b/gps/source_cache_bolt_encode.go
similarity index 99%
rename from internal/gps/source_cache_bolt_encode.go
rename to gps/source_cache_bolt_encode.go
index 006c6ca4de..2851b24b31 100644
--- a/internal/gps/source_cache_bolt_encode.go
+++ b/gps/source_cache_bolt_encode.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/boltdb/bolt"
-	"github.com/golang/dep/internal/gps/internal/pb"
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/internal/pb"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/protobuf/proto"
 	"github.com/jmank88/nuts"
 	"github.com/pkg/errors"
diff --git a/internal/gps/source_cache_bolt_encode_test.go b/gps/source_cache_bolt_encode_test.go
similarity index 100%
rename from internal/gps/source_cache_bolt_encode_test.go
rename to gps/source_cache_bolt_encode_test.go
diff --git a/internal/gps/source_cache_bolt_test.go b/gps/source_cache_bolt_test.go
similarity index 97%
rename from internal/gps/source_cache_bolt_test.go
rename to gps/source_cache_bolt_test.go
index d2d2d16710..66a5664269 100644
--- a/internal/gps/source_cache_bolt_test.go
+++ b/gps/source_cache_bolt_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal/test"
 )
 
@@ -71,7 +71,7 @@ func TestBoltCacheTimeout(t *testing.T) {
 					CommentPath: "comment",
 					Name:        "simple",
 					Imports: []string{
-						"github.com/golang/dep/internal/gps",
+						"github.com/golang/dep/gps",
 						"sort",
 					},
 				},
@@ -82,7 +82,7 @@ func TestBoltCacheTimeout(t *testing.T) {
 					CommentPath: "",
 					Name:        "m1p",
 					Imports: []string{
-						"github.com/golang/dep/internal/gps",
+						"github.com/golang/dep/gps",
 						"os",
 						"sort",
 					},
@@ -237,7 +237,7 @@ func TestBoltCacheTimeout(t *testing.T) {
 					CommentPath: "newcomment",
 					Name:        "simple",
 					Imports: []string{
-						"github.com/golang/dep/internal/gps42",
+						"github.com/golang/dep/gps42",
 						"test",
 					},
 				},
diff --git a/internal/gps/source_cache_multi.go b/gps/source_cache_multi.go
similarity index 98%
rename from internal/gps/source_cache_multi.go
rename to gps/source_cache_multi.go
index 01ade0ff8a..e28a2b1cad 100644
--- a/internal/gps/source_cache_multi.go
+++ b/gps/source_cache_multi.go
@@ -5,7 +5,7 @@
 package gps
 
 import (
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 )
 
 // A multiCache manages two cache levels, ephemeral in-memory and persistent on-disk.
diff --git a/internal/gps/source_cache_test.go b/gps/source_cache_test.go
similarity index 99%
rename from internal/gps/source_cache_test.go
rename to gps/source_cache_test.go
index e219f4858f..590619da74 100644
--- a/internal/gps/source_cache_test.go
+++ b/gps/source_cache_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal/test"
 	"github.com/pkg/errors"
 )
@@ -210,7 +210,7 @@ func (test singleSourceCacheTest) run(t *testing.T) {
 						CommentPath: "comment",
 						Name:        "simple",
 						Imports: []string{
-							"github.com/golang/dep/internal/gps",
+							"github.com/golang/dep/gps",
 							"sort",
 						},
 					},
@@ -221,7 +221,7 @@ func (test singleSourceCacheTest) run(t *testing.T) {
 						CommentPath: "",
 						Name:        "m1p",
 						Imports: []string{
-							"github.com/golang/dep/internal/gps",
+							"github.com/golang/dep/gps",
 							"os",
 							"sort",
 						},
diff --git a/internal/gps/source_errors.go b/gps/source_errors.go
similarity index 100%
rename from internal/gps/source_errors.go
rename to gps/source_errors.go
diff --git a/internal/gps/source_errors_test.go b/gps/source_errors_test.go
similarity index 100%
rename from internal/gps/source_errors_test.go
rename to gps/source_errors_test.go
diff --git a/internal/gps/source_manager.go b/gps/source_manager.go
similarity index 99%
rename from internal/gps/source_manager.go
rename to gps/source_manager.go
index b7c8387002..bb12d492ad 100644
--- a/internal/gps/source_manager.go
+++ b/gps/source_manager.go
@@ -19,7 +19,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/nightlyone/lockfile"
 	"github.com/pkg/errors"
 	"github.com/sdboyer/constext"
@@ -172,7 +172,7 @@ var _ SourceManager = &SourceMgr{}
 // ErrSourceManagerIsReleased is the error returned by any SourceManager method
 // called after the SourceManager has been released, rendering its methods no
 // longer safe to call.
-var ErrSourceManagerIsReleased error = fmt.Errorf("this SourceManager has been released, its methods can no longer be called")
+var ErrSourceManagerIsReleased = fmt.Errorf("this SourceManager has been released, its methods can no longer be called")
 
 // SourceManagerConfig holds configuration information for creating SourceMgrs.
 type SourceManagerConfig struct {
diff --git a/internal/gps/source_manager_test.go b/gps/source_manager_test.go
similarity index 100%
rename from internal/gps/source_manager_test.go
rename to gps/source_manager_test.go
diff --git a/internal/gps/source_test.go b/gps/source_test.go
similarity index 99%
rename from internal/gps/source_test.go
rename to gps/source_test.go
index 639bec5dba..00d59612f1 100644
--- a/internal/gps/source_test.go
+++ b/gps/source_test.go
@@ -13,7 +13,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal/test"
 )
 
diff --git a/internal/gps/strings.go b/gps/strings.go
similarity index 100%
rename from internal/gps/strings.go
rename to gps/strings.go
diff --git a/internal/gps/strip_vendor.go b/gps/strip_vendor.go
similarity index 100%
rename from internal/gps/strip_vendor.go
rename to gps/strip_vendor.go
diff --git a/internal/gps/strip_vendor_nonwindows_test.go b/gps/strip_vendor_nonwindows_test.go
similarity index 100%
rename from internal/gps/strip_vendor_nonwindows_test.go
rename to gps/strip_vendor_nonwindows_test.go
diff --git a/internal/gps/strip_vendor_test.go b/gps/strip_vendor_test.go
similarity index 100%
rename from internal/gps/strip_vendor_test.go
rename to gps/strip_vendor_test.go
diff --git a/internal/gps/strip_vendor_windows.go b/gps/strip_vendor_windows.go
similarity index 100%
rename from internal/gps/strip_vendor_windows.go
rename to gps/strip_vendor_windows.go
diff --git a/internal/gps/strip_vendor_windows_test.go b/gps/strip_vendor_windows_test.go
similarity index 100%
rename from internal/gps/strip_vendor_windows_test.go
rename to gps/strip_vendor_windows_test.go
diff --git a/internal/gps/trace.go b/gps/trace.go
similarity index 99%
rename from internal/gps/trace.go
rename to gps/trace.go
index 05976573b6..4c579d30aa 100644
--- a/internal/gps/trace.go
+++ b/gps/trace.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 )
 
 const (
diff --git a/internal/gps/typed_radix.go b/gps/typed_radix.go
similarity index 100%
rename from internal/gps/typed_radix.go
rename to gps/typed_radix.go
diff --git a/internal/gps/typed_radix_test.go b/gps/typed_radix_test.go
similarity index 100%
rename from internal/gps/typed_radix_test.go
rename to gps/typed_radix_test.go
diff --git a/internal/gps/vcs_repo.go b/gps/vcs_repo.go
similarity index 100%
rename from internal/gps/vcs_repo.go
rename to gps/vcs_repo.go
diff --git a/internal/gps/vcs_repo_test.go b/gps/vcs_repo_test.go
similarity index 100%
rename from internal/gps/vcs_repo_test.go
rename to gps/vcs_repo_test.go
diff --git a/internal/gps/vcs_source.go b/gps/vcs_source.go
similarity index 99%
rename from internal/gps/vcs_source.go
rename to gps/vcs_source.go
index 0957128e1a..12ca76c573 100644
--- a/internal/gps/vcs_source.go
+++ b/gps/vcs_source.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 
 	"github.com/Masterminds/semver"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 
diff --git a/internal/gps/vcs_source_test.go b/gps/vcs_source_test.go
similarity index 100%
rename from internal/gps/vcs_source_test.go
rename to gps/vcs_source_test.go
diff --git a/internal/gps/vcs_version.go b/gps/vcs_version.go
similarity index 100%
rename from internal/gps/vcs_version.go
rename to gps/vcs_version.go
diff --git a/internal/gps/vcs_version_test.go b/gps/vcs_version_test.go
similarity index 100%
rename from internal/gps/vcs_version_test.go
rename to gps/vcs_version_test.go
diff --git a/internal/gps/version.go b/gps/version.go
similarity index 99%
rename from internal/gps/version.go
rename to gps/version.go
index 4c6c38f666..22f12ef9c0 100644
--- a/internal/gps/version.go
+++ b/gps/version.go
@@ -9,7 +9,7 @@ import (
 	"sort"
 
 	"github.com/Masterminds/semver"
-	"github.com/golang/dep/internal/gps/internal/pb"
+	"github.com/golang/dep/gps/internal/pb"
 )
 
 // VersionType indicates a type for a Version that conveys some additional
diff --git a/internal/gps/version_queue.go b/gps/version_queue.go
similarity index 100%
rename from internal/gps/version_queue.go
rename to gps/version_queue.go
diff --git a/internal/gps/version_queue_test.go b/gps/version_queue_test.go
similarity index 100%
rename from internal/gps/version_queue_test.go
rename to gps/version_queue_test.go
diff --git a/internal/gps/version_test.go b/gps/version_test.go
similarity index 100%
rename from internal/gps/version_test.go
rename to gps/version_test.go
diff --git a/internal/gps/version_unifier.go b/gps/version_unifier.go
similarity index 99%
rename from internal/gps/version_unifier.go
rename to gps/version_unifier.go
index 58923e4bb5..3698dc7e5d 100644
--- a/internal/gps/version_unifier.go
+++ b/gps/version_unifier.go
@@ -4,7 +4,7 @@
 
 package gps
 
-import "github.com/golang/dep/internal/gps/internal/pb"
+import "github.com/golang/dep/gps/internal/pb"
 
 // versionUnifier facilitates cross-type version comparison and set operations.
 type versionUnifier struct {
diff --git a/internal/gps/version_unifier_test.go b/gps/version_unifier_test.go
similarity index 98%
rename from internal/gps/version_unifier_test.go
rename to gps/version_unifier_test.go
index f044347188..741cb300e2 100644
--- a/internal/gps/version_unifier_test.go
+++ b/gps/version_unifier_test.go
@@ -7,7 +7,7 @@ package gps
 import (
 	"testing"
 
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps/pkgtree"
 )
 
 type lvFixBridge []Version
diff --git a/hack/lint.bash b/hack/lint.bash
index 2dc1d6e8ad..7dbf5bd8d0 100755
--- a/hack/lint.bash
+++ b/hack/lint.bash
@@ -9,4 +9,4 @@ set -e
 PKGS=$(go list ./... | grep -vF /vendor/)
 go vet $PKGS
 golint $PKGS
-megacheck -unused.exported -ignore "github.com/golang/dep/internal/test/test.go:U1000 github.com/golang/dep/internal/gps/prune.go:U1000" $PKGS
+megacheck -unused.exported -ignore "github.com/golang/dep/internal/test/test.go:U1000 github.com/golang/dep/gps/prune.go:U1000" $PKGS
diff --git a/internal/feedback/feedback.go b/internal/feedback/feedback.go
index e8b24ba4c9..7084b9b971 100644
--- a/internal/feedback/feedback.go
+++ b/internal/feedback/feedback.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 const (
diff --git a/internal/feedback/feedback_test.go b/internal/feedback/feedback_test.go
index af78a2bfa6..5f10c4929b 100644
--- a/internal/feedback/feedback_test.go
+++ b/internal/feedback/feedback_test.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 func TestFeedback_Constraint(t *testing.T) {
diff --git a/internal/gps/_testdata/src/ren/m1p/a.go b/internal/gps/_testdata/src/ren/m1p/a.go
deleted file mode 100644
index ddfc833eea..0000000000
--- a/internal/gps/_testdata/src/ren/m1p/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/internal/gps/_testdata/src/ren/simple/a.go b/internal/gps/_testdata/src/ren/simple/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/internal/gps/_testdata/src/ren/simple/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/internal/gps/_testdata/src/simple/a.go b/internal/gps/_testdata/src/simple/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/internal/gps/_testdata/src/simple/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/internal/gps/_testdata/src/simpleallt/a.go b/internal/gps/_testdata/src/simpleallt/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/internal/gps/_testdata/src/simpleallt/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/internal/gps/_testdata/src/simplet/a.go b/internal/gps/_testdata/src/simplet/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/internal/gps/_testdata/src/simplet/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/internal/gps/_testdata/src/simplext/a.go b/internal/gps/_testdata/src/simplext/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/internal/gps/_testdata/src/simplext/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/internal/gps/_testdata/src/twopkgs/a.go b/internal/gps/_testdata/src/twopkgs/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/internal/gps/_testdata/src/twopkgs/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/internal/importers/base/importer.go b/internal/importers/base/importer.go
index 262411c744..8b3be1463a 100644
--- a/internal/importers/base/importer.go
+++ b/internal/importers/base/importer.go
@@ -8,8 +8,8 @@ import (
 	"log"
 
 	"github.com/golang/dep"
+	"github.com/golang/dep/gps"
 	fb "github.com/golang/dep/internal/feedback"
-	"github.com/golang/dep/internal/gps"
 	"github.com/pkg/errors"
 )
 
diff --git a/internal/importers/base/importer_test.go b/internal/importers/base/importer_test.go
index f298efefd7..be76ecded7 100644
--- a/internal/importers/base/importer_test.go
+++ b/internal/importers/base/importer_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/importers/importertest"
 	"github.com/golang/dep/internal/test"
 )
diff --git a/internal/importers/glide/importer.go b/internal/importers/glide/importer.go
index 1745b1375c..6c0139ac73 100644
--- a/internal/importers/glide/importer.go
+++ b/internal/importers/glide/importer.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/go-yaml/yaml"
 	"github.com/golang/dep"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
 	"github.com/golang/dep/internal/importers/base"
 	"github.com/pkg/errors"
 )
diff --git a/internal/importers/glide/importer_test.go b/internal/importers/glide/importer_test.go
index eb2099a458..cf61dee5d9 100644
--- a/internal/importers/glide/importer_test.go
+++ b/internal/importers/glide/importer_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/importers/importertest"
 	"github.com/golang/dep/internal/test"
 	"github.com/pkg/errors"
diff --git a/internal/importers/godep/importer.go b/internal/importers/godep/importer.go
index e35636ec51..dbcfc04c40 100644
--- a/internal/importers/godep/importer.go
+++ b/internal/importers/godep/importer.go
@@ -12,7 +12,7 @@ import (
 	"path/filepath"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/importers/base"
 	"github.com/pkg/errors"
 )
diff --git a/internal/importers/godep/importer_test.go b/internal/importers/godep/importer_test.go
index 3aa27159a8..12e067d8f2 100644
--- a/internal/importers/godep/importer_test.go
+++ b/internal/importers/godep/importer_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/importers/importertest"
 	"github.com/golang/dep/internal/test"
 	"github.com/pkg/errors"
diff --git a/internal/importers/govend/importer.go b/internal/importers/govend/importer.go
index 2a49cce39f..b3f1972699 100644
--- a/internal/importers/govend/importer.go
+++ b/internal/importers/govend/importer.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/go-yaml/yaml"
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/importers/base"
 	"github.com/pkg/errors"
 )
diff --git a/internal/importers/govend/importer_test.go b/internal/importers/govend/importer_test.go
index 04c9ea5d8c..6aa3ae19e5 100644
--- a/internal/importers/govend/importer_test.go
+++ b/internal/importers/govend/importer_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/importers/importertest"
 	"github.com/golang/dep/internal/test"
 	"github.com/pkg/errors"
diff --git a/internal/importers/gvt/importer.go b/internal/importers/gvt/importer.go
index e6da7c451f..611e5bf07e 100644
--- a/internal/importers/gvt/importer.go
+++ b/internal/importers/gvt/importer.go
@@ -12,7 +12,7 @@ import (
 	"path/filepath"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/importers/base"
 	"github.com/pkg/errors"
 )
diff --git a/internal/importers/gvt/importer_test.go b/internal/importers/gvt/importer_test.go
index e927af8dbf..e33637e194 100644
--- a/internal/importers/gvt/importer_test.go
+++ b/internal/importers/gvt/importer_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/importers/importertest"
 	"github.com/golang/dep/internal/test"
 	"github.com/pkg/errors"
diff --git a/internal/importers/importers.go b/internal/importers/importers.go
index ad669b55bd..283effee62 100644
--- a/internal/importers/importers.go
+++ b/internal/importers/importers.go
@@ -8,7 +8,7 @@ import (
 	"log"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/importers/glide"
 	"github.com/golang/dep/internal/importers/godep"
 	"github.com/golang/dep/internal/importers/govend"
diff --git a/internal/importers/importertest/testcase.go b/internal/importers/importertest/testcase.go
index 54d041548e..c3fa62ffeb 100644
--- a/internal/importers/importertest/testcase.go
+++ b/internal/importers/importertest/testcase.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/test"
 	"github.com/pkg/errors"
 )
diff --git a/internal/importers/vndr/importer.go b/internal/importers/vndr/importer.go
index f24723ee0e..e8a162b3f5 100644
--- a/internal/importers/vndr/importer.go
+++ b/internal/importers/vndr/importer.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/importers/base"
 	"github.com/pkg/errors"
 )
diff --git a/internal/importers/vndr/importer_test.go b/internal/importers/vndr/importer_test.go
index c417c1188e..a445c28198 100644
--- a/internal/importers/vndr/importer_test.go
+++ b/internal/importers/vndr/importer_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/importers/importertest"
 	"github.com/golang/dep/internal/test"
 	"github.com/pkg/errors"
diff --git a/lock.go b/lock.go
index e11e9839a4..25d74d426c 100644
--- a/lock.go
+++ b/lock.go
@@ -10,7 +10,7 @@ import (
 	"io"
 	"sort"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/pelletier/go-toml"
 	"github.com/pkg/errors"
 )
diff --git a/lock_test.go b/lock_test.go
index 8ee340c578..8f55c91678 100644
--- a/lock_test.go
+++ b/lock_test.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/test"
 )
 
diff --git a/manifest.go b/manifest.go
index 87ea79292a..2f0f169ceb 100644
--- a/manifest.go
+++ b/manifest.go
@@ -13,8 +13,8 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/pelletier/go-toml"
 	"github.com/pkg/errors"
 )
diff --git a/manifest_test.go b/manifest_test.go
index 7ac24448ca..76e03768dc 100644
--- a/manifest_test.go
+++ b/manifest_test.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/test"
 )
 
@@ -31,7 +31,7 @@ func TestReadManifest(t *testing.T) {
 	c, _ := gps.NewSemverConstraint("^0.12.0")
 	want := Manifest{
 		Constraints: map[gps.ProjectRoot]gps.ProjectProperties{
-			gps.ProjectRoot("github.com/golang/dep/internal/gps"): {
+			gps.ProjectRoot("github.com/golang/dep/gps"): {
 				Constraint: c,
 			},
 			gps.ProjectRoot("github.com/babble/brook"): {
@@ -39,8 +39,8 @@ func TestReadManifest(t *testing.T) {
 			},
 		},
 		Ovr: map[gps.ProjectRoot]gps.ProjectProperties{
-			gps.ProjectRoot("github.com/golang/dep/internal/gps"): {
-				Source:     "https://github.com/golang/dep/internal/gps",
+			gps.ProjectRoot("github.com/golang/dep/gps"): {
+				Source:     "https://github.com/golang/dep/gps",
 				Constraint: gps.NewBranch("master"),
 			},
 		},
@@ -66,14 +66,14 @@ func TestWriteManifest(t *testing.T) {
 	want := h.GetTestFileString(golden)
 	c, _ := gps.NewSemverConstraint("^0.12.0")
 	m := NewManifest()
-	m.Constraints[gps.ProjectRoot("github.com/golang/dep/internal/gps")] = gps.ProjectProperties{
+	m.Constraints[gps.ProjectRoot("github.com/golang/dep/gps")] = gps.ProjectProperties{
 		Constraint: c,
 	}
 	m.Constraints[gps.ProjectRoot("github.com/babble/brook")] = gps.ProjectProperties{
 		Constraint: gps.Revision("d05d5aca9f895d19e9265839bffeadd74a2d2ecb"),
 	}
-	m.Ovr[gps.ProjectRoot("github.com/golang/dep/internal/gps")] = gps.ProjectProperties{
-		Source:     "https://github.com/golang/dep/internal/gps",
+	m.Ovr[gps.ProjectRoot("github.com/golang/dep/gps")] = gps.ProjectProperties{
+		Source:     "https://github.com/golang/dep/gps",
 		Constraint: gps.NewBranch("master"),
 	}
 	m.Ignored = []string{"github.com/foo/bar"}
diff --git a/project.go b/project.go
index e0c7104512..2da46dc497 100644
--- a/project.go
+++ b/project.go
@@ -9,9 +9,9 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 
diff --git a/project_test.go b/project_test.go
index c3d1ef00ba..eff7d30e29 100644
--- a/project_test.go
+++ b/project_test.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/test"
 )
 
diff --git a/test_project_context_test.go b/test_project_context_test.go
index c0739d9270..c8ab6692ed 100644
--- a/test_project_context_test.go
+++ b/test_project_context_test.go
@@ -7,7 +7,7 @@ package dep
 import (
 	"path/filepath"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/test"
 	"github.com/pkg/errors"
 )
diff --git a/testdata/manifest/golden.toml b/testdata/manifest/golden.toml
index 8614f1fdd7..225952b5a5 100644
--- a/testdata/manifest/golden.toml
+++ b/testdata/manifest/golden.toml
@@ -5,10 +5,10 @@ ignored = ["github.com/foo/bar"]
   revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb"
 
 [[constraint]]
-  name = "github.com/golang/dep/internal/gps"
+  name = "github.com/golang/dep/gps"
   version = "0.12.0"
 
 [[override]]
   branch = "master"
-  name = "github.com/golang/dep/internal/gps"
-  source = "https://github.com/golang/dep/internal/gps"
+  name = "github.com/golang/dep/gps"
+  source = "https://github.com/golang/dep/gps"
diff --git a/txn_writer.go b/txn_writer.go
index d06de2b439..4d62828e2b 100644
--- a/txn_writer.go
+++ b/txn_writer.go
@@ -12,8 +12,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
 	"github.com/pelletier/go-toml"
 	"github.com/pkg/errors"
 )