diff --git a/drone.go b/drone.go
index e40b0ffb6..f7e51ee3d 100644
--- a/drone.go
+++ b/drone.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"github.com/drone/drone/remote/github"
+	"github.com/drone/drone/pkg/remote/github"
 	"github.com/drone/drone/server"
 	"github.com/drone/drone/server/session"
 	"github.com/drone/drone/settings"
diff --git a/remote/client/client.go b/pkg/remote/client/client.go
similarity index 100%
rename from remote/client/client.go
rename to pkg/remote/client/client.go
diff --git a/remote/github/github.go b/pkg/remote/github/github.go
similarity index 100%
rename from remote/github/github.go
rename to pkg/remote/github/github.go
diff --git a/remote/github/helper.go b/pkg/remote/github/helper.go
similarity index 100%
rename from remote/github/helper.go
rename to pkg/remote/github/helper.go
diff --git a/remote/remote.go b/pkg/remote/remote.go
similarity index 100%
rename from remote/remote.go
rename to pkg/remote/remote.go
diff --git a/runner/builtin/updater.go b/runner/builtin/updater.go
index 45c056876..86b6515cd 100644
--- a/runner/builtin/updater.go
+++ b/runner/builtin/updater.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/drone/drone/common"
 	"github.com/drone/drone/pkg/bus"
+	"github.com/drone/drone/pkg/remote"
 	"github.com/drone/drone/pkg/store"
-	"github.com/drone/drone/remote"
 )
 
 type Updater interface {
diff --git a/server/repos.go b/server/repos.go
index 5e1394101..45803535f 100644
--- a/server/repos.go
+++ b/server/repos.go
@@ -9,7 +9,7 @@ import (
 	"github.com/drone/drone/common"
 	"github.com/drone/drone/common/httputil"
 	"github.com/drone/drone/common/sshutil"
-	"github.com/drone/drone/remote"
+	"github.com/drone/drone/pkg/remote"
 )
 
 // repoResp is a data structure used for sending
diff --git a/server/server.go b/server/server.go
index e5db50cca..44700b607 100644
--- a/server/server.go
+++ b/server/server.go
@@ -9,8 +9,8 @@ import (
 	"github.com/drone/drone/common"
 	"github.com/drone/drone/pkg/bus"
 	"github.com/drone/drone/pkg/queue"
+	"github.com/drone/drone/pkg/remote"
 	"github.com/drone/drone/pkg/store"
-	"github.com/drone/drone/remote"
 	"github.com/drone/drone/runner"
 	"github.com/drone/drone/server/session"
 	"github.com/drone/drone/settings"