diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension.go b/cmd/jaeger/internal/extension/jaegerstorage/extension.go
index d30dd21c8c5..d90968015a6 100644
--- a/cmd/jaeger/internal/extension/jaegerstorage/extension.go
+++ b/cmd/jaeger/internal/extension/jaegerstorage/extension.go
@@ -12,7 +12,6 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/extension"
 
-	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage/factoryadapter"
 	"github.com/jaegertracing/jaeger/internal/metrics/otelmetrics"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/plugin/metrics/prometheus"
@@ -22,6 +21,7 @@ import (
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 	"github.com/jaegertracing/jaeger/storage"
+	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 	"github.com/jaegertracing/jaeger/storage_v2/spanstore"
 )
 
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/factoryadapter/README.md b/storage_v2/factoryadapter/README.md
similarity index 100%
rename from cmd/jaeger/internal/extension/jaegerstorage/factoryadapter/README.md
rename to storage_v2/factoryadapter/README.md
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/factoryadapter/factory.go b/storage_v2/factoryadapter/factory.go
similarity index 100%
rename from cmd/jaeger/internal/extension/jaegerstorage/factoryadapter/factory.go
rename to storage_v2/factoryadapter/factory.go
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/factoryadapter/factory_test.go b/storage_v2/factoryadapter/factory_test.go
similarity index 100%
rename from cmd/jaeger/internal/extension/jaegerstorage/factoryadapter/factory_test.go
rename to storage_v2/factoryadapter/factory_test.go
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/factoryadapter/package_test.go b/storage_v2/factoryadapter/package_test.go
similarity index 100%
rename from cmd/jaeger/internal/extension/jaegerstorage/factoryadapter/package_test.go
rename to storage_v2/factoryadapter/package_test.go
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/factoryadapter/writer.go b/storage_v2/factoryadapter/writer.go
similarity index 100%
rename from cmd/jaeger/internal/extension/jaegerstorage/factoryadapter/writer.go
rename to storage_v2/factoryadapter/writer.go
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/factoryadapter/writer_test.go b/storage_v2/factoryadapter/writer_test.go
similarity index 100%
rename from cmd/jaeger/internal/extension/jaegerstorage/factoryadapter/writer_test.go
rename to storage_v2/factoryadapter/writer_test.go