diff --git a/cmd/registry/main.go b/cmd/registry/main.go
index 1bf635cc2..ff4830d29 100644
--- a/cmd/registry/main.go
+++ b/cmd/registry/main.go
@@ -12,10 +12,10 @@ import (
 	"github.com/gorilla/handlers"
 	"github.com/yvasiyarov/gorelic"
 
-	"github.com/docker/distribution"
 	_ "github.com/docker/distribution/auth/silly"
 	_ "github.com/docker/distribution/auth/token"
 	"github.com/docker/distribution/configuration"
+	"github.com/docker/distribution/registry"
 	_ "github.com/docker/distribution/storagedriver/filesystem"
 	_ "github.com/docker/distribution/storagedriver/inmemory"
 )
diff --git a/doc.go b/doc.go
new file mode 100644
index 000000000..9b981f7d8
--- /dev/null
+++ b/doc.go
@@ -0,0 +1,7 @@
+// Package distribution will define the interfaces for the components of
+// docker distribution. The goal is to allow users to reliably package, ship
+// and store content related to docker images.
+//
+// This is currently a work in progress. More details are availalbe in the
+// README.md.
+package distribution
diff --git a/api_test.go b/registry/api_test.go
similarity index 100%
rename from api_test.go
rename to registry/api_test.go
diff --git a/app.go b/registry/app.go
similarity index 100%
rename from app.go
rename to registry/app.go
diff --git a/app_test.go b/registry/app_test.go
similarity index 100%
rename from app_test.go
rename to registry/app_test.go
diff --git a/context.go b/registry/context.go
similarity index 100%
rename from context.go
rename to registry/context.go
diff --git a/helpers.go b/registry/helpers.go
similarity index 100%
rename from helpers.go
rename to registry/helpers.go
diff --git a/images.go b/registry/images.go
similarity index 100%
rename from images.go
rename to registry/images.go
diff --git a/layer.go b/registry/layer.go
similarity index 100%
rename from layer.go
rename to registry/layer.go
diff --git a/layerupload.go b/registry/layerupload.go
similarity index 100%
rename from layerupload.go
rename to registry/layerupload.go
diff --git a/tags.go b/registry/tags.go
similarity index 100%
rename from tags.go
rename to registry/tags.go
diff --git a/tokens.go b/registry/tokens.go
similarity index 100%
rename from tokens.go
rename to registry/tokens.go
diff --git a/tokens_test.go b/registry/tokens_test.go
similarity index 100%
rename from tokens_test.go
rename to registry/tokens_test.go
diff --git a/util.go b/registry/util.go
similarity index 100%
rename from util.go
rename to registry/util.go