diff --git a/cmd/dendrite-server-key-api-server/main.go b/cmd/dendrite-server-key-api-server/main.go
index 9388a5d45..075734125 100644
--- a/cmd/dendrite-server-key-api-server/main.go
+++ b/cmd/dendrite-server-key-api-server/main.go
@@ -15,7 +15,7 @@
 package main
 
 import (
-	"github.com/matrix-org/dendrite/common/basecomponent"
+	"github.com/matrix-org/dendrite/internal/basecomponent"
 	"github.com/matrix-org/dendrite/serverkeyapi"
 )
 
diff --git a/internal/keydb/cache/keydb.go b/internal/keydb/cache/keydb.go
index 6214beabe..a0cdb9007 100644
--- a/internal/keydb/cache/keydb.go
+++ b/internal/keydb/cache/keydb.go
@@ -4,12 +4,7 @@ import (
 	"context"
 	"errors"
 
-<<<<<<< HEAD:serverkeyapi/storage/cache/keydb.go
-	"github.com/matrix-org/dendrite/common/caching"
-=======
 	"github.com/matrix-org/dendrite/internal/caching"
-	"github.com/matrix-org/dendrite/internal/keydb"
->>>>>>> master:internal/keydb/cache/keydb.go
 	"github.com/matrix-org/gomatrixserverlib"
 )
 
diff --git a/internal/keydb/keydb.go b/internal/keydb/keydb.go
index 0335ffc24..3644a63e8 100644
--- a/internal/keydb/keydb.go
+++ b/internal/keydb/keydb.go
@@ -21,15 +21,9 @@ import (
 
 	"golang.org/x/crypto/ed25519"
 
-<<<<<<< HEAD:serverkeyapi/storage/keydb.go
-	"github.com/matrix-org/dendrite/common"
-	"github.com/matrix-org/dendrite/serverkeyapi/storage/postgres"
-	"github.com/matrix-org/dendrite/serverkeyapi/storage/sqlite3"
-=======
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/keydb/postgres"
 	"github.com/matrix-org/dendrite/internal/keydb/sqlite3"
->>>>>>> master:internal/keydb/keydb.go
 	"github.com/matrix-org/gomatrixserverlib"
 )
 
diff --git a/internal/keydb/keydb_wasm.go b/internal/keydb/keydb_wasm.go
index d5da32d33..95a5c0027 100644
--- a/internal/keydb/keydb_wasm.go
+++ b/internal/keydb/keydb_wasm.go
@@ -22,13 +22,8 @@ import (
 
 	"golang.org/x/crypto/ed25519"
 
-<<<<<<< HEAD:serverkeyapi/storage/keydb_wasm.go
-	"github.com/matrix-org/dendrite/common"
-	"github.com/matrix-org/dendrite/serverkeyapi/storage/sqlite3"
-=======
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/keydb/sqlite3"
->>>>>>> master:internal/keydb/keydb_wasm.go
 	"github.com/matrix-org/gomatrixserverlib"
 )
 
diff --git a/serverkeyapi/api/api.go b/serverkeyapi/api/api.go
index 2162ecfc9..4da27fd0a 100644
--- a/serverkeyapi/api/api.go
+++ b/serverkeyapi/api/api.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/matrix-org/dendrite/common/caching"
+	"github.com/matrix-org/dendrite/internal/caching"
 	"github.com/matrix-org/gomatrixserverlib"
 )
 
diff --git a/serverkeyapi/api/http.go b/serverkeyapi/api/http.go
index cc5576074..6f2f51eb5 100644
--- a/serverkeyapi/api/http.go
+++ b/serverkeyapi/api/http.go
@@ -3,7 +3,7 @@ package api
 import (
 	"context"
 
-	commonHTTP "github.com/matrix-org/dendrite/common/http"
+	commonHTTP "github.com/matrix-org/dendrite/internal/http"
 	"github.com/matrix-org/gomatrixserverlib"
 
 	"github.com/opentracing/opentracing-go"
diff --git a/serverkeyapi/internal/api.go b/serverkeyapi/internal/api.go
index 5b711156d..768906f87 100644
--- a/serverkeyapi/internal/api.go
+++ b/serverkeyapi/internal/api.go
@@ -3,8 +3,8 @@ package internal
 import (
 	"context"
 
-	"github.com/matrix-org/dendrite/common/caching"
-	"github.com/matrix-org/dendrite/common/config"
+	"github.com/matrix-org/dendrite/internal/caching"
+	"github.com/matrix-org/dendrite/internal/config"
 	"github.com/matrix-org/dendrite/serverkeyapi/api"
 	"github.com/matrix-org/dendrite/serverkeyapi/storage"
 	"github.com/matrix-org/gomatrixserverlib"
diff --git a/serverkeyapi/internal/http.go b/serverkeyapi/internal/http.go
index 60141e6bb..2f6d4b52e 100644
--- a/serverkeyapi/internal/http.go
+++ b/serverkeyapi/internal/http.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/matrix-org/dendrite/common"
+	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/serverkeyapi/api"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/matrix-org/util"
@@ -12,7 +12,7 @@ import (
 
 func (s *ServerKeyAPI) SetupHTTP(servMux *http.ServeMux) {
 	servMux.Handle(api.ServerKeyQueryPublicKeyPath,
-		common.MakeInternalAPI("queryPublicKeys", func(req *http.Request) util.JSONResponse {
+		internal.MakeInternalAPI("queryPublicKeys", func(req *http.Request) util.JSONResponse {
 			result := map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult{}
 			request := api.QueryPublicKeysRequest{}
 			response := api.QueryPublicKeysResponse{}
@@ -39,7 +39,7 @@ func (s *ServerKeyAPI) SetupHTTP(servMux *http.ServeMux) {
 		}),
 	)
 	servMux.Handle(api.ServerKeyInputPublicKeyPath,
-		common.MakeInternalAPI("inputPublicKeys", func(req *http.Request) util.JSONResponse {
+		internal.MakeInternalAPI("inputPublicKeys", func(req *http.Request) util.JSONResponse {
 			request := api.InputPublicKeysRequest{}
 			response := api.InputPublicKeysResponse{}
 			if err := json.NewDecoder(req.Body).Decode(&request); err != nil {
diff --git a/serverkeyapi/serverkeyapi.go b/serverkeyapi/serverkeyapi.go
index 6757efcf9..52e47bbe1 100644
--- a/serverkeyapi/serverkeyapi.go
+++ b/serverkeyapi/serverkeyapi.go
@@ -4,7 +4,7 @@ import (
 	"crypto/ed25519"
 	"encoding/base64"
 
-	"github.com/matrix-org/dendrite/common/basecomponent"
+	"github.com/matrix-org/dendrite/internal/basecomponent"
 	"github.com/matrix-org/dendrite/serverkeyapi/internal"
 	"github.com/matrix-org/dendrite/serverkeyapi/storage"
 	"github.com/matrix-org/dendrite/serverkeyapi/storage/cache"