Repository: dragonflyoss/Dragonfly2
Pull request #626 (2021-09-08 10:16:12)

Rename subSystem name cdnsystem to cdn
Signed-off-by: santong <244372610@qq.com>

<!--- Provide a general summary of your changes in the Title above -->

## Description
Rename subSystem name cdnsystem to cdn
<!--- Describe your changes in detail -->

## Related Issue

<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## Screenshots (if appropriate):

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] Documentation Update (if none of the other choices apply)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

- [ ] Code compiles correctly.
- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have read the **CONTRIBUTING** document.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.


codecov-commenter: # [Codecov](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss) Report
> Merging [#626](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss) (58c15fd) into [main](https://codecov.io/gh/dragonflyoss/Dragonfly2/commit/a18928e9eebacbac73fe9931b3925a5044dbc6d3?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss) (a18928e) will **increase** coverage by `0.17%`.
> The diff coverage is `n/a`.

[![Impacted file tree graph](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626/graphs/tree.svg?width=650&height=150&src=pr&token=PUICJYSAT7&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss)](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss)

```diff
@@            Coverage Diff             @@
##             main     #626      +/-   ##
==========================================
+ Coverage   38.36%   38.54%   +0.17%     
==========================================
  Files          88       88              
  Lines        6969     6969              
==========================================
+ Hits         2674     2686      +12     
+ Misses       3916     3903      -13     
- Partials      379      380       +1     
```

| Flag | Coverage Δ | |
|---|---|---|
| e2etests | `?` | |
| unittests | `38.54% <ø> (+0.17%)` | :arrow_up: |

Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss#carryforward-flags-in-the-pull-request-comment) to find out more.

| [Impacted Files](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss) | Coverage Δ | |
|---|---|---|
| [cdn/cdnutil/cdn\_util.go](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss#diff-Y2RuL2NkbnV0aWwvY2RuX3V0aWwuZ28=) | `12.50% <ø> (ø)` | |
| [cdn/errors/errors.go](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss#diff-Y2RuL2Vycm9ycy9lcnJvcnMuZ28=) | `76.66% <ø> (ø)` | |
| [cdn/plugins/plugin\_manager.go](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss#diff-Y2RuL3BsdWdpbnMvcGx1Z2luX21hbmFnZXIuZ28=) | `96.07% <ø> (ø)` | |
| [cdn/plugins/plugins.go](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss#diff-Y2RuL3BsdWdpbnMvcGx1Z2lucy5nbw==) | `0.00% <ø> (ø)` | |
| [cdn/rpcserver/rpcserver.go](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss#diff-Y2RuL3JwY3NlcnZlci9ycGNzZXJ2ZXIuZ28=) | `0.66% <ø> (ø)` | |
| [cdn/storedriver/driver.go](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss#diff-Y2RuL3N0b3JlZHJpdmVyL2RyaXZlci5nbw==) | `16.66% <ø> (ø)` | |
| [cdn/storedriver/local/local\_driver.go](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss#diff-Y2RuL3N0b3JlZHJpdmVyL2xvY2FsL2xvY2FsX2RyaXZlci5nbw==) | `51.89% <ø> (ø)` | |
| [cdn/storedriver/mock\_driver.go](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss#diff-Y2RuL3N0b3JlZHJpdmVyL21vY2tfZHJpdmVyLmdv) | `0.00% <ø> (ø)` | |
| [cdn/storedriver/store\_mgr.go](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss#diff-Y2RuL3N0b3JlZHJpdmVyL3N0b3JlX21nci5nbw==) | `60.00% <ø> (ø)` | |
| [cdn/storedriver/store\_util.go](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss#diff-Y2RuL3N0b3JlZHJpdmVyL3N0b3JlX3V0aWwuZ28=) | `0.00% <ø> (ø)` | |
| ... and [15 more](https://codecov.io/gh/dragonflyoss/Dragonfly2/pull/626/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dragonflyoss) | |


Patch:
diff --git a/cdnsystem/cdn.go b/cdn/cdn.go
similarity index 91%
rename from cdnsystem/cdn.go
rename to cdn/cdn.go
index eebb3639..0fbaa119 100644
--- a/cdnsystem/cdn.go
+++ b/cdn/cdn.go
@@ -15,21 +15,21 @@
  */
 
 // Package cdnsystem cdn server
-package cdnsystem
+package cdn
 
 import (
 	"context"
 	"fmt"
 	"runtime"
 
-	"d7y.io/dragonfly/v2/cdnsystem/config"
-	"d7y.io/dragonfly/v2/cdnsystem/plugins"
-	"d7y.io/dragonfly/v2/cdnsystem/rpcserver"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/gc"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/progress"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/task"
+	"d7y.io/dragonfly/v2/cdn/config"
+	"d7y.io/dragonfly/v2/cdn/plugins"
+	"d7y.io/dragonfly/v2/cdn/rpcserver"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage"
+	"d7y.io/dragonfly/v2/cdn/supervisor/gc"
+	"d7y.io/dragonfly/v2/cdn/supervisor/progress"
+	"d7y.io/dragonfly/v2/cdn/supervisor/task"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
 	"d7y.io/dragonfly/v2/pkg/rpc"
 	"d7y.io/dragonfly/v2/pkg/rpc/cdnsystem/server"
diff --git a/cdnsystem/cdnutil/cdn_util.go b/cdn/cdnutil/cdn_util.go
similarity index 97%
rename from cdnsystem/cdnutil/cdn_util.go
rename to cdn/cdnutil/cdn_util.go
index 9e301e57..3112a129 100644
--- a/cdnsystem/cdnutil/cdn_util.go
+++ b/cdn/cdnutil/cdn_util.go
@@ -19,7 +19,7 @@ package cdnutil
 import (
 	"fmt"
 
-	"d7y.io/dragonfly/v2/cdnsystem/config"
+	"d7y.io/dragonfly/v2/cdn/config"
 	"d7y.io/dragonfly/v2/pkg/util/net/iputils"
 )
 
diff --git a/cdnsystem/cdnutil/cdn_util_test.go b/cdn/cdnutil/cdn_util_test.go
similarity index 100%
rename from cdnsystem/cdnutil/cdn_util_test.go
rename to cdn/cdnutil/cdn_util_test.go
diff --git a/cdnsystem/config/config.go b/cdn/config/config.go
similarity index 95%
rename from cdnsystem/config/config.go
rename to cdn/config/config.go
index eec94d39..55f9b091 100644
--- a/cdnsystem/config/config.go
+++ b/cdn/config/config.go
@@ -19,12 +19,12 @@ package config
 import (
 	"time"
 
-	"d7y.io/dragonfly/v2/cdnsystem/plugins"
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver"
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver/local"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage/disk"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage/hybrid"
+	"d7y.io/dragonfly/v2/cdn/plugins"
+	"d7y.io/dragonfly/v2/cdn/storedriver"
+	"d7y.io/dragonfly/v2/cdn/storedriver/local"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage/disk"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage/hybrid"
 	"d7y.io/dragonfly/v2/cmd/dependency/base"
 	"d7y.io/dragonfly/v2/pkg/unit"
 	"d7y.io/dragonfly/v2/pkg/util/net/iputils"
diff --git a/cdnsystem/config/constants.go b/cdn/config/constants.go
similarity index 100%
rename from cdnsystem/config/constants.go
rename to cdn/config/constants.go
diff --git a/cdnsystem/config/constants_otel.go b/cdn/config/constants_otel.go
similarity index 100%
rename from cdnsystem/config/constants_otel.go
rename to cdn/config/constants_otel.go
diff --git a/cdnsystem/config/store_path.go b/cdn/config/store_path.go
similarity index 100%
rename from cdnsystem/config/store_path.go
rename to cdn/config/store_path.go
diff --git a/cdnsystem/errors/errors.go b/cdn/errors/errors.go
similarity index 100%
rename from cdnsystem/errors/errors.go
rename to cdn/errors/errors.go
diff --git a/cdnsystem/errors/errors_test.go b/cdn/errors/errors_test.go
similarity index 100%
rename from cdnsystem/errors/errors_test.go
rename to cdn/errors/errors_test.go
diff --git a/cdnsystem/plugins/plugin_manager.go b/cdn/plugins/plugin_manager.go
similarity index 100%
rename from cdnsystem/plugins/plugin_manager.go
rename to cdn/plugins/plugin_manager.go
diff --git a/cdnsystem/plugins/plugin_type.go b/cdn/plugins/plugin_type.go
similarity index 100%
rename from cdnsystem/plugins/plugin_type.go
rename to cdn/plugins/plugin_type.go
diff --git a/cdnsystem/plugins/plugins.go b/cdn/plugins/plugins.go
similarity index 100%
rename from cdnsystem/plugins/plugins.go
rename to cdn/plugins/plugins.go
diff --git a/cdnsystem/plugins/plugins_test.go b/cdn/plugins/plugins_test.go
similarity index 100%
rename from cdnsystem/plugins/plugins_test.go
rename to cdn/plugins/plugins_test.go
diff --git a/cdnsystem/rpcserver/rpcserver.go b/cdn/rpcserver/rpcserver.go
similarity index 97%
rename from cdnsystem/rpcserver/rpcserver.go
rename to cdn/rpcserver/rpcserver.go
index 9d1099b3..457b5864 100644
--- a/cdnsystem/rpcserver/rpcserver.go
+++ b/cdn/rpcserver/rpcserver.go
@@ -21,11 +21,11 @@ import (
 	"fmt"
 	"strings"
 
-	"d7y.io/dragonfly/v2/cdnsystem/cdnutil"
-	"d7y.io/dragonfly/v2/cdnsystem/config"
-	cdnerrors "d7y.io/dragonfly/v2/cdnsystem/errors"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/cdnutil"
+	"d7y.io/dragonfly/v2/cdn/config"
+	cdnerrors "d7y.io/dragonfly/v2/cdn/errors"
+	"d7y.io/dragonfly/v2/cdn/supervisor"
+	"d7y.io/dragonfly/v2/cdn/types"
 	"d7y.io/dragonfly/v2/internal/dfcodes"
 	"d7y.io/dragonfly/v2/internal/dferrors"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
diff --git a/cdnsystem/storedriver/driver.go b/cdn/storedriver/driver.go
similarity index 98%
rename from cdnsystem/storedriver/driver.go
rename to cdn/storedriver/driver.go
index 71ebd084..b98703a8 100644
--- a/cdnsystem/storedriver/driver.go
+++ b/cdn/storedriver/driver.go
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-//go:generate mockgen -destination ./mock_driver.go -package storedriver d7y.io/dragonfly/v2/cdnsystem/storedriver Driver
+//go:generate mockgen -destination ./mock_driver.go -package storedriver d7y.io/dragonfly/v2/cdn/storedriver Driver
 
 package storedriver
 
@@ -23,8 +23,8 @@ import (
 	"path/filepath"
 	"time"
 
-	cdnerrors "d7y.io/dragonfly/v2/cdnsystem/errors"
-	"d7y.io/dragonfly/v2/cdnsystem/plugins"
+	cdnerrors "d7y.io/dragonfly/v2/cdn/errors"
+	"d7y.io/dragonfly/v2/cdn/plugins"
 	"d7y.io/dragonfly/v2/pkg/unit"
 	"d7y.io/dragonfly/v2/pkg/util/stringutils"
 	"github.com/pkg/errors"
diff --git a/cdnsystem/storedriver/local/local_driver.go b/cdn/storedriver/local/local_driver.go
similarity index 99%
rename from cdnsystem/storedriver/local/local_driver.go
rename to cdn/storedriver/local/local_driver.go
index 57815dce..83ee3f3c 100644
--- a/cdnsystem/storedriver/local/local_driver.go
+++ b/cdn/storedriver/local/local_driver.go
@@ -23,8 +23,8 @@ import (
 	"os"
 	"path/filepath"
 
-	cdnerrors "d7y.io/dragonfly/v2/cdnsystem/errors"
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver"
+	cdnerrors "d7y.io/dragonfly/v2/cdn/errors"
+	"d7y.io/dragonfly/v2/cdn/storedriver"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
 	"d7y.io/dragonfly/v2/pkg/synclock"
 	"d7y.io/dragonfly/v2/pkg/unit"
diff --git a/cdnsystem/storedriver/mock_driver.go b/cdn/storedriver/mock_driver.go
similarity index 99%
rename from cdnsystem/storedriver/mock_driver.go
rename to cdn/storedriver/mock_driver.go
index bd56e04d..809514dc 100644
--- a/cdnsystem/storedriver/mock_driver.go
+++ b/cdn/storedriver/mock_driver.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: d7y.io/dragonfly/v2/cdnsystem/storedriver (interfaces: Driver)
+// Source: d7y.io/dragonfly/v2/cdn/storedriver (interfaces: Driver)
 
 // Package storedriver is a generated GoMock package.
 package storedriver
diff --git a/cdnsystem/storedriver/store_mgr.go b/cdn/storedriver/store_mgr.go
similarity index 97%
rename from cdnsystem/storedriver/store_mgr.go
rename to cdn/storedriver/store_mgr.go
index 84138331..274624f4 100644
--- a/cdnsystem/storedriver/store_mgr.go
+++ b/cdn/storedriver/store_mgr.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"d7y.io/dragonfly/v2/cdnsystem/plugins"
+	"d7y.io/dragonfly/v2/cdn/plugins"
 	"d7y.io/dragonfly/v2/pkg/util/fileutils"
 	"github.com/mitchellh/mapstructure"
 )
diff --git a/cdnsystem/storedriver/store_util.go b/cdn/storedriver/store_util.go
similarity index 97%
rename from cdnsystem/storedriver/store_util.go
rename to cdn/storedriver/store_util.go
index 918e8a76..950369bf 100644
--- a/cdnsystem/storedriver/store_util.go
+++ b/cdn/storedriver/store_util.go
@@ -17,7 +17,7 @@
 package storedriver
 
 import (
-	cdnerrors "d7y.io/dragonfly/v2/cdnsystem/errors"
+	cdnerrors "d7y.io/dragonfly/v2/cdn/errors"
 	"github.com/pkg/errors"
 )
 
diff --git a/cdnsystem/supervisor/cdn/cache_data_mgr.go b/cdn/supervisor/cdn/cache_data_mgr.go
similarity index 98%
rename from cdnsystem/supervisor/cdn/cache_data_mgr.go
rename to cdn/supervisor/cdn/cache_data_mgr.go
index 2a51753e..dc5a7662 100644
--- a/cdnsystem/supervisor/cdn/cache_data_mgr.go
+++ b/cdn/supervisor/cdn/cache_data_mgr.go
@@ -21,9 +21,9 @@ import (
 	"io"
 	"sort"
 
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/storedriver"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage"
+	"d7y.io/dragonfly/v2/cdn/types"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
 	"d7y.io/dragonfly/v2/pkg/synclock"
 	"d7y.io/dragonfly/v2/pkg/util/digestutils"
diff --git a/cdnsystem/supervisor/cdn/cache_detector.go b/cdn/supervisor/cdn/cache_detector.go
similarity index 98%
rename from cdnsystem/supervisor/cdn/cache_detector.go
rename to cdn/supervisor/cdn/cache_detector.go
index ccef76bb..ee6dcc5e 100644
--- a/cdnsystem/supervisor/cdn/cache_detector.go
+++ b/cdn/supervisor/cdn/cache_detector.go
@@ -26,10 +26,10 @@ import (
 	"sort"
 	"time"
 
-	"d7y.io/dragonfly/v2/cdnsystem/config"
-	cdnerrors "d7y.io/dragonfly/v2/cdnsystem/errors"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/config"
+	cdnerrors "d7y.io/dragonfly/v2/cdn/errors"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage"
+	"d7y.io/dragonfly/v2/cdn/types"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
 	"d7y.io/dragonfly/v2/pkg/source"
 	"d7y.io/dragonfly/v2/pkg/util/digestutils"
diff --git a/cdnsystem/supervisor/cdn/cache_writer.go b/cdn/supervisor/cdn/cache_writer.go
similarity index 98%
rename from cdnsystem/supervisor/cdn/cache_writer.go
rename to cdn/supervisor/cdn/cache_writer.go
index 3c413100..5e8467ba 100644
--- a/cdnsystem/supervisor/cdn/cache_writer.go
+++ b/cdn/supervisor/cdn/cache_writer.go
@@ -25,9 +25,9 @@ import (
 	"io"
 	"sync"
 
-	"d7y.io/dragonfly/v2/cdnsystem/config"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/config"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage"
+	"d7y.io/dragonfly/v2/cdn/types"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
 	"d7y.io/dragonfly/v2/pkg/util/digestutils"
 	"d7y.io/dragonfly/v2/pkg/util/rangeutils"
diff --git a/cdnsystem/supervisor/cdn/downloader.go b/cdn/supervisor/cdn/downloader.go
similarity index 98%
rename from cdnsystem/supervisor/cdn/downloader.go
rename to cdn/supervisor/cdn/downloader.go
index dfa64a4a..a355457f 100644
--- a/cdnsystem/supervisor/cdn/downloader.go
+++ b/cdn/supervisor/cdn/downloader.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"io"
 
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/types"
 	"d7y.io/dragonfly/v2/pkg/source"
 	"d7y.io/dragonfly/v2/pkg/structure/maputils"
 	"d7y.io/dragonfly/v2/pkg/util/rangeutils"
diff --git a/cdnsystem/supervisor/cdn/manager.go b/cdn/supervisor/cdn/manager.go
similarity index 95%
rename from cdnsystem/supervisor/cdn/manager.go
rename to cdn/supervisor/cdn/manager.go
index 86952de9..ee405f72 100644
--- a/cdnsystem/supervisor/cdn/manager.go
+++ b/cdn/supervisor/cdn/manager.go
@@ -27,17 +27,17 @@ import (
 	"context"
 	"fmt"
 
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor"
-	_ "d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage/disk"   // To register diskStorage
-	_ "d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage/hybrid" // To register hybridStorage
+	"d7y.io/dragonfly/v2/cdn/supervisor"
+	_ "d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage/disk"   // To register diskStorage
+	_ "d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage/hybrid" // To register hybridStorage
 	"d7y.io/dragonfly/v2/pkg/rpc/cdnsystem/server"
 
 	"d7y.io/dragonfly/v2/pkg/synclock"
 	"d7y.io/dragonfly/v2/pkg/util/timeutils"
 
-	"d7y.io/dragonfly/v2/cdnsystem/config"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/config"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage"
+	"d7y.io/dragonfly/v2/cdn/types"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
 	"d7y.io/dragonfly/v2/pkg/ratelimiter/limitreader"
 	"d7y.io/dragonfly/v2/pkg/ratelimiter/ratelimiter"
diff --git a/cdnsystem/supervisor/cdn/reporter.go b/cdn/supervisor/cdn/reporter.go
similarity index 94%
rename from cdnsystem/supervisor/cdn/reporter.go
rename to cdn/supervisor/cdn/reporter.go
index e3e30f02..4325a254 100644
--- a/cdnsystem/supervisor/cdn/reporter.go
+++ b/cdn/supervisor/cdn/reporter.go
@@ -19,9 +19,9 @@ package cdn
 import (
 	"context"
 
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/supervisor"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage"
+	"d7y.io/dragonfly/v2/cdn/types"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
diff --git a/cdnsystem/supervisor/cdn/storage/disk/disk.go b/cdn/supervisor/cdn/storage/disk/disk.go
similarity index 96%
rename from cdnsystem/supervisor/cdn/storage/disk/disk.go
rename to cdn/supervisor/cdn/storage/disk/disk.go
index 1c83ff69..51b46416 100644
--- a/cdnsystem/supervisor/cdn/storage/disk/disk.go
+++ b/cdn/supervisor/cdn/storage/disk/disk.go
@@ -27,13 +27,13 @@ import (
 
 	"go.uber.org/atomic"
 
-	cdnerrors "d7y.io/dragonfly/v2/cdnsystem/errors"
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver"
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver/local"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/gc"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	cdnerrors "d7y.io/dragonfly/v2/cdn/errors"
+	"d7y.io/dragonfly/v2/cdn/storedriver"
+	"d7y.io/dragonfly/v2/cdn/storedriver/local"
+	"d7y.io/dragonfly/v2/cdn/supervisor"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage"
+	"d7y.io/dragonfly/v2/cdn/supervisor/gc"
+	"d7y.io/dragonfly/v2/cdn/types"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
 	"d7y.io/dragonfly/v2/pkg/synclock"
 	"d7y.io/dragonfly/v2/pkg/unit"
diff --git a/cdnsystem/supervisor/cdn/storage/helper_darwin.go b/cdn/supervisor/cdn/storage/helper_darwin.go
similarity index 100%
rename from cdnsystem/supervisor/cdn/storage/helper_darwin.go
rename to cdn/supervisor/cdn/storage/helper_darwin.go
diff --git a/cdnsystem/supervisor/cdn/storage/helper_linux.go b/cdn/supervisor/cdn/storage/helper_linux.go
similarity index 100%
rename from cdnsystem/supervisor/cdn/storage/helper_linux.go
rename to cdn/supervisor/cdn/storage/helper_linux.go
diff --git a/cdnsystem/supervisor/cdn/storage/hybrid/hybrid.go b/cdn/supervisor/cdn/storage/hybrid/hybrid.go
similarity index 97%
rename from cdnsystem/supervisor/cdn/storage/hybrid/hybrid.go
rename to cdn/supervisor/cdn/storage/hybrid/hybrid.go
index 2da03e9e..008b312b 100644
--- a/cdnsystem/supervisor/cdn/storage/hybrid/hybrid.go
+++ b/cdn/supervisor/cdn/storage/hybrid/hybrid.go
@@ -26,13 +26,13 @@ import (
 	"sync"
 	"time"
 
-	cdnerrors "d7y.io/dragonfly/v2/cdnsystem/errors"
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver"
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver/local"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/gc"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	cdnerrors "d7y.io/dragonfly/v2/cdn/errors"
+	"d7y.io/dragonfly/v2/cdn/storedriver"
+	"d7y.io/dragonfly/v2/cdn/storedriver/local"
+	"d7y.io/dragonfly/v2/cdn/supervisor"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage"
+	"d7y.io/dragonfly/v2/cdn/supervisor/gc"
+	"d7y.io/dragonfly/v2/cdn/types"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
 	"d7y.io/dragonfly/v2/pkg/synclock"
 	"d7y.io/dragonfly/v2/pkg/unit"
diff --git a/cdnsystem/supervisor/cdn/storage/hybrid/shm_switch.go b/cdn/supervisor/cdn/storage/hybrid/shm_switch.go
similarity index 100%
rename from cdnsystem/supervisor/cdn/storage/hybrid/shm_switch.go
rename to cdn/supervisor/cdn/storage/hybrid/shm_switch.go
diff --git a/cdnsystem/supervisor/cdn/storage/mock/mock_storage_mgr.go b/cdn/supervisor/cdn/storage/mock/mock_storage_mgr.go
similarity index 96%
rename from cdnsystem/supervisor/cdn/storage/mock/mock_storage_mgr.go
rename to cdn/supervisor/cdn/storage/mock/mock_storage_mgr.go
index eafa7a3c..0eb044ab 100644
--- a/cdnsystem/supervisor/cdn/storage/mock/mock_storage_mgr.go
+++ b/cdn/supervisor/cdn/storage/mock/mock_storage_mgr.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage (interfaces: Manager)
+// Source: d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage (interfaces: Manager)
 
 // Package mock is a generated GoMock package.
 package mock
@@ -8,10 +8,10 @@ import (
 	io "io"
 	reflect "reflect"
 
-	storedriver "d7y.io/dragonfly/v2/cdnsystem/storedriver"
-	supervisor "d7y.io/dragonfly/v2/cdnsystem/supervisor"
-	storage "d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage"
-	types "d7y.io/dragonfly/v2/cdnsystem/types"
+	storedriver "d7y.io/dragonfly/v2/cdn/storedriver"
+	supervisor "d7y.io/dragonfly/v2/cdn/supervisor"
+	storage "d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage"
+	types "d7y.io/dragonfly/v2/cdn/types"
 	gomock "github.com/golang/mock/gomock"
 )
 
diff --git a/cdnsystem/supervisor/cdn/storage/path_util.go b/cdn/supervisor/cdn/storage/path_util.go
similarity index 98%
rename from cdnsystem/supervisor/cdn/storage/path_util.go
rename to cdn/supervisor/cdn/storage/path_util.go
index 4e302ff3..09e50166 100644
--- a/cdnsystem/supervisor/cdn/storage/path_util.go
+++ b/cdn/supervisor/cdn/storage/path_util.go
@@ -19,7 +19,7 @@ package storage
 import (
 	"path"
 
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver"
+	"d7y.io/dragonfly/v2/cdn/storedriver"
 	"d7y.io/dragonfly/v2/pkg/util/stringutils"
 )
 
diff --git a/cdnsystem/supervisor/cdn/storage/storage_gc.go b/cdn/supervisor/cdn/storage/storage_gc.go
similarity index 97%
rename from cdnsystem/supervisor/cdn/storage/storage_gc.go
rename to cdn/supervisor/cdn/storage/storage_gc.go
index 053e382d..0af93fff 100644
--- a/cdnsystem/supervisor/cdn/storage/storage_gc.go
+++ b/cdn/supervisor/cdn/storage/storage_gc.go
@@ -22,9 +22,9 @@ import (
 	"strings"
 	"time"
 
-	cdnerrors "d7y.io/dragonfly/v2/cdnsystem/errors"
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor"
+	cdnerrors "d7y.io/dragonfly/v2/cdn/errors"
+	"d7y.io/dragonfly/v2/cdn/storedriver"
+	"d7y.io/dragonfly/v2/cdn/supervisor"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
 	"d7y.io/dragonfly/v2/pkg/util/timeutils"
 	"github.com/emirpasic/gods/maps/treemap"
diff --git a/cdnsystem/supervisor/cdn/storage/storage_mgr.go b/cdn/supervisor/cdn/storage/storage_mgr.go
similarity index 97%
rename from cdnsystem/supervisor/cdn/storage/storage_mgr.go
rename to cdn/supervisor/cdn/storage/storage_mgr.go
index 03b1f790..22d2df7c 100644
--- a/cdnsystem/supervisor/cdn/storage/storage_mgr.go
+++ b/cdn/supervisor/cdn/storage/storage_mgr.go
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-//go:generate mockgen -destination ./mock/mock_storage_mgr.go -package mock d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage Manager
+//go:generate mockgen -destination ./mock/mock_storage_mgr.go -package mock d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage Manager
 
 package storage
 
@@ -25,10 +25,10 @@ import (
 	"strings"
 	"time"
 
-	"d7y.io/dragonfly/v2/cdnsystem/plugins"
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/plugins"
+	"d7y.io/dragonfly/v2/cdn/storedriver"
+	"d7y.io/dragonfly/v2/cdn/supervisor"
+	"d7y.io/dragonfly/v2/cdn/types"
 	"d7y.io/dragonfly/v2/pkg/unit"
 	"d7y.io/dragonfly/v2/pkg/util/rangeutils"
 	"github.com/mitchellh/mapstructure"
diff --git a/cdnsystem/supervisor/cdn_mgr.go b/cdn/supervisor/cdn_mgr.go
similarity index 93%
rename from cdnsystem/supervisor/cdn_mgr.go
rename to cdn/supervisor/cdn_mgr.go
index fa036730..22ec1753 100644
--- a/cdnsystem/supervisor/cdn_mgr.go
+++ b/cdn/supervisor/cdn_mgr.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-//go:generate mockgen -destination ./mock/mock_cdn_mgr.go -package mock d7y.io/dragonfly/v2/cdnsystem/supervisor CDNMgr
+//go:generate mockgen -destination ./mock/mock_cdn_mgr.go -package mock d7y.io/dragonfly/v2/cdn/supervisor CDNMgr
 
 package supervisor
 
 import (
 	"context"
 
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/types"
 )
 
 // CDNMgr as an interface defines all operations against CDN and
diff --git a/cdnsystem/supervisor/gc/manager.go b/cdn/supervisor/gc/manager.go
similarity index 100%
rename from cdnsystem/supervisor/gc/manager.go
rename to cdn/supervisor/gc/manager.go
diff --git a/cdnsystem/supervisor/mock/mock_cdn_mgr.go b/cdn/supervisor/mock/mock_cdn_mgr.go
similarity index 95%
rename from cdnsystem/supervisor/mock/mock_cdn_mgr.go
rename to cdn/supervisor/mock/mock_cdn_mgr.go
index 31a7bcf3..19f665a4 100644
--- a/cdnsystem/supervisor/mock/mock_cdn_mgr.go
+++ b/cdn/supervisor/mock/mock_cdn_mgr.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: d7y.io/dragonfly/v2/cdnsystem/supervisor (interfaces: CDNMgr)
+// Source: d7y.io/dragonfly/v2/cdn/supervisor (interfaces: CDNMgr)
 
 // Package mock is a generated GoMock package.
 package mock
@@ -8,7 +8,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	types "d7y.io/dragonfly/v2/cdnsystem/types"
+	types "d7y.io/dragonfly/v2/cdn/types"
 	gomock "github.com/golang/mock/gomock"
 )
 
diff --git a/cdnsystem/supervisor/mock/mock_gc_mgr.go b/cdn/supervisor/mock/mock_gc_mgr.go
similarity index 95%
rename from cdnsystem/supervisor/mock/mock_gc_mgr.go
rename to cdn/supervisor/mock/mock_gc_mgr.go
index 74d9c6b2..b7944bb1 100644
--- a/cdnsystem/supervisor/mock/mock_gc_mgr.go
+++ b/cdn/supervisor/mock/mock_gc_mgr.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: d7y.io/dragonfly/v2/cdnsystem/supervisor/mgr (interfaces: GCMgr)
+// Source: d7y.io/dragonfly/v2/cdn/supervisor/mgr (interfaces: GCMgr)
 
 // Package mock is a generated GoMock package.
 package mock
diff --git a/cdnsystem/supervisor/mock/mock_progress_mgr.go b/cdn/supervisor/mock/mock_progress_mgr.go
similarity index 96%
rename from cdnsystem/supervisor/mock/mock_progress_mgr.go
rename to cdn/supervisor/mock/mock_progress_mgr.go
index 7e4cf83e..17abf4f2 100644
--- a/cdnsystem/supervisor/mock/mock_progress_mgr.go
+++ b/cdn/supervisor/mock/mock_progress_mgr.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: d7y.io/dragonfly/v2/cdnsystem/supervisor (interfaces: SeedProgressMgr)
+// Source: d7y.io/dragonfly/v2/cdn/supervisor (interfaces: SeedProgressMgr)
 
 // Package mock is a generated GoMock package.
 package mock
@@ -8,8 +8,8 @@ import (
 	context "context"
 	reflect "reflect"
 
-	supervisor "d7y.io/dragonfly/v2/cdnsystem/supervisor"
-	types "d7y.io/dragonfly/v2/cdnsystem/types"
+	supervisor "d7y.io/dragonfly/v2/cdn/supervisor"
+	types "d7y.io/dragonfly/v2/cdn/types"
 	gomock "github.com/golang/mock/gomock"
 )
 
diff --git a/cdnsystem/supervisor/mock/mock_task_mgr.go b/cdn/supervisor/mock/mock_task_mgr.go
similarity index 98%
rename from cdnsystem/supervisor/mock/mock_task_mgr.go
rename to cdn/supervisor/mock/mock_task_mgr.go
index f4d3dc40..070c3ebe 100644
--- a/cdnsystem/supervisor/mock/mock_task_mgr.go
+++ b/cdn/supervisor/mock/mock_task_mgr.go
@@ -8,7 +8,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	types "d7y.io/dragonfly/v2/cdnsystem/types"
+	types "d7y.io/dragonfly/v2/cdn/types"
 	gomock "github.com/golang/mock/gomock"
 )
 
diff --git a/cdnsystem/supervisor/progress/manager.go b/cdn/supervisor/progress/manager.go
similarity index 98%
rename from cdnsystem/supervisor/progress/manager.go
rename to cdn/supervisor/progress/manager.go
index fa402410..d6fefe5b 100644
--- a/cdnsystem/supervisor/progress/manager.go
+++ b/cdn/supervisor/progress/manager.go
@@ -26,9 +26,9 @@ import (
 	"sync"
 	"time"
 
-	"d7y.io/dragonfly/v2/cdnsystem/config"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/config"
+	"d7y.io/dragonfly/v2/cdn/supervisor"
+	"d7y.io/dragonfly/v2/cdn/types"
 	"d7y.io/dragonfly/v2/internal/dferrors"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
 	"d7y.io/dragonfly/v2/pkg/structure/syncmap"
diff --git a/cdnsystem/supervisor/progress_mgr.go b/cdn/supervisor/progress_mgr.go
similarity index 93%
rename from cdnsystem/supervisor/progress_mgr.go
rename to cdn/supervisor/progress_mgr.go
index 2062a6a9..f6c5d192 100644
--- a/cdnsystem/supervisor/progress_mgr.go
+++ b/cdn/supervisor/progress_mgr.go
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-//go:generate mockgen -destination ./mock/mock_progress_mgr.go -package mock d7y.io/dragonfly/v2/cdnsystem/supervisor SeedProgressMgr
+//go:generate mockgen -destination ./mock/mock_progress_mgr.go -package mock d7y.io/dragonfly/v2/cdn/supervisor SeedProgressMgr
 
 package supervisor
 
 import (
 	"context"
 
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/types"
 )
 
 // SeedProgressMgr as an interface defines all operations about seed progress
diff --git a/cdnsystem/supervisor/task/manager.go b/cdn/supervisor/task/manager.go
similarity index 97%
rename from cdnsystem/supervisor/task/manager.go
rename to cdn/supervisor/task/manager.go
index c4d831a2..c6469d72 100644
--- a/cdnsystem/supervisor/task/manager.go
+++ b/cdn/supervisor/task/manager.go
@@ -21,11 +21,11 @@ import (
 	"encoding/json"
 	"time"
 
-	"d7y.io/dragonfly/v2/cdnsystem/config"
-	cdnerrors "d7y.io/dragonfly/v2/cdnsystem/errors"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/gc"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/config"
+	cdnerrors "d7y.io/dragonfly/v2/cdn/errors"
+	"d7y.io/dragonfly/v2/cdn/supervisor"
+	"d7y.io/dragonfly/v2/cdn/supervisor/gc"
+	"d7y.io/dragonfly/v2/cdn/types"
 	"d7y.io/dragonfly/v2/internal/dferrors"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
 	"d7y.io/dragonfly/v2/pkg/structure/syncmap"
diff --git a/cdnsystem/supervisor/task/manager_util.go b/cdn/supervisor/task/manager_util.go
similarity index 97%
rename from cdnsystem/supervisor/task/manager_util.go
rename to cdn/supervisor/task/manager_util.go
index 715c0529..1d301c92 100644
--- a/cdnsystem/supervisor/task/manager_util.go
+++ b/cdn/supervisor/task/manager_util.go
@@ -22,10 +22,10 @@ import (
 	"reflect"
 	"time"
 
-	"d7y.io/dragonfly/v2/cdnsystem/cdnutil"
-	"d7y.io/dragonfly/v2/cdnsystem/config"
-	cdnerrors "d7y.io/dragonfly/v2/cdnsystem/errors"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/cdnutil"
+	"d7y.io/dragonfly/v2/cdn/config"
+	cdnerrors "d7y.io/dragonfly/v2/cdn/errors"
+	"d7y.io/dragonfly/v2/cdn/types"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
 	"d7y.io/dragonfly/v2/pkg/source"
 	"d7y.io/dragonfly/v2/pkg/synclock"
diff --git a/cdnsystem/supervisor/task_mgr.go b/cdn/supervisor/task_mgr.go
similarity index 93%
rename from cdnsystem/supervisor/task_mgr.go
rename to cdn/supervisor/task_mgr.go
index 41d57a04..49c1d546 100644
--- a/cdnsystem/supervisor/task_mgr.go
+++ b/cdn/supervisor/task_mgr.go
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-//go:generate mockgen -destination ./mock/mock_task_mgr.go -package mock d7y.io/dragonfly/v2/cdnsystem/supervisor SeedTaskMgr
+//go:generate mockgen -destination ./mock/mock_task_mgr.go -package mock d7y.io/dragonfly/v2/cdn/supervisor SeedTaskMgr
 
 package supervisor
 
 import (
 	"context"
 
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/types"
 )
 
 // SeedTaskMgr as an interface defines all operations against SeedTask.
diff --git a/client/daemon/peer/piece_manager.go b/client/daemon/peer/piece_manager.go
index 301e7bb4..233cf81b 100644
--- a/client/daemon/peer/piece_manager.go
+++ b/client/daemon/peer/piece_manager.go
@@ -24,7 +24,7 @@ import (
 
 	"golang.org/x/time/rate"
 
-	"d7y.io/dragonfly/v2/cdnsystem/cdnutil"
+	"d7y.io/dragonfly/v2/cdn/cdnutil"
 	"d7y.io/dragonfly/v2/client/clientutil"
 	"d7y.io/dragonfly/v2/client/config"
 	"d7y.io/dragonfly/v2/client/daemon/storage"
diff --git a/cmd/cdn/cmd/root.go b/cmd/cdn/cmd/root.go
index da18a5e0..1fe03811 100644
--- a/cmd/cdn/cmd/root.go
+++ b/cmd/cdn/cmd/root.go
@@ -19,8 +19,8 @@ package cmd
 import (
 	"os"
 
-	"d7y.io/dragonfly/v2/cdnsystem"
-	"d7y.io/dragonfly/v2/cdnsystem/config"
+	"d7y.io/dragonfly/v2/cdn"
+	"d7y.io/dragonfly/v2/cdn/config"
 	"d7y.io/dragonfly/v2/cmd/dependency"
 	logger "d7y.io/dragonfly/v2/internal/dflog"
 	"d7y.io/dragonfly/v2/internal/dflog/logcore"
@@ -79,7 +79,7 @@ func runCdnSystem() error {
 	ff := dependency.InitMonitor(cfg.Verbose, cfg.PProfPort, cfg.Telemetry)
 	defer ff()
 
-	svr, err := cdnsystem.New(cfg)
+	svr, err := cdn.New(cfg)
 	if err != nil {
 		return err
 	}
diff --git a/docs/en/README.md b/docs/en/README.md
index 2f4ca7fa..8ba58dc7 100644
--- a/docs/en/README.md
+++ b/docs/en/README.md
@@ -8,7 +8,7 @@ Organization of document is as following:
 * [User Guide](#User-Guide)
 * [CLI Reference](#CLI-Reference)
     * [WIP dfget](cli-reference/dfget.md)
-    * [WIP cdnsystem](cli-reference/cdn.md)
+    * [WIP cdn](cli-reference/cdn.md)
     * [WIP scheduler](cli-reference/scheduler.md)
     * [manager](cli-reference/manager.md)
 * [API Reference](#API-Reference)
@@ -37,7 +37,7 @@ understand Dragonfly better would be included as well.
 
 ## CLI Reference
 
-For almost all users, commandline is the first reference you may need. Document in directory [CLI Reference](cli-reference) is about command detailed usage of Dragonfly CLI including `dfget`, `cdnsystem`, `scheduler` and `manager`. You can get introductions, synopsis, examples, options about command. Last but not least, Dragonfly can guarantee commandline docs is strongly consistent with Dragonfly CLI's source code. What's more, all commandline docs are auto generated via source code.
+For almost all users, commandline is the first reference you may need. Document in directory [CLI Reference](cli-reference) is about command detailed usage of Dragonfly CLI including `dfget`, `cdn`, `scheduler` and `manager`. You can get introductions, synopsis, examples, options about command. Last but not least, Dragonfly can guarantee commandline docs is strongly consistent with Dragonfly CLI's source code. What's more, all commandline docs are auto generated via source code.
 
 ## API Reference
 
diff --git a/docs/en/user-guide/install/README.md b/docs/en/user-guide/install/README.md
index a969f7fb..05c0f8c2 100644
--- a/docs/en/user-guide/install/README.md
+++ b/docs/en/user-guide/install/README.md
@@ -1,8 +1,20 @@
-[install-client](./install-dfdaemon.md) is the installation instructions of dfdaemon
+# Installation
 
-[install-manager](./install-manager.md) is the installation instructions of manager
+There are two installation methods, it is recommended to use helm charts to install as a whole, or install separately according to modules
 
-[install-scheduler](./install-scheduler.md) is the installation instructions of scheduler
+## Install with Helm Charts
 
-[install-cdn](./install-cdn.md) is the installation instructions of CDN
+> ArtifactHub Link: https://artifacthub.io/packages/helm/dragonfly/dragonfly
+
+It is recommended to use helm charts for installation, which is a simple and quick installation. [Kubernetes-with-Dragonfly](../../ecosystem/Kubernetes-with-Dragonfly.md) is the installation instructions of dragonfly.
+
+## Install separately
+
+* [install-client](./install-dfdaemon.md) is the installation instructions of dfdaemon
+
+* [install-manager](./install-manager.md) is the installation instructions of manager
+
+* [install-scheduler](./install-scheduler.md) is the installation instructions of scheduler
+
+* [install-cdn](./install-cdn.md) is the installation instructions of CDN
 
diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md
index b92ec246..a2933b46 100644
--- a/docs/zh-CN/README.md
+++ b/docs/zh-CN/README.md
@@ -8,7 +8,7 @@ Dragonfly Document 是关于 Dragonfly 的介绍。对于一般对 Dragonfly 感
 * [用户指南](#用户指南)
 * [CLI参考](#CLI参考)
     * [dfget](cli-reference/dfget.md)
-    * [cdnsystem](cli-reference/cdn.md)
+    * [cdn](cli-reference/cdn.md)
     * [scheduler](cli-reference/scheduler.md)
     * [manager](cli-reference/manager.md)
 * [API 参考](#API参考)
@@ -35,7 +35,7 @@ Dragonfly Document 是关于 Dragonfly 的介绍。对于一般对 Dragonfly 感
 
 ## CLI参考
 
-对于几乎所有用户，命令行是您可能需要的第一个参考。 [CLI Reference](cli-reference)目录下的文档是关于Dragonfly CLI的命令详细使用，包括`dfget`、`cdnsystem`、`scheduler`和`manager`。您可以获得有关命令的介绍、概要、示例和选项。最后但同样重要的是，Dragonfly 可以保证命令行文档与 Dragonfly CLI 的源代码高度一致。更重要的是，所有命令行文档都是通过源代码自动生成的。
+对于几乎所有用户，命令行是您可能需要的第一个参考。 [CLI Reference](cli-reference)目录下的文档是关于Dragonfly CLI的命令详细使用，包括`dfget`、`cdn`、`scheduler`和`manager`。您可以获得有关命令的介绍、概要、示例和选项。最后但同样重要的是，Dragonfly 可以保证命令行文档与 Dragonfly CLI 的源代码高度一致。更重要的是，所有命令行文档都是通过源代码自动生成的。
 
 ## API参考
 
diff --git a/docs/zh-CN/user-guide/install/README.md b/docs/zh-CN/user-guide/install/README.md
index 452dcabc..1c28aaa8 100644
--- a/docs/zh-CN/user-guide/install/README.md
+++ b/docs/zh-CN/user-guide/install/README.md
@@ -1,7 +1,19 @@
-[install-client](./install-dfdaemon.md) 是 dfdaemon 的安装指南
+# 安装
 
-[install-manager](./install-manager.md) 是 manager 的安装指南
+有两种安装模式，推荐使用 Helm Charts 一次性整体安装，也可以各模块单独安装。
 
-[install-scheduler](./install-scheduler.md) 是 scheduler 的安装指南
+## 使用 Helm Charts 进行按轧辊
 
-[install-cdn](./install-cdn.md) 是 CDN 的安装指南
+> ArtifactHub 仓库链接为: https://artifacthub.io/packages/helm/dragonfly/dragonfly
+
+推荐使用 Helm Charts 进行安装，简单且快捷。参考文档 [Kubernetes-with-Dragonfly](../../ecosystem/Kubernetes-with-Dragonfly.md)。
+
+## 按模块单独安装
+
+* [install-dfdaemon](./install-dfdaemon.md) 是 dfdaemon 的安装指南
+
+* [install-manager](./install-manager.md) 是 manager 的安装指南
+
+* [install-scheduler](./install-scheduler.md) 是 scheduler 的安装指南
+
+* [install-cdn](./install-cdn.md) 是 CDN 的安装指南
diff --git a/pkg/source/httpprotocol/http_source_client.go b/pkg/source/httpprotocol/http_source_client.go
index 2f3a69f4..730d7717 100644
--- a/pkg/source/httpprotocol/http_source_client.go
+++ b/pkg/source/httpprotocol/http_source_client.go
@@ -26,7 +26,7 @@ import (
 	"os"
 	"time"
 
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/types"
 	"d7y.io/dragonfly/v2/pkg/util/rangeutils"
 
 	"github.com/go-http-utils/headers"
diff --git a/pkg/source/ossprotocol/oss_source_client.go b/pkg/source/ossprotocol/oss_source_client.go
index 636cf3c9..aa5b81bd 100644
--- a/pkg/source/ossprotocol/oss_source_client.go
+++ b/pkg/source/ossprotocol/oss_source_client.go
@@ -27,7 +27,7 @@ import (
 
 	"d7y.io/dragonfly/v2/pkg/util/rangeutils"
 
-	cdnerrors "d7y.io/dragonfly/v2/cdnsystem/errors"
+	cdnerrors "d7y.io/dragonfly/v2/cdn/errors"
 	"d7y.io/dragonfly/v2/pkg/source"
 	"d7y.io/dragonfly/v2/pkg/util/stringutils"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"


Test patch:
diff --git a/.github/workflows/compatibility-e2e.yml b/.github/workflows/compatibility-e2e.yml
index b0fbc3cb..675b57ee 100644
--- a/.github/workflows/compatibility-e2e.yml
+++ b/.github/workflows/compatibility-e2e.yml
@@ -38,7 +38,7 @@ jobs:
       matrix:
         module: ["manager", "scheduler", "cdn", "dfdaemon"]
     needs: skip_check
-    if: needs.skip_check.outputs.noop != 'true'
+    if: ${{ needs.skip_check.outputs.should_skip != 'true' }}
 
     steps:
       - name: Checkout code
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 2ea09e50..24d009c9 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -33,7 +33,7 @@ jobs:
   e2e_tests:
     runs-on: ubuntu-latest
     needs: skip_check
-    if: needs.skip_check.outputs.noop != 'true'
+    if: ${{ needs.skip_check.outputs.should_skip != 'true' }}
 
     steps:
       - name: Checkout code
diff --git a/cdnsystem/rpcserver/rpcserver_test.go b/cdn/rpcserver/rpcserver_test.go
similarity index 97%
rename from cdnsystem/rpcserver/rpcserver_test.go
rename to cdn/rpcserver/rpcserver_test.go
index 0e00abb6..692fd76f 100644
--- a/cdnsystem/rpcserver/rpcserver_test.go
+++ b/cdn/rpcserver/rpcserver_test.go
@@ -21,9 +21,9 @@ import (
 	"reflect"
 	"testing"
 
-	"d7y.io/dragonfly/v2/cdnsystem/config"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/config"
+	"d7y.io/dragonfly/v2/cdn/supervisor"
+	"d7y.io/dragonfly/v2/cdn/types"
 	"d7y.io/dragonfly/v2/pkg/rpc/base"
 	"d7y.io/dragonfly/v2/pkg/rpc/cdnsystem"
 )
diff --git a/cdnsystem/storedriver/local/local_driver_test.go b/cdn/storedriver/local/local_driver_test.go
similarity index 99%
rename from cdnsystem/storedriver/local/local_driver_test.go
rename to cdn/storedriver/local/local_driver_test.go
index e9cf77bc..4b00fa2c 100644
--- a/cdnsystem/storedriver/local/local_driver_test.go
+++ b/cdn/storedriver/local/local_driver_test.go
@@ -26,9 +26,9 @@ import (
 	"syscall"
 	"testing"
 
-	"d7y.io/dragonfly/v2/cdnsystem/errors"
-	"d7y.io/dragonfly/v2/cdnsystem/plugins"
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver"
+	"d7y.io/dragonfly/v2/cdn/errors"
+	"d7y.io/dragonfly/v2/cdn/plugins"
+	"d7y.io/dragonfly/v2/cdn/storedriver"
 	"d7y.io/dragonfly/v2/pkg/unit"
 	"d7y.io/dragonfly/v2/pkg/util/statutils"
 	"github.com/stretchr/testify/suite"
diff --git a/cdnsystem/storedriver/store_mgr_test.go b/cdn/storedriver/store_mgr_test.go
similarity index 98%
rename from cdnsystem/storedriver/store_mgr_test.go
rename to cdn/storedriver/store_mgr_test.go
index 59bf0ffa..20a7c6f5 100644
--- a/cdnsystem/storedriver/store_mgr_test.go
+++ b/cdn/storedriver/store_mgr_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"d7y.io/dragonfly/v2/cdnsystem/plugins"
+	"d7y.io/dragonfly/v2/cdn/plugins"
 	"d7y.io/dragonfly/v2/pkg/unit"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/cdnsystem/supervisor/cdn/cache_detector_test.go b/cdn/supervisor/cdn/cache_detector_test.go
similarity index 98%
rename from cdnsystem/supervisor/cdn/cache_detector_test.go
rename to cdn/supervisor/cdn/cache_detector_test.go
index 5aeb6959..7c856048 100644
--- a/cdnsystem/supervisor/cdn/cache_detector_test.go
+++ b/cdn/supervisor/cdn/cache_detector_test.go
@@ -27,11 +27,11 @@ import (
 	"testing"
 	"time"
 
-	cdnerrors "d7y.io/dragonfly/v2/cdnsystem/errors"
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage"
-	storageMock "d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage/mock"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	cdnerrors "d7y.io/dragonfly/v2/cdn/errors"
+	"d7y.io/dragonfly/v2/cdn/storedriver"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage"
+	storageMock "d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage/mock"
+	"d7y.io/dragonfly/v2/cdn/types"
 	"d7y.io/dragonfly/v2/pkg/source"
 	sourceMock "d7y.io/dragonfly/v2/pkg/source/mock"
 	"d7y.io/dragonfly/v2/pkg/util/digestutils"
diff --git a/cdnsystem/supervisor/cdn/cache_writer_test.go b/cdn/supervisor/cdn/cache_writer_test.go
similarity index 94%
rename from cdnsystem/supervisor/cdn/cache_writer_test.go
rename to cdn/supervisor/cdn/cache_writer_test.go
index bf002b99..240e3641 100644
--- a/cdnsystem/supervisor/cdn/cache_writer_test.go
+++ b/cdn/supervisor/cdn/cache_writer_test.go
@@ -27,14 +27,14 @@ import (
 	"testing"
 	"time"
 
-	"d7y.io/dragonfly/v2/cdnsystem/config"
-	"d7y.io/dragonfly/v2/cdnsystem/plugins"
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver"
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver/local"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage/disk"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/progress"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/config"
+	"d7y.io/dragonfly/v2/cdn/plugins"
+	"d7y.io/dragonfly/v2/cdn/storedriver"
+	"d7y.io/dragonfly/v2/cdn/storedriver/local"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage/disk"
+	"d7y.io/dragonfly/v2/cdn/supervisor/progress"
+	"d7y.io/dragonfly/v2/cdn/types"
 	"d7y.io/dragonfly/v2/pkg/unit"
 	"github.com/stretchr/testify/suite"
 )
diff --git a/cdnsystem/supervisor/cdn/manager_test.go b/cdn/supervisor/cdn/manager_test.go
similarity index 97%
rename from cdnsystem/supervisor/cdn/manager_test.go
rename to cdn/supervisor/cdn/manager_test.go
index 7bd3c08f..83f9d92f 100644
--- a/cdnsystem/supervisor/cdn/manager_test.go
+++ b/cdn/supervisor/cdn/manager_test.go
@@ -25,11 +25,11 @@ import (
 	"strings"
 	"testing"
 
-	"d7y.io/dragonfly/v2/cdnsystem/config"
-	"d7y.io/dragonfly/v2/cdnsystem/plugins"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/mock"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/config"
+	"d7y.io/dragonfly/v2/cdn/plugins"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage"
+	"d7y.io/dragonfly/v2/cdn/supervisor/mock"
+	"d7y.io/dragonfly/v2/cdn/types"
 	"d7y.io/dragonfly/v2/internal/idgen"
 	"d7y.io/dragonfly/v2/pkg/rpc/base"
 	"d7y.io/dragonfly/v2/pkg/source"
diff --git a/cdnsystem/supervisor/cdn/storage/disk/disk_test.go b/cdn/supervisor/cdn/storage/disk/disk_test.go
similarity index 96%
rename from cdnsystem/supervisor/cdn/storage/disk/disk_test.go
rename to cdn/supervisor/cdn/storage/disk/disk_test.go
index 8143dcff..85085901 100644
--- a/cdnsystem/supervisor/cdn/storage/disk/disk_test.go
+++ b/cdn/supervisor/cdn/storage/disk/disk_test.go
@@ -20,9 +20,9 @@ import (
 	"fmt"
 	"testing"
 
-	"d7y.io/dragonfly/v2/cdnsystem/storedriver"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn/storage"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/mock"
+	"d7y.io/dragonfly/v2/cdn/storedriver"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn/storage"
+	"d7y.io/dragonfly/v2/cdn/supervisor/mock"
 	"github.com/golang/mock/gomock"
 
 	"d7y.io/dragonfly/v2/pkg/unit"
diff --git a/cdnsystem/supervisor/task/manager_test.go b/cdn/supervisor/task/manager_test.go
similarity index 95%
rename from cdnsystem/supervisor/task/manager_test.go
rename to cdn/supervisor/task/manager_test.go
index b71a4616..25680bcd 100644
--- a/cdnsystem/supervisor/task/manager_test.go
+++ b/cdn/supervisor/task/manager_test.go
@@ -20,9 +20,9 @@ import (
 	"context"
 	"testing"
 
-	"d7y.io/dragonfly/v2/cdnsystem/config"
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/mock"
-	"d7y.io/dragonfly/v2/cdnsystem/types"
+	"d7y.io/dragonfly/v2/cdn/config"
+	"d7y.io/dragonfly/v2/cdn/supervisor/mock"
+	"d7y.io/dragonfly/v2/cdn/types"
 	"d7y.io/dragonfly/v2/internal/idgen"
 	"d7y.io/dragonfly/v2/pkg/rpc/base"
 	"github.com/golang/mock/gomock"
diff --git a/cdnsystem/testdata/cdn/download/dra/dragonfly b/cdn/testdata/cdn/download/dra/dragonfly
similarity index 100%
rename from cdnsystem/testdata/cdn/download/dra/dragonfly
rename to cdn/testdata/cdn/download/dra/dragonfly
diff --git a/cdnsystem/testdata/cdn/download/dra/test1.piece b/cdn/testdata/cdn/download/dra/test1.piece
similarity index 100%
rename from cdnsystem/testdata/cdn/download/dra/test1.piece
rename to cdn/testdata/cdn/download/dra/test1.piece
diff --git a/cdnsystem/testdata/cdn/download/dra/test2.piece b/cdn/testdata/cdn/download/dra/test2.piece
similarity index 100%
rename from cdnsystem/testdata/cdn/download/dra/test2.piece
rename to cdn/testdata/cdn/download/dra/test2.piece
diff --git a/cdnsystem/testdata/cdn/go.html b/cdn/testdata/cdn/go.html
similarity index 100%
rename from cdnsystem/testdata/cdn/go.html
rename to cdn/testdata/cdn/go.html
diff --git a/cdnsystem/testdata/config/cdn.yaml b/cdn/testdata/config/cdn.yaml
similarity index 100%
rename from cdnsystem/testdata/config/cdn.yaml
rename to cdn/testdata/config/cdn.yaml
diff --git a/cdnsystem/types/seed_piece_info.go b/cdn/types/seed_piece_info.go
similarity index 100%
rename from cdnsystem/types/seed_piece_info.go
rename to cdn/types/seed_piece_info.go
diff --git a/cdnsystem/types/seed_task_info.go b/cdn/types/seed_task_info.go
similarity index 100%
rename from cdnsystem/types/seed_task_info.go
rename to cdn/types/seed_task_info.go
diff --git a/cdnsystem/types/task_register_request.go b/cdn/types/task_register_request.go
similarity index 100%
rename from cdnsystem/types/task_register_request.go
rename to cdn/types/task_register_request.go
diff --git a/client/daemon/peer/peertask_file_test.go b/client/daemon/peer/peertask_file_test.go
index 58ae8041..93dc058f 100644
--- a/client/daemon/peer/peertask_file_test.go
+++ b/client/daemon/peer/peertask_file_test.go
@@ -26,7 +26,7 @@ import (
 	"testing"
 	"time"
 
-	"d7y.io/dragonfly/v2/cdnsystem/cdnutil"
+	"d7y.io/dragonfly/v2/cdn/cdnutil"
 	"d7y.io/dragonfly/v2/pkg/rpc/base"
 	rangers "d7y.io/dragonfly/v2/pkg/util/rangeutils"
 
diff --git a/client/daemon/peer/peertask_manager_test.go b/client/daemon/peer/peertask_manager_test.go
index 65ed9b5b..4f81d6d1 100644
--- a/client/daemon/peer/peertask_manager_test.go
+++ b/client/daemon/peer/peertask_manager_test.go
@@ -35,7 +35,7 @@ import (
 	testifyassert "github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 
-	"d7y.io/dragonfly/v2/cdnsystem/cdnutil"
+	"d7y.io/dragonfly/v2/cdn/cdnutil"
 	"d7y.io/dragonfly/v2/client/clientutil"
 	"d7y.io/dragonfly/v2/client/config"
 	"d7y.io/dragonfly/v2/client/daemon/storage"
diff --git a/client/daemon/peer/peertask_stream_test.go b/client/daemon/peer/peertask_stream_test.go
index 5a00ce69..ad673d34 100644
--- a/client/daemon/peer/peertask_stream_test.go
+++ b/client/daemon/peer/peertask_stream_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/golang/mock/gomock"
 	testifyassert "github.com/stretchr/testify/assert"
 
-	"d7y.io/dragonfly/v2/cdnsystem/cdnutil"
+	"d7y.io/dragonfly/v2/cdn/cdnutil"
 	"d7y.io/dragonfly/v2/client/clientutil"
 	"d7y.io/dragonfly/v2/client/config"
 	"d7y.io/dragonfly/v2/client/daemon/test"
diff --git a/pkg/source/hdfsprotocol/hdfs_source_client_test.go b/pkg/source/hdfsprotocol/hdfs_source_client_test.go
index 1473574d..41a11dc1 100644
--- a/pkg/source/hdfsprotocol/hdfs_source_client_test.go
+++ b/pkg/source/hdfsprotocol/hdfs_source_client_test.go
@@ -26,7 +26,7 @@ import (
 	"testing"
 	"time"
 
-	"d7y.io/dragonfly/v2/cdnsystem/supervisor/cdn"
+	"d7y.io/dragonfly/v2/cdn/supervisor/cdn"
 	"d7y.io/dragonfly/v2/pkg/util/rangeutils"
 
 	"d7y.io/dragonfly/v2/pkg/source"
diff --git a/test/e2e/manager/preheat.go b/test/e2e/manager/preheat.go
index 3ef7a450..345c4dc3 100644
--- a/test/e2e/manager/preheat.go
+++ b/test/e2e/manager/preheat.go
@@ -180,9 +180,9 @@ var _ = Describe("Preheat with manager", func() {
 })
 
 func waitForDone(preheat *types.Preheat, pod *e2eutil.PodExec) bool {
-	ticker := time.NewTicker(3 * time.Second)
+	ticker := time.NewTicker(5 * time.Second)
 	defer ticker.Stop()
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
+	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute)
 	defer cancel()
 	for {
 		select {