diff --git a/publicroomsapi/storage/postgreswithdht/storage.go b/cmd/dendrite-p2p-demo/storage/postgreswithdht/storage.go
similarity index 100%
rename from publicroomsapi/storage/postgreswithdht/storage.go
rename to cmd/dendrite-p2p-demo/storage/postgreswithdht/storage.go
diff --git a/cmd/dendrite-p2p-demo/storage/storage.go b/cmd/dendrite-p2p-demo/storage/storage.go
index d44cb70a2..768f26a78 100644
--- a/cmd/dendrite-p2p-demo/storage/storage.go
+++ b/cmd/dendrite-p2p-demo/storage/storage.go
@@ -3,7 +3,9 @@ package storage
 import (
 	"net/url"
 
+	dht "github.com/libp2p/go-libp2p-kad-dht"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
+	"github.com/matrix-org/dendrite/cmd/dendrite-p2p-demo/storage/postgreswithdht"
 	"github.com/matrix-org/dendrite/cmd/dendrite-p2p-demo/storage/postgreswithpubsub"
 	"github.com/matrix-org/dendrite/publicroomsapi/storage"
 	"github.com/matrix-org/dendrite/publicroomsapi/storage/sqlite3"
@@ -12,6 +14,22 @@ import (
 const schemePostgres = "postgres"
 const schemeFile = "file"
 
+// NewPublicRoomsServerDatabase opens a database connection.
+func NewPublicRoomsServerDatabaseWithDHT(dataSourceName string, dht *dht.IpfsDHT) (storage.Database, error) {
+	uri, err := url.Parse(dataSourceName)
+	if err != nil {
+		return postgreswithdht.NewPublicRoomsServerDatabase(dataSourceName, dht)
+	}
+	switch uri.Scheme {
+	case schemePostgres:
+		return postgreswithdht.NewPublicRoomsServerDatabase(dataSourceName, dht)
+	case schemeFile:
+		return sqlite3.NewPublicRoomsServerDatabase(dataSourceName)
+	default:
+		return postgreswithdht.NewPublicRoomsServerDatabase(dataSourceName, dht)
+	}
+}
+
 // NewPublicRoomsServerDatabase opens a database connection.
 func NewPublicRoomsServerDatabaseWithPubSub(dataSourceName string, pubsub *pubsub.PubSub) (storage.Database, error) {
 	uri, err := url.Parse(dataSourceName)
diff --git a/publicroomsapi/storage/storage.go b/publicroomsapi/storage/storage.go
index fdf1ff8fc..e674514aa 100644
--- a/publicroomsapi/storage/storage.go
+++ b/publicroomsapi/storage/storage.go
@@ -19,9 +19,7 @@ package storage
 import (
 	"net/url"
 
-	dht "github.com/libp2p/go-libp2p-kad-dht"
 	"github.com/matrix-org/dendrite/publicroomsapi/storage/postgres"
-	"github.com/matrix-org/dendrite/publicroomsapi/storage/postgreswithdht"
 	"github.com/matrix-org/dendrite/publicroomsapi/storage/sqlite3"
 )
 
@@ -43,19 +41,3 @@ func NewPublicRoomsServerDatabase(dataSourceName string) (Database, error) {
 		return postgres.NewPublicRoomsServerDatabase(dataSourceName)
 	}
 }
-
-// NewPublicRoomsServerDatabase opens a database connection.
-func NewPublicRoomsServerDatabaseWithDHT(dataSourceName string, dht *dht.IpfsDHT) (Database, error) {
-	uri, err := url.Parse(dataSourceName)
-	if err != nil {
-		return postgreswithdht.NewPublicRoomsServerDatabase(dataSourceName, dht)
-	}
-	switch uri.Scheme {
-	case schemePostgres:
-		return postgreswithdht.NewPublicRoomsServerDatabase(dataSourceName, dht)
-	case schemeFile:
-		return sqlite3.NewPublicRoomsServerDatabase(dataSourceName)
-	default:
-		return postgreswithdht.NewPublicRoomsServerDatabase(dataSourceName, dht)
-	}
-}