diff --git a/databricks/client/client_test.go b/databricks/client/client_test.go
index 8fee02bfd..c5d002d6c 100644
--- a/databricks/client/client_test.go
+++ b/databricks/client/client_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/databricks/databricks-sdk-go/databricks/config"
 	"github.com/databricks/databricks-sdk-go/databricks/env"
 	"github.com/databricks/databricks-sdk-go/databricks/useragent"
-	"github.com/databricks/databricks-sdk-go/version"
+	"github.com/databricks/databricks-sdk-go/databricks/version"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/databricks/databricks.go b/databricks/databricks.go
index d8bc52a01..7409be659 100644
--- a/databricks/databricks.go
+++ b/databricks/databricks.go
@@ -3,7 +3,7 @@ package databricks
 import (
 	"github.com/databricks/databricks-sdk-go/databricks/config"
 	"github.com/databricks/databricks-sdk-go/databricks/useragent"
-	"github.com/databricks/databricks-sdk-go/version"
+	"github.com/databricks/databricks-sdk-go/databricks/version"
 )
 
 type Config config.Config
diff --git a/databricks/go.mod b/databricks/go.mod
index 440c453a3..cfaf2580c 100644
--- a/databricks/go.mod
+++ b/databricks/go.mod
@@ -3,7 +3,6 @@ module github.com/databricks/databricks-sdk-go/databricks
 go 1.18
 
 require (
-	github.com/databricks/databricks-sdk-go v0.55.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/go-querystring v1.1.0
 	github.com/google/uuid v1.6.0
diff --git a/databricks/go.sum b/databricks/go.sum
index 32c10e1af..40906d3ba 100644
--- a/databricks/go.sum
+++ b/databricks/go.sum
@@ -9,8 +9,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/databricks/databricks-sdk-go v0.55.0 h1:ReziD6spzTDltM0ml80LggKo27F3oUjgTinCFDJDnak=
-github.com/databricks/databricks-sdk-go v0.55.0/go.mod h1:JpLizplEs+up9/Z4Xf2x++o3sM9eTTWFGzIXAptKJzI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
diff --git a/databricks/qa/poll/poll_test.go b/databricks/qa/poll/poll_test.go
deleted file mode 100644
index 05597c40a..000000000
--- a/databricks/qa/poll/poll_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package poll_test
-
-import (
-	"testing"
-
-	"github.com/databricks/databricks-sdk-go/databricks/qa/poll"
-	"github.com/databricks/databricks-sdk-go/service/sql"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSimple(t *testing.T) {
-	waiter := sql.WaitGetWarehouseRunning[int]{
-		Poll: poll.Simple(sql.GetWarehouseResponse{
-			Id: "test",
-		}),
-	}
-	res, err := waiter.Get()
-	assert.NoError(t, err)
-	assert.Equal(t, "test", res.Id)
-}
diff --git a/databricks/useragent/user_agent.go b/databricks/useragent/user_agent.go
index 627c6ce10..9fd16afa1 100644
--- a/databricks/useragent/user_agent.go
+++ b/databricks/useragent/user_agent.go
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/databricks/databricks-sdk-go/version"
+	"github.com/databricks/databricks-sdk-go/databricks/version"
 	"golang.org/x/mod/semver"
 )
 
diff --git a/databricks/useragent/user_agent_test.go b/databricks/useragent/user_agent_test.go
index 8707dbeea..b9a465d9e 100644
--- a/databricks/useragent/user_agent_test.go
+++ b/databricks/useragent/user_agent_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/databricks/databricks-sdk-go/version"
+	"github.com/databricks/databricks-sdk-go/databricks/version"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/version/version.go b/databricks/version/version.go
similarity index 100%
rename from version/version.go
rename to databricks/version/version.go