Reorganize library layout

Move the packages under mongo and mongo/private to core. GODRIVER-327 Change-Id: I0d9a489dfd6e733d9714a542c62ef7844412bb33
zsimon2016 · Apr 5, 2018 · 0783f3c · 0783f3c
1 parent 854de67
commit 0783f3c
Show file tree

Hide file tree

Showing 191 changed files with 383 additions and 382 deletions.
diff --git a/.errcheck-excludes b/.errcheck-excludes
@@ -1,5 +1,4 @@
-(github.com/mongodb/mongo-go-driver/mongo/private/conn.Connection).Close
-(*github.com/mongodb/mongo-go-driver/mongo/private/roots/connection.connection).Close
-(github.com/mongodb/mongo-go-driver/mongo/private/roots/connection.Connection).Close
-(*github.com/mongodb/mongo-go-driver/mongo/private/roots/topology.Subscription).Unsubscribe
-(*github.com/mongodb/mongo-go-driver/mongo/private/roots/topology.Server).Close
+(*github.com/mongodb/mongo-go-driver/core/connection.connection).Close
+(github.com/mongodb/mongo-go-driver/core/connection.Connection).Close
+(*github.com/mongodb/mongo-go-driver/core/topology.Subscription).Unsubscribe
+(*github.com/mongodb/mongo-go-driver/core/topology.Server).Close
diff --git a/Makefile b/Makefile
@@ -1,22 +1,24 @@
 BSON_PKGS = $(shell ./etc/find_pkgs.sh ./bson)
 BSON_TEST_PKGS = $(shell ./etc/find_pkgs.sh ./bson _test)
-YAMGO_PKGS = $(shell ./etc/find_pkgs.sh ./mongo)
-YAMGO_TEST_PKGS = $(shell ./etc/find_pkgs.sh ./mongo _test)
-PKGS = $(BSON_PKGS) $(YAMGO_PKGS)
-TEST_PKGS = $(BSON_TEST_PKGS) $(YAMGO_TEST_PKGS)
+MONGO_PKGS = $(shell ./etc/find_pkgs.sh ./mongo)
+MONGO_TEST_PKGS = $(shell ./etc/find_pkgs.sh ./mongo _test)
+CORE_PKGS = $(shell ./etc/find_pkgs.sh ./core)
+CORE_TEST_PKGS = $(shell ./etc/find_pkgs.sh ./core _test)
+PKGS = $(BSON_PKGS) $(MONGO_PKGS) $(CORE_PKGS)
+TEST_PKGS = $(BSON_TEST_PKGS) $(MONGO_TEST_PKGS) $(CORE_TEST_PKGS)
 
 TEST_TIMEOUT = 300
 
 .PHONY: default
-default: check-fmt vet build-examples lint errcheck test-cover test-race 
+default: check-fmt vet build-examples lint errcheck test-cover test-race
 
 .PHONY: doc
 doc:
 	godoc -http=:6060 -index
 
 .PHONY: build-examples
 build-examples:
-	go build $(BUILD_TAGS) ./examples/...
+	go build $(BUILD_TAGS) ./examples/... ./core/examples/...
 
 .PHONY: check-fmt
 check-fmt:
@@ -99,4 +101,4 @@ evg-test:
 
 .PHONY: evg-test-auth
 evg-test-auth:
-	go run -tags gssapi ./mongo/private/examples/count/main.go -uri $(MONGODB_URI)
+	go run -tags gssapi ./core/examples/count/main.go -uri $(MONGODB_URI)
diff --git a/mongo/private/README.md → core/README.md b/mongo/private/README.md → core/README.md
@@ -1,16 +1,16 @@
 # WARNING: NOT FOR PUBLIC USE
 
-**The API for packages in `private` have no stability guarantee.**
+**The API for packages in `core` have no stability guarantee.**
 
-The packages within the `private` directory would normally be put into an
+The packages within the `core` directory would normally be put into an
 `internal` directory to prohibit their use outside the `mongo` directory.
 
 However, some MongoDB tools require very low-level access to the building
-blocks of a driver, so we have placed them into `private` to allow these
+blocks of a driver, so we have placed them into `core` to allow these
 packages to be imported by projects that need them.
 
 These package APIs may be modified in backwards-incompatible ways at any
 time.
 
 **You are strongly discouraged from directly using any packages in
-`private`.**
+`core`.**
diff --git a/mongo/private/roots/addr/addr.go → core/addr/addr.go b/mongo/private/roots/addr/addr.go → core/addr/addr.go
diff --git a/mongo/private/roots/addr/addr_test.go → core/addr/addr_test.go b/mongo/private/roots/addr/addr_test.go → core/addr/addr_test.go
diff --git a/mongo/private/auth/auth.go → core/auth/auth.go b/mongo/private/auth/auth.go → core/auth/auth.go
@@ -10,11 +10,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/addr"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/command"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/connection"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	"github.com/mongodb/mongo-go-driver/core/addr"
+	"github.com/mongodb/mongo-go-driver/core/command"
+	"github.com/mongodb/mongo-go-driver/core/connection"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // AuthenticatorFactory constructs an authenticator.

diff --git a/mongo/private/auth/auth_test.go → core/auth/auth_test.go b/mongo/private/auth/auth_test.go → core/auth/auth_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	. "github.com/mongodb/mongo-go-driver/mongo/private/auth"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	. "github.com/mongodb/mongo-go-driver/core/auth"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/mongo/private/auth/cred.go → core/auth/cred.go b/mongo/private/auth/cred.go → core/auth/cred.go
diff --git a/mongo/private/auth/default.go → core/auth/default.go b/mongo/private/auth/default.go → core/auth/default.go
@@ -9,9 +9,9 @@ package auth
 import (
 	"context"
 
-	"github.com/mongodb/mongo-go-driver/mongo/internal/feature"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
+	"github.com/mongodb/mongo-go-driver/internal/feature"
 )
 
 func newDefaultAuthenticator(cred *Cred) (Authenticator, error) {

diff --git a/mongo/private/auth/doc.go → core/auth/doc.go b/mongo/private/auth/doc.go → core/auth/doc.go
diff --git a/mongo/private/auth/gssapi.go → core/auth/gssapi.go b/mongo/private/auth/gssapi.go → core/auth/gssapi.go
@@ -13,9 +13,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/mongodb/mongo-go-driver/mongo/internal/auth/gssapi"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	"github.com/mongodb/mongo-go-driver/core/auth/internal/gssapi"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // GSSAPI is the mechanism name for GSSAPI.

diff --git a/mongo/private/auth/gssapi_not_enabled.go → core/auth/gssapi_not_enabled.go b/mongo/private/auth/gssapi_not_enabled.go → core/auth/gssapi_not_enabled.go
diff --git a/mongo/private/auth/gssapi_not_supported.go → core/auth/gssapi_not_supported.go b/mongo/private/auth/gssapi_not_supported.go → core/auth/gssapi_not_supported.go
diff --git a/mongo/internal/auth/gssapi/gss.go → core/auth/internal/gssapi/gss.go b/mongo/internal/auth/gssapi/gss.go → core/auth/internal/gssapi/gss.go
diff --git a/mongo/internal/auth/gssapi/gss_wrapper.c → core/auth/internal/gssapi/gss_wrapper.c b/mongo/internal/auth/gssapi/gss_wrapper.c → core/auth/internal/gssapi/gss_wrapper.c
diff --git a/mongo/internal/auth/gssapi/gss_wrapper.h → core/auth/internal/gssapi/gss_wrapper.h b/mongo/internal/auth/gssapi/gss_wrapper.h → core/auth/internal/gssapi/gss_wrapper.h
diff --git a/mongo/internal/auth/gssapi/sspi.go → core/auth/internal/gssapi/sspi.go b/mongo/internal/auth/gssapi/sspi.go → core/auth/internal/gssapi/sspi.go
diff --git a/mongo/internal/auth/gssapi/sspi_wrapper.c → core/auth/internal/gssapi/sspi_wrapper.c b/mongo/internal/auth/gssapi/sspi_wrapper.c → core/auth/internal/gssapi/sspi_wrapper.c
diff --git a/mongo/internal/auth/gssapi/sspi_wrapper.h → core/auth/internal/gssapi/sspi_wrapper.h b/mongo/internal/auth/gssapi/sspi_wrapper.h → core/auth/internal/gssapi/sspi_wrapper.h
diff --git a/mongo/private/auth/mongodbcr.go → core/auth/mongodbcr.go b/mongo/private/auth/mongodbcr.go → core/auth/mongodbcr.go
@@ -14,9 +14,9 @@ import (
 	"io"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/command"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	"github.com/mongodb/mongo-go-driver/core/command"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // MONGODBCR is the mechanism name for MONGODB-CR.

diff --git a/mongo/private/auth/mongodbcr_test.go → core/auth/mongodbcr_test.go b/mongo/private/auth/mongodbcr_test.go → core/auth/mongodbcr_test.go
@@ -15,9 +15,9 @@ import (
 	"strings"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	. "github.com/mongodb/mongo-go-driver/mongo/private/auth"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	. "github.com/mongodb/mongo-go-driver/core/auth"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 func TestMongoDBCRAuthenticator_Fails(t *testing.T) {

diff --git a/mongo/private/auth/plain.go → core/auth/plain.go b/mongo/private/auth/plain.go → core/auth/plain.go
@@ -10,8 +10,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // PLAIN is the mechanism name for PLAIN.

diff --git a/mongo/private/auth/plain_test.go → core/auth/plain_test.go b/mongo/private/auth/plain_test.go → core/auth/plain_test.go
@@ -16,9 +16,9 @@ import (
 	"encoding/base64"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	. "github.com/mongodb/mongo-go-driver/mongo/private/auth"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	. "github.com/mongodb/mongo-go-driver/core/auth"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 func TestPlainAuthenticator_Fails(t *testing.T) {

diff --git a/mongo/private/auth/sasl.go → core/auth/sasl.go b/mongo/private/auth/sasl.go → core/auth/sasl.go
@@ -10,9 +10,9 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/command"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	"github.com/mongodb/mongo-go-driver/core/command"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // SaslClient is the client piece of a sasl conversation.

diff --git a/mongo/private/auth/scramsha1.go → core/auth/scramsha1.go b/mongo/private/auth/scramsha1.go → core/auth/scramsha1.go
@@ -16,8 +16,8 @@ import (
 	"math/rand"
 	"strconv"
 
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 	"golang.org/x/crypto/pbkdf2"
 
 	"strings"

diff --git a/...o/private/auth/scramsha1_internal_test.go → core/auth/scramsha1_internal_test.go b/...o/private/auth/scramsha1_internal_test.go → core/auth/scramsha1_internal_test.go
diff --git a/mongo/private/auth/scramsha1_test.go → core/auth/scramsha1_test.go b/mongo/private/auth/scramsha1_test.go → core/auth/scramsha1_test.go
@@ -16,9 +16,9 @@ import (
 	"encoding/base64"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	. "github.com/mongodb/mongo-go-driver/mongo/private/auth"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	. "github.com/mongodb/mongo-go-driver/core/auth"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/mongo/private/auth/util.go → core/auth/util.go b/mongo/private/auth/util.go → core/auth/util.go
diff --git a/mongo/private/auth/x509.go → core/auth/x509.go b/mongo/private/auth/x509.go → core/auth/x509.go
@@ -10,9 +10,9 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/command"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	"github.com/mongodb/mongo-go-driver/core/command"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // MongoDBX509 is the mechanism name for MongoDBX509.

diff --git a/mongo/private/roots/command/aggregate.go → core/command/aggregate.go b/mongo/private/roots/command/aggregate.go → core/command/aggregate.go
@@ -4,10 +4,10 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/options"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
-	"github.com/mongodb/mongo-go-driver/mongo/readpref"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/options"
+	"github.com/mongodb/mongo-go-driver/core/readpref"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // Aggregate represents the aggregate command.

diff --git a/mongo/private/roots/command/bootstrap.go → core/command/bootstrap.go b/mongo/private/roots/command/bootstrap.go → core/command/bootstrap.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // Bootstrap represents a command used for bootstrapping such as isMaster,

diff --git a/mongo/private/roots/command/buildinfo.go → core/command/buildinfo.go b/mongo/private/roots/command/buildinfo.go → core/command/buildinfo.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/result"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	"github.com/mongodb/mongo-go-driver/core/result"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // BuildInfo represents the buildInfo command.

diff --git a/mongo/private/roots/command/command.go → core/command/command.go b/mongo/private/roots/command/command.go → core/command/command.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/bson/builder"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
-	"github.com/mongodb/mongo-go-driver/mongo/readpref"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/readpref"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // Command represents a generic database command.

diff --git a/mongo/private/roots/command/command_test.go → core/command/command_test.go b/mongo/private/roots/command/command_test.go → core/command/command_test.go
diff --git a/mongo/private/roots/command/count.go → core/command/count.go b/mongo/private/roots/command/count.go → core/command/count.go
@@ -5,10 +5,10 @@ import (
 	"errors"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/options"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
-	"github.com/mongodb/mongo-go-driver/mongo/readpref"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/options"
+	"github.com/mongodb/mongo-go-driver/core/readpref"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // Count represents the count command.

diff --git a/...o/private/roots/command/create_indexes.go → core/command/create_indexes.go b/...o/private/roots/command/create_indexes.go → core/command/create_indexes.go
@@ -4,9 +4,9 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/result"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/result"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // CreateIndexes represents the createIndexes command.

diff --git a/mongo/private/roots/command/cursor.go → core/command/cursor.go b/mongo/private/roots/command/cursor.go → core/command/cursor.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/options"
+	"github.com/mongodb/mongo-go-driver/core/options"
 )
 
 // Cursor instances iterate a stream of documents. Each document is

diff --git a/mongo/private/roots/command/delete.go → core/command/delete.go b/mongo/private/roots/command/delete.go → core/command/delete.go
@@ -4,10 +4,10 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/options"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/result"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/options"
+	"github.com/mongodb/mongo-go-driver/core/result"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // Delete represents the delete command.

diff --git a/mongo/private/roots/command/distinct.go → core/command/distinct.go b/mongo/private/roots/command/distinct.go → core/command/distinct.go
@@ -4,11 +4,11 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/options"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/result"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
-	"github.com/mongodb/mongo-go-driver/mongo/readpref"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/options"
+	"github.com/mongodb/mongo-go-driver/core/readpref"
+	"github.com/mongodb/mongo-go-driver/core/result"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // Distinct represents the disctinct command.

diff --git a/mongo/private/roots/command/doc.go → core/command/doc.go b/mongo/private/roots/command/doc.go → core/command/doc.go
diff --git a/mongo/private/roots/command/drop_indexes.go → core/command/drop_indexes.go b/mongo/private/roots/command/drop_indexes.go → core/command/drop_indexes.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // DropIndexes represents the dropIndexes command.

diff --git a/mongo/private/roots/command/errors.go → core/command/errors.go b/mongo/private/roots/command/errors.go → core/command/errors.go
diff --git a/mongo/private/roots/command/find.go → core/command/find.go b/mongo/private/roots/command/find.go → core/command/find.go
@@ -4,10 +4,10 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/options"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
-	"github.com/mongodb/mongo-go-driver/mongo/readpref"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/options"
+	"github.com/mongodb/mongo-go-driver/core/readpref"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // Find represents the find command.

diff --git a/.../private/roots/command/find_and_modify.go → core/command/find_and_modify.go b/.../private/roots/command/find_and_modify.go → core/command/find_and_modify.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/result"
+	"github.com/mongodb/mongo-go-driver/core/result"
 )
 
 // unmarshalFindAndModifyResult turns the provided bson.Reader into a findAndModify result.

diff --git a/.../private/roots/command/find_one_delete.go → core/command/find_one_delete.go b/.../private/roots/command/find_one_delete.go → core/command/find_one_delete.go
@@ -4,10 +4,10 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo/private/options"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/description"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/result"
-	"github.com/mongodb/mongo-go-driver/mongo/private/roots/wiremessage"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/options"
+	"github.com/mongodb/mongo-go-driver/core/result"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // FindOneAndDelete represents the findOneAndDelete operation.