diff --git a/cmd/registry/main.go b/cmd/registry/main.go
index 1c3996177..535b9cde0 100644
--- a/cmd/registry/main.go
+++ b/cmd/registry/main.go
@@ -10,8 +10,8 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/bugsnag/bugsnag-go"
-	_ "github.com/docker/distribution/auth/silly"
-	_ "github.com/docker/distribution/auth/token"
+	_ "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/handlers"
diff --git a/auth/auth.go b/registry/auth/auth.go
similarity index 100%
rename from auth/auth.go
rename to registry/auth/auth.go
diff --git a/auth/silly/access.go b/registry/auth/silly/access.go
similarity index 98%
rename from auth/silly/access.go
rename to registry/auth/silly/access.go
index c3adba804..7d3a4d40d 100644
--- a/auth/silly/access.go
+++ b/registry/auth/silly/access.go
@@ -12,7 +12,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/docker/distribution/auth"
+	"github.com/docker/distribution/registry/auth"
 	ctxu "github.com/docker/distribution/context"
 	"golang.org/x/net/context"
 )
diff --git a/auth/silly/access_test.go b/registry/auth/silly/access_test.go
similarity index 97%
rename from auth/silly/access_test.go
rename to registry/auth/silly/access_test.go
index 44d66a4d7..d579e8780 100644
--- a/auth/silly/access_test.go
+++ b/registry/auth/silly/access_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/docker/distribution/auth"
+	"github.com/docker/distribution/registry/auth"
 	"golang.org/x/net/context"
 )
 
diff --git a/auth/token/accesscontroller.go b/registry/auth/token/accesscontroller.go
similarity index 99%
rename from auth/token/accesscontroller.go
rename to registry/auth/token/accesscontroller.go
index 2f1e3d6d7..61b275a70 100644
--- a/auth/token/accesscontroller.go
+++ b/registry/auth/token/accesscontroller.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/docker/distribution/auth"
+	"github.com/docker/distribution/registry/auth"
 	ctxu "github.com/docker/distribution/context"
 	"github.com/docker/libtrust"
 	"golang.org/x/net/context"
diff --git a/auth/token/stringset.go b/registry/auth/token/stringset.go
similarity index 100%
rename from auth/token/stringset.go
rename to registry/auth/token/stringset.go
diff --git a/auth/token/token.go b/registry/auth/token/token.go
similarity index 99%
rename from auth/token/token.go
rename to registry/auth/token/token.go
index 6d67374ed..166816eea 100644
--- a/auth/token/token.go
+++ b/registry/auth/token/token.go
@@ -13,7 +13,7 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/docker/libtrust"
 
-	"github.com/docker/distribution/auth"
+	"github.com/docker/distribution/registry/auth"
 )
 
 const (
diff --git a/auth/token/token_test.go b/registry/auth/token/token_test.go
similarity index 99%
rename from auth/token/token_test.go
rename to registry/auth/token/token_test.go
index ab9fb896b..791eb2140 100644
--- a/auth/token/token_test.go
+++ b/registry/auth/token/token_test.go
@@ -15,7 +15,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution/auth"
+	"github.com/docker/distribution/registry/auth"
 	"github.com/docker/libtrust"
 	"golang.org/x/net/context"
 )
diff --git a/auth/token/util.go b/registry/auth/token/util.go
similarity index 100%
rename from auth/token/util.go
rename to registry/auth/token/util.go
diff --git a/registry/handlers/app.go b/registry/handlers/app.go
index 876c69b46..5f433e95d 100644
--- a/registry/handlers/app.go
+++ b/registry/handlers/app.go
@@ -8,7 +8,7 @@ import (
 
 	"code.google.com/p/go-uuid/uuid"
 	"github.com/docker/distribution/registry/api/v2"
-	"github.com/docker/distribution/auth"
+	"github.com/docker/distribution/registry/auth"
 	"github.com/docker/distribution/configuration"
 	ctxu "github.com/docker/distribution/context"
 	"github.com/docker/distribution/storage"
diff --git a/registry/handlers/app_test.go b/registry/handlers/app_test.go
index 249c381b4..8da285a38 100644
--- a/registry/handlers/app_test.go
+++ b/registry/handlers/app_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/docker/distribution/registry/api/v2"
-	_ "github.com/docker/distribution/auth/silly"
+	_ "github.com/docker/distribution/registry/auth/silly"
 	"github.com/docker/distribution/configuration"
 	"github.com/docker/distribution/storage"
 	"github.com/docker/distribution/storagedriver/inmemory"