diff --git a/shared/deploy/appfog.go b/plugin/deploy/appfog.go
similarity index 100%
rename from shared/deploy/appfog.go
rename to plugin/deploy/appfog.go
diff --git a/shared/deploy/bash.go b/plugin/deploy/bash.go
similarity index 100%
rename from shared/deploy/bash.go
rename to plugin/deploy/bash.go
diff --git a/shared/deploy/bash_test.go b/plugin/deploy/bash_test.go
similarity index 100%
rename from shared/deploy/bash_test.go
rename to plugin/deploy/bash_test.go
diff --git a/shared/deploy/cloudcontrol.go b/plugin/deploy/cloudcontrol.go
similarity index 100%
rename from shared/deploy/cloudcontrol.go
rename to plugin/deploy/cloudcontrol.go
diff --git a/shared/deploy/cloudfoundry.go b/plugin/deploy/cloudfoundry.go
similarity index 100%
rename from shared/deploy/cloudfoundry.go
rename to plugin/deploy/cloudfoundry.go
diff --git a/shared/deploy/cloudfoundry_test.go b/plugin/deploy/cloudfoundry_test.go
similarity index 100%
rename from shared/deploy/cloudfoundry_test.go
rename to plugin/deploy/cloudfoundry_test.go
diff --git a/shared/deploy/deployment.go b/plugin/deploy/deployment.go
similarity index 100%
rename from shared/deploy/deployment.go
rename to plugin/deploy/deployment.go
diff --git a/shared/deploy/engineyard.go b/plugin/deploy/engineyard.go
similarity index 100%
rename from shared/deploy/engineyard.go
rename to plugin/deploy/engineyard.go
diff --git a/shared/deploy/git.go b/plugin/deploy/git.go
similarity index 100%
rename from shared/deploy/git.go
rename to plugin/deploy/git.go
diff --git a/shared/deploy/heroku.go b/plugin/deploy/heroku.go
similarity index 100%
rename from shared/deploy/heroku.go
rename to plugin/deploy/heroku.go
diff --git a/shared/deploy/modulus.go b/plugin/deploy/modulus.go
similarity index 100%
rename from shared/deploy/modulus.go
rename to plugin/deploy/modulus.go
diff --git a/shared/deploy/nodejitsu.go b/plugin/deploy/nodejitsu.go
similarity index 100%
rename from shared/deploy/nodejitsu.go
rename to plugin/deploy/nodejitsu.go
diff --git a/shared/deploy/openshift.go b/plugin/deploy/openshift.go
similarity index 100%
rename from shared/deploy/openshift.go
rename to plugin/deploy/openshift.go
diff --git a/shared/deploy/ssh.go b/plugin/deploy/ssh.go
similarity index 100%
rename from shared/deploy/ssh.go
rename to plugin/deploy/ssh.go
diff --git a/shared/deploy/ssh_test.go b/plugin/deploy/ssh_test.go
similarity index 100%
rename from shared/deploy/ssh_test.go
rename to plugin/deploy/ssh_test.go
diff --git a/shared/deploy/tsuru.go b/plugin/deploy/tsuru.go
similarity index 100%
rename from shared/deploy/tsuru.go
rename to plugin/deploy/tsuru.go
diff --git a/shared/notify/email.go b/plugin/notify/email.go
similarity index 100%
rename from shared/notify/email.go
rename to plugin/notify/email.go
diff --git a/shared/notify/hipchat.go b/plugin/notify/hipchat.go
similarity index 100%
rename from shared/notify/hipchat.go
rename to plugin/notify/hipchat.go
diff --git a/shared/notify/irc.go b/plugin/notify/irc.go
similarity index 100%
rename from shared/notify/irc.go
rename to plugin/notify/irc.go
diff --git a/shared/notify/notification.go b/plugin/notify/notification.go
similarity index 100%
rename from shared/notify/notification.go
rename to plugin/notify/notification.go
diff --git a/shared/notify/slack.go b/plugin/notify/slack.go
similarity index 100%
rename from shared/notify/slack.go
rename to plugin/notify/slack.go
diff --git a/shared/notify/slack_test.go b/plugin/notify/slack_test.go
similarity index 100%
rename from shared/notify/slack_test.go
rename to plugin/notify/slack_test.go
diff --git a/shared/notify/webhook.go b/plugin/notify/webhook.go
similarity index 100%
rename from shared/notify/webhook.go
rename to plugin/notify/webhook.go
diff --git a/shared/notify/zapier.go b/plugin/notify/zapier.go
similarity index 100%
rename from shared/notify/zapier.go
rename to plugin/notify/zapier.go
diff --git a/shared/publish/bintray.go b/plugin/publish/bintray.go
similarity index 100%
rename from shared/publish/bintray.go
rename to plugin/publish/bintray.go
diff --git a/shared/publish/dropbox.go b/plugin/publish/dropbox.go
similarity index 100%
rename from shared/publish/dropbox.go
rename to plugin/publish/dropbox.go
diff --git a/shared/publish/gems.go b/plugin/publish/gems.go
similarity index 100%
rename from shared/publish/gems.go
rename to plugin/publish/gems.go
diff --git a/shared/publish/maven.go b/plugin/publish/maven.go
similarity index 100%
rename from shared/publish/maven.go
rename to plugin/publish/maven.go
diff --git a/shared/publish/npm.go b/plugin/publish/npm.go
similarity index 100%
rename from shared/publish/npm.go
rename to plugin/publish/npm.go
diff --git a/shared/publish/npm_test.go b/plugin/publish/npm_test.go
similarity index 100%
rename from shared/publish/npm_test.go
rename to plugin/publish/npm_test.go
diff --git a/shared/publish/pub.go b/plugin/publish/pub.go
similarity index 100%
rename from shared/publish/pub.go
rename to plugin/publish/pub.go
diff --git a/shared/publish/publish.go b/plugin/publish/publish.go
similarity index 100%
rename from shared/publish/publish.go
rename to plugin/publish/publish.go
diff --git a/shared/publish/pypi.go b/plugin/publish/pypi.go
similarity index 100%
rename from shared/publish/pypi.go
rename to plugin/publish/pypi.go
diff --git a/shared/publish/s3.go b/plugin/publish/s3.go
similarity index 100%
rename from shared/publish/s3.go
rename to plugin/publish/s3.go
diff --git a/shared/publish/swift.go b/plugin/publish/swift.go
similarity index 100%
rename from shared/publish/swift.go
rename to plugin/publish/swift.go
diff --git a/shared/remote/bitbucket/bitbucket.go b/plugin/remote/bitbucket/bitbucket.go
similarity index 99%
rename from shared/remote/bitbucket/bitbucket.go
rename to plugin/remote/bitbucket/bitbucket.go
index 21b621c24..98eb5191e 100644
--- a/shared/remote/bitbucket/bitbucket.go
+++ b/plugin/remote/bitbucket/bitbucket.go
@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/drone/drone/shared/remote"
+	"github.com/drone/drone/plugin/remote"
 	"github.com/drone/drone/shared/util/httputil"
 	"github.com/drone/go-bitbucket/bitbucket"
 	"github.com/drone/go-bitbucket/oauth1"
diff --git a/shared/remote/bitbucket/client.go b/plugin/remote/bitbucket/client.go
similarity index 98%
rename from shared/remote/bitbucket/client.go
rename to plugin/remote/bitbucket/client.go
index 10d66b08e..ea73b4127 100644
--- a/shared/remote/bitbucket/client.go
+++ b/plugin/remote/bitbucket/client.go
@@ -2,7 +2,7 @@ package bitbucket
 
 import (
 	"fmt"
-	"github.com/drone/drone/shared/remote"
+	"github.com/drone/drone/plugin/remote"
 	"github.com/drone/go-bitbucket/bitbucket"
 	"net/url"
 )
diff --git a/shared/remote/github/client.go b/plugin/remote/github/client.go
similarity index 98%
rename from shared/remote/github/client.go
rename to plugin/remote/github/client.go
index f463c925c..8c2cb25f3 100644
--- a/shared/remote/github/client.go
+++ b/plugin/remote/github/client.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/drone/drone/shared/remote"
+	"github.com/drone/drone/plugin/remote"
 	"github.com/drone/go-github/github"
 )
 
diff --git a/shared/remote/github/github.go b/plugin/remote/github/github.go
similarity index 99%
rename from shared/remote/github/github.go
rename to plugin/remote/github/github.go
index 968d1733c..2dbb88a8c 100644
--- a/shared/remote/github/github.go
+++ b/plugin/remote/github/github.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/drone/drone/shared/remote"
+	"github.com/drone/drone/plugin/remote"
 	"github.com/drone/drone/shared/util/httputil"
 	"github.com/drone/go-github/github"
 	"github.com/drone/go-github/oauth2"
diff --git a/shared/remote/gitlab/client.go b/plugin/remote/gitlab/client.go
similarity index 95%
rename from shared/remote/gitlab/client.go
rename to plugin/remote/gitlab/client.go
index bc91434ea..1795cf33d 100644
--- a/shared/remote/gitlab/client.go
+++ b/plugin/remote/gitlab/client.go
@@ -1,7 +1,7 @@
 package gitlab
 
 import (
-	"github.com/drone/drone/shared/remote"
+	"github.com/drone/drone/plugin/remote"
 )
 
 type Client struct {
diff --git a/shared/remote/gitlab/gitlab.go b/plugin/remote/gitlab/gitlab.go
similarity index 96%
rename from shared/remote/gitlab/gitlab.go
rename to plugin/remote/gitlab/gitlab.go
index c778d56a4..b7a533682 100644
--- a/shared/remote/gitlab/gitlab.go
+++ b/plugin/remote/gitlab/gitlab.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/drone/drone/shared/remote"
+	"github.com/drone/drone/plugin/remote"
 )
 
 type Gitlab struct {
diff --git a/shared/remote/remote.go b/plugin/remote/remote.go
similarity index 100%
rename from shared/remote/remote.go
rename to plugin/remote/remote.go
diff --git a/shared/remote/stash/client.go b/plugin/remote/stash/client.go
similarity index 95%
rename from shared/remote/stash/client.go
rename to plugin/remote/stash/client.go
index 992fbd703..b7e9ecc9f 100644
--- a/shared/remote/stash/client.go
+++ b/plugin/remote/stash/client.go
@@ -1,7 +1,7 @@
 package stash
 
 import (
-	"github.com/drone/drone/shared/remote"
+	"github.com/drone/drone/plugin/remote"
 )
 
 type Client struct {
diff --git a/shared/remote/stash/stash.go b/plugin/remote/stash/stash.go
similarity index 97%
rename from shared/remote/stash/stash.go
rename to plugin/remote/stash/stash.go
index 2e61fff7b..f4cf69c65 100644
--- a/shared/remote/stash/stash.go
+++ b/plugin/remote/stash/stash.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/drone/drone/shared/remote"
+	"github.com/drone/drone/plugin/remote"
 )
 
 type Stash struct {
diff --git a/shared/report/README.md b/plugin/report/README.md
similarity index 100%
rename from shared/report/README.md
rename to plugin/report/README.md
diff --git a/shared/smtp/smtp.go b/plugin/smtp/smtp.go
similarity index 100%
rename from shared/smtp/smtp.go
rename to plugin/smtp/smtp.go
diff --git a/server/resource/config/model.go b/server/resource/config/model.go
index 587ef784b..a6e9ebe6c 100644
--- a/server/resource/config/model.go
+++ b/server/resource/config/model.go
@@ -1,12 +1,12 @@
 package config
 
 import (
-	"github.com/drone/drone/shared/remote"
-	"github.com/drone/drone/shared/remote/bitbucket"
-	"github.com/drone/drone/shared/remote/github"
-	"github.com/drone/drone/shared/remote/gitlab"
-	"github.com/drone/drone/shared/remote/stash"
-	"github.com/drone/drone/shared/smtp"
+	"github.com/drone/drone/plugin/remote"
+	"github.com/drone/drone/plugin/remote/bitbucket"
+	"github.com/drone/drone/plugin/remote/github"
+	"github.com/drone/drone/plugin/remote/gitlab"
+	"github.com/drone/drone/plugin/remote/stash"
+	"github.com/drone/drone/plugin/smtp"
 )
 
 type Config struct {
diff --git a/shared/build/script/script.go b/shared/build/script/script.go
index fd4eca737..bb6ddc002 100644
--- a/shared/build/script/script.go
+++ b/shared/build/script/script.go
@@ -8,12 +8,12 @@ import (
 
 	"gopkg.in/yaml.v1"
 
+	"github.com/drone/drone/plugin/deploy"
+	"github.com/drone/drone/plugin/notify"
+	"github.com/drone/drone/plugin/publish"
 	"github.com/drone/drone/shared/build/buildfile"
 	"github.com/drone/drone/shared/build/git"
 	"github.com/drone/drone/shared/build/repo"
-	"github.com/drone/drone/shared/deploy"
-	"github.com/drone/drone/shared/notify"
-	"github.com/drone/drone/shared/publish"
 )
 
 func ParseBuild(data string, params map[string]string) (*Build, error) {