diff --git a/docs/doc.go b/docs/doc.go
new file mode 100644
index 000000000..5049dae35
--- /dev/null
+++ b/docs/doc.go
@@ -0,0 +1,3 @@
+// Package registry is a placeholder package for registry interface
+// destinations and utilities.
+package registry
diff --git a/docs/api_test.go b/docs/handlers/api_test.go
similarity index 99%
rename from docs/api_test.go
rename to docs/handlers/api_test.go
index 5e3bd72c6..1d1173a9a 100644
--- a/docs/api_test.go
+++ b/docs/handlers/api_test.go
@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"bytes"
diff --git a/docs/app.go b/docs/handlers/app.go
similarity index 99%
rename from docs/app.go
rename to docs/handlers/app.go
index 817373f25..e49144e2f 100644
--- a/docs/app.go
+++ b/docs/handlers/app.go
@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"fmt"
diff --git a/docs/app_test.go b/docs/handlers/app_test.go
similarity index 99%
rename from docs/app_test.go
rename to docs/handlers/app_test.go
index 9b106575d..927f40a4a 100644
--- a/docs/app_test.go
+++ b/docs/handlers/app_test.go
@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"encoding/json"
diff --git a/docs/basicauth.go b/docs/handlers/basicauth.go
similarity index 88%
rename from docs/basicauth.go
rename to docs/handlers/basicauth.go
index 55794ee32..8727a3cd1 100644
--- a/docs/basicauth.go
+++ b/docs/handlers/basicauth.go
@@ -1,6 +1,6 @@
 // +build go1.4
 
-package registry
+package handlers
 
 import (
 	"net/http"
diff --git a/docs/basicauth_prego14.go b/docs/handlers/basicauth_prego14.go
similarity index 98%
rename from docs/basicauth_prego14.go
rename to docs/handlers/basicauth_prego14.go
index dc563135b..6cf10a25e 100644
--- a/docs/basicauth_prego14.go
+++ b/docs/handlers/basicauth_prego14.go
@@ -1,6 +1,6 @@
 // +build !go1.4
 
-package registry
+package handlers
 
 import (
 	"encoding/base64"
diff --git a/docs/context.go b/docs/handlers/context.go
similarity index 99%
rename from docs/context.go
rename to docs/handlers/context.go
index 7c4dbb023..8f277595c 100644
--- a/docs/context.go
+++ b/docs/handlers/context.go
@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"fmt"
diff --git a/docs/helpers.go b/docs/handlers/helpers.go
similarity index 97%
rename from docs/helpers.go
rename to docs/handlers/helpers.go
index 6bcb4ae82..f2879137b 100644
--- a/docs/helpers.go
+++ b/docs/handlers/helpers.go
@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"encoding/json"
diff --git a/docs/hmac.go b/docs/handlers/hmac.go
similarity index 99%
rename from docs/hmac.go
rename to docs/handlers/hmac.go
index d24700875..e17ececa2 100644
--- a/docs/hmac.go
+++ b/docs/handlers/hmac.go
@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"crypto/hmac"
diff --git a/docs/hmac_test.go b/docs/handlers/hmac_test.go
similarity index 99%
rename from docs/hmac_test.go
rename to docs/handlers/hmac_test.go
index 5ad60f61d..cce2cd492 100644
--- a/docs/hmac_test.go
+++ b/docs/handlers/hmac_test.go
@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import "testing"
 
diff --git a/docs/images.go b/docs/handlers/images.go
similarity index 99%
rename from docs/images.go
rename to docs/handlers/images.go
index c44b0b210..c26a2239a 100644
--- a/docs/images.go
+++ b/docs/handlers/images.go
@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"encoding/json"
diff --git a/docs/layer.go b/docs/handlers/layer.go
similarity index 99%
rename from docs/layer.go
rename to docs/handlers/layer.go
index 10569465c..31d24b865 100644
--- a/docs/layer.go
+++ b/docs/handlers/layer.go
@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"net/http"
diff --git a/docs/layerupload.go b/docs/handlers/layerupload.go
similarity index 99%
rename from docs/layerupload.go
rename to docs/handlers/layerupload.go
index f30bb3aa6..a15e274a7 100644
--- a/docs/layerupload.go
+++ b/docs/handlers/layerupload.go
@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"fmt"
diff --git a/docs/tags.go b/docs/handlers/tags.go
similarity index 98%
rename from docs/tags.go
rename to docs/handlers/tags.go
index 1f745c6a9..65ffacfc9 100644
--- a/docs/tags.go
+++ b/docs/handlers/tags.go
@@ -1,4 +1,4 @@
-package registry
+package handlers
 
 import (
 	"encoding/json"