diff --git a/client.go b/client.go
index b9184424d..642221812 100644
--- a/client.go
+++ b/client.go
@@ -38,6 +38,7 @@ import (
 	versionservice "github.com/containerd/containerd/api/services/version/v1"
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/content"
+	contentproxy "github.com/containerd/containerd/content/proxy"
 	"github.com/containerd/containerd/defaults"
 	"github.com/containerd/containerd/dialer"
 	"github.com/containerd/containerd/errdefs"
@@ -460,7 +461,7 @@ func (c *Client) ContentStore() content.Store {
 	if c.contentStore != nil {
 		return c.contentStore
 	}
-	return NewContentStoreFromClient(contentapi.NewContentClient(c.conn))
+	return contentproxy.NewContentStore(contentapi.NewContentClient(c.conn))
 }
 
 // SnapshotService returns the underlying snapshotter for the provided snapshotter name
diff --git a/content_reader.go b/content/proxy/content_reader.go
similarity index 98%
rename from content_reader.go
rename to content/proxy/content_reader.go
index 72628e6ca..b06e48fa9 100644
--- a/content_reader.go
+++ b/content/proxy/content_reader.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package proxy
 
 import (
 	"context"
diff --git a/content_store.go b/content/proxy/content_store.go
similarity index 96%
rename from content_store.go
rename to content/proxy/content_store.go
index 790249c2b..6c5b6d3e1 100644
--- a/content_store.go
+++ b/content/proxy/content_store.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package proxy
 
 import (
 	"context"
@@ -31,8 +31,9 @@ type remoteContent struct {
 	client contentapi.ContentClient
 }
 
-// NewContentStoreFromClient returns a new content store
-func NewContentStoreFromClient(client contentapi.ContentClient) content.Store {
+// NewContentStore returns a new content store which communicates over a GRPC
+// connection using the containerd content GRPC API.
+func NewContentStore(client contentapi.ContentClient) content.Store {
 	return &remoteContent{
 		client: client,
 	}
diff --git a/content_writer.go b/content/proxy/content_writer.go
similarity index 99%
rename from content_writer.go
rename to content/proxy/content_writer.go
index a4247daa0..6d35ba61a 100644
--- a/content_writer.go
+++ b/content/proxy/content_writer.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package proxy
 
 import (
 	"context"