diff --git a/.github/workflows/chroma-cluster-test.yml b/.github/workflows/chroma-cluster-test.yml
index bdcbcc96827..64209dbc21d 100644
--- a/.github/workflows/chroma-cluster-test.yml
+++ b/.github/workflows/chroma-cluster-test.yml
@@ -65,4 +65,4 @@ jobs:
     - name: Start Tilt
       run: tilt ci
     - name: Test
-      run: bin/cluster-test.sh bash -c 'cd go/coordinator && go test -timeout 30s -run ^TestNodeWatcher$ github.com/chroma/chroma-coordinator/internal/memberlist_manager'
\ No newline at end of file
+      run: bin/cluster-test.sh bash -c 'cd go && go test -timeout 30s -run ^TestNodeWatcher$ github.com/chroma/chroma-coordinator/internal/memberlist_manager'
\ No newline at end of file
diff --git a/.github/workflows/chroma-coordinator-test.yaml b/.github/workflows/chroma-coordinator-test.yaml
index e62ab2a5d0d..2728f2ba5eb 100644
--- a/.github/workflows/chroma-coordinator-test.yaml
+++ b/.github/workflows/chroma-coordinator-test.yaml
@@ -34,7 +34,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Build and test
-      run: cd go/coordinator && make test
+      run: cd go && make test
       env:
         POSTGRES_HOST: localhost
         POSTGRES_PORT: 5432
diff --git a/.gitignore b/.gitignore
index e21a17c2b30..b4b8e402b5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,8 @@
 
 **/__pycache__
 
-go/coordinator/bin/
-go/coordinator/**/testdata/
+go/bin/
+go/**/testdata/
 
 *.log
 
diff --git a/Tiltfile b/Tiltfile
index b3747e7772d..5eae55776b8 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -2,12 +2,12 @@ update_settings(max_parallel_updates=6)
 
 docker_build('migration',
              context='.',
-             dockerfile='./go/coordinator/Dockerfile.migration'
+             dockerfile='./go/Dockerfile.migration'
 )
 
 docker_build('coordinator',
              context='.',
-             dockerfile='./go/coordinator/Dockerfile'
+             dockerfile='./go/Dockerfile'
 )
 
 docker_build('server',
diff --git a/bin/reset.sh b/bin/reset.sh
index 92fb04d8224..e1819f0c7a0 100755
--- a/bin/reset.sh
+++ b/bin/reset.sh
@@ -2,7 +2,7 @@
 
 eval $(minikube -p chroma-test docker-env)
 
-docker build -t chroma-coordinator:latest -f go/coordinator/Dockerfile .
+docker build -t chroma-coordinator:latest -f go/Dockerfile .
 
 kubectl delete deployment coordinator -n chroma
 
diff --git a/chromadb/ingest/impl/simple_policy.py b/chromadb/ingest/impl/simple_policy.py
index f8068ee2046..9267ba06a40 100644
--- a/chromadb/ingest/impl/simple_policy.py
+++ b/chromadb/ingest/impl/simple_policy.py
@@ -54,7 +54,7 @@ def assign_collection(self, collection_id: UUID) -> str:
 
     @overrides
     def get_topics(self) -> Sequence[str]:
-        # Mirrors go/coordinator/internal/coordinator/assignment_policy.go
+        # Mirrors go/internal/coordinator/assignment_policy.go
         return [
             f"persistent://{self._tenant_id}/{self._topic_ns}/chroma_log_{i}"
             for i in range(16)
diff --git a/go/coordinator/Dockerfile b/go/Dockerfile
similarity index 90%
rename from go/coordinator/Dockerfile
rename to go/Dockerfile
index 59da87fdb60..3bcc97e01b5 100644
--- a/go/coordinator/Dockerfile
+++ b/go/Dockerfile
@@ -2,12 +2,12 @@ FROM golang:1.20-alpine3.18 as build
 WORKDIR /src/chroma-coordinator
 RUN apk add --no-cache make git build-base bash
 
-ADD ./go/coordinator/go.mod ./go.mod
-ADD ./go/coordinator/go.sum ./go.sum
+ADD ./go/go.mod ./go.mod
+ADD ./go/go.sum ./go.sum
 ENV PATH=$PATH:/go/bin
 RUN go mod download
 
-ADD ./go/coordinator ./
+ADD ./go/ ./
 ENV GOCACHE=/root/.cache/go-build
 RUN --mount=type=cache,target="/root/.cache/go-build" make
 
diff --git a/go/Dockerfile.migration b/go/Dockerfile.migration
new file mode 100644
index 00000000000..b93e9cb01c4
--- /dev/null
+++ b/go/Dockerfile.migration
@@ -0,0 +1,4 @@
+FROM arigaio/atlas:latest
+workdir /app
+COPY ./go/migrations migrations
+COPY ./go/atlas.hcl atlas.hcl
diff --git a/go/coordinator/Makefile b/go/Makefile
similarity index 100%
rename from go/coordinator/Makefile
rename to go/Makefile
diff --git a/go/coordinator/atlas.hcl b/go/atlas.hcl
similarity index 100%
rename from go/coordinator/atlas.hcl
rename to go/atlas.hcl
diff --git a/go/coordinator/cmd/coordinator/cmd.go b/go/cmd/coordinator/cmd.go
similarity index 100%
rename from go/coordinator/cmd/coordinator/cmd.go
rename to go/cmd/coordinator/cmd.go
diff --git a/go/coordinator/cmd/coordinator/main.go b/go/cmd/coordinator/main.go
similarity index 100%
rename from go/coordinator/cmd/coordinator/main.go
rename to go/cmd/coordinator/main.go
diff --git a/go/coordinator/cmd/flag/flag.go b/go/cmd/flag/flag.go
similarity index 100%
rename from go/coordinator/cmd/flag/flag.go
rename to go/cmd/flag/flag.go
diff --git a/go/coordinator/cmd/logservice/cmd.go b/go/cmd/logservice/cmd.go
similarity index 100%
rename from go/coordinator/cmd/logservice/cmd.go
rename to go/cmd/logservice/cmd.go
diff --git a/go/coordinator/cmd/logservice/main.go b/go/cmd/logservice/main.go
similarity index 100%
rename from go/coordinator/cmd/logservice/main.go
rename to go/cmd/logservice/main.go
diff --git a/go/coordinator/Dockerfile.migration b/go/coordinator/Dockerfile.migration
deleted file mode 100644
index 092f2629540..00000000000
--- a/go/coordinator/Dockerfile.migration
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM arigaio/atlas:latest
-workdir /app
-COPY ./go/coordinator/migrations migrations
-COPY ./go/coordinator/atlas.hcl atlas.hcl
diff --git a/go/coordinator/go.mod b/go/go.mod
similarity index 100%
rename from go/coordinator/go.mod
rename to go/go.mod
diff --git a/go/coordinator/go.sum b/go/go.sum
similarity index 100%
rename from go/coordinator/go.sum
rename to go/go.sum
diff --git a/go/coordinator/internal/common/component.go b/go/internal/common/component.go
similarity index 100%
rename from go/coordinator/internal/common/component.go
rename to go/internal/common/component.go
diff --git a/go/coordinator/internal/common/constants.go b/go/internal/common/constants.go
similarity index 100%
rename from go/coordinator/internal/common/constants.go
rename to go/internal/common/constants.go
diff --git a/go/coordinator/internal/common/errors.go b/go/internal/common/errors.go
similarity index 100%
rename from go/coordinator/internal/common/errors.go
rename to go/internal/common/errors.go
diff --git a/go/coordinator/internal/coordinator/apis.go b/go/internal/coordinator/apis.go
similarity index 100%
rename from go/coordinator/internal/coordinator/apis.go
rename to go/internal/coordinator/apis.go
diff --git a/go/coordinator/internal/coordinator/apis_test.go b/go/internal/coordinator/apis_test.go
similarity index 100%
rename from go/coordinator/internal/coordinator/apis_test.go
rename to go/internal/coordinator/apis_test.go
diff --git a/go/coordinator/internal/coordinator/assignment_policy.go b/go/internal/coordinator/assignment_policy.go
similarity index 100%
rename from go/coordinator/internal/coordinator/assignment_policy.go
rename to go/internal/coordinator/assignment_policy.go
diff --git a/go/coordinator/internal/coordinator/coordinator.go b/go/internal/coordinator/coordinator.go
similarity index 100%
rename from go/coordinator/internal/coordinator/coordinator.go
rename to go/internal/coordinator/coordinator.go
diff --git a/go/coordinator/internal/coordinator/grpc/collection_service.go b/go/internal/coordinator/grpc/collection_service.go
similarity index 100%
rename from go/coordinator/internal/coordinator/grpc/collection_service.go
rename to go/internal/coordinator/grpc/collection_service.go
diff --git a/go/coordinator/internal/coordinator/grpc/collection_service_test.go b/go/internal/coordinator/grpc/collection_service_test.go
similarity index 100%
rename from go/coordinator/internal/coordinator/grpc/collection_service_test.go
rename to go/internal/coordinator/grpc/collection_service_test.go
diff --git a/go/coordinator/internal/coordinator/grpc/proto_model_convert.go b/go/internal/coordinator/grpc/proto_model_convert.go
similarity index 100%
rename from go/coordinator/internal/coordinator/grpc/proto_model_convert.go
rename to go/internal/coordinator/grpc/proto_model_convert.go
diff --git a/go/coordinator/internal/coordinator/grpc/proto_model_convert_test.go b/go/internal/coordinator/grpc/proto_model_convert_test.go
similarity index 100%
rename from go/coordinator/internal/coordinator/grpc/proto_model_convert_test.go
rename to go/internal/coordinator/grpc/proto_model_convert_test.go
diff --git a/go/coordinator/internal/coordinator/grpc/segment_service.go b/go/internal/coordinator/grpc/segment_service.go
similarity index 100%
rename from go/coordinator/internal/coordinator/grpc/segment_service.go
rename to go/internal/coordinator/grpc/segment_service.go
diff --git a/go/coordinator/internal/coordinator/grpc/server.go b/go/internal/coordinator/grpc/server.go
similarity index 100%
rename from go/coordinator/internal/coordinator/grpc/server.go
rename to go/internal/coordinator/grpc/server.go
diff --git a/go/coordinator/internal/coordinator/grpc/tenant_database_service.go b/go/internal/coordinator/grpc/tenant_database_service.go
similarity index 100%
rename from go/coordinator/internal/coordinator/grpc/tenant_database_service.go
rename to go/internal/coordinator/grpc/tenant_database_service.go
diff --git a/go/coordinator/internal/coordinator/meta.go b/go/internal/coordinator/meta.go
similarity index 100%
rename from go/coordinator/internal/coordinator/meta.go
rename to go/internal/coordinator/meta.go
diff --git a/go/coordinator/internal/coordinator/meta_test.go b/go/internal/coordinator/meta_test.go
similarity index 100%
rename from go/coordinator/internal/coordinator/meta_test.go
rename to go/internal/coordinator/meta_test.go
diff --git a/go/coordinator/internal/grpcutils/config.go b/go/internal/grpcutils/config.go
similarity index 100%
rename from go/coordinator/internal/grpcutils/config.go
rename to go/internal/grpcutils/config.go
diff --git a/go/coordinator/internal/grpcutils/config_test.go b/go/internal/grpcutils/config_test.go
similarity index 100%
rename from go/coordinator/internal/grpcutils/config_test.go
rename to go/internal/grpcutils/config_test.go
diff --git a/go/coordinator/internal/grpcutils/response.go b/go/internal/grpcutils/response.go
similarity index 100%
rename from go/coordinator/internal/grpcutils/response.go
rename to go/internal/grpcutils/response.go
diff --git a/go/coordinator/internal/grpcutils/service.go b/go/internal/grpcutils/service.go
similarity index 100%
rename from go/coordinator/internal/grpcutils/service.go
rename to go/internal/grpcutils/service.go
diff --git a/go/coordinator/internal/logservice/apis.go b/go/internal/logservice/apis.go
similarity index 100%
rename from go/coordinator/internal/logservice/apis.go
rename to go/internal/logservice/apis.go
diff --git a/go/coordinator/internal/logservice/grpc/record_log_service.go b/go/internal/logservice/grpc/record_log_service.go
similarity index 100%
rename from go/coordinator/internal/logservice/grpc/record_log_service.go
rename to go/internal/logservice/grpc/record_log_service.go
diff --git a/go/coordinator/internal/logservice/grpc/record_log_service_test.go b/go/internal/logservice/grpc/record_log_service_test.go
similarity index 100%
rename from go/coordinator/internal/logservice/grpc/record_log_service_test.go
rename to go/internal/logservice/grpc/record_log_service_test.go
diff --git a/go/coordinator/internal/logservice/grpc/server.go b/go/internal/logservice/grpc/server.go
similarity index 100%
rename from go/coordinator/internal/logservice/grpc/server.go
rename to go/internal/logservice/grpc/server.go
diff --git a/go/coordinator/internal/logservice/recordlog.go b/go/internal/logservice/recordlog.go
similarity index 100%
rename from go/coordinator/internal/logservice/recordlog.go
rename to go/internal/logservice/recordlog.go
diff --git a/go/coordinator/internal/memberlist_manager/memberlist_manager.go b/go/internal/memberlist_manager/memberlist_manager.go
similarity index 100%
rename from go/coordinator/internal/memberlist_manager/memberlist_manager.go
rename to go/internal/memberlist_manager/memberlist_manager.go
diff --git a/go/coordinator/internal/memberlist_manager/memberlist_manager_test.go b/go/internal/memberlist_manager/memberlist_manager_test.go
similarity index 100%
rename from go/coordinator/internal/memberlist_manager/memberlist_manager_test.go
rename to go/internal/memberlist_manager/memberlist_manager_test.go
diff --git a/go/coordinator/internal/memberlist_manager/memberlist_store.go b/go/internal/memberlist_manager/memberlist_store.go
similarity index 100%
rename from go/coordinator/internal/memberlist_manager/memberlist_store.go
rename to go/internal/memberlist_manager/memberlist_store.go
diff --git a/go/coordinator/internal/memberlist_manager/node_watcher.go b/go/internal/memberlist_manager/node_watcher.go
similarity index 100%
rename from go/coordinator/internal/memberlist_manager/node_watcher.go
rename to go/internal/memberlist_manager/node_watcher.go
diff --git a/go/coordinator/internal/metastore/catalog.go b/go/internal/metastore/catalog.go
similarity index 100%
rename from go/coordinator/internal/metastore/catalog.go
rename to go/internal/metastore/catalog.go
diff --git a/go/coordinator/internal/metastore/coordinator/memory_catalog.go b/go/internal/metastore/coordinator/memory_catalog.go
similarity index 100%
rename from go/coordinator/internal/metastore/coordinator/memory_catalog.go
rename to go/internal/metastore/coordinator/memory_catalog.go
diff --git a/go/coordinator/internal/metastore/coordinator/memory_catalog_test.go b/go/internal/metastore/coordinator/memory_catalog_test.go
similarity index 100%
rename from go/coordinator/internal/metastore/coordinator/memory_catalog_test.go
rename to go/internal/metastore/coordinator/memory_catalog_test.go
diff --git a/go/coordinator/internal/metastore/coordinator/model_db_convert.go b/go/internal/metastore/coordinator/model_db_convert.go
similarity index 100%
rename from go/coordinator/internal/metastore/coordinator/model_db_convert.go
rename to go/internal/metastore/coordinator/model_db_convert.go
diff --git a/go/coordinator/internal/metastore/coordinator/model_db_convert_test.go b/go/internal/metastore/coordinator/model_db_convert_test.go
similarity index 100%
rename from go/coordinator/internal/metastore/coordinator/model_db_convert_test.go
rename to go/internal/metastore/coordinator/model_db_convert_test.go
diff --git a/go/coordinator/internal/metastore/coordinator/table_catalog.go b/go/internal/metastore/coordinator/table_catalog.go
similarity index 100%
rename from go/coordinator/internal/metastore/coordinator/table_catalog.go
rename to go/internal/metastore/coordinator/table_catalog.go
diff --git a/go/coordinator/internal/metastore/coordinator/table_catalog_test.go b/go/internal/metastore/coordinator/table_catalog_test.go
similarity index 100%
rename from go/coordinator/internal/metastore/coordinator/table_catalog_test.go
rename to go/internal/metastore/coordinator/table_catalog_test.go
diff --git a/go/coordinator/internal/metastore/db/dao/collection.go b/go/internal/metastore/db/dao/collection.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dao/collection.go
rename to go/internal/metastore/db/dao/collection.go
diff --git a/go/coordinator/internal/metastore/db/dao/collection_metadata.go b/go/internal/metastore/db/dao/collection_metadata.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dao/collection_metadata.go
rename to go/internal/metastore/db/dao/collection_metadata.go
diff --git a/go/coordinator/internal/metastore/db/dao/collection_test.go b/go/internal/metastore/db/dao/collection_test.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dao/collection_test.go
rename to go/internal/metastore/db/dao/collection_test.go
diff --git a/go/coordinator/internal/metastore/db/dao/common.go b/go/internal/metastore/db/dao/common.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dao/common.go
rename to go/internal/metastore/db/dao/common.go
diff --git a/go/coordinator/internal/metastore/db/dao/database.go b/go/internal/metastore/db/dao/database.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dao/database.go
rename to go/internal/metastore/db/dao/database.go
diff --git a/go/coordinator/internal/metastore/db/dao/notification.go b/go/internal/metastore/db/dao/notification.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dao/notification.go
rename to go/internal/metastore/db/dao/notification.go
diff --git a/go/coordinator/internal/metastore/db/dao/record_log.go b/go/internal/metastore/db/dao/record_log.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dao/record_log.go
rename to go/internal/metastore/db/dao/record_log.go
diff --git a/go/coordinator/internal/metastore/db/dao/record_log_test.go b/go/internal/metastore/db/dao/record_log_test.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dao/record_log_test.go
rename to go/internal/metastore/db/dao/record_log_test.go
diff --git a/go/coordinator/internal/metastore/db/dao/segment.go b/go/internal/metastore/db/dao/segment.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dao/segment.go
rename to go/internal/metastore/db/dao/segment.go
diff --git a/go/coordinator/internal/metastore/db/dao/segment_metadata.go b/go/internal/metastore/db/dao/segment_metadata.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dao/segment_metadata.go
rename to go/internal/metastore/db/dao/segment_metadata.go
diff --git a/go/coordinator/internal/metastore/db/dao/segment_test.go b/go/internal/metastore/db/dao/segment_test.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dao/segment_test.go
rename to go/internal/metastore/db/dao/segment_test.go
diff --git a/go/coordinator/internal/metastore/db/dao/tenant.go b/go/internal/metastore/db/dao/tenant.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dao/tenant.go
rename to go/internal/metastore/db/dao/tenant.go
diff --git a/go/coordinator/internal/metastore/db/dbcore/core.go b/go/internal/metastore/db/dbcore/core.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbcore/core.go
rename to go/internal/metastore/db/dbcore/core.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/collection.go b/go/internal/metastore/db/dbmodel/collection.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/collection.go
rename to go/internal/metastore/db/dbmodel/collection.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/collection_metadata.go b/go/internal/metastore/db/dbmodel/collection_metadata.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/collection_metadata.go
rename to go/internal/metastore/db/dbmodel/collection_metadata.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/common.go b/go/internal/metastore/db/dbmodel/common.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/common.go
rename to go/internal/metastore/db/dbmodel/common.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/database.go b/go/internal/metastore/db/dbmodel/database.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/database.go
rename to go/internal/metastore/db/dbmodel/database.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/mocks/ICollectionDb.go b/go/internal/metastore/db/dbmodel/mocks/ICollectionDb.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/mocks/ICollectionDb.go
rename to go/internal/metastore/db/dbmodel/mocks/ICollectionDb.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/mocks/ICollectionMetadataDb.go b/go/internal/metastore/db/dbmodel/mocks/ICollectionMetadataDb.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/mocks/ICollectionMetadataDb.go
rename to go/internal/metastore/db/dbmodel/mocks/ICollectionMetadataDb.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/mocks/IDatabaseDb.go b/go/internal/metastore/db/dbmodel/mocks/IDatabaseDb.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/mocks/IDatabaseDb.go
rename to go/internal/metastore/db/dbmodel/mocks/IDatabaseDb.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/mocks/IMetaDomain.go b/go/internal/metastore/db/dbmodel/mocks/IMetaDomain.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/mocks/IMetaDomain.go
rename to go/internal/metastore/db/dbmodel/mocks/IMetaDomain.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/mocks/INotificationDb.go b/go/internal/metastore/db/dbmodel/mocks/INotificationDb.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/mocks/INotificationDb.go
rename to go/internal/metastore/db/dbmodel/mocks/INotificationDb.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/mocks/ISegmentDb.go b/go/internal/metastore/db/dbmodel/mocks/ISegmentDb.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/mocks/ISegmentDb.go
rename to go/internal/metastore/db/dbmodel/mocks/ISegmentDb.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/mocks/ISegmentMetadataDb.go b/go/internal/metastore/db/dbmodel/mocks/ISegmentMetadataDb.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/mocks/ISegmentMetadataDb.go
rename to go/internal/metastore/db/dbmodel/mocks/ISegmentMetadataDb.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/mocks/ITenantDb.go b/go/internal/metastore/db/dbmodel/mocks/ITenantDb.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/mocks/ITenantDb.go
rename to go/internal/metastore/db/dbmodel/mocks/ITenantDb.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/mocks/ITransaction.go b/go/internal/metastore/db/dbmodel/mocks/ITransaction.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/mocks/ITransaction.go
rename to go/internal/metastore/db/dbmodel/mocks/ITransaction.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/notification.go b/go/internal/metastore/db/dbmodel/notification.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/notification.go
rename to go/internal/metastore/db/dbmodel/notification.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/record_log.go b/go/internal/metastore/db/dbmodel/record_log.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/record_log.go
rename to go/internal/metastore/db/dbmodel/record_log.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/segment.go b/go/internal/metastore/db/dbmodel/segment.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/segment.go
rename to go/internal/metastore/db/dbmodel/segment.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/segment_metadata.go b/go/internal/metastore/db/dbmodel/segment_metadata.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/segment_metadata.go
rename to go/internal/metastore/db/dbmodel/segment_metadata.go
diff --git a/go/coordinator/internal/metastore/db/dbmodel/tenant.go b/go/internal/metastore/db/dbmodel/tenant.go
similarity index 100%
rename from go/coordinator/internal/metastore/db/dbmodel/tenant.go
rename to go/internal/metastore/db/dbmodel/tenant.go
diff --git a/go/coordinator/internal/metastore/mocks/Catalog.go b/go/internal/metastore/mocks/Catalog.go
similarity index 100%
rename from go/coordinator/internal/metastore/mocks/Catalog.go
rename to go/internal/metastore/mocks/Catalog.go
diff --git a/go/coordinator/internal/model/collection.go b/go/internal/model/collection.go
similarity index 100%
rename from go/coordinator/internal/model/collection.go
rename to go/internal/model/collection.go
diff --git a/go/coordinator/internal/model/collection_metadata.go b/go/internal/model/collection_metadata.go
similarity index 100%
rename from go/coordinator/internal/model/collection_metadata.go
rename to go/internal/model/collection_metadata.go
diff --git a/go/coordinator/internal/model/database.go b/go/internal/model/database.go
similarity index 100%
rename from go/coordinator/internal/model/database.go
rename to go/internal/model/database.go
diff --git a/go/coordinator/internal/model/notification.go b/go/internal/model/notification.go
similarity index 100%
rename from go/coordinator/internal/model/notification.go
rename to go/internal/model/notification.go
diff --git a/go/coordinator/internal/model/segment.go b/go/internal/model/segment.go
similarity index 100%
rename from go/coordinator/internal/model/segment.go
rename to go/internal/model/segment.go
diff --git a/go/coordinator/internal/model/segment_metadata.go b/go/internal/model/segment_metadata.go
similarity index 100%
rename from go/coordinator/internal/model/segment_metadata.go
rename to go/internal/model/segment_metadata.go
diff --git a/go/coordinator/internal/model/tenant.go b/go/internal/model/tenant.go
similarity index 100%
rename from go/coordinator/internal/model/tenant.go
rename to go/internal/model/tenant.go
diff --git a/go/coordinator/internal/notification/database_notification_store.go b/go/internal/notification/database_notification_store.go
similarity index 100%
rename from go/coordinator/internal/notification/database_notification_store.go
rename to go/internal/notification/database_notification_store.go
diff --git a/go/coordinator/internal/notification/database_notification_store_test.go b/go/internal/notification/database_notification_store_test.go
similarity index 100%
rename from go/coordinator/internal/notification/database_notification_store_test.go
rename to go/internal/notification/database_notification_store_test.go
diff --git a/go/coordinator/internal/notification/memory_notification_store.go b/go/internal/notification/memory_notification_store.go
similarity index 100%
rename from go/coordinator/internal/notification/memory_notification_store.go
rename to go/internal/notification/memory_notification_store.go
diff --git a/go/coordinator/internal/notification/memory_notification_store_test.go b/go/internal/notification/memory_notification_store_test.go
similarity index 100%
rename from go/coordinator/internal/notification/memory_notification_store_test.go
rename to go/internal/notification/memory_notification_store_test.go
diff --git a/go/coordinator/internal/notification/notification_processor.go b/go/internal/notification/notification_processor.go
similarity index 100%
rename from go/coordinator/internal/notification/notification_processor.go
rename to go/internal/notification/notification_processor.go
diff --git a/go/coordinator/internal/notification/notification_processor_test.go b/go/internal/notification/notification_processor_test.go
similarity index 100%
rename from go/coordinator/internal/notification/notification_processor_test.go
rename to go/internal/notification/notification_processor_test.go
diff --git a/go/coordinator/internal/notification/notification_store.go b/go/internal/notification/notification_store.go
similarity index 100%
rename from go/coordinator/internal/notification/notification_store.go
rename to go/internal/notification/notification_store.go
diff --git a/go/coordinator/internal/notification/notifier.go b/go/internal/notification/notifier.go
similarity index 100%
rename from go/coordinator/internal/notification/notifier.go
rename to go/internal/notification/notifier.go
diff --git a/go/coordinator/internal/proto/coordinatorpb/chroma.pb.go b/go/internal/proto/coordinatorpb/chroma.pb.go
similarity index 100%
rename from go/coordinator/internal/proto/coordinatorpb/chroma.pb.go
rename to go/internal/proto/coordinatorpb/chroma.pb.go
diff --git a/go/coordinator/internal/proto/coordinatorpb/chroma_grpc.pb.go b/go/internal/proto/coordinatorpb/chroma_grpc.pb.go
similarity index 100%
rename from go/coordinator/internal/proto/coordinatorpb/chroma_grpc.pb.go
rename to go/internal/proto/coordinatorpb/chroma_grpc.pb.go
diff --git a/go/coordinator/internal/proto/coordinatorpb/coordinator.pb.go b/go/internal/proto/coordinatorpb/coordinator.pb.go
similarity index 100%
rename from go/coordinator/internal/proto/coordinatorpb/coordinator.pb.go
rename to go/internal/proto/coordinatorpb/coordinator.pb.go
diff --git a/go/coordinator/internal/proto/coordinatorpb/coordinator_grpc.pb.go b/go/internal/proto/coordinatorpb/coordinator_grpc.pb.go
similarity index 100%
rename from go/coordinator/internal/proto/coordinatorpb/coordinator_grpc.pb.go
rename to go/internal/proto/coordinatorpb/coordinator_grpc.pb.go
diff --git a/go/coordinator/internal/proto/logservicepb/logservice.pb.go b/go/internal/proto/logservicepb/logservice.pb.go
similarity index 100%
rename from go/coordinator/internal/proto/logservicepb/logservice.pb.go
rename to go/internal/proto/logservicepb/logservice.pb.go
diff --git a/go/coordinator/internal/proto/logservicepb/logservice_grpc.pb.go b/go/internal/proto/logservicepb/logservice_grpc.pb.go
similarity index 100%
rename from go/coordinator/internal/proto/logservicepb/logservice_grpc.pb.go
rename to go/internal/proto/logservicepb/logservice_grpc.pb.go
diff --git a/go/coordinator/internal/types/types.go b/go/internal/types/types.go
similarity index 100%
rename from go/coordinator/internal/types/types.go
rename to go/internal/types/types.go
diff --git a/go/coordinator/internal/utils/integration.go b/go/internal/utils/integration.go
similarity index 100%
rename from go/coordinator/internal/utils/integration.go
rename to go/internal/utils/integration.go
diff --git a/go/coordinator/internal/utils/kubernetes.go b/go/internal/utils/kubernetes.go
similarity index 100%
rename from go/coordinator/internal/utils/kubernetes.go
rename to go/internal/utils/kubernetes.go
diff --git a/go/coordinator/internal/utils/log.go b/go/internal/utils/log.go
similarity index 100%
rename from go/coordinator/internal/utils/log.go
rename to go/internal/utils/log.go
diff --git a/go/coordinator/internal/utils/pulsar_admin.go b/go/internal/utils/pulsar_admin.go
similarity index 100%
rename from go/coordinator/internal/utils/pulsar_admin.go
rename to go/internal/utils/pulsar_admin.go
diff --git a/go/coordinator/internal/utils/rendezvous_hash.go b/go/internal/utils/rendezvous_hash.go
similarity index 100%
rename from go/coordinator/internal/utils/rendezvous_hash.go
rename to go/internal/utils/rendezvous_hash.go
diff --git a/go/coordinator/internal/utils/rendezvous_hash_test.go b/go/internal/utils/rendezvous_hash_test.go
similarity index 100%
rename from go/coordinator/internal/utils/rendezvous_hash_test.go
rename to go/internal/utils/rendezvous_hash_test.go
diff --git a/go/coordinator/internal/utils/run.go b/go/internal/utils/run.go
similarity index 100%
rename from go/coordinator/internal/utils/run.go
rename to go/internal/utils/run.go
diff --git a/go/coordinator/internal/utils/signal.go b/go/internal/utils/signal.go
similarity index 100%
rename from go/coordinator/internal/utils/signal.go
rename to go/internal/utils/signal.go
diff --git a/go/coordinator/migrations/20240216211350.sql b/go/migrations/20240216211350.sql
similarity index 100%
rename from go/coordinator/migrations/20240216211350.sql
rename to go/migrations/20240216211350.sql
diff --git a/go/coordinator/migrations/atlas.sum b/go/migrations/atlas.sum
similarity index 100%
rename from go/coordinator/migrations/atlas.sum
rename to go/migrations/atlas.sum
diff --git a/idl/makefile b/idl/makefile
index 183fd24a198..f1daeee927f 100644
--- a/idl/makefile
+++ b/idl/makefile
@@ -10,14 +10,14 @@ proto_python:
 proto_go:
 	@echo "Generating gRPC code for golang..."
 	@protoc \
-		--go_out=../go/coordinator/internal/proto/coordinatorpb \
+		--go_out=../go/internal/proto/coordinatorpb \
 		--go_opt paths=source_relative \
 		--plugin protoc-gen-go="${GOPATH}/bin/protoc-gen-go" \
-    	--go-grpc_out=../go/coordinator/internal/proto/coordinatorpb \
+    	--go-grpc_out=../go/internal/proto/coordinatorpb \
     	--go-grpc_opt paths=source_relative \
     	--plugin protoc-gen-go-grpc="${GOPATH}/bin/protoc-gen-go-grpc" \
 	    chromadb/proto/*.proto
-	@mv ../go/coordinator/internal/proto/coordinatorpb/chromadb/proto/logservice*.go ../go/coordinator/internal/proto/logservicepb/
-	@mv ../go/coordinator/internal/proto/coordinatorpb/chromadb/proto/*.go ../go/coordinator/internal/proto/coordinatorpb/
-	@rm -rf ../go/coordinator/internal/proto/coordinatorpb/chromadb
+	@mv ../go/internal/proto/coordinatorpb/chromadb/proto/logservice*.go ../go/internal/proto/logservicepb/
+	@mv ../go/internal/proto/coordinatorpb/chromadb/proto/*.go ../go/internal/proto/coordinatorpb/
+	@rm -rf ../go/internal/proto/coordinatorpb/chromadb
 	@echo "Done"