diff --git a/plugin/remote/bitbucket/bitbucket.go b/plugin/remote/bitbucket/bitbucket.go
index 98eb5191..300becc0 100644
--- a/plugin/remote/bitbucket/bitbucket.go
+++ b/plugin/remote/bitbucket/bitbucket.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/drone/drone/plugin/remote"
-	"github.com/drone/drone/shared/util/httputil"
+	"github.com/drone/drone/shared/httputil"
 	"github.com/drone/go-bitbucket/bitbucket"
 	"github.com/drone/go-bitbucket/oauth1"
 )
diff --git a/plugin/remote/github/github.go b/plugin/remote/github/github.go
index 2dbb88a8..e55c7f7b 100644
--- a/plugin/remote/github/github.go
+++ b/plugin/remote/github/github.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/drone/drone/plugin/remote"
-	"github.com/drone/drone/shared/util/httputil"
+	"github.com/drone/drone/shared/httputil"
 	"github.com/drone/go-github/github"
 	"github.com/drone/go-github/oauth2"
 )
diff --git a/server/handler/repo.go b/server/handler/repo.go
index 6119da24..d161726f 100644
--- a/server/handler/repo.go
+++ b/server/handler/repo.go
@@ -10,8 +10,8 @@ import (
 	"github.com/drone/drone/server/resource/perm"
 	"github.com/drone/drone/server/resource/repo"
 	"github.com/drone/drone/server/session"
-	"github.com/drone/drone/shared/util/httputil"
-	"github.com/drone/drone/shared/util/sshutil"
+	"github.com/drone/drone/shared/httputil"
+	"github.com/drone/drone/shared/sshutil"
 	"github.com/gorilla/pat"
 )
 
diff --git a/server/handler/site.go b/server/handler/site.go
index fb6a9a09..883e0046 100644
--- a/server/handler/site.go
+++ b/server/handler/site.go
@@ -10,7 +10,7 @@ import (
 	"github.com/drone/drone/server/resource/repo"
 	"github.com/drone/drone/server/resource/user"
 	"github.com/drone/drone/server/session"
-	"github.com/drone/drone/shared/util/httputil"
+	"github.com/drone/drone/shared/httputil"
 	"github.com/gorilla/pat"
 )
 
diff --git a/shared/util/httputil/httputil.go b/shared/httputil/httputil.go
similarity index 100%
rename from shared/util/httputil/httputil.go
rename to shared/httputil/httputil.go
diff --git a/shared/util/sshutil/sshutil.go b/shared/sshutil/sshutil.go
similarity index 100%
rename from shared/util/sshutil/sshutil.go
rename to shared/sshutil/sshutil.go