diff --git a/registry/client/repository.go b/registry/client/repository.go
index 61dcf0f44..788e79042 100644
--- a/registry/client/repository.go
+++ b/registry/client/repository.go
@@ -18,16 +18,17 @@ import (
 	"github.com/docker/distribution"
 	"github.com/docker/distribution/context"
 	"github.com/docker/distribution/registry/api/v2"
+	"github.com/docker/distribution/registry/client/transport"
 	"github.com/docker/distribution/registry/storage/cache"
 )
 
-// NewRepository creates a new Repository for the given repository name and endpoint
-func NewRepository(ctx context.Context, name, endpoint string, transport http.RoundTripper) (distribution.Repository, error) {
+// NewRepository creates a new Repository for the given repository name and base URL
+func NewRepository(ctx context.Context, name, baseURL string, transport http.RoundTripper) (distribution.Repository, error) {
 	if err := v2.ValidateRespositoryName(name); err != nil {
 		return nil, err
 	}
 
-	ub, err := v2.NewURLBuilderFromString(endpoint)
+	ub, err := v2.NewURLBuilderFromString(baseURL)
 	if err != nil {
 		return nil, err
 	}
@@ -292,7 +293,7 @@ func (ls *blobs) Open(ctx context.Context, dgst digest.Digest) (distribution.Rea
 		return nil, err
 	}
 
-	return NewHTTPReadSeeker(ls.repository.client, blobURL, stat.Length), nil
+	return transport.NewHTTPReadSeeker(ls.repository.client, blobURL, stat.Length), nil
 }
 
 func (ls *blobs) ServeBlob(ctx context.Context, w http.ResponseWriter, r *http.Request, dgst digest.Digest) error {
diff --git a/registry/client/authchallenge.go b/registry/client/transport/authchallenge.go
similarity index 99%
rename from registry/client/authchallenge.go
rename to registry/client/transport/authchallenge.go
index 49cf270e5..fffd560b0 100644
--- a/registry/client/authchallenge.go
+++ b/registry/client/transport/authchallenge.go
@@ -1,4 +1,4 @@
-package client
+package transport
 
 import (
 	"net/http"
diff --git a/registry/client/authchallenge_test.go b/registry/client/transport/authchallenge_test.go
similarity index 98%
rename from registry/client/authchallenge_test.go
rename to registry/client/transport/authchallenge_test.go
index 802c94f30..45c932b9c 100644
--- a/registry/client/authchallenge_test.go
+++ b/registry/client/transport/authchallenge_test.go
@@ -1,4 +1,4 @@
-package client
+package transport
 
 import (
 	"net/http"
diff --git a/registry/client/http_reader.go b/registry/client/transport/http_reader.go
similarity index 99%
rename from registry/client/http_reader.go
rename to registry/client/transport/http_reader.go
index 22f9bfbc4..de728a966 100644
--- a/registry/client/http_reader.go
+++ b/registry/client/transport/http_reader.go
@@ -1,4 +1,4 @@
-package client
+package transport
 
 import (
 	"bufio"
diff --git a/registry/client/session.go b/registry/client/transport/session.go
similarity index 99%
rename from registry/client/session.go
rename to registry/client/transport/session.go
index 41bb4f31e..670be1ba8 100644
--- a/registry/client/session.go
+++ b/registry/client/transport/session.go
@@ -1,4 +1,4 @@
-package client
+package transport
 
 import (
 	"encoding/json"
diff --git a/registry/client/session_test.go b/registry/client/transport/session_test.go
similarity index 97%
rename from registry/client/session_test.go
rename to registry/client/transport/session_test.go
index cf8e546e4..374d6e799 100644
--- a/registry/client/session_test.go
+++ b/registry/client/transport/session_test.go
@@ -1,4 +1,4 @@
-package client
+package transport
 
 import (
 	"encoding/base64"
@@ -11,6 +11,12 @@ import (
 	"github.com/docker/distribution/testutil"
 )
 
+func testServer(rrm testutil.RequestResponseMap) (string, func()) {
+	h := testutil.NewHandler(rrm)
+	s := httptest.NewServer(h)
+	return s.URL, s.Close
+}
+
 type testAuthenticationWrapper struct {
 	headers   http.Header
 	authCheck func(string) bool
diff --git a/registry/client/transport.go b/registry/client/transport/transport.go
similarity index 99%
rename from registry/client/transport.go
rename to registry/client/transport/transport.go
index 0b241619c..c8cfbb19f 100644
--- a/registry/client/transport.go
+++ b/registry/client/transport/transport.go
@@ -1,4 +1,4 @@
-package client
+package transport
 
 import (
 	"io"