diff --git a/historyserver/README.md b/historyserver/README.md
index 1b520664d1c..4100ac73f40 100644
--- a/historyserver/README.md
+++ b/historyserver/README.md
@@ -118,9 +118,9 @@ Each backend requires specific configuration parameters passed through environme
 ### Code Structure
 
 - `cmd/`: Main applications (collector and historyserver)
-- `backend/`: Core logic for storage backends and collection
-- `backend/collector/`: Collector-specific code
-- `backend/historyserver/`: History server implementation
+- `pkg/`: Core logic for storage backends and collection
+- `pkg/collector/`: Collector-specific code
+- `pkg/storage/`: Storage backend implementations
 - `dashboard/`: Web UI files
 
 ### Testing
diff --git a/historyserver/pkg/collector/eventserver/eventserver.go b/historyserver/pkg/collector/eventserver/eventserver.go
index b0143c63c96..358c33ebe62 100644
--- a/historyserver/pkg/collector/eventserver/eventserver.go
+++ b/historyserver/pkg/collector/eventserver/eventserver.go
@@ -18,7 +18,7 @@ import (
 	"github.com/fsnotify/fsnotify"
 	"github.com/sirupsen/logrus"
 
-	"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
+	"github.com/ray-project/kuberay/historyserver/pkg/storage"
 )
 
 type Event struct {
diff --git a/historyserver/pkg/collector/logcollector/runtime/logcollector/collector.go b/historyserver/pkg/collector/logcollector/runtime/logcollector/collector.go
index e3a041a154f..d0088f92ca3 100644
--- a/historyserver/pkg/collector/logcollector/runtime/logcollector/collector.go
+++ b/historyserver/pkg/collector/logcollector/runtime/logcollector/collector.go
@@ -17,7 +17,7 @@ import (
 	"github.com/fsnotify/fsnotify"
 	"github.com/sirupsen/logrus"
 
-	"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
+	"github.com/ray-project/kuberay/historyserver/pkg/storage"
 	"github.com/ray-project/kuberay/historyserver/pkg/utils"
 )
 
diff --git a/historyserver/pkg/collector/logcollector/runtime/runtime.go b/historyserver/pkg/collector/logcollector/runtime/runtime.go
index 18e2bfc2788..8189b80e332 100644
--- a/historyserver/pkg/collector/logcollector/runtime/runtime.go
+++ b/historyserver/pkg/collector/logcollector/runtime/runtime.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/runtime/logcollector"
-	"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
 	"github.com/ray-project/kuberay/historyserver/pkg/collector/types"
+	"github.com/ray-project/kuberay/historyserver/pkg/storage"
 	"github.com/ray-project/kuberay/historyserver/pkg/utils"
 )
 
diff --git a/historyserver/pkg/collector/registry.go b/historyserver/pkg/collector/registry.go
index 4bbfc6e2fa3..423b9be14ef 100644
--- a/historyserver/pkg/collector/registry.go
+++ b/historyserver/pkg/collector/registry.go
@@ -1,11 +1,11 @@
 package collector
 
 import (
-	"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
-	"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage/aliyunoss/ray"
-	"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage/localtest"
-	"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage/s3"
 	"github.com/ray-project/kuberay/historyserver/pkg/collector/types"
+	"github.com/ray-project/kuberay/historyserver/pkg/storage"
+	"github.com/ray-project/kuberay/historyserver/pkg/storage/aliyunoss/ray"
+	"github.com/ray-project/kuberay/historyserver/pkg/storage/localtest"
+	"github.com/ray-project/kuberay/historyserver/pkg/storage/s3"
 )
 
 type WriterRegistry map[string]func(globalData *types.RayCollectorConfig, data map[string]interface{}) (storage.StorageWriter, error)
diff --git a/historyserver/pkg/collector/logcollector/storage/aliyunoss/README.md b/historyserver/pkg/storage/aliyunoss/README.md
similarity index 100%
rename from historyserver/pkg/collector/logcollector/storage/aliyunoss/README.md
rename to historyserver/pkg/storage/aliyunoss/README.md
diff --git a/historyserver/pkg/collector/logcollector/storage/aliyunoss/config/types.go b/historyserver/pkg/storage/aliyunoss/config/types.go
similarity index 100%
rename from historyserver/pkg/collector/logcollector/storage/aliyunoss/config/types.go
rename to historyserver/pkg/storage/aliyunoss/config/types.go
diff --git a/historyserver/pkg/collector/logcollector/storage/aliyunoss/config/validate.go b/historyserver/pkg/storage/aliyunoss/config/validate.go
similarity index 100%
rename from historyserver/pkg/collector/logcollector/storage/aliyunoss/config/validate.go
rename to historyserver/pkg/storage/aliyunoss/config/validate.go
diff --git a/historyserver/pkg/collector/logcollector/storage/aliyunoss/ray/config.go b/historyserver/pkg/storage/aliyunoss/ray/config.go
similarity index 100%
rename from historyserver/pkg/collector/logcollector/storage/aliyunoss/ray/config.go
rename to historyserver/pkg/storage/aliyunoss/ray/config.go
diff --git a/historyserver/pkg/collector/logcollector/storage/aliyunoss/ray/ray.go b/historyserver/pkg/storage/aliyunoss/ray/ray.go
similarity index 97%
rename from historyserver/pkg/collector/logcollector/storage/aliyunoss/ray/ray.go
rename to historyserver/pkg/storage/aliyunoss/ray/ray.go
index 01850fda6ac..a685c60c081 100644
--- a/historyserver/pkg/collector/logcollector/storage/aliyunoss/ray/ray.go
+++ b/historyserver/pkg/storage/aliyunoss/ray/ray.go
@@ -30,9 +30,9 @@ import (
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"github.com/sirupsen/logrus"
 
-	"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
-	"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage/aliyunoss/rrsa"
 	"github.com/ray-project/kuberay/historyserver/pkg/collector/types"
+	"github.com/ray-project/kuberay/historyserver/pkg/storage"
+	"github.com/ray-project/kuberay/historyserver/pkg/storage/aliyunoss/rrsa"
 	"github.com/ray-project/kuberay/historyserver/pkg/utils"
 )
 
diff --git a/historyserver/pkg/collector/logcollector/storage/aliyunoss/ray/ray_test.go b/historyserver/pkg/storage/aliyunoss/ray/ray_test.go
similarity index 100%
rename from historyserver/pkg/collector/logcollector/storage/aliyunoss/ray/ray_test.go
rename to historyserver/pkg/storage/aliyunoss/ray/ray_test.go
diff --git a/historyserver/pkg/collector/logcollector/storage/aliyunoss/rrsa/credential.go b/historyserver/pkg/storage/aliyunoss/rrsa/credential.go
similarity index 100%
rename from historyserver/pkg/collector/logcollector/storage/aliyunoss/rrsa/credential.go
rename to historyserver/pkg/storage/aliyunoss/rrsa/credential.go
diff --git a/historyserver/pkg/collector/logcollector/storage/interface.go b/historyserver/pkg/storage/interface.go
similarity index 100%
rename from historyserver/pkg/collector/logcollector/storage/interface.go
rename to historyserver/pkg/storage/interface.go
diff --git a/historyserver/pkg/collector/logcollector/storage/localtest/reader.go b/historyserver/pkg/storage/localtest/reader.go
similarity index 96%
rename from historyserver/pkg/collector/logcollector/storage/localtest/reader.go
rename to historyserver/pkg/storage/localtest/reader.go
index 3dbba172d1c..d92b8b1bdd1 100644
--- a/historyserver/pkg/collector/logcollector/storage/localtest/reader.go
+++ b/historyserver/pkg/storage/localtest/reader.go
@@ -4,8 +4,8 @@ import (
 	"io"
 	"strings"
 
-	"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
 	"github.com/ray-project/kuberay/historyserver/pkg/collector/types"
+	"github.com/ray-project/kuberay/historyserver/pkg/storage"
 	"github.com/ray-project/kuberay/historyserver/pkg/utils"
 )
 
diff --git a/historyserver/pkg/collector/logcollector/storage/localtest/writer.go b/historyserver/pkg/storage/localtest/writer.go
similarity index 94%
rename from historyserver/pkg/collector/logcollector/storage/localtest/writer.go
rename to historyserver/pkg/storage/localtest/writer.go
index cfb6ca08e5d..9b79af8caf7 100644
--- a/historyserver/pkg/collector/logcollector/storage/localtest/writer.go
+++ b/historyserver/pkg/storage/localtest/writer.go
@@ -3,8 +3,8 @@ package localtest
 import (
 	"io"
 
-	"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
 	"github.com/ray-project/kuberay/historyserver/pkg/collector/types"
+	"github.com/ray-project/kuberay/historyserver/pkg/storage"
 )
 
 // MockWriter is a mock implementation of the StorageWriter interface
diff --git a/historyserver/pkg/collector/logcollector/storage/s3/README.md b/historyserver/pkg/storage/s3/README.md
similarity index 100%
rename from historyserver/pkg/collector/logcollector/storage/s3/README.md
rename to historyserver/pkg/storage/s3/README.md
diff --git a/historyserver/pkg/collector/logcollector/storage/s3/config.go b/historyserver/pkg/storage/s3/config.go
similarity index 100%
rename from historyserver/pkg/collector/logcollector/storage/s3/config.go
rename to historyserver/pkg/storage/s3/config.go
diff --git a/historyserver/pkg/collector/logcollector/storage/s3/s3.go b/historyserver/pkg/storage/s3/s3.go
similarity index 99%
rename from historyserver/pkg/collector/logcollector/storage/s3/s3.go
rename to historyserver/pkg/storage/s3/s3.go
index 43d5ece7f95..760e12f7123 100644
--- a/historyserver/pkg/collector/logcollector/storage/s3/s3.go
+++ b/historyserver/pkg/storage/s3/s3.go
@@ -34,8 +34,8 @@ import (
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/sirupsen/logrus"
 
-	"github.com/ray-project/kuberay/historyserver/pkg/collector/logcollector/storage"
 	"github.com/ray-project/kuberay/historyserver/pkg/collector/types"
+	"github.com/ray-project/kuberay/historyserver/pkg/storage"
 	"github.com/ray-project/kuberay/historyserver/pkg/utils"
 )
 
diff --git a/historyserver/pkg/collector/logcollector/storage/s3/s3_test.go b/historyserver/pkg/storage/s3/s3_test.go
similarity index 100%
rename from historyserver/pkg/collector/logcollector/storage/s3/s3_test.go
rename to historyserver/pkg/storage/s3/s3_test.go
diff --git a/historyserver/pkg/storage/storage.go b/historyserver/pkg/storage/storage.go
deleted file mode 100644
index 82be0547ed0..00000000000
--- a/historyserver/pkg/storage/storage.go
+++ /dev/null
@@ -1 +0,0 @@
-package storage