diff --git a/cmd/registry-storagedriver-azure/main.go b/cmd/registry-storagedriver-azure/main.go
index 71b1faaf..8083d23b 100644
--- a/cmd/registry-storagedriver-azure/main.go
+++ b/cmd/registry-storagedriver-azure/main.go
@@ -7,8 +7,8 @@ import (
 	"os"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/storagedriver/azure"
-	"github.com/docker/distribution/storagedriver/ipc"
+	"github.com/docker/distribution/registry/storage/driver/azure"
+	"github.com/docker/distribution/registry/storage/driver/ipc"
 )
 
 // An out-of-process Azure Storage driver, intended to be run by ipc.NewDriverClient
diff --git a/cmd/registry-storagedriver-filesystem/main.go b/cmd/registry-storagedriver-filesystem/main.go
index 2ad6d82e..93756d2c 100644
--- a/cmd/registry-storagedriver-filesystem/main.go
+++ b/cmd/registry-storagedriver-filesystem/main.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"github.com/docker/distribution/storagedriver/filesystem"
-	"github.com/docker/distribution/storagedriver/ipc"
+	"github.com/docker/distribution/registry/storage/driver/filesystem"
+	"github.com/docker/distribution/registry/storage/driver/ipc"
 )
 
 // An out-of-process filesystem driver, intended to be run by ipc.NewDriverClient
diff --git a/cmd/registry-storagedriver-inmemory/main.go b/cmd/registry-storagedriver-inmemory/main.go
index ef6fabe4..d957cc25 100644
--- a/cmd/registry-storagedriver-inmemory/main.go
+++ b/cmd/registry-storagedriver-inmemory/main.go
@@ -4,8 +4,8 @@ package main
 
 import (
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/storagedriver/inmemory"
-	"github.com/docker/distribution/storagedriver/ipc"
+	"github.com/docker/distribution/registry/storage/driver/inmemory"
+	"github.com/docker/distribution/registry/storage/driver/ipc"
 )
 
 // An out-of-process inmemory driver, intended to be run by ipc.NewDriverClient
diff --git a/cmd/registry-storagedriver-s3/main.go b/cmd/registry-storagedriver-s3/main.go
index be49f157..8604fef0 100644
--- a/cmd/registry-storagedriver-s3/main.go
+++ b/cmd/registry-storagedriver-s3/main.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"github.com/docker/distribution/storagedriver/ipc"
-	"github.com/docker/distribution/storagedriver/s3"
+	"github.com/docker/distribution/registry/storage/driver/ipc"
+	"github.com/docker/distribution/registry/storage/driver/s3"
 )
 
 // An out-of-process S3 driver, intended to be run by ipc.NewDriverClient
diff --git a/cmd/registry/main.go b/cmd/registry/main.go
index 535b9cde..79f45ab0 100644
--- a/cmd/registry/main.go
+++ b/cmd/registry/main.go
@@ -10,14 +10,14 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/bugsnag/bugsnag-go"
-	_ "github.com/docker/distribution/registry/auth/silly"
-	_ "github.com/docker/distribution/registry/auth/token"
 	"github.com/docker/distribution/configuration"
 	ctxu "github.com/docker/distribution/context"
+	_ "github.com/docker/distribution/registry/auth/silly"
+	_ "github.com/docker/distribution/registry/auth/token"
 	"github.com/docker/distribution/registry/handlers"
-	_ "github.com/docker/distribution/storagedriver/filesystem"
-	_ "github.com/docker/distribution/storagedriver/inmemory"
-	_ "github.com/docker/distribution/storagedriver/s3"
+	_ "github.com/docker/distribution/registry/storage/driver/filesystem"
+	_ "github.com/docker/distribution/registry/storage/driver/inmemory"
+	_ "github.com/docker/distribution/registry/storage/driver/s3"
 	"github.com/docker/distribution/version"
 	gorhandlers "github.com/gorilla/handlers"
 	"github.com/yvasiyarov/gorelic"
diff --git a/registry/handlers/api_test.go b/registry/handlers/api_test.go
index 08d0cf97..a14e93dc 100644
--- a/registry/handlers/api_test.go
+++ b/registry/handlers/api_test.go
@@ -14,11 +14,11 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/docker/distribution/registry/api/v2"
 	"github.com/docker/distribution/configuration"
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/manifest"
-	_ "github.com/docker/distribution/storagedriver/inmemory"
+	"github.com/docker/distribution/registry/api/v2"
+	_ "github.com/docker/distribution/registry/storage/driver/inmemory"
 	"github.com/docker/distribution/testutil"
 	"github.com/docker/libtrust"
 	"github.com/gorilla/handlers"
diff --git a/registry/handlers/app.go b/registry/handlers/app.go
index 09c0c621..7a36309b 100644
--- a/registry/handlers/app.go
+++ b/registry/handlers/app.go
@@ -7,14 +7,14 @@ import (
 	"os"
 
 	"code.google.com/p/go-uuid/uuid"
-	"github.com/docker/distribution/registry/api/v2"
-	"github.com/docker/distribution/registry/auth"
 	"github.com/docker/distribution/configuration"
 	ctxu "github.com/docker/distribution/context"
+	"github.com/docker/distribution/registry/api/v2"
+	"github.com/docker/distribution/registry/auth"
 	"github.com/docker/distribution/registry/storage"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/docker/distribution/registry/storage/driver/factory"
 	"github.com/docker/distribution/registry/storage/notifications"
-	"github.com/docker/distribution/storagedriver"
-	"github.com/docker/distribution/storagedriver/factory"
 	"github.com/gorilla/mux"
 	"golang.org/x/net/context"
 )
diff --git a/registry/handlers/app_test.go b/registry/handlers/app_test.go
index b27c788a..158f5fc1 100644
--- a/registry/handlers/app_test.go
+++ b/registry/handlers/app_test.go
@@ -7,11 +7,11 @@ import (
 	"net/url"
 	"testing"
 
+	"github.com/docker/distribution/configuration"
 	"github.com/docker/distribution/registry/api/v2"
 	_ "github.com/docker/distribution/registry/auth/silly"
-	"github.com/docker/distribution/configuration"
 	"github.com/docker/distribution/registry/storage"
-	"github.com/docker/distribution/storagedriver/inmemory"
+	"github.com/docker/distribution/registry/storage/driver/inmemory"
 	"golang.org/x/net/context"
 )
 
diff --git a/registry/storage/blobstore.go b/registry/storage/blobstore.go
index ac123f44..975df19f 100644
--- a/registry/storage/blobstore.go
+++ b/registry/storage/blobstore.go
@@ -5,7 +5,7 @@ import (
 
 	ctxu "github.com/docker/distribution/context"
 	"github.com/docker/distribution/digest"
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 	"golang.org/x/net/context"
 )
 
diff --git a/registry/storage/cloudfrontlayerhandler.go b/registry/storage/cloudfrontlayerhandler.go
index fa420cc7..f887895c 100644
--- a/registry/storage/cloudfrontlayerhandler.go
+++ b/registry/storage/cloudfrontlayerhandler.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/AdRoll/goamz/cloudfront"
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 )
 
 // cloudFrontLayerHandler provides an simple implementation of layerHandler that
diff --git a/registry/storage/delegatelayerhandler.go b/registry/storage/delegatelayerhandler.go
index 7ed6d87b..01354023 100644
--- a/registry/storage/delegatelayerhandler.go
+++ b/registry/storage/delegatelayerhandler.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 )
 
 // delegateLayerHandler provides a simple implementation of layerHandler that
diff --git a/storagedriver/README.md b/registry/storage/driver/README.md
similarity index 100%
rename from storagedriver/README.md
rename to registry/storage/driver/README.md
diff --git a/storagedriver/azure/azure.go b/registry/storage/driver/azure/azure.go
similarity index 97%
rename from storagedriver/azure/azure.go
rename to registry/storage/driver/azure/azure.go
index b6c42f66..6ccbff40 100644
--- a/storagedriver/azure/azure.go
+++ b/registry/storage/driver/azure/azure.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/distribution/storagedriver"
-	"github.com/docker/distribution/storagedriver/base"
-	"github.com/docker/distribution/storagedriver/factory"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/docker/distribution/registry/storage/driver/base"
+	"github.com/docker/distribution/registry/storage/driver/factory"
 
 	azure "github.com/MSOpenTech/azure-sdk-for-go/clients/storage"
 )
diff --git a/storagedriver/azure/azure_test.go b/registry/storage/driver/azure/azure_test.go
similarity index 90%
rename from storagedriver/azure/azure_test.go
rename to registry/storage/driver/azure/azure_test.go
index 170e20f8..a8fdf3e9 100644
--- a/storagedriver/azure/azure_test.go
+++ b/registry/storage/driver/azure/azure_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/distribution/storagedriver"
-	"github.com/docker/distribution/storagedriver/testsuites"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/docker/distribution/registry/storage/driver/testsuites"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/storagedriver/azure/blockblob.go b/registry/storage/driver/azure/blockblob.go
similarity index 100%
rename from storagedriver/azure/blockblob.go
rename to registry/storage/driver/azure/blockblob.go
diff --git a/storagedriver/azure/blockblob_test.go b/registry/storage/driver/azure/blockblob_test.go
similarity index 100%
rename from storagedriver/azure/blockblob_test.go
rename to registry/storage/driver/azure/blockblob_test.go
diff --git a/storagedriver/azure/blockid.go b/registry/storage/driver/azure/blockid.go
similarity index 100%
rename from storagedriver/azure/blockid.go
rename to registry/storage/driver/azure/blockid.go
diff --git a/storagedriver/azure/blockid_test.go b/registry/storage/driver/azure/blockid_test.go
similarity index 100%
rename from storagedriver/azure/blockid_test.go
rename to registry/storage/driver/azure/blockid_test.go
diff --git a/storagedriver/azure/randomwriter.go b/registry/storage/driver/azure/randomwriter.go
similarity index 100%
rename from storagedriver/azure/randomwriter.go
rename to registry/storage/driver/azure/randomwriter.go
diff --git a/storagedriver/azure/randomwriter_test.go b/registry/storage/driver/azure/randomwriter_test.go
similarity index 100%
rename from storagedriver/azure/randomwriter_test.go
rename to registry/storage/driver/azure/randomwriter_test.go
diff --git a/storagedriver/azure/zerofillwriter.go b/registry/storage/driver/azure/zerofillwriter.go
similarity index 100%
rename from storagedriver/azure/zerofillwriter.go
rename to registry/storage/driver/azure/zerofillwriter.go
diff --git a/storagedriver/azure/zerofillwriter_test.go b/registry/storage/driver/azure/zerofillwriter_test.go
similarity index 100%
rename from storagedriver/azure/zerofillwriter_test.go
rename to registry/storage/driver/azure/zerofillwriter_test.go
diff --git a/storagedriver/base/base.go b/registry/storage/driver/base/base.go
similarity index 98%
rename from storagedriver/base/base.go
rename to registry/storage/driver/base/base.go
index 51fdf512..0365ba3c 100644
--- a/storagedriver/base/base.go
+++ b/registry/storage/driver/base/base.go
@@ -40,7 +40,7 @@ package base
 import (
 	"io"
 
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 )
 
 // Base provides a wrapper around a storagedriver implementation that provides
diff --git a/storagedriver/factory/factory.go b/registry/storage/driver/factory/factory.go
similarity index 97%
rename from storagedriver/factory/factory.go
rename to registry/storage/driver/factory/factory.go
index ba3b7dfa..66d160f3 100644
--- a/storagedriver/factory/factory.go
+++ b/registry/storage/driver/factory/factory.go
@@ -3,7 +3,7 @@ package factory
 import (
 	"fmt"
 
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 )
 
 // driverFactories stores an internal mapping between storage driver names and their respective
diff --git a/storagedriver/fileinfo.go b/registry/storage/driver/fileinfo.go
similarity index 99%
rename from storagedriver/fileinfo.go
rename to registry/storage/driver/fileinfo.go
index 82e3d546..e5064029 100644
--- a/storagedriver/fileinfo.go
+++ b/registry/storage/driver/fileinfo.go
@@ -1,4 +1,4 @@
-package storagedriver
+package driver
 
 import "time"
 
diff --git a/storagedriver/filesystem/README.md b/registry/storage/driver/filesystem/README.md
similarity index 100%
rename from storagedriver/filesystem/README.md
rename to registry/storage/driver/filesystem/README.md
diff --git a/storagedriver/filesystem/driver.go b/registry/storage/driver/filesystem/driver.go
similarity index 97%
rename from storagedriver/filesystem/driver.go
rename to registry/storage/driver/filesystem/driver.go
index e76b4bab..0e5aea75 100644
--- a/storagedriver/filesystem/driver.go
+++ b/registry/storage/driver/filesystem/driver.go
@@ -9,9 +9,9 @@ import (
 	"path"
 	"time"
 
-	"github.com/docker/distribution/storagedriver"
-	"github.com/docker/distribution/storagedriver/base"
-	"github.com/docker/distribution/storagedriver/factory"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/docker/distribution/registry/storage/driver/base"
+	"github.com/docker/distribution/registry/storage/driver/factory"
 )
 
 const driverName = "filesystem"
diff --git a/storagedriver/filesystem/driver_test.go b/registry/storage/driver/filesystem/driver_test.go
similarity index 81%
rename from storagedriver/filesystem/driver_test.go
rename to registry/storage/driver/filesystem/driver_test.go
index 08b203bd..8572de16 100644
--- a/storagedriver/filesystem/driver_test.go
+++ b/registry/storage/driver/filesystem/driver_test.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/distribution/storagedriver"
-	"github.com/docker/distribution/storagedriver/testsuites"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/docker/distribution/registry/storage/driver/testsuites"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/storagedriver/inmemory/README.md b/registry/storage/driver/inmemory/README.md
similarity index 100%
rename from storagedriver/inmemory/README.md
rename to registry/storage/driver/inmemory/README.md
diff --git a/storagedriver/inmemory/driver.go b/registry/storage/driver/inmemory/driver.go
similarity index 96%
rename from storagedriver/inmemory/driver.go
rename to registry/storage/driver/inmemory/driver.go
index d3fdec57..f2c9c3ff 100644
--- a/storagedriver/inmemory/driver.go
+++ b/registry/storage/driver/inmemory/driver.go
@@ -8,9 +8,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/docker/distribution/storagedriver"
-	"github.com/docker/distribution/storagedriver/base"
-	"github.com/docker/distribution/storagedriver/factory"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/docker/distribution/registry/storage/driver/base"
+	"github.com/docker/distribution/registry/storage/driver/factory"
 )
 
 const driverName = "inmemory"
diff --git a/storagedriver/inmemory/driver_test.go b/registry/storage/driver/inmemory/driver_test.go
similarity index 79%
rename from storagedriver/inmemory/driver_test.go
rename to registry/storage/driver/inmemory/driver_test.go
index 1034422e..a02ff23e 100644
--- a/storagedriver/inmemory/driver_test.go
+++ b/registry/storage/driver/inmemory/driver_test.go
@@ -3,8 +3,8 @@ package inmemory
 import (
 	"testing"
 
-	"github.com/docker/distribution/storagedriver"
-	"github.com/docker/distribution/storagedriver/testsuites"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/docker/distribution/registry/storage/driver/testsuites"
 
 	"gopkg.in/check.v1"
 )
diff --git a/storagedriver/inmemory/mfs.go b/registry/storage/driver/inmemory/mfs.go
similarity index 100%
rename from storagedriver/inmemory/mfs.go
rename to registry/storage/driver/inmemory/mfs.go
diff --git a/storagedriver/ipc/client.go b/registry/storage/driver/ipc/client.go
similarity index 99%
rename from storagedriver/ipc/client.go
rename to registry/storage/driver/ipc/client.go
index fab73113..daa823d7 100644
--- a/storagedriver/ipc/client.go
+++ b/registry/storage/driver/ipc/client.go
@@ -13,7 +13,7 @@ import (
 	"os/exec"
 	"syscall"
 
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 	"github.com/docker/libchan"
 	"github.com/docker/libchan/spdy"
 )
diff --git a/storagedriver/ipc/ipc.go b/registry/storage/driver/ipc/ipc.go
similarity index 98%
rename from storagedriver/ipc/ipc.go
rename to registry/storage/driver/ipc/ipc.go
index e7ddd69e..dabb834d 100644
--- a/storagedriver/ipc/ipc.go
+++ b/registry/storage/driver/ipc/ipc.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"reflect"
 
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 	"github.com/docker/libchan"
 )
 
diff --git a/storagedriver/ipc/server.go b/registry/storage/driver/ipc/server.go
similarity index 98%
rename from storagedriver/ipc/server.go
rename to registry/storage/driver/ipc/server.go
index 6d7df2eb..4c6f1d4d 100644
--- a/storagedriver/ipc/server.go
+++ b/registry/storage/driver/ipc/server.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"reflect"
 
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 	"github.com/docker/libchan"
 	"github.com/docker/libchan/spdy"
 )
diff --git a/storagedriver/s3/README.md b/registry/storage/driver/s3/README.md
similarity index 100%
rename from storagedriver/s3/README.md
rename to registry/storage/driver/s3/README.md
diff --git a/storagedriver/s3/s3.go b/registry/storage/driver/s3/s3.go
similarity index 98%
rename from storagedriver/s3/s3.go
rename to registry/storage/driver/s3/s3.go
index c9d4ccbe..eb9f08f4 100644
--- a/storagedriver/s3/s3.go
+++ b/registry/storage/driver/s3/s3.go
@@ -26,9 +26,9 @@ import (
 
 	"github.com/AdRoll/goamz/aws"
 	"github.com/AdRoll/goamz/s3"
-	"github.com/docker/distribution/storagedriver"
-	"github.com/docker/distribution/storagedriver/base"
-	"github.com/docker/distribution/storagedriver/factory"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/docker/distribution/registry/storage/driver/base"
+	"github.com/docker/distribution/registry/storage/driver/factory"
 )
 
 const driverName = "s3"
diff --git a/storagedriver/s3/s3_test.go b/registry/storage/driver/s3/s3_test.go
similarity index 93%
rename from storagedriver/s3/s3_test.go
rename to registry/storage/driver/s3/s3_test.go
index 0175e8ac..fb2003e1 100644
--- a/storagedriver/s3/s3_test.go
+++ b/registry/storage/driver/s3/s3_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/AdRoll/goamz/aws"
-	"github.com/docker/distribution/storagedriver"
-	"github.com/docker/distribution/storagedriver/testsuites"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/docker/distribution/registry/storage/driver/testsuites"
 
 	"gopkg.in/check.v1"
 )
diff --git a/storagedriver/storagedriver.go b/registry/storage/driver/storagedriver.go
similarity index 99%
rename from storagedriver/storagedriver.go
rename to registry/storage/driver/storagedriver.go
index c94ef8d6..dd8fb4a0 100644
--- a/storagedriver/storagedriver.go
+++ b/registry/storage/driver/storagedriver.go
@@ -1,4 +1,4 @@
-package storagedriver
+package driver
 
 import (
 	"errors"
diff --git a/storagedriver/testsuites/testsuites.go b/registry/storage/driver/testsuites/testsuites.go
similarity index 99%
rename from storagedriver/testsuites/testsuites.go
rename to registry/storage/driver/testsuites/testsuites.go
index da127627..cfa3a48a 100644
--- a/storagedriver/testsuites/testsuites.go
+++ b/registry/storage/driver/testsuites/testsuites.go
@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 
 	"gopkg.in/check.v1"
 )
diff --git a/registry/storage/filereader.go b/registry/storage/filereader.go
index 9bc09afe..4cb2b331 100644
--- a/registry/storage/filereader.go
+++ b/registry/storage/filereader.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 )
 
 // TODO(stevvooe): Set an optimal buffer size here. We'll have to
diff --git a/registry/storage/filereader_test.go b/registry/storage/filereader_test.go
index 53dd6c9a..7c554e8b 100644
--- a/registry/storage/filereader_test.go
+++ b/registry/storage/filereader_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/docker/distribution/digest"
 
-	"github.com/docker/distribution/storagedriver/inmemory"
+	"github.com/docker/distribution/registry/storage/driver/inmemory"
 )
 
 func TestSimpleRead(t *testing.T) {
diff --git a/registry/storage/filewriter.go b/registry/storage/filewriter.go
index 5037f160..cbf03704 100644
--- a/registry/storage/filewriter.go
+++ b/registry/storage/filewriter.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 )
 
 // fileWriter implements a remote file writer backed by a storage driver.
diff --git a/registry/storage/filewriter_test.go b/registry/storage/filewriter_test.go
index 2235462f..1a38a519 100644
--- a/registry/storage/filewriter_test.go
+++ b/registry/storage/filewriter_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/docker/distribution/digest"
-	"github.com/docker/distribution/storagedriver/inmemory"
+	"github.com/docker/distribution/registry/storage/driver/inmemory"
 )
 
 // TestSimpleWrite takes the fileWriter through common write operations
diff --git a/registry/storage/layer_test.go b/registry/storage/layer_test.go
index c7d64b79..48982993 100644
--- a/registry/storage/layer_test.go
+++ b/registry/storage/layer_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 
 	"github.com/docker/distribution/digest"
-	"github.com/docker/distribution/storagedriver"
-	"github.com/docker/distribution/storagedriver/inmemory"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/docker/distribution/registry/storage/driver/inmemory"
 	"github.com/docker/distribution/testutil"
 	"golang.org/x/net/context"
 )
diff --git a/registry/storage/layerhandler.go b/registry/storage/layerhandler.go
index 2755470e..5bcfeddd 100644
--- a/registry/storage/layerhandler.go
+++ b/registry/storage/layerhandler.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 )
 
 // LayerHandler provides middleware for serving the contents of a Layer.
diff --git a/registry/storage/layerstore.go b/registry/storage/layerstore.go
index b6578792..e4760b4e 100644
--- a/registry/storage/layerstore.go
+++ b/registry/storage/layerstore.go
@@ -7,7 +7,7 @@ import (
 	ctxu "github.com/docker/distribution/context"
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/manifest"
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 )
 
 type layerStore struct {
diff --git a/registry/storage/layerupload.go b/registry/storage/layerupload.go
index 54860913..e6cf21a9 100644
--- a/registry/storage/layerupload.go
+++ b/registry/storage/layerupload.go
@@ -9,7 +9,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	ctxu "github.com/docker/distribution/context"
 	"github.com/docker/distribution/digest"
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 	"github.com/docker/docker/pkg/tarsum"
 )
 
diff --git a/registry/storage/manifeststore_test.go b/registry/storage/manifeststore_test.go
index 8284ce94..1fd02662 100644
--- a/registry/storage/manifeststore_test.go
+++ b/registry/storage/manifeststore_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/manifest"
-	"github.com/docker/distribution/storagedriver/inmemory"
+	"github.com/docker/distribution/registry/storage/driver/inmemory"
 	"github.com/docker/distribution/testutil"
 	"github.com/docker/libtrust"
 	"golang.org/x/net/context"
diff --git a/registry/storage/notifications/listener_test.go b/registry/storage/notifications/listener_test.go
index b62e7e7e..b8d6a31e 100644
--- a/registry/storage/notifications/listener_test.go
+++ b/registry/storage/notifications/listener_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/manifest"
 	"github.com/docker/distribution/registry/storage"
-	"github.com/docker/distribution/storagedriver/inmemory"
+	"github.com/docker/distribution/registry/storage/driver/inmemory"
 	"github.com/docker/distribution/testutil"
 	"github.com/docker/libtrust"
 	"golang.org/x/net/context"
diff --git a/registry/storage/registry.go b/registry/storage/registry.go
index ed865007..c4ca2f80 100644
--- a/registry/storage/registry.go
+++ b/registry/storage/registry.go
@@ -1,7 +1,7 @@
 package storage
 
 import (
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 	"golang.org/x/net/context"
 )
 
diff --git a/registry/storage/tagstore.go b/registry/storage/tagstore.go
index f7b87a25..6ae3e5f8 100644
--- a/registry/storage/tagstore.go
+++ b/registry/storage/tagstore.go
@@ -4,7 +4,7 @@ import (
 	"path"
 
 	"github.com/docker/distribution/digest"
-	"github.com/docker/distribution/storagedriver"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
 )
 
 // tagStore provides methods to manage manifest tags in a backend storage driver.