diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ca0283e3ea1..d563bf0a976 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -42,7 +42,7 @@ updates:
       - /docker/base
       - /docker/debug
       - /examples/hotrod
-      - /plugin/storage/cassandra
+      - /internal/storage/v1/cassandra
     schedule:
       interval: daily
   - package-ecosystem: docker
diff --git a/Makefile.Docker.mk b/Makefile.Docker.mk
index b1d4daa2b11..873c8a68339 100644
--- a/Makefile.Docker.mk
+++ b/Makefile.Docker.mk
@@ -60,7 +60,7 @@ docker-images-anonymizer:
 
 .PHONY: docker-images-cassandra
 docker-images-cassandra:
-	docker build -t $(DOCKER_NAMESPACE)/jaeger-cassandra-schema:${DOCKER_TAG} plugin/storage/cassandra/
+	docker build -t $(DOCKER_NAMESPACE)/jaeger-cassandra-schema:${DOCKER_TAG} internal/storage/v1/cassandra/
 	@echo "Finished building jaeger-cassandra-schema =============="
 
 .PHONY: docker-images-elastic
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/config.go b/cmd/jaeger/internal/extension/jaegerstorage/config.go
index 0612a805019..2203ab56dfb 100644
--- a/cmd/jaeger/internal/extension/jaegerstorage/config.go
+++ b/cmd/jaeger/internal/extension/jaegerstorage/config.go
@@ -12,12 +12,12 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/confmap"
 
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
 	casCfg "github.com/jaegertracing/jaeger/pkg/cassandra/config"
 	esCfg "github.com/jaegertracing/jaeger/pkg/es/config"
 	promCfg "github.com/jaegertracing/jaeger/pkg/prometheus/config"
 	"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus"
 	"github.com/jaegertracing/jaeger/plugin/storage/badger"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
 	"github.com/jaegertracing/jaeger/plugin/storage/es"
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension.go b/cmd/jaeger/internal/extension/jaegerstorage/extension.go
index 53e29a07d7e..fff54a2c9a3 100644
--- a/cmd/jaeger/internal/extension/jaegerstorage/extension.go
+++ b/cmd/jaeger/internal/extension/jaegerstorage/extension.go
@@ -12,11 +12,11 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/extension"
 
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/telemetry"
 	"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus"
 	"github.com/jaegertracing/jaeger/plugin/storage/badger"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
 	"github.com/jaegertracing/jaeger/plugin/storage/es"
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go b/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go
index b202ee4bb7e..dbcc5eefdd9 100644
--- a/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go
+++ b/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go
@@ -21,11 +21,11 @@ import (
 	nooptrace "go.opentelemetry.io/otel/trace/noop"
 	"go.uber.org/zap"
 
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
 	esCfg "github.com/jaegertracing/jaeger/pkg/es/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	promCfg "github.com/jaegertracing/jaeger/pkg/prometheus/config"
 	"github.com/jaegertracing/jaeger/plugin/storage/badger"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 	"github.com/jaegertracing/jaeger/storage"
diff --git a/plugin/storage/cassandra/Dockerfile b/internal/storage/v1/cassandra/Dockerfile
similarity index 100%
rename from plugin/storage/cassandra/Dockerfile
rename to internal/storage/v1/cassandra/Dockerfile
diff --git a/plugin/storage/cassandra/dependencystore/bootstrap.go b/internal/storage/v1/cassandra/dependencystore/bootstrap.go
similarity index 100%
rename from plugin/storage/cassandra/dependencystore/bootstrap.go
rename to internal/storage/v1/cassandra/dependencystore/bootstrap.go
diff --git a/plugin/storage/cassandra/dependencystore/bootstrap_test.go b/internal/storage/v1/cassandra/dependencystore/bootstrap_test.go
similarity index 100%
rename from plugin/storage/cassandra/dependencystore/bootstrap_test.go
rename to internal/storage/v1/cassandra/dependencystore/bootstrap_test.go
diff --git a/plugin/storage/cassandra/dependencystore/model.go b/internal/storage/v1/cassandra/dependencystore/model.go
similarity index 100%
rename from plugin/storage/cassandra/dependencystore/model.go
rename to internal/storage/v1/cassandra/dependencystore/model.go
diff --git a/plugin/storage/cassandra/dependencystore/model_test.go b/internal/storage/v1/cassandra/dependencystore/model_test.go
similarity index 100%
rename from plugin/storage/cassandra/dependencystore/model_test.go
rename to internal/storage/v1/cassandra/dependencystore/model_test.go
diff --git a/plugin/storage/cassandra/dependencystore/package_test.go b/internal/storage/v1/cassandra/dependencystore/package_test.go
similarity index 100%
rename from plugin/storage/cassandra/dependencystore/package_test.go
rename to internal/storage/v1/cassandra/dependencystore/package_test.go
diff --git a/plugin/storage/cassandra/dependencystore/storage.go b/internal/storage/v1/cassandra/dependencystore/storage.go
similarity index 100%
rename from plugin/storage/cassandra/dependencystore/storage.go
rename to internal/storage/v1/cassandra/dependencystore/storage.go
diff --git a/plugin/storage/cassandra/dependencystore/storage_test.go b/internal/storage/v1/cassandra/dependencystore/storage_test.go
similarity index 100%
rename from plugin/storage/cassandra/dependencystore/storage_test.go
rename to internal/storage/v1/cassandra/dependencystore/storage_test.go
diff --git a/plugin/storage/cassandra/factory.go b/internal/storage/v1/cassandra/factory.go
similarity index 95%
rename from plugin/storage/cassandra/factory.go
rename to internal/storage/v1/cassandra/factory.go
index 5937f92d08a..7c84ef401bb 100644
--- a/plugin/storage/cassandra/factory.go
+++ b/internal/storage/v1/cassandra/factory.go
@@ -15,6 +15,11 @@ import (
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 
+	cDepStore "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/dependencystore"
+	cSamplingStore "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/samplingstore"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/schema"
+	cSpanStore "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/pkg/cassandra"
 	"github.com/jaegertracing/jaeger/pkg/cassandra/config"
 	gocqlw "github.com/jaegertracing/jaeger/pkg/cassandra/gocql"
@@ -23,11 +28,6 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/plugin"
 	cLock "github.com/jaegertracing/jaeger/plugin/pkg/distributedlock/cassandra"
-	cDepStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/dependencystore"
-	cSamplingStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/samplingstore"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/schema"
-	cSpanStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/storage"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	"github.com/jaegertracing/jaeger/storage/samplingstore"
diff --git a/plugin/storage/cassandra/factory_test.go b/internal/storage/v1/cassandra/factory_test.go
similarity index 100%
rename from plugin/storage/cassandra/factory_test.go
rename to internal/storage/v1/cassandra/factory_test.go
diff --git a/plugin/storage/cassandra/options.go b/internal/storage/v1/cassandra/options.go
similarity index 100%
rename from plugin/storage/cassandra/options.go
rename to internal/storage/v1/cassandra/options.go
diff --git a/plugin/storage/cassandra/options_test.go b/internal/storage/v1/cassandra/options_test.go
similarity index 100%
rename from plugin/storage/cassandra/options_test.go
rename to internal/storage/v1/cassandra/options_test.go
diff --git a/plugin/storage/cassandra/package_test.go b/internal/storage/v1/cassandra/package_test.go
similarity index 100%
rename from plugin/storage/cassandra/package_test.go
rename to internal/storage/v1/cassandra/package_test.go
diff --git a/plugin/storage/cassandra/samplingstore/storage.go b/internal/storage/v1/cassandra/samplingstore/storage.go
similarity index 100%
rename from plugin/storage/cassandra/samplingstore/storage.go
rename to internal/storage/v1/cassandra/samplingstore/storage.go
diff --git a/plugin/storage/cassandra/samplingstore/storage_test.go b/internal/storage/v1/cassandra/samplingstore/storage_test.go
similarity index 100%
rename from plugin/storage/cassandra/samplingstore/storage_test.go
rename to internal/storage/v1/cassandra/samplingstore/storage_test.go
diff --git a/plugin/storage/cassandra/savetracetest/main.go b/internal/storage/v1/cassandra/savetracetest/main.go
similarity index 96%
rename from plugin/storage/cassandra/savetracetest/main.go
rename to internal/storage/v1/cassandra/savetracetest/main.go
index 70522e30843..f43cd394c7a 100644
--- a/plugin/storage/cassandra/savetracetest/main.go
+++ b/internal/storage/v1/cassandra/savetracetest/main.go
@@ -11,11 +11,11 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
+	cSpanStore "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore"
 	cascfg "github.com/jaegertracing/jaeger/pkg/cassandra/config"
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
-	cSpanStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
diff --git a/plugin/storage/cassandra/schema/README.md b/internal/storage/v1/cassandra/schema/README.md
similarity index 100%
rename from plugin/storage/cassandra/schema/README.md
rename to internal/storage/v1/cassandra/schema/README.md
diff --git a/plugin/storage/cassandra/schema/create.sh b/internal/storage/v1/cassandra/schema/create.sh
similarity index 100%
rename from plugin/storage/cassandra/schema/create.sh
rename to internal/storage/v1/cassandra/schema/create.sh
diff --git a/plugin/storage/cassandra/schema/create.test.sh b/internal/storage/v1/cassandra/schema/create.test.sh
similarity index 100%
rename from plugin/storage/cassandra/schema/create.test.sh
rename to internal/storage/v1/cassandra/schema/create.test.sh
diff --git a/plugin/storage/cassandra/schema/docker.sh b/internal/storage/v1/cassandra/schema/docker.sh
similarity index 100%
rename from plugin/storage/cassandra/schema/docker.sh
rename to internal/storage/v1/cassandra/schema/docker.sh
diff --git a/plugin/storage/cassandra/schema/migration/V002toV003.sh b/internal/storage/v1/cassandra/schema/migration/V002toV003.sh
similarity index 100%
rename from plugin/storage/cassandra/schema/migration/V002toV003.sh
rename to internal/storage/v1/cassandra/schema/migration/V002toV003.sh
diff --git a/plugin/storage/cassandra/schema/migration/v001tov002part1.sh b/internal/storage/v1/cassandra/schema/migration/v001tov002part1.sh
similarity index 100%
rename from plugin/storage/cassandra/schema/migration/v001tov002part1.sh
rename to internal/storage/v1/cassandra/schema/migration/v001tov002part1.sh
diff --git a/plugin/storage/cassandra/schema/migration/v001tov002part2.sh b/internal/storage/v1/cassandra/schema/migration/v001tov002part2.sh
similarity index 100%
rename from plugin/storage/cassandra/schema/migration/v001tov002part2.sh
rename to internal/storage/v1/cassandra/schema/migration/v001tov002part2.sh
diff --git a/plugin/storage/cassandra/schema/package_test.go b/internal/storage/v1/cassandra/schema/package_test.go
similarity index 100%
rename from plugin/storage/cassandra/schema/package_test.go
rename to internal/storage/v1/cassandra/schema/package_test.go
diff --git a/plugin/storage/cassandra/schema/schema.go b/internal/storage/v1/cassandra/schema/schema.go
similarity index 100%
rename from plugin/storage/cassandra/schema/schema.go
rename to internal/storage/v1/cassandra/schema/schema.go
diff --git a/plugin/storage/cassandra/schema/schema_test.go b/internal/storage/v1/cassandra/schema/schema_test.go
similarity index 100%
rename from plugin/storage/cassandra/schema/schema_test.go
rename to internal/storage/v1/cassandra/schema/schema_test.go
diff --git a/plugin/storage/cassandra/schema/v001.cql.tmpl b/internal/storage/v1/cassandra/schema/v001.cql.tmpl
similarity index 100%
rename from plugin/storage/cassandra/schema/v001.cql.tmpl
rename to internal/storage/v1/cassandra/schema/v001.cql.tmpl
diff --git a/plugin/storage/cassandra/schema/v002.cql.tmpl b/internal/storage/v1/cassandra/schema/v002.cql.tmpl
similarity index 100%
rename from plugin/storage/cassandra/schema/v002.cql.tmpl
rename to internal/storage/v1/cassandra/schema/v002.cql.tmpl
diff --git a/plugin/storage/cassandra/schema/v003.cql.tmpl b/internal/storage/v1/cassandra/schema/v003.cql.tmpl
similarity index 99%
rename from plugin/storage/cassandra/schema/v003.cql.tmpl
rename to internal/storage/v1/cassandra/schema/v003.cql.tmpl
index 6ed90e9dee9..7f9690b1333 100644
--- a/plugin/storage/cassandra/schema/v003.cql.tmpl
+++ b/internal/storage/v1/cassandra/schema/v003.cql.tmpl
@@ -204,7 +204,7 @@ CREATE TABLE IF NOT EXISTS ${keyspace}.dependencies_v2 (
     AND default_time_to_live = ${dependencies_ttl};
 
 -- adaptive sampling tables
--- ./plugin/storage/cassandra/samplingstore/storage.go
+-- ./internal/storage/v1/cassandra/samplingstore/storage.go
 CREATE TABLE IF NOT EXISTS ${keyspace}.operation_throughput (
     bucket        int,
     ts            timeuuid,
diff --git a/plugin/storage/cassandra/schema/v004-go-tmpl.cql.tmpl b/internal/storage/v1/cassandra/schema/v004-go-tmpl.cql.tmpl
similarity index 99%
rename from plugin/storage/cassandra/schema/v004-go-tmpl.cql.tmpl
rename to internal/storage/v1/cassandra/schema/v004-go-tmpl.cql.tmpl
index 41ea7494274..f6a79abdc2b 100644
--- a/plugin/storage/cassandra/schema/v004-go-tmpl.cql.tmpl
+++ b/internal/storage/v1/cassandra/schema/v004-go-tmpl.cql.tmpl
@@ -175,7 +175,7 @@ CREATE TABLE IF NOT EXISTS {{.Keyspace}}.dependencies_v2 (
     AND default_time_to_live = {{.DependenciesTTLInSeconds}};
 
 -- adaptive sampling tables
--- ./plugin/storage/cassandra/samplingstore/storage.go
+-- ./internal/storage/v1/cassandra/samplingstore/storage.go
 CREATE TABLE IF NOT EXISTS {{.Keyspace}}.operation_throughput (
     bucket        int,
     ts            timeuuid,
diff --git a/plugin/storage/cassandra/schema/v004.cql.tmpl b/internal/storage/v1/cassandra/schema/v004.cql.tmpl
similarity index 99%
rename from plugin/storage/cassandra/schema/v004.cql.tmpl
rename to internal/storage/v1/cassandra/schema/v004.cql.tmpl
index 27f9bc10764..9dc547fe89f 100644
--- a/plugin/storage/cassandra/schema/v004.cql.tmpl
+++ b/internal/storage/v1/cassandra/schema/v004.cql.tmpl
@@ -197,7 +197,7 @@ CREATE TABLE IF NOT EXISTS ${keyspace}.dependencies_v2 (
     AND default_time_to_live = ${dependencies_ttl};
 
 -- adaptive sampling tables
--- ./plugin/storage/cassandra/samplingstore/storage.go
+-- ./internal/storage/v1/cassandra/samplingstore/storage.go
 CREATE TABLE IF NOT EXISTS ${keyspace}.operation_throughput (
     bucket        int,
     ts            timeuuid,
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/converter.go b/internal/storage/v1/cassandra/spanstore/dbmodel/converter.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/converter.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/converter.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/converter_test.go b/internal/storage/v1/cassandra/spanstore/dbmodel/converter_test.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/converter_test.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/converter_test.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/cql_udt.go b/internal/storage/v1/cassandra/spanstore/dbmodel/cql_udt.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/cql_udt.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/cql_udt.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/cql_udt_test.go b/internal/storage/v1/cassandra/spanstore/dbmodel/cql_udt_test.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/cql_udt_test.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/cql_udt_test.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/index_filter.go b/internal/storage/v1/cassandra/spanstore/dbmodel/index_filter.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/index_filter.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/index_filter.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/index_filter_test.go b/internal/storage/v1/cassandra/spanstore/dbmodel/index_filter_test.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/index_filter_test.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/index_filter_test.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/model.go b/internal/storage/v1/cassandra/spanstore/dbmodel/model.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/model.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/model.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/model_test.go b/internal/storage/v1/cassandra/spanstore/dbmodel/model_test.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/model_test.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/model_test.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/operation.go b/internal/storage/v1/cassandra/spanstore/dbmodel/operation.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/operation.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/operation.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/package_test.go b/internal/storage/v1/cassandra/spanstore/dbmodel/package_test.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/package_test.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/package_test.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/tag_filter.go b/internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/tag_filter.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/tag_filter_drop_all.go b/internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_drop_all.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/tag_filter_drop_all.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_drop_all.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/tag_filter_drop_all_test.go b/internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_drop_all_test.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/tag_filter_drop_all_test.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_drop_all_test.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/tag_filter_exact_match.go b/internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_exact_match.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/tag_filter_exact_match.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_exact_match.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/tag_filter_exact_match_test.go b/internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_exact_match_test.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/tag_filter_exact_match_test.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_exact_match_test.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/tag_filter_test.go b/internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_test.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/tag_filter_test.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_test.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/unique_ids.go b/internal/storage/v1/cassandra/spanstore/dbmodel/unique_ids.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/unique_ids.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/unique_ids.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/unique_ids_test.go b/internal/storage/v1/cassandra/spanstore/dbmodel/unique_ids_test.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/unique_ids_test.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/unique_ids_test.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/unique_tags.go b/internal/storage/v1/cassandra/spanstore/dbmodel/unique_tags.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/unique_tags.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/unique_tags.go
diff --git a/plugin/storage/cassandra/spanstore/dbmodel/unique_tags_test.go b/internal/storage/v1/cassandra/spanstore/dbmodel/unique_tags_test.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/dbmodel/unique_tags_test.go
rename to internal/storage/v1/cassandra/spanstore/dbmodel/unique_tags_test.go
diff --git a/plugin/storage/cassandra/spanstore/matchers_test.go b/internal/storage/v1/cassandra/spanstore/matchers_test.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/matchers_test.go
rename to internal/storage/v1/cassandra/spanstore/matchers_test.go
diff --git a/plugin/storage/cassandra/spanstore/operation_names.go b/internal/storage/v1/cassandra/spanstore/operation_names.go
similarity index 98%
rename from plugin/storage/cassandra/spanstore/operation_names.go
rename to internal/storage/v1/cassandra/spanstore/operation_names.go
index e1aec8ae144..b55efccbe04 100644
--- a/plugin/storage/cassandra/spanstore/operation_names.go
+++ b/internal/storage/v1/cassandra/spanstore/operation_names.go
@@ -10,11 +10,11 @@ import (
 
 	"go.uber.org/zap"
 
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/pkg/cache"
 	"github.com/jaegertracing/jaeger/pkg/cassandra"
 	casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
diff --git a/plugin/storage/cassandra/spanstore/operation_names_test.go b/internal/storage/v1/cassandra/spanstore/operation_names_test.go
similarity index 98%
rename from plugin/storage/cassandra/spanstore/operation_names_test.go
rename to internal/storage/v1/cassandra/spanstore/operation_names_test.go
index 3af5e8b3442..b7e2438f9f9 100644
--- a/plugin/storage/cassandra/spanstore/operation_names_test.go
+++ b/internal/storage/v1/cassandra/spanstore/operation_names_test.go
@@ -16,9 +16,9 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/internal/metricstest"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
diff --git a/plugin/storage/cassandra/spanstore/package_test.go b/internal/storage/v1/cassandra/spanstore/package_test.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/package_test.go
rename to internal/storage/v1/cassandra/spanstore/package_test.go
diff --git a/plugin/storage/cassandra/spanstore/reader.go b/internal/storage/v1/cassandra/spanstore/reader.go
similarity index 99%
rename from plugin/storage/cassandra/spanstore/reader.go
rename to internal/storage/v1/cassandra/spanstore/reader.go
index fb24c69337a..bafc5efcf05 100644
--- a/plugin/storage/cassandra/spanstore/reader.go
+++ b/internal/storage/v1/cassandra/spanstore/reader.go
@@ -16,11 +16,11 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/pkg/cassandra"
 	casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/otelsemconv"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
diff --git a/plugin/storage/cassandra/spanstore/reader_test.go b/internal/storage/v1/cassandra/spanstore/reader_test.go
similarity index 99%
rename from plugin/storage/cassandra/spanstore/reader_test.go
rename to internal/storage/v1/cassandra/spanstore/reader_test.go
index 5b415d4636a..e45d7a86ad4 100644
--- a/plugin/storage/cassandra/spanstore/reader_test.go
+++ b/internal/storage/v1/cassandra/spanstore/reader_test.go
@@ -21,10 +21,10 @@ import (
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
 	"github.com/jaegertracing/jaeger/internal/metricstest"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/pkg/cassandra"
 	"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
diff --git a/plugin/storage/cassandra/spanstore/service_names.go b/internal/storage/v1/cassandra/spanstore/service_names.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/service_names.go
rename to internal/storage/v1/cassandra/spanstore/service_names.go
diff --git a/plugin/storage/cassandra/spanstore/service_names_test.go b/internal/storage/v1/cassandra/spanstore/service_names_test.go
similarity index 100%
rename from plugin/storage/cassandra/spanstore/service_names_test.go
rename to internal/storage/v1/cassandra/spanstore/service_names_test.go
diff --git a/plugin/storage/cassandra/spanstore/writer.go b/internal/storage/v1/cassandra/spanstore/writer.go
similarity index 99%
rename from plugin/storage/cassandra/spanstore/writer.go
rename to internal/storage/v1/cassandra/spanstore/writer.go
index 4e970d05c82..1f702d27c21 100644
--- a/plugin/storage/cassandra/spanstore/writer.go
+++ b/internal/storage/v1/cassandra/spanstore/writer.go
@@ -15,10 +15,10 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/pkg/cassandra"
 	casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
 )
 
 const (
diff --git a/plugin/storage/cassandra/spanstore/writer_options.go b/internal/storage/v1/cassandra/spanstore/writer_options.go
similarity index 94%
rename from plugin/storage/cassandra/spanstore/writer_options.go
rename to internal/storage/v1/cassandra/spanstore/writer_options.go
index a706d5cc3c3..c3bd89028a6 100644
--- a/plugin/storage/cassandra/spanstore/writer_options.go
+++ b/internal/storage/v1/cassandra/spanstore/writer_options.go
@@ -5,7 +5,7 @@
 package spanstore
 
 import (
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 )
 
 // Option is a function that sets some option on the writer.
diff --git a/plugin/storage/cassandra/spanstore/writer_options_test.go b/internal/storage/v1/cassandra/spanstore/writer_options_test.go
similarity index 92%
rename from plugin/storage/cassandra/spanstore/writer_options_test.go
rename to internal/storage/v1/cassandra/spanstore/writer_options_test.go
index ec39c9dcef7..b0c5c66a2ae 100644
--- a/plugin/storage/cassandra/spanstore/writer_options_test.go
+++ b/internal/storage/v1/cassandra/spanstore/writer_options_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 )
 
 func TestWriterOptions(t *testing.T) {
diff --git a/plugin/storage/cassandra/spanstore/writer_test.go b/internal/storage/v1/cassandra/spanstore/writer_test.go
similarity index 99%
rename from plugin/storage/cassandra/spanstore/writer_test.go
rename to internal/storage/v1/cassandra/spanstore/writer_test.go
index af9a4c752f3..01e7407a314 100644
--- a/plugin/storage/cassandra/spanstore/writer_test.go
+++ b/internal/storage/v1/cassandra/spanstore/writer_test.go
@@ -20,9 +20,9 @@ import (
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
 	"github.com/jaegertracing/jaeger/internal/metricstest"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
diff --git a/plugin/storage/factory.go b/plugin/storage/factory.go
index 6142c299456..a73e36bc5c4 100644
--- a/plugin/storage/factory.go
+++ b/plugin/storage/factory.go
@@ -14,11 +14,11 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/internal/safeexpvar"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/plugin"
 	"github.com/jaegertracing/jaeger/plugin/storage/badger"
 	"github.com/jaegertracing/jaeger/plugin/storage/blackhole"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
 	"github.com/jaegertracing/jaeger/plugin/storage/es"
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc"
 	"github.com/jaegertracing/jaeger/plugin/storage/kafka"
diff --git a/plugin/storage/integration/cassandra_test.go b/plugin/storage/integration/cassandra_test.go
index efffd2ccf50..c057c86d6ec 100644
--- a/plugin/storage/integration/cassandra_test.go
+++ b/plugin/storage/integration/cassandra_test.go
@@ -14,10 +14,10 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest"
 
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )
diff --git a/scripts/build/build-upload-docker-images.sh b/scripts/build/build-upload-docker-images.sh
index b7af280ba00..8dbe147fc9e 100755
--- a/scripts/build/build-upload-docker-images.sh
+++ b/scripts/build/build-upload-docker-images.sh
@@ -74,7 +74,7 @@ done
 
 bash scripts/build/build-upload-a-docker-image.sh "${FLAGS[@]}" -b -c jaeger-es-index-cleaner -d cmd/es-index-cleaner -p "${platforms}" -t release
 bash scripts/build/build-upload-a-docker-image.sh "${FLAGS[@]}" -b -c jaeger-es-rollover -d cmd/es-rollover  -p "${platforms}" -t release
-bash scripts/build/build-upload-a-docker-image.sh "${FLAGS[@]}" -c jaeger-cassandra-schema -d plugin/storage/cassandra/ -p "${platforms}"
+bash scripts/build/build-upload-a-docker-image.sh "${FLAGS[@]}" -c jaeger-cassandra-schema -d internal/storage/v1/cassandra/ -p "${platforms}"
 
 # build/upload images for jaeger-tracegen and jaeger-anonymizer
 for component in tracegen anonymizer
diff --git a/scripts/e2e/cassandra.sh b/scripts/e2e/cassandra.sh
index 3789017d419..839cab818d8 100755
--- a/scripts/e2e/cassandra.sh
+++ b/scripts/e2e/cassandra.sh
@@ -68,7 +68,7 @@ teardown_cassandra() {
 
 apply_schema() {
   local image=cassandra-schema
-  local schema_dir=plugin/storage/cassandra/
+  local schema_dir=internal/storage/v1/cassandra/
   local schema_version=$1
   local keyspace=$2
   local params=(
diff --git a/scripts/utils/run-tests.sh b/scripts/utils/run-tests.sh
index dd33f666eae..0ab6b02b95d 100755
--- a/scripts/utils/run-tests.sh
+++ b/scripts/utils/run-tests.sh
@@ -10,7 +10,7 @@ REPO_ROOT="$UTILS_DIR/../.."
 # Define list of test files explicitly here , to be dynamic to the location of the test file
 TEST_FILES=(
     "$UTILS_DIR/compute-tags.test.sh"
-    "$REPO_ROOT/plugin/storage/cassandra/schema/create.test.sh"
+    "$REPO_ROOT/internal/storage/v1/cassandra/schema/create.test.sh"
 )
 
 run_test_file() {