diff --git a/context/ghrepo.go b/context/ghrepo.go
index a64425761..5ea9a45a6 100644
--- a/context/ghrepo.go
+++ b/context/ghrepo.go
@@ -26,7 +26,7 @@ func CurrentGitHubRepository() (*GitHubRepository, error) {
 			return nil, err
 		}
 	} else {
-		remote, rerr := github.GuessRemote()
+		remote, rerr := GuessRemote()
 
 		if rerr != nil {
 			return nil, rerr
diff --git a/github/remote.go b/context/remote.go
similarity index 99%
rename from github/remote.go
rename to context/remote.go
index e51266d93..a47f382b8 100644
--- a/github/remote.go
+++ b/context/remote.go
@@ -1,4 +1,4 @@
-package github
+package context
 
 import (
 	"fmt"