diff --git a/federationsender/federationsender.go b/federationsender/federationsender.go
index bf9d326b..64de4fd2 100644
--- a/federationsender/federationsender.go
+++ b/federationsender/federationsender.go
@@ -20,8 +20,8 @@ import (
 	"github.com/matrix-org/dendrite/common/basecomponent"
 	"github.com/matrix-org/dendrite/federationsender/api"
 	"github.com/matrix-org/dendrite/federationsender/consumers"
+	"github.com/matrix-org/dendrite/federationsender/internal"
 	"github.com/matrix-org/dendrite/federationsender/producers"
-	"github.com/matrix-org/dendrite/federationsender/query"
 	"github.com/matrix-org/dendrite/federationsender/queue"
 	"github.com/matrix-org/dendrite/federationsender/storage"
 	roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
@@ -61,7 +61,7 @@ func SetupFederationSenderComponent(
 		logrus.WithError(err).Panic("failed to start typing server consumer")
 	}
 
-	queryAPI := query.NewFederationSenderInternalAPI(
+	queryAPI := internal.NewFederationSenderInternalAPI(
 		federationSenderDB, base.Cfg, roomserverProducer, federation, keyRing,
 	)
 	queryAPI.SetupHTTP(http.DefaultServeMux)
diff --git a/federationsender/query/api.go b/federationsender/internal/api.go
similarity index 99%
rename from federationsender/query/api.go
rename to federationsender/internal/api.go
index e92453f9..89a1fda4 100644
--- a/federationsender/query/api.go
+++ b/federationsender/internal/api.go
@@ -1,4 +1,4 @@
-package query
+package internal
 
 import (
 	"encoding/json"
diff --git a/federationsender/query/perform.go b/federationsender/internal/perform.go
similarity index 97%
rename from federationsender/query/perform.go
rename to federationsender/internal/perform.go
index d39fef5e..961d8027 100644
--- a/federationsender/query/perform.go
+++ b/federationsender/internal/perform.go
@@ -1,4 +1,4 @@
-package query
+package internal
 
 import (
 	"context"
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/matrix-org/dendrite/federationsender/api"
-	"github.com/matrix-org/dendrite/federationsender/query/perform"
+	"github.com/matrix-org/dendrite/federationsender/internal/perform"
 	"github.com/matrix-org/dendrite/roomserver/version"
 	"github.com/matrix-org/gomatrixserverlib"
 )
diff --git a/federationsender/query/perform/join.go b/federationsender/internal/perform/join.go
similarity index 100%
rename from federationsender/query/perform/join.go
rename to federationsender/internal/perform/join.go
diff --git a/federationsender/query/query.go b/federationsender/internal/query.go
similarity index 98%
rename from federationsender/query/query.go
rename to federationsender/internal/query.go
index 004ad156..88dd50a6 100644
--- a/federationsender/query/query.go
+++ b/federationsender/internal/query.go
@@ -1,4 +1,4 @@
-package query
+package internal
 
 import (
 	"context"