diff --git a/client/client.go b/client/client.go
index 6495da965..c697e01ce 100644
--- a/client/client.go
+++ b/client/client.go
@@ -9,7 +9,7 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/registry/api/v2"
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/manifest"
 )
diff --git a/cmd/registry-api-descriptor-template/main.go b/cmd/registry-api-descriptor-template/main.go
index f6f209253..5118d330c 100644
--- a/cmd/registry-api-descriptor-template/main.go
+++ b/cmd/registry-api-descriptor-template/main.go
@@ -20,7 +20,7 @@ import (
 	"regexp"
 	"text/template"
 
-	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/registry/api/v2"
 )
 
 var spaceRegex = regexp.MustCompile(`\n\s*`)
diff --git a/api/v2/descriptors.go b/registry/api/v2/descriptors.go
similarity index 100%
rename from api/v2/descriptors.go
rename to registry/api/v2/descriptors.go
diff --git a/api/v2/doc.go b/registry/api/v2/doc.go
similarity index 100%
rename from api/v2/doc.go
rename to registry/api/v2/doc.go
diff --git a/api/v2/errors.go b/registry/api/v2/errors.go
similarity index 100%
rename from api/v2/errors.go
rename to registry/api/v2/errors.go
diff --git a/api/v2/errors_test.go b/registry/api/v2/errors_test.go
similarity index 100%
rename from api/v2/errors_test.go
rename to registry/api/v2/errors_test.go
diff --git a/api/v2/names.go b/registry/api/v2/names.go
similarity index 100%
rename from api/v2/names.go
rename to registry/api/v2/names.go
diff --git a/api/v2/names_test.go b/registry/api/v2/names_test.go
similarity index 100%
rename from api/v2/names_test.go
rename to registry/api/v2/names_test.go
diff --git a/api/v2/routes.go b/registry/api/v2/routes.go
similarity index 100%
rename from api/v2/routes.go
rename to registry/api/v2/routes.go
diff --git a/api/v2/routes_test.go b/registry/api/v2/routes_test.go
similarity index 100%
rename from api/v2/routes_test.go
rename to registry/api/v2/routes_test.go
diff --git a/api/v2/urls.go b/registry/api/v2/urls.go
similarity index 100%
rename from api/v2/urls.go
rename to registry/api/v2/urls.go
diff --git a/api/v2/urls_test.go b/registry/api/v2/urls_test.go
similarity index 100%
rename from api/v2/urls_test.go
rename to registry/api/v2/urls_test.go
diff --git a/registry/handlers/api_test.go b/registry/handlers/api_test.go
index 1d1173a9a..08d0cf972 100644
--- a/registry/handlers/api_test.go
+++ b/registry/handlers/api_test.go
@@ -14,7 +14,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/registry/api/v2"
 	"github.com/docker/distribution/configuration"
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/manifest"
diff --git a/registry/handlers/app.go b/registry/handlers/app.go
index e49144e2f..876c69b46 100644
--- a/registry/handlers/app.go
+++ b/registry/handlers/app.go
@@ -7,7 +7,7 @@ import (
 	"os"
 
 	"code.google.com/p/go-uuid/uuid"
-	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/registry/api/v2"
 	"github.com/docker/distribution/auth"
 	"github.com/docker/distribution/configuration"
 	ctxu "github.com/docker/distribution/context"
diff --git a/registry/handlers/app_test.go b/registry/handlers/app_test.go
index 927f40a4a..249c381b4 100644
--- a/registry/handlers/app_test.go
+++ b/registry/handlers/app_test.go
@@ -7,7 +7,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/registry/api/v2"
 	_ "github.com/docker/distribution/auth/silly"
 	"github.com/docker/distribution/configuration"
 	"github.com/docker/distribution/storage"
diff --git a/registry/handlers/context.go b/registry/handlers/context.go
index 8f277595c..c940d8f4b 100644
--- a/registry/handlers/context.go
+++ b/registry/handlers/context.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/registry/api/v2"
 	ctxu "github.com/docker/distribution/context"
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/storage"
diff --git a/registry/handlers/images.go b/registry/handlers/images.go
index c26a2239a..9c2dfa437 100644
--- a/registry/handlers/images.go
+++ b/registry/handlers/images.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/registry/api/v2"
 	ctxu "github.com/docker/distribution/context"
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/manifest"
diff --git a/registry/handlers/layer.go b/registry/handlers/layer.go
index 31d24b865..73641ddeb 100644
--- a/registry/handlers/layer.go
+++ b/registry/handlers/layer.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"net/http"
 
-	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/registry/api/v2"
 	ctxu "github.com/docker/distribution/context"
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/storage"
diff --git a/registry/handlers/layerupload.go b/registry/handlers/layerupload.go
index a15e274a7..190cf86bf 100644
--- a/registry/handlers/layerupload.go
+++ b/registry/handlers/layerupload.go
@@ -7,7 +7,7 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/registry/api/v2"
 	ctxu "github.com/docker/distribution/context"
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/storage"
diff --git a/registry/handlers/tags.go b/registry/handlers/tags.go
index 65ffacfc9..1e8e43d55 100644
--- a/registry/handlers/tags.go
+++ b/registry/handlers/tags.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/docker/distribution/api/v2"
+	"github.com/docker/distribution/registry/api/v2"
 	"github.com/docker/distribution/storage"
 	"github.com/gorilla/handlers"
 )