diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/Fs.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/Fs.java
index e434bd72ee..f4eaa6697b 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/Fs.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/Fs.java
@@ -44,6 +44,8 @@ public interface Fs extends Closeable {
 
   boolean canRead(FsPath dest) throws IOException;
 
+  boolean canRead(FsPath dest, String user) throws IOException;
+
   boolean canWrite(FsPath dest) throws IOException;
 
   boolean exists(FsPath dest) throws IOException;
diff --git a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/HDFSFileSystem.java b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/HDFSFileSystem.java
index 74260470a6..56d846b31d 100644
--- a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/HDFSFileSystem.java
+++ b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/HDFSFileSystem.java
@@ -296,6 +296,11 @@ public boolean canRead(FsPath dest) throws IOException {
     return canAccess(dest, FsAction.READ);
   }
 
+  @Override
+  public boolean canRead(FsPath fsPath, String s) throws IOException {
+    return false;
+  }
+
   @Override
   public boolean canWrite(FsPath dest) throws IOException {
     return canAccess(dest, FsAction.WRITE);
diff --git a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java
index 0e3066489b..9516e90361 100644
--- a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java
+++ b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java
@@ -422,6 +422,11 @@ public boolean canRead(FsPath dest) throws IOException {
         PosixFilePermission.OTHERS_READ);
   }
 
+  @Override
+  public boolean canRead(FsPath fsPath, String s) throws IOException {
+    return false;
+  }
+
   @Override
   public boolean canWrite(FsPath dest) throws IOException {
     return can(
diff --git a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/OSSFileSystem.java b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/OSSFileSystem.java
index 99cf159a01..16e5beb539 100644
--- a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/OSSFileSystem.java
+++ b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/OSSFileSystem.java
@@ -286,6 +286,11 @@ public boolean canRead(FsPath dest) throws IOException {
     return true;
   }
 
+  @Override
+  public boolean canRead(FsPath fsPath, String s) throws IOException {
+    return false;
+  }
+
   @Override
   public boolean canWrite(FsPath dest) throws IOException {
     return true;
diff --git a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/S3FileSystem.java b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/S3FileSystem.java
index 026a6f9e0e..1e7a90532c 100644
--- a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/S3FileSystem.java
+++ b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/S3FileSystem.java
@@ -357,6 +357,11 @@ public boolean canRead(FsPath dest) {
     return true;
   }
 
+  @Override
+  public boolean canRead(FsPath fsPath, String s) throws IOException {
+    return false;
+  }
+
   @Override
   public boolean canWrite(FsPath dest) {
     return true;
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml b/linkis-public-enhancements/linkis-bml-server/pom.xml
similarity index 98%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
rename to linkis-public-enhancements/linkis-bml-server/pom.xml
index 0764146762..5e3a221b89 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
+++ b/linkis-public-enhancements/linkis-bml-server/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.linkis</groupId>
     <artifactId>linkis</artifactId>
     <version>${revision}</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>linkis-bmlserver</artifactId>
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-bml-server/src/main/assembly/distribution.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/assembly/distribution.xml
rename to linkis-public-enhancements/linkis-bml-server/src/main/assembly/distribution.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/LinkisBMLApplication.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/LinkisBMLApplication.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/LinkisBMLApplication.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/LinkisBMLApplication.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/Constant.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/Constant.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/Constant.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/Constant.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ExecutorManager.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ExecutorManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ExecutorManager.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ExecutorManager.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/HdfsResourceHelper.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/HdfsResourceHelper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/HdfsResourceHelper.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/HdfsResourceHelper.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/LocalResourceHelper.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/LocalResourceHelper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/LocalResourceHelper.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/LocalResourceHelper.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/OperationEnum.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/OperationEnum.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/OperationEnum.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/OperationEnum.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelper.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelper.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelper.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelperFactory.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelperFactory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelperFactory.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelperFactory.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ScheduledTask.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ScheduledTask.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ScheduledTask.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ScheduledTask.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/BmlProjectDao.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/BmlProjectDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/BmlProjectDao.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/BmlProjectDao.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/DownloadDao.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/DownloadDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/DownloadDao.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/DownloadDao.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/ResourceDao.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/ResourceDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/ResourceDao.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/ResourceDao.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/TaskDao.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/TaskDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/TaskDao.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/TaskDao.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/BmlProject.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/BmlProject.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/BmlProject.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/BmlProject.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/DownloadModel.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/DownloadModel.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/DownloadModel.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/DownloadModel.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Resource.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Resource.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Resource.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Resource.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceTask.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceTask.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceTask.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceTask.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceVersion.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceVersion.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceVersion.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceVersion.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Version.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Version.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Version.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Version.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/errorcode/BmlServerErrorCodeSummary.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/errorcode/BmlServerErrorCodeSummary.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/errorcode/BmlServerErrorCodeSummary.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/errorcode/BmlServerErrorCodeSummary.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/RestfulUtils.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/RestfulUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/RestfulUtils.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/RestfulUtils.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlProjectService.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlProjectService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlProjectService.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlProjectService.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlService.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlService.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlService.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlShareResourceService.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlShareResourceService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlShareResourceService.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlShareResourceService.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/DownloadService.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/DownloadService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/DownloadService.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/DownloadService.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/ResourceService.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/ResourceService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/ResourceService.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/ResourceService.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/TaskService.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/TaskService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/TaskService.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/TaskService.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/VersionService.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/VersionService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/VersionService.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/VersionService.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlProjectServiceImpl.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlProjectServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlProjectServiceImpl.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlProjectServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlServiceImpl.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlServiceImpl.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlShareResourceServiceImpl.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlShareResourceServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlShareResourceServiceImpl.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlShareResourceServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/DownloadServiceImpl.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/DownloadServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/DownloadServiceImpl.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/DownloadServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Scheduler.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Scheduler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Scheduler.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Scheduler.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Task.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Task.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Task.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Task.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/TaskState.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/TaskState.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/TaskState.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/TaskState.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/HttpRequestHelper.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/HttpRequestHelper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/HttpRequestHelper.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/HttpRequestHelper.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/MD5Utils.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/MD5Utils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/MD5Utils.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/MD5Utils.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceBasicVO.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceBasicVO.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceBasicVO.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceBasicVO.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVO.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVO.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVO.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVO.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVersionsVO.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVersionsVO.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVersionsVO.java
rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVersionsVO.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/DownloadMapper.xml b/linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/common/DownloadMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/DownloadMapper.xml
rename to linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/common/DownloadMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/mysql/BmlProjectMapper.xml b/linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/mysql/BmlProjectMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/mysql/BmlProjectMapper.xml
rename to linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/mysql/BmlProjectMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/mysql/ResourceMapper.xml b/linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/mysql/ResourceMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/mysql/ResourceMapper.xml
rename to linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/mysql/ResourceMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/mysql/TaskMapper.xml b/linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/mysql/TaskMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/mysql/TaskMapper.xml
rename to linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/mysql/TaskMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/mysql/VersionMapper.xml b/linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/mysql/VersionMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/mysql/VersionMapper.xml
rename to linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/mysql/VersionMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/postgresql/BmlProjectMapper.xml b/linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/postgresql/BmlProjectMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/postgresql/BmlProjectMapper.xml
rename to linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/postgresql/BmlProjectMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/postgresql/ResourceMapper.xml b/linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/postgresql/ResourceMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/postgresql/ResourceMapper.xml
rename to linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/postgresql/ResourceMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/postgresql/TaskMapper.xml b/linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/postgresql/TaskMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/postgresql/TaskMapper.xml
rename to linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/postgresql/TaskMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/postgresql/VersionMapper.xml b/linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/postgresql/VersionMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/postgresql/VersionMapper.xml
rename to linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/postgresql/VersionMapper.xml
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlAuthorityException.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlAuthorityException.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlAuthorityException.scala
rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlAuthorityException.scala
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlPermissionDeniedException.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlPermissionDeniedException.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlPermissionDeniedException.scala
rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlPermissionDeniedException.scala
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlQueryFailException.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlQueryFailException.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlQueryFailException.scala
rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlQueryFailException.scala
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlResourceExpiredException.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlResourceExpiredException.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlResourceExpiredException.scala
rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlResourceExpiredException.scala
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlServerParaErrorException.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlServerParaErrorException.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlServerParaErrorException.scala
rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlServerParaErrorException.scala
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/conf/BmlServerConfiguration.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/conf/BmlServerConfiguration.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/conf/BmlServerConfiguration.scala
rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/conf/BmlServerConfiguration.scala
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/protocol/BmlServerProtocol.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/protocol/BmlServerProtocol.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/protocol/BmlServerProtocol.scala
rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/protocol/BmlServerProtocol.scala
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/rpc/BmlReceiver.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/rpc/BmlReceiver.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/rpc/BmlReceiver.scala
rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/rpc/BmlReceiver.scala
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/Scan.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/Scan.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/Scan.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/Scan.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/WebApplicationServer.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/WebApplicationServer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/WebApplicationServer.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/WebApplicationServer.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/HdfsResourceHelperTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/HdfsResourceHelperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/HdfsResourceHelperTest.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/HdfsResourceHelperTest.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/LocalResourceHelperTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/LocalResourceHelperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/LocalResourceHelperTest.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/LocalResourceHelperTest.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/VersionServiceImplTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/VersionServiceImplTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/VersionServiceImplTest.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/VersionServiceImplTest.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BaseDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BaseDaoTest.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BaseDaoTest.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BmlProjectDaoTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BmlProjectDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BmlProjectDaoTest.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BmlProjectDaoTest.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/DownloadDaoTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/DownloadDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/DownloadDaoTest.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/DownloadDaoTest.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/ResourceDaoTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/ResourceDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/ResourceDaoTest.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/ResourceDaoTest.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/TaskDaoTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/TaskDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/TaskDaoTest.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/TaskDaoTest.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/BmlProjectServiceTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/BmlProjectServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/BmlProjectServiceTest.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/BmlProjectServiceTest.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/DownloadServiceImplTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/DownloadServiceImplTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/DownloadServiceImplTest.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/DownloadServiceImplTest.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/ResourceServiceImplTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/ResourceServiceImplTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/ResourceServiceImplTest.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/ResourceServiceImplTest.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/TaskServiceImplTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/TaskServiceImplTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/TaskServiceImplTest.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/TaskServiceImplTest.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/VersionServiceImplTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/VersionServiceImplTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/VersionServiceImplTest.java
rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/VersionServiceImplTest.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-bml-server/src/test/resources/application.properties
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/application.properties
rename to linkis-public-enhancements/linkis-bml-server/src/test/resources/application.properties
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/create.sql b/linkis-public-enhancements/linkis-bml-server/src/test/resources/create.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/create.sql
rename to linkis-public-enhancements/linkis-bml-server/src/test/resources/create.sql
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/create_pg.sql b/linkis-public-enhancements/linkis-bml-server/src/test/resources/create_pg.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/create_pg.sql
rename to linkis-public-enhancements/linkis-bml-server/src/test/resources/create_pg.sql
diff --git a/linkis-public-enhancements/linkis-bml/pom.xml b/linkis-public-enhancements/linkis-bml/pom.xml
deleted file mode 100644
index 6cbb16659a..0000000000
--- a/linkis-public-enhancements/linkis-bml/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~ 
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~ 
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.linkis</groupId>
-    <artifactId>linkis</artifactId>
-    <version>${revision}</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>linkis-bml</artifactId>
-
-  <packaging>pom</packaging>
-  <modules>
-    <module>linkis-bml-server</module>
-  </modules>
-
-</project>
diff --git a/linkis-public-enhancements/linkis-context-service/pom.xml b/linkis-public-enhancements/linkis-context-service/pom.xml
deleted file mode 100644
index c2d73e4b7b..0000000000
--- a/linkis-public-enhancements/linkis-context-service/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~ 
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~ 
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.linkis</groupId>
-    <artifactId>linkis</artifactId>
-    <version>${revision}</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>linkis-context-service</artifactId>
-
-  <packaging>pom</packaging>
-
-  <modules>
-
-    <module>linkis-cs-server</module>
-
-  </modules>
-
-</project>
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml b/linkis-public-enhancements/linkis-cs-server/pom.xml
similarity index 98%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
rename to linkis-public-enhancements/linkis-cs-server/pom.xml
index 31bf7a38e5..0c762ac242 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
+++ b/linkis-public-enhancements/linkis-cs-server/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.linkis</groupId>
     <artifactId>linkis</artifactId>
     <version>${revision}</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>linkis-cs-server</artifactId>
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-cs-server/src/main/assembly/distribution.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/assembly/distribution.xml
rename to linkis-public-enhancements/linkis-cs-server/src/main/assembly/distribution.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/ContextSearch.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/ContextSearch.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/ContextSearch.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/ContextSearch.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/DefaultContextSearch.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/DefaultContextSearch.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/DefaultContextSearch.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/DefaultContextSearch.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AbstractCommonCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AbstractCommonCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AbstractCommonCondition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AbstractCommonCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AtomicCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AtomicCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AtomicCondition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AtomicCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/BinaryLogicCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/BinaryLogicCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/BinaryLogicCondition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/BinaryLogicCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/Condition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/Condition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/Condition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/Condition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/ConditionType.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/ConditionType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/ConditionType.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/ConditionType.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/UnaryLogicCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/UnaryLogicCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/UnaryLogicCondition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/UnaryLogicCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/AndConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/AndConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/AndConditionParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/AndConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilder.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilder.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilder.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilder.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContainsConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContainsConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContainsConditionParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContainsConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextScopeConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextScopeConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextScopeConditionParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextScopeConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextTypeConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextTypeConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextTypeConditionParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextTypeConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextValueTypeConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextValueTypeConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextValueTypeConditionParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextValueTypeConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NearestConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NearestConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NearestConditionParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NearestConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NotConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NotConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NotConditionParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NotConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/OrConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/OrConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/OrConditionParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/OrConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/RegexConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/RegexConditionParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/RegexConditionParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/RegexConditionParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/AndCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/AndCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/AndCondition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/AndCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContainsCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContainsCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContainsCondition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContainsCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextScopeCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextScopeCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextScopeCondition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextScopeCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextTypeCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextTypeCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextTypeCondition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextTypeCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextValueTypeCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextValueTypeCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextValueTypeCondition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextValueTypeCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NearestCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NearestCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NearestCondition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NearestCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NotCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NotCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NotCondition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NotCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/OrCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/OrCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/OrCondition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/OrCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/RegexCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/RegexCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/RegexCondition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/RegexCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/ContextCacheService.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/ContextCacheService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/ContextCacheService.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/ContextCacheService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/ContextCache.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/ContextCache.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/ContextCache.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/ContextCache.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextAddListener.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextAddListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextAddListener.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextAddListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValue.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValue.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cleaner/AUTOCleaner.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cleaner/AUTOCleaner.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cleaner/AUTOCleaner.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cleaner/AUTOCleaner.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/conf/ContextCacheConf.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/conf/ContextCacheConf.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/conf/ContextCacheConf.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/conf/ContextCacheConf.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndex.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndex.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndex.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndex.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSet.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSet.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSet.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSet.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextCacheMetric.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextCacheMetric.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextCacheMetric.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextCacheMetric.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextIDMetric.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextIDMetric.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextIDMetric.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextIDMetric.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextIDMetric.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextIDMetric.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextIDMetric.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextIDMetric.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/Metrtic.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/Metrtic.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/Metrtic.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/Metrtic.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ObjectInfo.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ObjectInfo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ObjectInfo.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ObjectInfo.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/SizeEstimator.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/SizeEstimator.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/SizeEstimator.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/SizeEstimator.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/ContextKeyValueParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/ContextKeyValueParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/ContextKeyValueParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/ContextKeyValueParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/utils/ContextCacheUtils.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/utils/ContextCacheUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/utils/ContextCacheUtils.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/utils/ContextCacheUtils.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummary.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummary.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummary.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummary.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/exception/ContextSearchFailedException.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/exception/ContextSearchFailedException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/exception/ContextSearchFailedException.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/exception/ContextSearchFailedException.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/AbstractConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/AbstractConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/AbstractConditionExecution.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/AbstractConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ConditionExecution.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextCacheFetcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextCacheFetcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextCacheFetcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextCacheFetcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/AndConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/AndConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/AndConditionExecution.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/AndConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/BinaryLogicConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/BinaryLogicConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/BinaryLogicConditionExecution.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/BinaryLogicConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContainsConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContainsConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContainsConditionExecution.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContainsConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextScopeConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextScopeConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextScopeConditionExecution.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextScopeConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextTypeConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextTypeConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextTypeConditionExecution.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextTypeConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NearestConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NearestConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NearestConditionExecution.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NearestConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NotConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NotConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NotConditionExecution.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NotConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/OrConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/OrConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/OrConditionExecution.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/OrConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/RegexConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/RegexConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/RegexConditionExecution.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/RegexConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/UnaryLogicConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/UnaryLogicConditionExecution.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/UnaryLogicConditionExecution.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/UnaryLogicConditionExecution.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ConditionMatcherResolver.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ConditionMatcherResolver.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ConditionMatcherResolver.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ConditionMatcherResolver.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/RegexContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/RegexContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/RegexContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/RegexContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/SkipContextSearchMather.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/SkipContextSearchMather.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/SkipContextSearchMather.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/SkipContextSearchMather.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/AbstractContextSearchRuler.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/AbstractContextSearchRuler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/AbstractContextSearchRuler.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/AbstractContextSearchRuler.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/CommonListContextSearchRuler.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/CommonListContextSearchRuler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/CommonListContextSearchRuler.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/CommonListContextSearchRuler.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/ContextSearchRuler.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/ContextSearchRuler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/ContextSearchRuler.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/ContextSearchRuler.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/AbstractContextHAManager.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/AbstractContextHAManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/AbstractContextHAManager.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/AbstractContextHAManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ContextHAManager.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ContextHAManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ContextHAManager.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ContextHAManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/conf/ContextHighAvailableConf.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/conf/ContextHighAvailableConf.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/conf/ContextHighAvailableConf.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/conf/ContextHighAvailableConf.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/exception/CSErrorCode.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/exception/CSErrorCode.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/exception/CSErrorCode.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/exception/CSErrorCode.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/BackupInstanceGenerator.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/BackupInstanceGenerator.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/BackupInstanceGenerator.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/BackupInstanceGenerator.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAChecker.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAChecker.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAChecker.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAChecker.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAIDGenerator.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAIDGenerator.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAIDGenerator.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAIDGenerator.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/ConditionOptimizer.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/ConditionOptimizer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/ConditionOptimizer.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/ConditionOptimizer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/OptimizedCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/OptimizedCondition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/OptimizedCondition.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/OptimizedCondition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/cost/ConditionCostCalculator.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/cost/ConditionCostCalculator.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/cost/ConditionCostCalculator.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/cost/ConditionCostCalculator.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/BinaryTree.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/BinaryTree.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/BinaryTree.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/BinaryTree.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/MinCostBinaryTree.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/MinCostBinaryTree.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/MinCostBinaryTree.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/MinCostBinaryTree.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/Node.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/Node.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/Node.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/Node.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceBeans.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceBeans.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceBeans.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceBeans.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManager.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManager.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManagerImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManagerImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManagerImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManagerImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Ignore.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Ignore.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Ignore.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Ignore.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Tuning.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Tuning.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Tuning.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Tuning.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/aop/PersistenceTuningAspect.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/aop/PersistenceTuningAspect.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/aop/PersistenceTuningAspect.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/aop/PersistenceTuningAspect.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/conf/PersistenceConf.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/conf/PersistenceConf.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/conf/PersistenceConf.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/conf/PersistenceConf.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapper.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapper.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapper.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapper.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapper.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapper.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDMapper.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDMapper.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDMapper.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapper.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapper.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapper.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextMapMapper.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextMapMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextMapMapper.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextMapMapper.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/ExtraFieldClass.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/ExtraFieldClass.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/ExtraFieldClass.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/ExtraFieldClass.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextHistory.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextHistory.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextID.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextID.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextIDListener.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextIDListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextIDListener.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextIDListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKey.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKey.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyListener.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyListener.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyValue.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyValue.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextValue.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextValue.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/exception/ThrowingFunction.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/exception/ThrowingFunction.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/exception/ThrowingFunction.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/exception/ThrowingFunction.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextHistoryPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextHistoryPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextHistoryPersistence.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextHistoryPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDPersistence.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMapPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMapPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMapPersistence.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMapPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMetricsPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMetricsPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMetricsPersistence.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMetricsPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/KeywordContextHistoryPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/KeywordContextHistoryPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/KeywordContextHistoryPersistence.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/KeywordContextHistoryPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/TransactionManager.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/TransactionManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/TransactionManager.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/TransactionManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextHistoryPersistenceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextHistoryPersistenceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextHistoryPersistenceImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextHistoryPersistenceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/KeywordContextHistoryPersistenceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/KeywordContextHistoryPersistenceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/KeywordContextHistoryPersistenceImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/KeywordContextHistoryPersistenceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/util/PersistenceUtils.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/util/PersistenceUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/util/PersistenceUtils.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/util/PersistenceUtils.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/LinkisCSApplication.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/LinkisCSApplication.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/LinkisCSApplication.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/LinkisCSApplication.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/conf/ContextServerConf.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/conf/ContextServerConf.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/conf/ContextServerConf.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/conf/ContextServerConf.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceMethod.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceMethod.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceMethod.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceMethod.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceType.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceType.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceType.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/label/CSInstanceLabelClient.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/label/CSInstanceLabelClient.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/label/CSInstanceLabelClient.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/label/CSInstanceLabelClient.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/DefaultKeywordParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/DefaultKeywordParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/DefaultKeywordParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/DefaultKeywordParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordMethodEntity.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordMethodEntity.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordMethodEntity.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordMethodEntity.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/AbstractHttpRequestProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/AbstractHttpRequestProtocol.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/AbstractHttpRequestProtocol.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/AbstractHttpRequestProtocol.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextHistoryProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextHistoryProtocol.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextHistoryProtocol.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextHistoryProtocol.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextIDProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextIDProtocol.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextIDProtocol.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextIDProtocol.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextListenerProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextListenerProtocol.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextListenerProtocol.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextListenerProtocol.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextProtocol.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextProtocol.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextProtocol.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpProtocol.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpProtocol.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpProtocol.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpRequestProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpRequestProtocol.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpRequestProtocol.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpRequestProtocol.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpResponseProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpResponseProtocol.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpResponseProtocol.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpResponseProtocol.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/RestResponseProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/RestResponseProtocol.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/RestResponseProtocol.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/RestResponseProtocol.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextHistoryRestfulApi.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextHistoryRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextHistoryRestfulApi.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextHistoryRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextIDRestfulApi.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextIDRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextIDRestfulApi.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextIDRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextListenerRestfulApi.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextListenerRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextListenerRestfulApi.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextListenerRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextRestfulApi.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextRestfulApi.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/CsRestfulParent.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/CsRestfulParent.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/CsRestfulParent.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/CsRestfulParent.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/CsScheduler.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/CsScheduler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/CsScheduler.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/CsScheduler.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/DefaultCsScheduler.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/DefaultCsScheduler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/DefaultCsScheduler.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/DefaultCsScheduler.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJob.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJob.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJob.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJob.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJobBuilder.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJobBuilder.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJobBuilder.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJobBuilder.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJob.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJob.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJob.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJob.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJobBuilder.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJobBuilder.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJobBuilder.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJobBuilder.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpPriorityJob.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpPriorityJob.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpPriorityJob.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpPriorityJob.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/RestJobBuilder.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/RestJobBuilder.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/RestJobBuilder.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/RestJobBuilder.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecuteRequest.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecuteRequest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecuteRequest.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecuteRequest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecutorExecutionManager.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecutorExecutionManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecutorExecutionManager.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecutorExecutionManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsJobListener.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsJobListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsJobListener.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsJobListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerBean.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerBean.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerBean.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerBean.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerJob.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerJob.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerJob.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerJob.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/JobToExecuteRequestConsumer.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/JobToExecuteRequestConsumer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/JobToExecuteRequestConsumer.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/JobToExecuteRequestConsumer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/AbstractService.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/AbstractService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/AbstractService.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/AbstractService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextHistoryService.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextHistoryService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextHistoryService.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextHistoryService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextIDService.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextIDService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextIDService.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextIDService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextListenerService.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextListenerService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextListenerService.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextListenerService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextService.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextService.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/Service.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/Service.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/Service.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/Service.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextHistoryServiceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextHistoryServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextHistoryServiceImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextHistoryServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextIDServiceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextIDServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextIDServiceImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextIDServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextListenerServiceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextListenerServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextListenerServiceImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextListenerServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextServiceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextServiceImpl.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/util/CsUtils.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/util/CsUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/util/CsUtils.java
rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/util/CsUtils.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/cs_ddl.sql b/linkis-public-enhancements/linkis-cs-server/src/main/resources/cs_ddl.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/cs_ddl.sql
rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/cs_ddl.sql
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextKeyListenerMapper.xml b/linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/common/contextKeyListenerMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextKeyListenerMapper.xml
rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/common/contextKeyListenerMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/mysql/contextHistoryMapper.xml b/linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/mysql/contextHistoryMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/mysql/contextHistoryMapper.xml
rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/mysql/contextHistoryMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/mysql/contextIDListenerMapper.xml b/linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/mysql/contextIDListenerMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/mysql/contextIDListenerMapper.xml
rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/mysql/contextIDListenerMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/mysql/contextIDMapper.xml b/linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/mysql/contextIDMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/mysql/contextIDMapper.xml
rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/mysql/contextIDMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/mysql/contextMapMapper.xml b/linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/mysql/contextMapMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/mysql/contextMapMapper.xml
rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/mysql/contextMapMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextHistoryMapper.xml b/linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/postgresql/contextHistoryMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextHistoryMapper.xml
rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/postgresql/contextHistoryMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextIDListenerMapper.xml b/linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/postgresql/contextIDListenerMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextIDListenerMapper.xml
rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/postgresql/contextIDListenerMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextIDMapper.xml b/linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/postgresql/contextIDMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextIDMapper.xml
rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/postgresql/contextIDMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextMapMapper.xml b/linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/postgresql/contextMapMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextMapMapper.xml
rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/postgresql/contextMapMapper.xml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasConverter.scala b/linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasConverter.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasConverter.scala
rename to linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasConverter.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasManager.scala b/linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasManager.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasManager.scala
rename to linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasManager.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala b/linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala
rename to linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala b/linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala
rename to linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala b/linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala
rename to linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/server/scheduler/impl/CsExecutor.scala b/linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/server/scheduler/impl/CsExecutor.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/server/scheduler/impl/CsExecutor.scala
rename to linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/server/scheduler/impl/CsExecutor.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/AndTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/AndTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/AndTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/AndTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContainsTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContainsTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContainsTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContainsTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextScopeTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextScopeTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextScopeTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextScopeTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextSearchTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextSearchTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextSearchTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextSearchTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextTypeTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextTypeTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextTypeTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextTypeTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/RegexTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/RegexTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/RegexTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/RegexTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/Scan.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/Scan.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/Scan.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/Scan.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/WebApplicationServer.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/WebApplicationServer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/WebApplicationServer.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/WebApplicationServer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/csid/TestContextID.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/csid/TestContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/csid/TestContextID.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/csid/TestContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKey.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKey.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextValue.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextValue.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/service/TestContextCacheService.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/service/TestContextCacheService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/service/TestContextCacheService.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/service/TestContextCacheService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/csid/TestContextID.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/csid/TestContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/csid/TestContextID.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/csid/TestContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummaryTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummaryTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummaryTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummaryTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/exception/ContextSearchFailedExceptionTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/exception/ContextSearchFailedExceptionTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/exception/ContextSearchFailedExceptionTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/exception/ContextSearchFailedExceptionTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/haid/TestHAID.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/haid/TestHAID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/haid/TestHAID.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/haid/TestHAID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/persist/TestPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/persist/TestPersistence.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/persist/TestPersistence.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/persist/TestPersistence.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKey.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKey.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKeyValue.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKeyValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKeyValue.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKeyValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextValue.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextValue.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/parser/ApiJsonTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/parser/ApiJsonTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/parser/ApiJsonTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/parser/ApiJsonTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextHistory.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextHistory.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextID.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextID.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextIDListener.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextIDListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextIDListener.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextIDListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKey.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKey.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyListener.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyListener.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyValue.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyValue.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextValue.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextValue.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextHistoryTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextHistoryTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextHistoryTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextHistoryTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDListenerTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDListenerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDListenerTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDListenerTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextKeyListenerTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextKeyListenerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextKeyListenerTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextKeyListenerTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextMapTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextMapTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextMapTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextMapTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ExtraFieldClassTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ExtraFieldClassTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ExtraFieldClassTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ExtraFieldClassTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/MapTypeAdapter.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/MapTypeAdapter.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/MapTypeAdapter.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/MapTypeAdapter.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyMethodA.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyMethodA.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyMethodA.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyMethodA.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/Scan.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/Scan.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/Scan.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/Scan.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/conf/PersistenceConfTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/conf/PersistenceConfTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/conf/PersistenceConfTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/conf/PersistenceConfTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/BaseDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/BaseDaoTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/BaseDaoTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapperTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapperTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapperTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapperTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapperTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapperTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDMapperTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDMapperTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDMapperTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapperTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapperTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapperTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextMapMapperTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextMapMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextMapMapperTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextMapMapperTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/utils/PersistenceUtilsTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/utils/PersistenceUtilsTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/utils/PersistenceUtilsTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/utils/PersistenceUtilsTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/CsRestfulParent.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/CsRestfulParent.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/CsRestfulParent.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/CsRestfulParent.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/Scan.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/Scan.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/Scan.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/Scan.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/SchedulerTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/SchedulerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/SchedulerTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/SchedulerTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/conf/ContextServerConfTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/conf/ContextServerConfTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/conf/ContextServerConfTest.java
rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/conf/ContextServerConfTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-cs-server/src/test/resources/application.properties
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.properties
rename to linkis-public-enhancements/linkis-cs-server/src/test/resources/application.properties
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.yml b/linkis-public-enhancements/linkis-cs-server/src/test/resources/application.yml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.yml
rename to linkis-public-enhancements/linkis-cs-server/src/test/resources/application.yml
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/create.sql b/linkis-public-enhancements/linkis-cs-server/src/test/resources/create.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/create.sql
rename to linkis-public-enhancements/linkis-cs-server/src/test/resources/create.sql
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/create_pg.sql b/linkis-public-enhancements/linkis-cs-server/src/test/resources/create_pg.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/create_pg.sql
rename to linkis-public-enhancements/linkis-cs-server/src/test/resources/create_pg.sql
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-cs-server/src/test/resources/linkis.properties
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/linkis.properties
rename to linkis-public-enhancements/linkis-cs-server/src/test/resources/linkis.properties
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/log4j2.xml b/linkis-public-enhancements/linkis-cs-server/src/test/resources/log4j2.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/log4j2.xml
rename to linkis-public-enhancements/linkis-cs-server/src/test/resources/log4j2.xml
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml b/linkis-public-enhancements/linkis-instance-label-server/pom.xml
similarity index 97%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml
rename to linkis-public-enhancements/linkis-instance-label-server/pom.xml
index bf0ff327f3..ec9ce625d8 100644
--- a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml
+++ b/linkis-public-enhancements/linkis-instance-label-server/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.linkis</groupId>
     <artifactId>linkis</artifactId>
     <version>${revision}</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>linkis-instance-label-server</artifactId>
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/errorcode/LinkisInstanceLabelErrorCodeSummary.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/errorcode/LinkisInstanceLabelErrorCodeSummary.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/errorcode/LinkisInstanceLabelErrorCodeSummary.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/errorcode/LinkisInstanceLabelErrorCodeSummary.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/SpringInsLabelService.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/SpringInsLabelService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/SpringInsLabelService.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/SpringInsLabelService.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/mysql/InsLabelRelationMapper.xml b/linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/mysql/InsLabelRelationMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/mysql/InsLabelRelationMapper.xml
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/mysql/InsLabelRelationMapper.xml
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/mysql/InstanceInfoMapper.xml b/linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/mysql/InstanceInfoMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/mysql/InstanceInfoMapper.xml
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/mysql/InstanceInfoMapper.xml
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/mysql/InstanceLabelMapper.xml b/linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/mysql/InstanceLabelMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/mysql/InstanceLabelMapper.xml
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/mysql/InstanceLabelMapper.xml
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/postgresql/InsLabelRelationMapper.xml b/linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/postgresql/InsLabelRelationMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/postgresql/InsLabelRelationMapper.xml
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/postgresql/InsLabelRelationMapper.xml
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/postgresql/InstanceInfoMapper.xml b/linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/postgresql/InstanceInfoMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/postgresql/InstanceInfoMapper.xml
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/postgresql/InstanceInfoMapper.xml
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/postgresql/InstanceLabelMapper.xml b/linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/postgresql/InstanceLabelMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/postgresql/InstanceLabelMapper.xml
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/postgresql/InstanceLabelMapper.xml
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala b/linkis-public-enhancements/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala b/linkis-public-enhancements/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala
rename to linkis-public-enhancements/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/Scan.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/Scan.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/Scan.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/Scan.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/WebApplicationServer.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/WebApplicationServer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/WebApplicationServer.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/WebApplicationServer.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/BaseDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/BaseDaoTest.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/BaseDaoTest.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InsLabelRelationDaoTest.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InsLabelRelationDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InsLabelRelationDaoTest.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InsLabelRelationDaoTest.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceInfoDaoTest.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceInfoDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceInfoDaoTest.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceInfoDaoTest.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceLabelDaoTest.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceLabelDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceLabelDaoTest.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceLabelDaoTest.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceTest.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceTest.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceTest.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/utils/EntityParserTest.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/utils/EntityParserTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/utils/EntityParserTest.java
rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/utils/EntityParserTest.java
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-instance-label-server/src/test/resources/application.properties
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties
rename to linkis-public-enhancements/linkis-instance-label-server/src/test/resources/application.properties
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create.sql b/linkis-public-enhancements/linkis-instance-label-server/src/test/resources/create.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create.sql
rename to linkis-public-enhancements/linkis-instance-label-server/src/test/resources/create.sql
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create_pg.sql b/linkis-public-enhancements/linkis-instance-label-server/src/test/resources/create_pg.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create_pg.sql
rename to linkis-public-enhancements/linkis-instance-label-server/src/test/resources/create_pg.sql
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml b/linkis-public-enhancements/linkis-udf-service/pom.xml
similarity index 98%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml
rename to linkis-public-enhancements/linkis-udf-service/pom.xml
index 073ab311ec..30a8652394 100644
--- a/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml
+++ b/linkis-public-enhancements/linkis-udf-service/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.apache.linkis</groupId>
     <artifactId>linkis</artifactId>
     <version>${revision}</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>linkis-udf-service</artifactId>
   <packaging>jar</packaging>
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java
rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFDao.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFDao.java
rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFDao.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFTreeDao.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFTreeDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFTreeDao.java
rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFTreeDao.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFVersionDao.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFVersionDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFVersionDao.java
rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFVersionDao.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFService.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFService.java
rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFService.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFTreeService.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFTreeService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFTreeService.java
rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFTreeService.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFTreeServiceImpl.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFTreeServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFTreeServiceImpl.java
rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFTreeServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/common/UDFTreeDao.xml b/linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/common/UDFTreeDao.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/common/UDFTreeDao.xml
rename to linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/common/UDFTreeDao.xml
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/mysql/UDFDao.xml b/linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/mysql/UDFDao.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/mysql/UDFDao.xml
rename to linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/mysql/UDFDao.xml
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/mysql/UDFVersionDao.xml b/linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/mysql/UDFVersionDao.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/mysql/UDFVersionDao.xml
rename to linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/mysql/UDFVersionDao.xml
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/postgresql/UDFDao.xml b/linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/postgresql/UDFDao.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/postgresql/UDFDao.xml
rename to linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/postgresql/UDFDao.xml
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/postgresql/UDFVersionDao.xml b/linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/postgresql/UDFVersionDao.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/postgresql/UDFVersionDao.xml
rename to linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/postgresql/UDFVersionDao.xml
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiver.scala b/linkis-public-enhancements/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiver.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiver.scala
rename to linkis-public-enhancements/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiver.scala
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiverChooser.scala b/linkis-public-enhancements/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiverChooser.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiverChooser.scala
rename to linkis-public-enhancements/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiverChooser.scala
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/utils/UdfConfiguration.scala b/linkis-public-enhancements/linkis-udf-service/src/main/scala/org/apache/linkis/udf/utils/UdfConfiguration.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/utils/UdfConfiguration.scala
rename to linkis-public-enhancements/linkis-udf-service/src/main/scala/org/apache/linkis/udf/utils/UdfConfiguration.scala
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/Scan.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/Scan.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/Scan.java
rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/Scan.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/WebApplicationServer.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/WebApplicationServer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/WebApplicationServer.java
rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/WebApplicationServer.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/api/UDFRestfulApiTest.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/api/UDFRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/api/UDFRestfulApiTest.java
rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/api/UDFRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/BaseDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/BaseDaoTest.java
rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/BaseDaoTest.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFDaoTest.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFDaoTest.java
rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFDaoTest.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFTreeDaoTest.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFTreeDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFTreeDaoTest.java
rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFTreeDaoTest.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFVersionDaoTest.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFVersionDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFVersionDaoTest.java
rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFVersionDaoTest.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFServiceTest.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFServiceTest.java
rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFServiceTest.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFTreeServiceTest.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFTreeServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFTreeServiceTest.java
rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFTreeServiceTest.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/application.properties b/linkis-public-enhancements/linkis-udf-service/src/test/resources/application.properties
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/application.properties
rename to linkis-public-enhancements/linkis-udf-service/src/test/resources/application.properties
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/create.sql b/linkis-public-enhancements/linkis-udf-service/src/test/resources/create.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/create.sql
rename to linkis-public-enhancements/linkis-udf-service/src/test/resources/create.sql
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/create_pg.sql b/linkis-public-enhancements/linkis-udf-service/src/test/resources/create_pg.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/create_pg.sql
rename to linkis-public-enhancements/linkis-udf-service/src/test/resources/create_pg.sql
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-udf-service/src/test/resources/linkis.properties
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/linkis.properties
rename to linkis-public-enhancements/linkis-udf-service/src/test/resources/linkis.properties
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/scala/org/apache/linkis/udf/utils/UdfConfigurationTest.scala b/linkis-public-enhancements/linkis-udf-service/src/test/scala/org/apache/linkis/udf/utils/UdfConfigurationTest.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/scala/org/apache/linkis/udf/utils/UdfConfigurationTest.scala
rename to linkis-public-enhancements/linkis-udf-service/src/test/scala/org/apache/linkis/udf/utils/UdfConfigurationTest.scala
diff --git a/linkis-public-enhancements/pom.xml b/linkis-public-enhancements/pom.xml
index 7b9385ddb4..72f8067a3f 100644
--- a/linkis-public-enhancements/pom.xml
+++ b/linkis-public-enhancements/pom.xml
@@ -31,15 +31,15 @@
     <module>linkis-pes-common</module>
     <module>linkis-pes-client</module>
     <module>linkis-pes-rpc-client</module>
-    <module>linkis-pes-publicservice</module>
-    <module>linkis-bml</module>
-    <module>linkis-context-service</module>
+    <module>linkis-ps-common-lock</module>
+    <module>linkis-bml-server</module>
+    <module>linkis-cs-server</module>
     <module>linkis-datasource</module>
-    <module>linkis-udf/linkis-udf-service</module>
+    <module>linkis-udf-service</module>
     <module>linkis-jobhistory</module>
     <module>linkis-configuration</module>
-    <module>linkis-instance-label/linkis-instance-label-server</module>
-    <module>linkis-ps-common-lock</module>
+    <module>linkis-instance-label-server</module>
+    <module>linkis-pes-publicservice</module>
   </modules>
 
   <dependencies>