You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@amoro.apache.org by ji...@apache.org on 2024/04/22 03:28:40 UTC

(amoro) branch master updated: [AMORO-2768] Change the folder name of the module to match the artifactId (#2769)

This is an automated email from the ASF dual-hosted git repository.

jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git


The following commit(s) were added to refs/heads/master by this push:
     new f3486e4a5 [AMORO-2768] Change the folder name of the module to match the artifactId (#2769)
f3486e4a5 is described below

commit f3486e4a5692ac960838cb2028606271207b17ca
Author: xleoken <le...@163.com>
AuthorDate: Mon Apr 22 11:28:35 2024 +0800

    [AMORO-2768] Change the folder name of the module to match the artifactId (#2769)
---
 .github/workflows/core-hadoop2-ci.yml                   |  12 ++++++------
 .github/workflows/core-hadoop3-ci.yml                   |  12 ++++++------
 .github/workflows/trino-ci.yml                          |  12 ++++++------
 .gitignore                                              |   8 ++++----
 {ams/api => amoro-ams/amoro-ams-api}/pom.xml            |   0
 .../src/main/java/org/apache/amoro/api/Action.java      |   0
 .../main/java/org/apache/amoro/api/ActivePlugin.java    |   0
 .../src/main/java/org/apache/amoro/api/AmoroPlugin.java |   0
 .../java/org/apache/amoro/api/OptimizerProperties.java  |   0
 .../org/apache/amoro/api/ServerTableIdentifier.java     |   0
 .../src/main/java/org/apache/amoro/api/StateField.java  |   0
 .../main/java/org/apache/amoro/api/TableRuntime.java    |   0
 .../java/org/apache/amoro/api/config/ConfigHelpers.java |   0
 .../java/org/apache/amoro/api/config/ConfigOption.java  |   0
 .../java/org/apache/amoro/api/config/ConfigOptions.java |   0
 .../org/apache/amoro/api/config/Configurations.java     |   0
 .../apache/amoro/api/config/DataExpirationConfig.java   |   0
 .../org/apache/amoro/api/config/OptimizingConfig.java   |   0
 .../amoro/api/config/StructuredOptionsSplitter.java     |   0
 .../org/apache/amoro/api/config/TableConfiguration.java |   0
 .../org/apache/amoro/api/config/TagConfiguration.java   |   0
 .../main/java/org/apache/amoro/api/events/Event.java    |   0
 .../java/org/apache/amoro/api/events/EventListener.java |   0
 .../java/org/apache/amoro/api/events/EventType.java     |   0
 .../org/apache/amoro/api/events/IcebergReportEvent.java |   0
 .../java/org/apache/amoro/api/events/TableEvent.java    |   0
 .../main/java/org/apache/amoro/api/metrics/Counter.java |   0
 .../main/java/org/apache/amoro/api/metrics/Gauge.java   |   0
 .../main/java/org/apache/amoro/api/metrics/Metric.java  |   0
 .../java/org/apache/amoro/api/metrics/MetricDefine.java |   0
 .../org/apache/amoro/api/metrics/MetricDefines.java     |   0
 .../java/org/apache/amoro/api/metrics/MetricKey.java    |   0
 .../amoro/api/metrics/MetricRegisterListener.java       |   0
 .../org/apache/amoro/api/metrics/MetricReporter.java    |   0
 .../java/org/apache/amoro/api/metrics/MetricSet.java    |   0
 .../java/org/apache/amoro/api/metrics/MetricType.java   |   0
 .../java/org/apache/amoro/api/process/AmoroProcess.java |   0
 .../org/apache/amoro/api/process/OptimizingStage.java   |   0
 .../org/apache/amoro/api/process/OptimizingState.java   |   0
 .../java/org/apache/amoro/api/process/PendingInput.java |   0
 .../org/apache/amoro/api/process/ProcessFactory.java    |   0
 .../java/org/apache/amoro/api/process/ProcessState.java |   0
 .../org/apache/amoro/api/process/ProcessStatus.java     |   0
 .../java/org/apache/amoro/api/process/SimpleFuture.java |   0
 .../java/org/apache/amoro/api/process/TableProcess.java |   0
 .../org/apache/amoro/api/process/TableProcessState.java |   0
 .../java/org/apache/amoro/api/resource/Resource.java    |   0
 .../apache/amoro/api/resource/ResourceContainer.java    |   0
 .../org/apache/amoro/api/resource/ResourceGroup.java    |   0
 .../org/apache/amoro/api/resource/ResourceManager.java  |   0
 .../org/apache/amoro/api/resource/ResourceStatus.java   |   0
 .../org/apache/amoro/api/resource/ResourceType.java     |   0
 .../java/org/apache/amoro/api/MockZookeeperServer.java  |   0
 .../org/apache/amoro/api/metrics/MetricDefineTest.java  |   0
 .../org/apache/amoro/api/metrics/TestMetricDefine.java  |   0
 .../org/apache/amoro/api/metrics/TestMetricKey.java     |   0
 .../amoro-ams-dashboard}/.browserslistrc                |   0
 .../amoro-ams-dashboard}/.editorconfig                  |   0
 .../amoro-ams-dashboard}/.gitignore                     |   0
 .../amoro-ams-dashboard}/.vscode/extensions.json        |   0
 .../amoro-ams-dashboard}/README.md                      |   0
 .../amoro-ams-dashboard}/commitlint.config.js           |   0
 .../amoro-ams-dashboard}/eslint.config.js               |   0
 .../amoro-ams-dashboard}/index.html                     |   0
 .../amoro-ams-dashboard}/license.node.js                |   0
 .../amoro-ams-dashboard}/mock/index.js                  |   0
 .../amoro-ams-dashboard}/mock/modules/catalogs.js       |   0
 .../amoro-ams-dashboard}/mock/modules/common.js         |   0
 .../amoro-ams-dashboard}/mock/modules/database.js       |   0
 .../amoro-ams-dashboard}/mock/modules/db.js             |   0
 .../amoro-ams-dashboard}/mock/modules/optimize.js       |   0
 .../amoro-ams-dashboard}/mock/modules/overview.js       |   0
 .../amoro-ams-dashboard}/mock/modules/settings.js       |   0
 .../amoro-ams-dashboard}/mock/modules/table.js          |   0
 .../amoro-ams-dashboard}/mock/modules/terminal.js       |   0
 .../amoro-ams-dashboard}/package.json                   |   0
 .../amoro-ams-dashboard}/pnpm-lock.yaml                 |   0
 .../dashboard => amoro-ams/amoro-ams-dashboard}/pom.xml |   0
 .../amoro-ams-dashboard}/public/favicon-bak.ico         | Bin
 .../amoro-ams-dashboard}/public/favicon.ico             | Bin
 .../amoro-ams-dashboard}/src/.gitkeep                   |   0
 .../amoro-ams-dashboard}/src/App.vue                    |   0
 .../amoro-ams-dashboard}/src/assets/icons/index.ts      |   0
 .../amoro-ams-dashboard}/src/assets/icons/svg/amoro.svg |   0
 .../src/assets/icons/svg/arctic.svg                     |   0
 .../src/assets/icons/svg/branch.svg                     |   0
 .../src/assets/icons/svg/catalogs.svg                   |   0
 .../src/assets/icons/svg/database.svg                   |   0
 .../src/assets/icons/svg/format.svg                     |   0
 .../amoro-ams-dashboard}/src/assets/icons/svg/hive.svg  |   0
 .../src/assets/icons/svg/iceberg.svg                    |   0
 .../src/assets/icons/svg/optimizers.svg                 |   0
 .../src/assets/icons/svg/optimizing.svg                 |   0
 .../src/assets/icons/svg/overview.svg                   |   0
 .../src/assets/icons/svg/paimon.svg                     |   0
 .../src/assets/icons/svg/settings.svg                   |   0
 .../amoro-ams-dashboard}/src/assets/icons/svg/slide.svg |   0
 .../src/assets/icons/svg/sqldebug.svg                   |   0
 .../src/assets/icons/svg/sqlinit.svg                    |   0
 .../src/assets/icons/svg/sqlmax.svg                     |   0
 .../src/assets/icons/svg/sqlpause.svg                   |   0
 .../src/assets/icons/svg/tables.svg                     |   0
 .../amoro-ams-dashboard}/src/assets/icons/svg/tag.svg   |   0
 .../src/assets/icons/svg/terminal.svg                   |   0
 .../src/assets/images/Catalog-Service.png               | Bin
 .../src/assets/images/Infrastructure-Idependent.png     | Bin
 .../src/assets/images/Management-tools.png              | Bin
 .../src/assets/images/Multiple-Formats.png              | Bin
 .../src/assets/images/Rich-Plugins.png                  | Bin
 .../src/assets/images/Self-managed.png                  | Bin
 .../src/assets/images/arctic-dashboard.svg              |   0
 .../src/assets/images/arctic-dashboard1.svg             |   0
 .../src/assets/images/arctic-introduce.png              | Bin
 .../src/assets/images/home-content.png                  | Bin
 .../src/assets/images/introduce_arctic.png              | Bin
 .../src/assets/images/item-icon.png                     | Bin
 .../src/assets/images/logo-all1.svg                     |   0
 .../amoro-ams-dashboard}/src/assets/images/logo.svg     |   0
 .../amoro-ams-dashboard}/src/assets/images/logo1.svg    |   0
 .../amoro-ams-dashboard}/src/assets/images/logo2.svg    |   0
 .../amoro-ams-dashboard}/src/components/Layout.vue      |   0
 .../amoro-ams-dashboard}/src/components/Sidebar.vue     |   0
 .../amoro-ams-dashboard}/src/components/Topbar.vue      |   0
 .../src/components/VirtualRecycleScroller.vue           |   0
 .../src/components/ant-design/index.ts                  |   0
 .../src/components/echarts/Chart.vue                    |   0
 .../src/components/echarts/index.ts                     |   0
 .../src/components/loading/index.ts                     |   0
 .../src/components/loading/loading.vue                  |   0
 .../amoro-ams-dashboard}/src/components/register.ts     |   0
 .../src/components/sql-editor/editor-config.ts          |   0
 .../src/components/sql-editor/index.vue                 |   0
 .../amoro-ams-dashboard}/src/components/svg-icon.vue    |   0
 .../src/components/tables-sub-menu/CreateDB.vue         |   0
 .../src/components/tables-sub-menu/TablesMenu.vue       |   0
 .../amoro-ams-dashboard}/src/hooks/usePagination.ts     |   0
 .../amoro-ams-dashboard}/src/hooks/usePlaceholder.ts    |   0
 .../src/language/datetimeFormats.ts                     |   0
 .../amoro-ams-dashboard}/src/language/en.ts             |   0
 .../amoro-ams-dashboard}/src/language/i18n.ts           |   0
 .../amoro-ams-dashboard}/src/language/index.ts          |   0
 .../amoro-ams-dashboard}/src/language/zh.ts             |   0
 .../amoro-ams-dashboard}/src/main.ts                    |   0
 .../amoro-ams-dashboard}/src/router/index.ts            |   0
 .../amoro-ams-dashboard}/src/services/global.service.ts |   0
 .../amoro-ams-dashboard}/src/services/login.service.ts  |   0
 .../src/services/optimize.service.ts                    |   0
 .../src/services/setting.services.ts                    |   0
 .../amoro-ams-dashboard}/src/services/table.service.ts  |   0
 .../src/services/terminal.service.ts                    |   0
 .../amoro-ams-dashboard}/src/shims-vue.d.ts             |   0
 .../amoro-ams-dashboard}/src/store/index.ts             |   0
 .../amoro-ams-dashboard}/src/styles/ant-design.less     |   0
 .../amoro-ams-dashboard}/src/styles/global.less         |   0
 .../amoro-ams-dashboard}/src/styles/index.less          |   0
 .../amoro-ams-dashboard}/src/styles/reset.less          |   0
 .../amoro-ams-dashboard}/src/types/common.type.ts       |   0
 .../amoro-ams-dashboard}/src/utils/chart.ts             |   0
 .../amoro-ams-dashboard}/src/utils/editor.ts            |   0
 .../amoro-ams-dashboard}/src/utils/index.ts             |   0
 .../amoro-ams-dashboard}/src/utils/request.ts           |   0
 .../amoro-ams-dashboard}/src/utils/sql.ts               |   0
 .../amoro-ams-dashboard}/src/views/404.vue              |   0
 .../amoro-ams-dashboard}/src/views/Home.vue             |   0
 .../amoro-ams-dashboard}/src/views/catalogs/Detail.vue  |   0
 .../src/views/catalogs/Properties.vue                   |   0
 .../amoro-ams-dashboard}/src/views/catalogs/index.vue   |   0
 .../src/views/hive-details/components/Details.vue       |   0
 .../src/views/hive-details/components/ErrorMsg.vue      |   0
 .../src/views/hive-details/components/Field.vue         |   0
 .../src/views/hive-details/components/Partition.vue     |   0
 .../src/views/hive-details/components/Properties.vue    |   0
 .../src/views/hive-details/index.vue                    |   0
 .../src/views/hive-details/upgrade.vue                  |   0
 .../src/views/introduce/index-bakl.vue                  |   0
 .../amoro-ams-dashboard}/src/views/introduce/index.vue  |   0
 .../amoro-ams-dashboard}/src/views/login/index.vue      |   0
 .../src/views/optimize/components/List.vue              |   0
 .../src/views/optimize/components/ScaleOut.vue          |   0
 .../amoro-ams-dashboard}/src/views/optimize/index.vue   |   0
 .../src/views/resource/components/GroupModal.vue        |   0
 .../src/views/resource/components/List.vue              |   0
 .../src/views/resource/components/ScaleOut.vue          |   0
 .../amoro-ams-dashboard}/src/views/resource/index.vue   |   0
 .../amoro-ams-dashboard}/src/views/settings/index.vue   |   0
 .../src/views/tables/components/Details.vue             |   0
 .../src/views/tables/components/Files.vue               |   0
 .../src/views/tables/components/Operations.vue          |   0
 .../src/views/tables/components/Optimizing.vue          |   0
 .../src/views/tables/components/Selector.vue            |   0
 .../src/views/tables/components/Snapshots.vue           |   0
 .../amoro-ams-dashboard}/src/views/tables/create.vue    |   0
 .../amoro-ams-dashboard}/src/views/tables/index.vue     |   0
 .../src/views/terminal/components/sql-log.vue           |   0
 .../src/views/terminal/components/sql-result.vue        |   0
 .../amoro-ams-dashboard}/src/views/terminal/index.vue   |   0
 .../amoro-ams-dashboard}/src/vite-env.d.ts              |   0
 .../amoro-ams-dashboard}/tsconfig.json                  |   0
 .../amoro-ams-dashboard}/tsconfig.node.json             |   0
 .../amoro-ams-dashboard}/vite.config.ts                 |   0
 .../amoro-ams-metric-reporter}/pom.xml                  |   0
 .../prometheus-reporter/pom.xml                         |   0
 .../metrics/reporter/promethues/MetricCollector.java    |   0
 .../promethues/PrometheusExporterMetricReporter.java    |   0
 .../amoro-ams-optimizer}/common/pom.xml                 |   0
 .../optimizer/common/AbstractOptimizerOperator.java     |   0
 .../org/apache/amoro/optimizer/common/Optimizer.java    |   0
 .../apache/amoro/optimizer/common/OptimizerConfig.java  |   0
 .../amoro/optimizer/common/OptimizerExecutor.java       |   0
 .../apache/amoro/optimizer/common/OptimizerToucher.java |   0
 .../amoro/optimizer/common/OptimizerTestBase.java       |   0
 .../amoro/optimizer/common/OptimizerTestHelpers.java    |   0
 .../apache/amoro/optimizer/common/TestOptimizer.java    |   0
 .../amoro/optimizer/common/TestOptimizerConfig.java     |   0
 .../amoro/optimizer/common/TestOptimizerExecutor.java   |   0
 .../amoro/optimizer/common/TestOptimizerToucher.java    |   0
 .../amoro-ams-optimizer}/flink-optimizer/pom.xml        |   0
 .../org/apache/amoro/optimizer/flink/FlinkExecutor.java |   0
 .../apache/amoro/optimizer/flink/FlinkOptimizer.java    |   0
 .../amoro/optimizer/flink/FlinkOptimizerExecutor.java   |   0
 .../org/apache/amoro/optimizer/flink/FlinkToucher.java  |   0
 .../optimizer => amoro-ams/amoro-ams-optimizer}/pom.xml |   0
 .../amoro-ams-optimizer}/spark-optimizer/pom.xml        |   0
 .../apache/amoro/optimizer/spark/SparkOptimizer.java    |   0
 .../amoro/optimizer/spark/SparkOptimizerExecutor.java   |   0
 .../optimizer/spark/SparkOptimizingTaskFunction.java    |   0
 .../amoro-ams-optimizer}/standalone-optimizer/pom.xml   |   0
 .../amoro/optimizer/standalone/StandaloneOptimizer.java |   0
 {ams/server => amoro-ams/amoro-ams-server}/pom.xml      |   0
 .../org/apache/amoro/server/ArcticManagementConf.java   |   0
 .../amoro/server/ArcticManagementConfValidator.java     |   0
 .../org/apache/amoro/server/ArcticServiceConstants.java |   0
 .../org/apache/amoro/server/ArcticServiceContainer.java |   0
 .../apache/amoro/server/DefaultOptimizingService.java   |   0
 .../main/java/org/apache/amoro/server/Environments.java |   0
 .../apache/amoro/server/HighAvailabilityContainer.java  |   0
 .../org/apache/amoro/server/RestCatalogService.java     |   0
 .../org/apache/amoro/server/TableManagementService.java |   0
 .../org/apache/amoro/server/catalog/CatalogBuilder.java |   0
 .../org/apache/amoro/server/catalog/CatalogService.java |   0
 .../org/apache/amoro/server/catalog/CatalogType.java    |   0
 .../apache/amoro/server/catalog/ExternalCatalog.java    |   0
 .../apache/amoro/server/catalog/InternalCatalog.java    |   0
 .../server/catalog/InternalIcebergCatalogImpl.java      |   0
 .../amoro/server/catalog/InternalMixedCatalogImpl.java  |   0
 .../amoro/server/catalog/MixedHiveCatalogImpl.java      |   0
 .../org/apache/amoro/server/catalog/ServerCatalog.java  |   0
 .../apache/amoro/server/dashboard/APITokenManager.java  |   0
 .../apache/amoro/server/dashboard/DashboardServer.java  |   0
 .../amoro/server/dashboard/FormatTableDescriptor.java   |   0
 .../dashboard/MixedAndIcebergTableDescriptor.java       |   0
 .../amoro/server/dashboard/PaimonTableDescriptor.java   |   0
 .../amoro/server/dashboard/PlatformFileManager.java     |   0
 .../amoro/server/dashboard/ServerTableDescriptor.java   |   0
 .../amoro/server/dashboard/ServerTableProperties.java   |   0
 .../dashboard/component/reverser/DDLReverser.java       |   0
 .../component/reverser/IcebergTableMetaExtract.java     |   0
 .../component/reverser/IcebergTypeToSparkType.java      |   0
 .../component/reverser/MetadataChangeHandler.java       |   0
 .../component/reverser/PaimonTableMetaExtract.java      |   0
 .../component/reverser/PaimonTypeToSparkType.java       |   0
 .../component/reverser/SparkMetadataChangeHandler.java  |   0
 .../dashboard/component/reverser/TableMetaExtract.java  |   0
 .../server/dashboard/controller/CatalogController.java  |   0
 .../dashboard/controller/HealthCheckController.java     |   0
 .../server/dashboard/controller/LoginController.java    |   0
 .../dashboard/controller/OptimizerController.java       |   0
 .../controller/PlatformFileInfoController.java          |   0
 .../server/dashboard/controller/SettingController.java  |   0
 .../server/dashboard/controller/TableController.java    |   0
 .../server/dashboard/controller/TerminalController.java |   0
 .../server/dashboard/controller/VersionController.java  |   0
 .../amoro/server/dashboard/model/AMSColumnInfo.java     |   0
 .../amoro/server/dashboard/model/AMSPartitionField.java |   0
 .../server/dashboard/model/AmoroSnapshotsOfTable.java   |   0
 .../apache/amoro/server/dashboard/model/ApiTokens.java  |   0
 .../server/dashboard/model/CatalogRegisterInfo.java     |   0
 .../server/dashboard/model/CatalogSettingInfo.java      |   0
 .../apache/amoro/server/dashboard/model/DDLInfo.java    |   0
 .../amoro/server/dashboard/model/FilesStatistics.java   |   0
 .../amoro/server/dashboard/model/HiveTableInfo.java     |   0
 .../server/dashboard/model/KafkaClusterSimpleInfo.java  |   0
 .../amoro/server/dashboard/model/LatestSessionInfo.java |   0
 .../apache/amoro/server/dashboard/model/LogInfo.java    |   0
 .../amoro/server/dashboard/model/OperationType.java     |   0
 .../server/dashboard/model/OptimizerInstanceInfo.java   |   0
 .../server/dashboard/model/OptimizerResourceInfo.java   |   0
 .../server/dashboard/model/OptimizingProcessInfo.java   |   0
 .../server/dashboard/model/OptimizingTaskInfo.java      |   0
 .../amoro/server/dashboard/model/PartitionBaseInfo.java |   0
 .../server/dashboard/model/PartitionFileBaseInfo.java   |   0
 .../amoro/server/dashboard/model/PlatformFileInfo.java  |   0
 .../amoro/server/dashboard/model/ServerTableMeta.java   |   0
 .../amoro/server/dashboard/model/SessionInfo.java       |   0
 .../amoro/server/dashboard/model/SnapshotInfo.java      |   0
 .../apache/amoro/server/dashboard/model/SqlExample.java |   0
 .../apache/amoro/server/dashboard/model/SqlResult.java  |   0
 .../apache/amoro/server/dashboard/model/SqlStatus.java  |   0
 .../amoro/server/dashboard/model/TableBasicInfo.java    |   0
 .../apache/amoro/server/dashboard/model/TableMeta.java  |   0
 .../amoro/server/dashboard/model/TableOperation.java    |   0
 .../server/dashboard/model/TableOptimizingInfo.java     |   0
 .../amoro/server/dashboard/model/TableStatistics.java   |   0
 .../amoro/server/dashboard/model/TagOrBranchInfo.java   |   0
 .../amoro/server/dashboard/model/UpgradeHiveMeta.java   |   0
 .../server/dashboard/model/UpgradeRunningInfo.java      |   0
 .../amoro/server/dashboard/model/UpgradeStatus.java     |   0
 .../amoro/server/dashboard/model/VersionInfo.java       |   0
 .../amoro/server/dashboard/response/ErrorResponse.java  |   0
 .../amoro/server/dashboard/response/OkResponse.java     |   0
 .../amoro/server/dashboard/response/PageResult.java     |   0
 .../amoro/server/dashboard/response/Response.java       |   0
 .../apache/amoro/server/dashboard/utils/AmsUtil.java    |   0
 .../apache/amoro/server/dashboard/utils/CommonUtil.java |   0
 .../server/dashboard/utils/DesensitizationUtil.java     |   0
 .../server/dashboard/utils/FilesStatisticsBuilder.java  |   0
 .../amoro/server/dashboard/utils/OptimizingUtil.java    |   0
 .../dashboard/utils/ParamSignatureCalculator.java       |   0
 .../amoro/server/dashboard/utils/PropertiesUtil.java    |   0
 .../server/dashboard/utils/TableStatCollector.java      |   0
 .../amoro/server/events/LoggingEventListener.java       |   0
 .../amoro/server/exception/AlreadyExistsException.java  |   0
 .../amoro/server/exception/ArcticRuntimeException.java  |   0
 .../server/exception/BlockerConflictException.java      |   0
 .../amoro/server/exception/ForbiddenException.java      |   0
 .../server/exception/IllegalMetadataException.java      |   0
 .../server/exception/IllegalTaskStateException.java     |   0
 .../amoro/server/exception/LoadingPluginException.java  |   0
 .../server/exception/ObjectNotExistsException.java      |   0
 .../server/exception/OptimizingClosedException.java     |   0
 .../server/exception/OptimizingCommitException.java     |   0
 .../amoro/server/exception/PersistenceException.java    |   0
 .../amoro/server/exception/PluginAuthException.java     |   0
 .../server/exception/PluginRetryAuthException.java      |   0
 .../amoro/server/exception/SignatureCheckException.java |   0
 .../amoro/server/exception/TaskNotFoundException.java   |   0
 .../amoro/server/exception/TaskRuntimeException.java    |   0
 .../amoro/server/exception/UndefinedException.java      |   0
 .../amoro/server/manager/AbstractPluginManager.java     |   0
 .../amoro/server/manager/AbstractResourceContainer.java |   0
 .../apache/amoro/server/manager/ClassLoaderContext.java |   0
 .../org/apache/amoro/server/manager/EventsManager.java  |   0
 .../java/org/apache/amoro/server/manager/ExecUtil.java  |   0
 .../amoro/server/manager/FlinkOptimizerContainer.java   |   0
 .../amoro/server/manager/LocalOptimizerContainer.java   |   0
 .../org/apache/amoro/server/manager/MetricManager.java  |   0
 .../amoro/server/manager/PluginConfiguration.java       |   0
 .../org/apache/amoro/server/manager/PluginManager.java  |   0
 .../amoro/server/manager/SparkOptimizerContainer.java   |   0
 .../org/apache/amoro/server/metrics/MetricRegistry.java |   0
 .../amoro/server/optimizing/KeyedTableCommit.java       |   0
 .../apache/amoro/server/optimizing/MetricsSummary.java  |   0
 .../amoro/server/optimizing/OptimizerGroupMetrics.java  |   0
 .../amoro/server/optimizing/OptimizingProcess.java      |   0
 .../amoro/server/optimizing/OptimizingProcessMeta.java  |   0
 .../apache/amoro/server/optimizing/OptimizingQueue.java |   0
 .../amoro/server/optimizing/OptimizingStatus.java       |   0
 .../amoro/server/optimizing/OptimizingTaskMeta.java     |   0
 .../apache/amoro/server/optimizing/OptimizingType.java  |   0
 .../amoro/server/optimizing/SchedulingPolicy.java       |   0
 .../org/apache/amoro/server/optimizing/TaskRuntime.java |   0
 .../amoro/server/optimizing/UnKeyedTableCommit.java     |   0
 .../maintainer/AutoCreateIcebergTagAction.java          |   0
 .../optimizing/maintainer/IcebergTableMaintainer.java   |   0
 .../optimizing/maintainer/MixedTableMaintainer.java     |   0
 .../server/optimizing/maintainer/TableMaintainer.java   |   0
 .../server/optimizing/plan/AbstractPartitionPlan.java   |   0
 .../optimizing/plan/CommonPartitionEvaluator.java       |   0
 .../server/optimizing/plan/IcebergPartitionPlan.java    |   0
 .../server/optimizing/plan/MixedHivePartitionPlan.java  |   0
 .../optimizing/plan/MixedIcebergPartitionPlan.java      |   0
 .../server/optimizing/plan/OptimizingEvaluator.java     |   0
 .../amoro/server/optimizing/plan/OptimizingPlanner.java |   0
 .../server/optimizing/plan/PartitionEvaluator.java      |   0
 .../amoro/server/optimizing/plan/TaskDescriptor.java    |   0
 .../optimizing/scan/IcebergTableFileScanHelper.java     |   0
 .../optimizing/scan/KeyedTableFileScanHelper.java       |   0
 .../server/optimizing/scan/TableFileScanHelper.java     |   0
 .../optimizing/scan/UnkeyedTableFileScanHelper.java     |   0
 .../amoro/server/persistence/NestedSqlSession.java      |   0
 .../apache/amoro/server/persistence/PersistentBase.java |   0
 .../server/persistence/SqlSessionFactoryProvider.java   |   0
 .../amoro/server/persistence/StatedPersistentBase.java  |   0
 .../amoro/server/persistence/TaskFilesPersistence.java  |   0
 .../persistence/converter/JsonObjectConverter.java      |   0
 .../persistence/converter/List2StringConverter.java     |   0
 .../server/persistence/converter/Long2TsConverter.java  |   0
 .../persistence/converter/Map2StringConverter.java      |   0
 .../persistence/converter/MapLong2StringConverter.java  |   0
 .../persistence/converter/Object2ByteArrayConvert.java  |   0
 .../server/persistence/mapper/ApiTokensMapper.java      |   0
 .../server/persistence/mapper/CatalogMetaMapper.java    |   0
 .../server/persistence/mapper/OptimizerMapper.java      |   0
 .../server/persistence/mapper/OptimizingMapper.java     |   0
 .../server/persistence/mapper/PlatformFileMapper.java   |   0
 .../amoro/server/persistence/mapper/ResourceMapper.java |   0
 .../server/persistence/mapper/TableBlockerMapper.java   |   0
 .../server/persistence/mapper/TableMetaMapper.java      |   0
 .../apache/amoro/server/resource/ContainerMetadata.java |   0
 .../apache/amoro/server/resource/OptimizerInstance.java |   0
 .../apache/amoro/server/resource/OptimizerManager.java  |   0
 .../apache/amoro/server/resource/OptimizerThread.java   |   0
 .../org/apache/amoro/server/resource/QuotaProvider.java |   0
 .../amoro/server/resource/ResourceContainers.java       |   0
 .../apache/amoro/server/table/BasicTableSnapshot.java   |   0
 .../apache/amoro/server/table/DefaultTableService.java  |   0
 .../apache/amoro/server/table/KeyedTableSnapshot.java   |   0
 .../apache/amoro/server/table/RuntimeHandlerChain.java  |   0
 .../org/apache/amoro/server/table/TableManager.java     |   0
 .../org/apache/amoro/server/table/TableMetadata.java    |   0
 .../org/apache/amoro/server/table/TableMetrics.java     |   0
 .../org/apache/amoro/server/table/TableRuntime.java     |   0
 .../apache/amoro/server/table/TableRuntimeHandler.java  |   0
 .../org/apache/amoro/server/table/TableRuntimeMeta.java |   0
 .../org/apache/amoro/server/table/TableService.java     |   0
 .../org/apache/amoro/server/table/TableSnapshot.java    |   0
 .../apache/amoro/server/table/blocker/TableBlocker.java |   0
 .../server/table/executor/AsyncTableExecutors.java      |   0
 .../amoro/server/table/executor/BaseTableExecutor.java  |   0
 .../server/table/executor/BlockerExpiringExecutor.java  |   0
 .../executor/DanglingDeleteFilesCleaningExecutor.java   |   0
 .../server/table/executor/DataExpiringExecutor.java     |   0
 .../server/table/executor/HiveCommitSyncExecutor.java   |   0
 .../server/table/executor/OptimizingCommitExecutor.java |   0
 .../table/executor/OptimizingExpiringExecutor.java      |   0
 .../table/executor/OrphanFilesCleaningExecutor.java     |   0
 .../table/executor/SnapshotsExpiringExecutor.java       |   0
 .../table/executor/TableRuntimeRefreshExecutor.java     |   0
 .../server/table/executor/TagsAutoCreatingExecutor.java |   0
 .../table/internal/IcebergInternalTableOperations.java  |   0
 .../server/table/internal/InternalIcebergCreator.java   |   0
 .../server/table/internal/InternalIcebergHandler.java   |   0
 .../table/internal/InternalMixedIcebergCreator.java     |   0
 .../table/internal/InternalMixedIcebergHandler.java     |   0
 .../server/table/internal/InternalTableConstants.java   |   0
 .../server/table/internal/InternalTableCreator.java     |   0
 .../server/table/internal/InternalTableHandler.java     |   0
 .../MixedIcebergInternalTableStoreOperations.java       |   0
 .../apache/amoro/server/terminal/ExecutionResult.java   |   0
 .../apache/amoro/server/terminal/ExecutionStatus.java   |   0
 .../org/apache/amoro/server/terminal/JDBCResultSet.java |   0
 .../apache/amoro/server/terminal/SimpleResultSet.java   |   0
 .../apache/amoro/server/terminal/SparkContextUtil.java  |   0
 .../apache/amoro/server/terminal/StatementResult.java   |   0
 .../apache/amoro/server/terminal/TerminalManager.java   |   0
 .../apache/amoro/server/terminal/TerminalSession.java   |   0
 .../amoro/server/terminal/TerminalSessionContext.java   |   0
 .../amoro/server/terminal/TerminalSessionFactory.java   |   0
 .../amoro/server/terminal/kyuubi/KyuubiSession.java     |   0
 .../terminal/kyuubi/KyuubiTerminalSessionFactory.java   |   0
 .../server/terminal/local/LocalSessionFactory.java      |   0
 .../server/terminal/local/LocalTerminalSession.java     |   0
 .../org/apache/amoro/server/utils/CompressUtil.java     |   0
 .../org/apache/amoro/server/utils/FlinkClientUtil.java  |   0
 .../org/apache/amoro/server/utils/HiveLocationUtil.java |   0
 .../org/apache/amoro/server/utils/IcebergTableUtil.java |   0
 .../apache/amoro/server/utils/InternalTableUtil.java    |   0
 .../apache/amoro/server/utils/PreconditionUtils.java    |   0
 .../amoro/server/utils/StructuredOptionsSplitter.java   |   0
 .../apache/amoro/server/utils/ThriftServiceProxy.java   |   0
 .../services/org.apache.amoro.api.events.EventListener  |   0
 .../org.apache.amoro.api.resource.ResourceContainer     |   0
 .../src/main/resources/derby/ams-derby-init.sql         |   0
 .../amoro-ams-server}/src/main/resources/log4j2.xml     |   0
 .../src/main/resources/mysql/ams-mysql-init.sql         |   0
 .../src/main/resources/mysql/update.sql                 |   0
 .../src/main/resources/mysql/upgrade-0.3.0-to-0.3.1.sql |   0
 .../src/main/resources/mysql/upgrade-0.3.1-to-0.3.2.sql |   0
 .../src/main/resources/mysql/upgrade-0.3.2-to-0.4.0.sql |   0
 .../src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql |   0
 .../src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql |   0
 .../src/main/resources/mysql/upgrade-0.5.0-to-0.5.1.sql |   0
 .../src/main/resources/mysql/upgrade-0.5.1-to-0.6.0.sql |   0
 .../src/main/resources/postgres/ams-postgres-init.sql   |   0
 .../src/main/resources/postgres/update.sql              |   0
 .../main/resources/postgres/upgrade-0.5.1-to-0.6.0.sql  |   0
 .../java/org/apache/amoro/server/AmsEnvironment.java    |   0
 .../apache/amoro/server/RestCatalogServiceTestBase.java |   0
 .../amoro/server/TestArcticManagementConfValidator.java |   0
 .../amoro/server/TestDefaultOptimizingService.java      |   0
 .../amoro/server/TestInternalIcebergCatalogService.java |   0
 .../amoro/server/TestInternalMixedCatalogService.java   |   0
 .../amoro/server/catalog/TableCatalogTestBase.java      |   0
 .../apache/amoro/server/catalog/TestServerCatalog.java  |   0
 .../dashboard/TestIcebergServerTableDescriptor.java     |   0
 .../dashboard/TestPaimonServerTableDescriptor.java      |   0
 .../server/dashboard/TestServerTableDescriptor.java     |   0
 .../dashboard/utils/TestParamSignatureCalculator.java   |   0
 .../server/dashboard/utils/TestPropertiesUtil.java      |   0
 .../amoro/server/manager/TestAbstractPluginManager.java |   0
 .../server/manager/TestFlinkOptimizerContainer.java     |   0
 .../server/manager/TestSparkOptimizerContainer.java     |   0
 .../amoro/server/metrics/MockedMetricReporter.java      |   0
 .../apache/amoro/server/metrics/TestMetricRegistry.java |   0
 .../amoro/server/optimizing/AbstractOptimizingTest.java |   0
 .../amoro/server/optimizing/BaseOptimizingChecker.java  |   0
 .../amoro/server/optimizing/OptimizingTestHelpers.java  |   0
 .../server/optimizing/TestIcebergHadoopOptimizing.java  |   0
 .../server/optimizing/TestMixedHiveOptimizing.java      |   0
 .../server/optimizing/TestMixedIcebergOptimizing.java   |   0
 .../server/optimizing/TestOptimizingIntegration.java    |   0
 .../amoro/server/optimizing/TestOptimizingQueue.java    |   0
 .../server/optimizing/commit/TestMixIcebergCommit.java  |   0
 .../optimizing/commit/TestUnKeyedTableCommit.java       |   0
 .../server/optimizing/flow/CompleteOptimizingFlow.java  |   0
 .../apache/amoro/server/optimizing/flow/DataReader.java |   0
 .../server/optimizing/flow/RandomRecordGenerator.java   |   0
 .../optimizing/flow/TestKeyedContinuousOptimizing.java  |   0
 .../flow/TestUnKeyedContinuousOptimizing.java           |   0
 .../optimizing/flow/checker/AbstractHiveChecker.java    |   0
 .../flow/checker/AbstractSceneCountChecker.java         |   0
 .../optimizing/flow/checker/DataConcurrencyChecker.java |   0
 .../flow/checker/FullOptimizingMove2HiveChecker.java    |   0
 .../flow/checker/FullOptimizingWrite2HiveChecker.java   |   0
 .../optimizing/flow/checker/MajorOptimizingChecker.java |   0
 .../optimizing/flow/checker/MinorOptimizingCheck.java   |   0
 .../optimizing/flow/checker/OptimizingCountChecker.java |   0
 .../optimizing/flow/view/AbstractTableDataView.java     |   0
 .../server/optimizing/flow/view/KeyedTableDataView.java |   0
 .../amoro/server/optimizing/flow/view/MatchResult.java  |   0
 .../server/optimizing/flow/view/TableDataView.java      |   0
 .../optimizing/flow/view/UnKeyedTableDataView.java      |   0
 .../maintainer/TestAutoCreateIcebergTagAction.java      |   0
 .../server/optimizing/maintainer/TestDataExpire.java    |   0
 .../optimizing/maintainer/TestDataExpireHive.java       |   0
 .../optimizing/maintainer/TestDataExpireIceberg.java    |   0
 .../optimizing/maintainer/TestOrphanFileClean.java      |   0
 .../optimizing/maintainer/TestOrphanFileCleanHive.java  |   0
 .../maintainer/TestOrphanFileCleanIceberg.java          |   0
 .../optimizing/maintainer/TestSnapshotExpire.java       |   0
 .../optimizing/maintainer/TestSnapshotExpireHive.java   |   0
 .../maintainer/TestSnapshotExpireIceberg.java           |   0
 .../server/optimizing/plan/MixedTablePlanTestBase.java  |   0
 .../optimizing/plan/TestHiveKeyedPartitionPlan.java     |   0
 .../optimizing/plan/TestHiveOptimizingEvaluator.java    |   0
 .../optimizing/plan/TestHiveUnkeyedPartitionPlan.java   |   0
 .../optimizing/plan/TestIcebergPartitionPlan.java       |   0
 .../server/optimizing/plan/TestKeyedPartitionPlan.java  |   0
 .../server/optimizing/plan/TestOptimizingEvaluator.java |   0
 .../server/optimizing/plan/TestOptimizingPlanner.java   |   0
 .../optimizing/plan/TestUnkeyedPartitionPlan.java       |   0
 .../optimizing/scan/TableFileScanHelperTestBase.java    |   0
 .../scan/TestHiveKeyedTableFileScanHelper.java          |   0
 .../scan/TestHiveUnkeyedTableFileScanHelper.java        |   0
 .../optimizing/scan/TestIcebergTableFileScanHelper.java |   0
 .../optimizing/scan/TestKeyedTableFileScanHelper.java   |   0
 .../optimizing/scan/TestUnkeyedTableFileScanHelper.java |   0
 .../amoro/server/persistence/TestNestedSqlSession.java  |   0
 .../amoro/server/persistence/TestPersistentBase.java    |   0
 .../server/persistence/TestStatedPersistentBase.java    |   0
 .../amoro/server/persistence/mapper/MySQLTestBase.java  |   0
 .../org/apache/amoro/server/table/AMSTableTestBase.java |   0
 .../org/apache/amoro/server/table/DerbyPersistence.java |   0
 .../apache/amoro/server/table/TableServiceTestBase.java |   0
 .../apache/amoro/server/table/TestCatalogService.java   |   0
 .../apache/amoro/server/table/TestDatabaseService.java  |   0
 .../amoro/server/table/TestTableRuntimeHandler.java     |   0
 .../amoro/server/table/TestTableRuntimeManager.java     |   0
 .../org/apache/amoro/server/table/TestTableService.java |   0
 .../amoro/server/table/executor/ExecutorTestBase.java   |   0
 .../table/executor/TestBlockerExpiringExecutor.java     |   0
 .../org/apache/amoro/server/util/TestCompressUtil.java  |   0
 .../apache/amoro/server/util/TestConfigurationUtil.java |   0
 .../org.apache.amoro.api.metrics.MetricReporter         |   0
 ....server.manager.TestAbstractPluginManager$TestPlugin |   0
 .../amoro-ams-server}/src/test/resources/log4j2.xml     |   0
 .../mockito-extensions/org.mockito.plugins.MockMaker    |   0
 {ams => amoro-ams}/dist/pom.xml                         |   0
 {ams => amoro-ams}/dist/src/main/arctic-bin/bin/ams.sh  |   0
 .../dist/src/main/arctic-bin/bin/load-config.sh         |   0
 .../dist/src/main/arctic-bin/bin/optimizer.sh           |   0
 .../dist/src/main/arctic-bin/conf/config.yaml           |   0
 .../dist/src/main/arctic-bin/conf/jvm.properties        |   0
 .../dist/src/main/arctic-bin/conf/log4j2.xml            |   0
 .../dist/src/main/arctic-bin/conf/optimize/log4j2.xml   |   0
 .../main/arctic-bin/conf/plugins/event-listeners.yaml   |   0
 .../main/arctic-bin/conf/plugins/metric-reporters.yaml  |   0
 {ams => amoro-ams}/dist/src/main/assemblies/bin.xml     |  16 ++++++++--------
 {ams => amoro-ams}/pom.xml                              |  10 +++++-----
 {core => amoro-core}/pom.xml                            |   0
 .../org/apache/amoro/api/AlreadyExistsException.java    |   0
 .../gen-java/org/apache/amoro/api/ArcticException.java  |   0
 .../org/apache/amoro/api/ArcticTableMetastore.java      |   0
 .../org/apache/amoro/api/BlockableOperation.java        |   0
 .../src/main/gen-java/org/apache/amoro/api/Blocker.java |   0
 .../main/gen-java/org/apache/amoro/api/CatalogMeta.java |   0
 .../main/gen-java/org/apache/amoro/api/ColumnInfo.java  |   0
 .../org/apache/amoro/api/CommitMetaProducer.java        |   0
 .../main/gen-java/org/apache/amoro/api/DataFile.java    |   0
 .../org/apache/amoro/api/InvalidObjectException.java    |   0
 .../gen-java/org/apache/amoro/api/MetaException.java    |   0
 .../org/apache/amoro/api/NoSuchObjectException.java     |   0
 .../org/apache/amoro/api/NotSupportedException.java     |   0
 .../apache/amoro/api/OperationConflictException.java    |   0
 .../org/apache/amoro/api/OptimizerRegisterInfo.java     |   0
 .../org/apache/amoro/api/OptimizingService.java         |   0
 .../gen-java/org/apache/amoro/api/OptimizingTask.java   |   0
 .../gen-java/org/apache/amoro/api/OptimizingTaskId.java |   0
 .../org/apache/amoro/api/OptimizingTaskResult.java      |   0
 .../org/apache/amoro/api/PartitionFieldData.java        |   0
 .../gen-java/org/apache/amoro/api/PrimaryKeySpec.java   |   0
 .../src/main/gen-java/org/apache/amoro/api/Schema.java  |   0
 .../gen-java/org/apache/amoro/api/SchemaUpdateMeta.java |   0
 .../main/gen-java/org/apache/amoro/api/TableChange.java |   0
 .../gen-java/org/apache/amoro/api/TableCommitMeta.java  |   0
 .../gen-java/org/apache/amoro/api/TableIdentifier.java  |   0
 .../main/gen-java/org/apache/amoro/api/TableMeta.java   |   0
 .../gen-java/org/apache/amoro/api/UpdateColumn.java     |   0
 .../java/org/apache/amoro/AlreadyExistsException.java   |   0
 .../src/main/java/org/apache/amoro/AmoroCatalog.java    |   0
 .../src/main/java/org/apache/amoro/AmoroTable.java      |   0
 .../src/main/java/org/apache/amoro/AmsClient.java       |   0
 .../main/java/org/apache/amoro/ArcticIOException.java   |   0
 .../java/org/apache/amoro/CommonUnifiedCatalog.java     |   0
 .../src/main/java/org/apache/amoro/Constants.java       |   0
 .../org/apache/amoro/DatabaseNotEmptyException.java     |   0
 .../src/main/java/org/apache/amoro/ErrorCodes.java      |   0
 .../src/main/java/org/apache/amoro/FormatCatalog.java   |   0
 .../java/org/apache/amoro/FormatCatalogFactory.java     |   0
 .../main/java/org/apache/amoro/IcebergFileEntry.java    |   0
 .../java/org/apache/amoro/NoSuchDatabaseException.java  |   0
 .../java/org/apache/amoro/NoSuchTableException.java     |   0
 .../src/main/java/org/apache/amoro/PooledAmsClient.java |   0
 .../src/main/java/org/apache/amoro/TableFormat.java     |   0
 .../main/java/org/apache/amoro/TableIDWithFormat.java   |   0
 .../src/main/java/org/apache/amoro/TableSnapshot.java   |   0
 .../src/main/java/org/apache/amoro/UnifiedCatalog.java  |   0
 .../java/org/apache/amoro/UnifiedCatalogLoader.java     |   0
 .../java/org/apache/amoro/catalog/ArcticCatalog.java    |   0
 .../org/apache/amoro/catalog/BasicArcticCatalog.java    |   0
 .../java/org/apache/amoro/catalog/CatalogLoader.java    |   0
 .../main/java/org/apache/amoro/catalog/MixedTables.java |   0
 .../java/org/apache/amoro/client/AmsClientPools.java    |   0
 .../java/org/apache/amoro/client/AmsServerInfo.java     |   0
 .../java/org/apache/amoro/client/ArcticThriftUrl.java   |   0
 .../org/apache/amoro/client/ArcticZookeeperFactory.java |   0
 .../apache/amoro/client/ConnectionFailException.java    |   0
 .../apache/amoro/client/NoBackendServiceException.java  |   0
 .../org/apache/amoro/client/OptimizingClientPools.java  |   0
 .../main/java/org/apache/amoro/client/PoolConfig.java   |   0
 .../main/java/org/apache/amoro/client/ServiceInfo.java  |   0
 .../main/java/org/apache/amoro/client/ThriftClient.java |   0
 .../org/apache/amoro/client/ThriftClientFactory.java    |   0
 .../java/org/apache/amoro/client/ThriftClientPool.java  |   0
 .../java/org/apache/amoro/client/ThriftException.java   |   0
 .../java/org/apache/amoro/client/ThriftPingFactory.java |   0
 .../main/java/org/apache/amoro/client/ThriftUtil.java   |   0
 .../java/org/apache/amoro/client/ZookeeperService.java  |   0
 .../main/java/org/apache/amoro/data/ChangeAction.java   |   0
 .../src/main/java/org/apache/amoro/data/ChangedLsn.java |   0
 .../main/java/org/apache/amoro/data/DataFileType.java   |   0
 .../main/java/org/apache/amoro/data/DataTreeNode.java   |   0
 .../java/org/apache/amoro/data/DefaultKeyedFile.java    |   0
 .../main/java/org/apache/amoro/data/FileNameRules.java  |   0
 .../main/java/org/apache/amoro/data/PrimaryKeyData.java |   0
 .../java/org/apache/amoro/data/PrimaryKeyedFile.java    |   0
 .../apache/amoro/formats/iceberg/IcebergCatalog.java    |   0
 .../amoro/formats/iceberg/IcebergCatalogFactory.java    |   0
 .../apache/amoro/formats/iceberg/IcebergSnapshot.java   |   0
 .../org/apache/amoro/formats/iceberg/IcebergTable.java  |   0
 .../org/apache/amoro/formats/mixed/MixedCatalog.java    |   0
 .../amoro/formats/mixed/MixedHiveCatalogFactory.java    |   0
 .../amoro/formats/mixed/MixedIcebergCatalogFactory.java |   0
 .../org/apache/amoro/formats/mixed/MixedSnapshot.java   |   0
 .../java/org/apache/amoro/formats/mixed/MixedTable.java |   0
 .../org/apache/amoro/formats/paimon/PaimonCatalog.java  |   0
 .../amoro/formats/paimon/PaimonCatalogFactory.java      |   0
 .../org/apache/amoro/formats/paimon/PaimonSnapshot.java |   0
 .../org/apache/amoro/formats/paimon/PaimonTable.java    |   0
 .../src/main/java/org/apache/amoro/io/ArcticFileIO.java |   0
 .../java/org/apache/amoro/io/ArcticFileIOAdapter.java   |   0
 .../main/java/org/apache/amoro/io/ArcticFileIOs.java    |   0
 .../java/org/apache/amoro/io/ArcticHadoopFileIO.java    |   0
 .../org/apache/amoro/io/BasicTableTrashManager.java     |   0
 .../org/apache/amoro/io/CloseableIterableWrapper.java   |   0
 .../org/apache/amoro/io/CloseableIteratorWrapper.java   |   0
 .../java/org/apache/amoro/io/CloseablePredicate.java    |   0
 .../src/main/java/org/apache/amoro/io/PathInfo.java     |   0
 .../org/apache/amoro/io/RecoverableHadoopFileIO.java    |   0
 .../apache/amoro/io/SupportFileRecycleOperations.java   |   0
 .../apache/amoro/io/SupportsFileSystemOperations.java   |   0
 .../java/org/apache/amoro/io/TableTrashManager.java     |   0
 .../java/org/apache/amoro/io/TableTrashManagers.java    |   0
 .../apache/amoro/io/reader/AbstractKeyedDataReader.java |   0
 .../amoro/io/reader/AbstractUnkeyedDataReader.java      |   0
 .../org/apache/amoro/io/reader/ArcticDeleteFilter.java  |   0
 .../amoro/io/reader/BaseIcebergPosDeleteReader.java     |   0
 .../apache/amoro/io/reader/CombinedDeleteFilter.java    |   0
 .../org/apache/amoro/io/reader/DataReaderCommon.java    |   0
 .../java/org/apache/amoro/io/reader/DeleteFilter.java   |   0
 .../main/java/org/apache/amoro/io/reader/Deletes.java   |   0
 .../io/reader/GenericCombinedIcebergDataReader.java     |   0
 .../apache/amoro/io/reader/GenericKeyedDataReader.java  |   0
 .../amoro/io/reader/GenericUnkeyedDataReader.java       |   0
 .../apache/amoro/io/reader/ParallelIcebergGenerics.java |   0
 .../amoro/io/reader/ParallelTableScanIterable.java      |   0
 .../org/apache/amoro/io/reader/StructForDelete.java     |   0
 .../org/apache/amoro/io/reader/StructLikeFunnel.java    |   0
 .../amoro/io/writer/ArcticTreeNodePosDeleteWriter.java  |   0
 .../java/org/apache/amoro/io/writer/BaseTaskWriter.java |   0
 .../org/apache/amoro/io/writer/ChangeTaskWriter.java    |   0
 .../apache/amoro/io/writer/CommonOutputFileFactory.java |   0
 .../apache/amoro/io/writer/GenericBaseTaskWriter.java   |   0
 .../apache/amoro/io/writer/GenericChangeTaskWriter.java |   0
 .../writer/GenericIcebergPartitionedFanoutWriter.java   |   0
 .../org/apache/amoro/io/writer/GenericTaskWriters.java  |   0
 .../amoro/io/writer/IcebergFanoutPosDeleteWriter.java   |   0
 .../org/apache/amoro/io/writer/OutputFileFactory.java   |   0
 .../org/apache/amoro/io/writer/RecordWithAction.java    |   0
 .../java/org/apache/amoro/io/writer/SetTreeNode.java    |   0
 .../apache/amoro/io/writer/SortedPosDeleteWriter.java   |   0
 .../org/apache/amoro/io/writer/TaskWriterBuilder.java   |   0
 .../java/org/apache/amoro/io/writer/TaskWriterKey.java  |   0
 .../src/main/java/org/apache/amoro/log/Bytes.java       |   0
 .../src/main/java/org/apache/amoro/log/Converter.java   |   0
 .../main/java/org/apache/amoro/log/FormatVersion.java   |   0
 .../org/apache/amoro/log/JsonToLogDataConverters.java   |   0
 .../src/main/java/org/apache/amoro/log/LogData.java     |   0
 .../apache/amoro/log/LogDataJsonDeserialization.java    |   0
 .../org/apache/amoro/log/LogDataJsonSerialization.java  |   0
 .../org/apache/amoro/log/LogDataToJsonConverters.java   |   0
 .../main/java/org/apache/amoro/log/MessageBytes.java    |   0
 .../src/main/java/org/apache/amoro/log/TimeFormats.java |   0
 .../java/org/apache/amoro/log/data/LogArrayData.java    |   0
 .../main/java/org/apache/amoro/log/data/LogMapData.java |   0
 .../apache/amoro/mixed/BasicMixedIcebergCatalog.java    |   0
 .../apache/amoro/mixed/InternalMixedIcebergCatalog.java |   0
 .../main/java/org/apache/amoro/mixed/MixedTables.java   |   0
 .../java/org/apache/amoro/op/ArcticAppendFiles.java     |   0
 .../java/org/apache/amoro/op/ArcticDeleteFiles.java     |   0
 .../apache/amoro/op/ArcticHadoopTableOperations.java    |   0
 .../java/org/apache/amoro/op/ArcticOverwriteFiles.java  |   0
 .../org/apache/amoro/op/ArcticReplacePartitions.java    |   0
 .../java/org/apache/amoro/op/ArcticRewriteFiles.java    |   0
 .../main/java/org/apache/amoro/op/ArcticRowDelta.java   |   0
 .../java/org/apache/amoro/op/ArcticTableOperations.java |   0
 .../java/org/apache/amoro/op/ArcticTransaction.java     |   0
 .../src/main/java/org/apache/amoro/op/ArcticUpdate.java |   0
 .../org/apache/amoro/op/CreateTableTransaction.java     |   0
 .../java/org/apache/amoro/op/KeyedPartitionRewrite.java |   0
 .../java/org/apache/amoro/op/KeyedSchemaUpdate.java     |   0
 .../java/org/apache/amoro/op/OverwriteBaseFiles.java    |   0
 .../org/apache/amoro/op/PartitionPropertiesUpdate.java  |   0
 .../apache/amoro/op/PartitionTransactionOperation.java  |   0
 .../java/org/apache/amoro/op/RewritePartitions.java     |   0
 .../main/java/org/apache/amoro/op/SnapshotSummary.java  |   0
 .../org/apache/amoro/op/UpdateKeyedTableProperties.java |   0
 .../org/apache/amoro/op/UpdatePartitionProperties.java  |   0
 .../amoro/optimizing/AbstractRewriteFilesExecutor.java  |   0
 .../optimizing/BaseArcticOptimizingDataReader.java      |   0
 .../apache/amoro/optimizing/BaseOptimizingInput.java    |   0
 .../apache/amoro/optimizing/IcebergRewriteExecutor.java |   0
 .../amoro/optimizing/IcebergRewriteExecutorFactory.java |   0
 .../amoro/optimizing/OptimizingCommitterFactory.java    |   0
 .../apache/amoro/optimizing/OptimizingDataReader.java   |   0
 .../org/apache/amoro/optimizing/OptimizingExecutor.java |   0
 .../amoro/optimizing/OptimizingExecutorFactory.java     |   0
 .../amoro/optimizing/OptimizingInputProperties.java     |   0
 .../apache/amoro/optimizing/OptimizingTaskSummary.java  |   0
 .../org/apache/amoro/optimizing/RewriteFilesInput.java  |   0
 .../org/apache/amoro/optimizing/RewriteFilesOutput.java |   0
 .../org/apache/amoro/optimizing/TableOptimizing.java    |   0
 .../org/apache/amoro/properties/AmsHAProperties.java    |   0
 .../apache/amoro/properties/CatalogMetaProperties.java  |   0
 .../apache/amoro/properties/HiveTableProperties.java    |   0
 .../apache/amoro/properties/MetaTableProperties.java    |   0
 .../java/org/apache/amoro/scan/ArcticFileScanTask.java  |   0
 .../org/apache/amoro/scan/BaseCombinedScanTask.java     |   0
 .../org/apache/amoro/scan/BasicArcticFileScanTask.java  |   0
 .../java/org/apache/amoro/scan/BasicKeyedTableScan.java |   0
 .../apache/amoro/scan/ChangeTableIncrementalScan.java   |   0
 .../org/apache/amoro/scan/CombinedIcebergScanTask.java  |   0
 .../java/org/apache/amoro/scan/CombinedScanTask.java    |   0
 .../main/java/org/apache/amoro/scan/KeyedTableScan.java |   0
 .../java/org/apache/amoro/scan/KeyedTableScanTask.java  |   0
 .../java/org/apache/amoro/scan/NodeFileScanTask.java    |   0
 .../java/org/apache/amoro/scan/TableEntriesScan.java    |   0
 .../amoro/scan/expressions/BasicPartitionEvaluator.java |   0
 .../org/apache/amoro/scan/expressions/RewriteNot.java   |   0
 .../main/java/org/apache/amoro/table/ArcticTable.java   |   0
 .../java/org/apache/amoro/table/BaseLocationKind.java   |   0
 .../src/main/java/org/apache/amoro/table/BaseTable.java |   0
 .../java/org/apache/amoro/table/BasicKeyedTable.java    |   0
 .../java/org/apache/amoro/table/BasicTableBuilder.java  |   0
 .../java/org/apache/amoro/table/BasicUnkeyedTable.java  |   0
 .../java/org/apache/amoro/table/ChangeLocationKind.java |   0
 .../main/java/org/apache/amoro/table/ChangeTable.java   |   0
 .../org/apache/amoro/table/DistributionHashMode.java    |   0
 .../main/java/org/apache/amoro/table/KeyedTable.java    |   0
 .../main/java/org/apache/amoro/table/LocationKind.java  |   0
 .../java/org/apache/amoro/table/MetadataColumns.java    |   0
 .../java/org/apache/amoro/table/PrimaryKeySpec.java     |   0
 .../main/java/org/apache/amoro/table/TableBuilder.java  |   0
 .../java/org/apache/amoro/table/TableIdentifier.java    |   0
 .../java/org/apache/amoro/table/TableMetaStore.java     |   0
 .../java/org/apache/amoro/table/TableProperties.java    |   0
 .../main/java/org/apache/amoro/table/UnkeyedTable.java  |   0
 .../java/org/apache/amoro/table/WatermarkGenerator.java |   0
 .../java/org/apache/amoro/table/WriteOperationKind.java |   0
 .../amoro/table/blocker/BasicTableBlockerManager.java   |   0
 .../java/org/apache/amoro/table/blocker/Blocker.java    |   0
 .../apache/amoro/table/blocker/RenewableBlocker.java    |   0
 .../apache/amoro/table/blocker/TableBlockerManager.java |   0
 .../java/org/apache/amoro/utils/ArcticCatalogUtil.java  |   0
 .../java/org/apache/amoro/utils/ArcticDataFiles.java    |   0
 .../java/org/apache/amoro/utils/ArcticTableUtil.java    |   0
 .../org/apache/amoro/utils/CompatiblePropertyUtil.java  |   0
 .../org/apache/amoro/utils/ConfigurationFileUtil.java   |   0
 .../main/java/org/apache/amoro/utils/ContentFiles.java  |   0
 .../java/org/apache/amoro/utils/ConvertStructUtil.java  |   0
 .../main/java/org/apache/amoro/utils/ExceptionUtil.java |   0
 .../java/org/apache/amoro/utils/ExpressionUtil.java     |   0
 .../java/org/apache/amoro/utils/FileScanTaskUtil.java   |   0
 .../src/main/java/org/apache/amoro/utils/FlipUtil.java  |   0
 .../apache/amoro/utils/IcebergInMemoryLockManager.java  |   0
 .../main/java/org/apache/amoro/utils/IdGenerator.java   |   0
 .../main/java/org/apache/amoro/utils/JacksonUtil.java   |   0
 .../main/java/org/apache/amoro/utils/LocalFileUtil.java |   0
 .../org/apache/amoro/utils/ManifestEntryFields.java     |   0
 .../main/java/org/apache/amoro/utils/NodeFilter.java    |   0
 .../main/java/org/apache/amoro/utils/SchemaUtil.java    |   0
 .../java/org/apache/amoro/utils/SerializationUtil.java  |   0
 .../java/org/apache/amoro/utils/StatisticsFileUtil.java |   0
 .../main/java/org/apache/amoro/utils/StructLikeSet.java |   0
 .../main/java/org/apache/amoro/utils/TableFileUtil.java |   0
 .../java/org/apache/amoro/utils/TablePropertyUtil.java  |   0
 .../apache/amoro/utils/map/DefaultSizeEstimator.java    |   0
 .../java/org/apache/amoro/utils/map/RocksDBBackend.java |   0
 .../main/java/org/apache/amoro/utils/map/SimpleMap.java |   0
 .../org/apache/amoro/utils/map/SimpleSpillableMap.java  |   0
 .../java/org/apache/amoro/utils/map/SizeEstimator.java  |   0
 .../org/apache/amoro/utils/map/StructLikeBaseMap.java   |   0
 .../apache/amoro/utils/map/StructLikeCollections.java   |   0
 .../org/apache/amoro/utils/map/StructLikeMemoryMap.java |   0
 .../apache/amoro/utils/map/StructLikeSpillableMap.java  |   0
 .../amoro/utils/map/StructLikeWrapperSizeEstimator.java |   0
 .../main/java/org/apache/iceberg/IcebergFindFiles.java  |   0
 .../java/org/apache/iceberg/MixedChangeTableScan.java   |   0
 .../org/apache/iceberg/data/PublicGenericReader.java    |   0
 .../services/org.apache.amoro.FormatCatalogFactory      |   0
 .../src/main/thrift/arctic_commons.thrift               |   0
 .../src/main/thrift/arctic_optimizing_service.thrift    |   0
 .../src/main/thrift/arctic_table_metastore.thrift       |   0
 .../java/org/apache/amoro/BasicTableTestHelper.java     |   0
 .../test/java/org/apache/amoro/DataFileTestHelpers.java |   0
 .../org/apache/amoro/MockArcticMetastoreServer.java     |   0
 .../java/org/apache/amoro/SingletonResourceUtil.java    |   0
 .../src/test/java/org/apache/amoro/TableTestHelper.java |   0
 .../src/test/java/org/apache/amoro/TestAms.java         |   0
 .../src/test/java/org/apache/amoro/TestTreeNode.java    |   0
 .../test/java/org/apache/amoro/TestUnifiedCatalog.java  |   0
 .../src/test/java/org/apache/amoro/TestedCatalogs.java  |   0
 .../apache/amoro/catalog/BasicCatalogTestHelper.java    |   0
 .../java/org/apache/amoro/catalog/CatalogTestBase.java  |   0
 .../org/apache/amoro/catalog/CatalogTestHelper.java     |   0
 .../org/apache/amoro/catalog/CatalogTestHelpers.java    |   0
 .../java/org/apache/amoro/catalog/TableTestBase.java    |   0
 .../org/apache/amoro/catalog/TestCatalogLoader.java     |   0
 .../java/org/apache/amoro/catalog/TestMixedCatalog.java |   0
 .../org/apache/amoro/data/TestDefaultKeyedFile.java     |   0
 .../java/org/apache/amoro/data/TestUpsertPushDown.java  |   0
 .../amoro/formats/AbstractFormatCatalogTestHelper.java  |   0
 .../org/apache/amoro/formats/AmoroCatalogTestBase.java  |   0
 .../apache/amoro/formats/AmoroCatalogTestHelper.java    |   0
 .../amoro/formats/IcebergHadoopCatalogTestHelper.java   |   0
 .../formats/MixedIcebergHadoopCatalogTestHelper.java    |   0
 .../amoro/formats/PaimonHadoopCatalogTestHelper.java    |   0
 .../org/apache/amoro/formats/TestAmoroCatalogBase.java  |   0
 .../apache/amoro/formats/TestIcebergAmoroCatalog.java   |   0
 .../amoro/formats/TestMixedIcebergFormatCatalog.java    |   0
 .../apache/amoro/formats/TestPaimonAmoroCatalog.java    |   0
 .../org/apache/amoro/io/IcebergDataTestHelpers.java     |   0
 .../java/org/apache/amoro/io/MixedDataTestHelpers.java  |   0
 .../java/org/apache/amoro/io/TableDataTestBase.java     |   0
 .../amoro/io/TestArcticTreeNodePosDeleteWriter.java     |   0
 .../org/apache/amoro/io/TestBasicTableTrashManager.java |   0
 .../java/org/apache/amoro/io/TestFileNameGenerator.java |   0
 .../org/apache/amoro/io/TestIcebergCombinedReader.java  |   0
 .../amoro/io/TestIcebergCombinedReaderVariousTypes.java |   0
 .../amoro/io/TestIcebergFanoutPosDeleteWriter.java      |   0
 .../apache/amoro/io/TestRecoverableArcticFileIO.java    |   0
 .../org/apache/amoro/io/TestTableTrashManagers.java     |   0
 .../test/java/org/apache/amoro/io/TestTaskReader.java   |   0
 .../test/java/org/apache/amoro/io/TestTaskWriter.java   |   0
 .../org/apache/amoro/listener/ArcticRunListener.java    |   0
 .../test/java/org/apache/amoro/log/FormatTestBase.java  |   0
 .../apache/amoro/log/TestLogDataJsonSerialization.java  |   0
 .../java/org/apache/amoro/op/TestOverwriteBaseFile.java |   0
 .../java/org/apache/amoro/op/TestRewritePartitions.java |   0
 .../apache/amoro/op/TestUpdatePartitionProperties.java  |   0
 .../test/java/org/apache/amoro/op/TestUpdateTable.java  |   0
 .../amoro/optimizing/IcebergRewriteExecutorTest.java    |   0
 .../org/apache/amoro/scan/TestBaseCombinedScanTask.java |   0
 .../java/org/apache/amoro/scan/TestKeyedTableScan.java  |   0
 .../org/apache/amoro/scan/TestMixedChangeTableScan.java |   0
 .../java/org/apache/amoro/scan/TestScanSplitTask.java   |   0
 .../org/apache/amoro/scan/TestTableEntriesScan.java     |   0
 .../table/blocker/TestBasicTableBlockerManager.java     |   0
 .../java/org/apache/amoro/trace/TestTableTracer.java    |   0
 .../java/org/apache/amoro/trace/TestTableWatermark.java |   0
 .../java/org/apache/amoro/utils/JacksonUtilTest.java    |   0
 .../org/apache/amoro/utils/TestArcticCatalogUtil.java   |   0
 .../org/apache/amoro/utils/TestArcticDataFiles.java     |   0
 .../apache/amoro/utils/TestCompatiblePropertyUtil.java  |   0
 .../test/java/org/apache/amoro/utils/TestFileUtil.java  |   0
 .../org/apache/amoro/utils/TestKeyedExpressionUtil.java |   0
 .../org/apache/amoro/utils/TestStatisticsFileUtil.java  |   0
 .../org/apache/amoro/utils/TestTablePropertyUtil.java   |   0
 .../apache/amoro/utils/TestUnkeyedExpressionUtil.java   |   0
 .../org/apache/amoro/utils/TestWatermarkGenerator.java  |   0
 .../org/apache/amoro/utils/map/TestRocksDBBackend.java  |   0
 .../apache/amoro/utils/map/TestSimpleSpillableMap.java  |   0
 .../apache/amoro/utils/map/TestSimpleSpilledMap.java    |   0
 .../org/apache/amoro/utils/map/TestStructLikeMap.java   |   0
 .../utils/map/TestStructLikeWrapperSizeEstimator.java   |   0
 .../java/org/apache/iceberg/TestIcebergFindFiles.java   |   0
 {core => amoro-core}/src/test/resources/log4j2.xml      |   0
 .../flink-common-format/pom.xml                         |   0
 .../org/apache/amoro/flink/shuffle/LogRecordV1.java     |   0
 .../org/apache/amoro/flink/shuffle/RowKindUtil.java     |   0
 .../flink-common-iceberg-bridge/pom.xml                 |   0
 .../flink/data/AdaptHiveFlinkParquetReaders.java        |   0
 .../flink/data/AdaptHiveFlinkParquetWriters.java        |   0
 .../data/AdaptHiveParquetWithFlinkSchemaVisitor.java    |   0
 .../iceberg/flink/source/RowDataFileScanTaskReader.java |   0
 .../org/apache/iceberg/flink/source/ScanContext.java    |   0
 .../amoro-mixed-format-flink}/flink-common/pom.xml      |   0
 .../java/org/apache/amoro/flink/FlinkSchemaUtil.java    |   0
 .../org/apache/amoro/flink/InternalCatalogBuilder.java  |   0
 .../apache/amoro/flink/catalog/FlinkUnifiedCatalog.java |   0
 .../org/apache/amoro/flink/catalog/MixedCatalog.java    |   0
 .../flink/catalog/factories/CatalogFactoryOptions.java  |   0
 .../catalog/factories/FlinkUnifiedCatalogFactory.java   |   0
 .../factories/iceberg/IcebergFlinkCatalogFactory.java   |   0
 .../catalog/factories/mixed/MixedCatalogFactory.java    |   0
 .../factories/mixed/MixedHiveCatalogFactory.java        |   0
 .../factories/mixed/MixedIcebergCatalogFactory.java     |   0
 .../factories/paimon/PaimonFlinkCatalogFactory.java     |   0
 .../FlinkTablePropertiesInvocationHandler.java          |   0
 .../amoro/flink/interceptor/KerberosInterceptor.java    |   0
 .../flink/interceptor/KerberosInvocationHandler.java    |   0
 .../apache/amoro/flink/interceptor/ProxyFactory.java    |   0
 .../amoro/flink/lookup/ArcticRowDataLookupFunction.java |   0
 .../apache/amoro/flink/lookup/BasicLookupFunction.java  |   0
 .../flink/lookup/BinaryRowDataSerializerWrapper.java    |   0
 .../amoro/flink/lookup/ByteArraySetSerializer.java      |   0
 .../org/apache/amoro/flink/lookup/ByteArrayWrapper.java |   0
 .../java/org/apache/amoro/flink/lookup/KVTable.java     |   0
 .../org/apache/amoro/flink/lookup/KVTableFactory.java   |   0
 .../java/org/apache/amoro/flink/lookup/KeyRowData.java  |   0
 .../org/apache/amoro/flink/lookup/LookupMetrics.java    |   0
 .../org/apache/amoro/flink/lookup/LookupOptions.java    |   0
 .../org/apache/amoro/flink/lookup/LookupRecord.java     |   0
 .../apache/amoro/flink/lookup/RocksDBCacheState.java    |   0
 .../apache/amoro/flink/lookup/RocksDBRecordState.java   |   0
 .../amoro/flink/lookup/RocksDBSetSpilledState.java      |   0
 .../org/apache/amoro/flink/lookup/RocksDBSetState.java  |   0
 .../apache/amoro/flink/lookup/RowDataStateFactory.java  |   0
 .../apache/amoro/flink/lookup/SecondaryIndexTable.java  |   0
 .../org/apache/amoro/flink/lookup/TableFactory.java     |   0
 .../org/apache/amoro/flink/lookup/UniqueIndexTable.java |   0
 .../amoro/flink/lookup/filter/RowDataPredicate.java     |   0
 .../filter/RowDataPredicateExpressionVisitor.java       |   0
 .../org/apache/amoro/flink/metric/MetricConstant.java   |   0
 .../org/apache/amoro/flink/metric/MetricsGenerator.java |   0
 .../amoro/flink/planner/calcite/FlinkTypeSystem.java    |   0
 .../amoro/flink/read/AdaptHiveFlinkParquetReaders.java  |   0
 .../java/org/apache/amoro/flink/read/ArcticSource.java  |   0
 .../org/apache/amoro/flink/read/FlinkSplitPlanner.java  |   0
 .../apache/amoro/flink/read/MixedIncrementalLoader.java |   0
 .../apache/amoro/flink/read/PartitionAndNodeGroup.java  |   0
 .../read/hybrid/assigner/ShuffleSplitAssigner.java      |   0
 .../apache/amoro/flink/read/hybrid/assigner/Split.java  |   0
 .../amoro/flink/read/hybrid/assigner/SplitAssigner.java |   0
 .../flink/read/hybrid/assigner/StaticSplitAssigner.java |   0
 .../hybrid/enumerator/AbstractArcticEnumerator.java     |   0
 .../read/hybrid/enumerator/ArcticEnumeratorOffset.java  |   0
 .../enumerator/ArcticEnumeratorOffsetSerializer.java    |   0
 .../read/hybrid/enumerator/ArcticSourceEnumState.java   |   0
 .../enumerator/ArcticSourceEnumStateSerializer.java     |   0
 .../read/hybrid/enumerator/ArcticSourceEnumerator.java  |   0
 .../hybrid/enumerator/ContinuousEnumerationResult.java  |   0
 .../read/hybrid/enumerator/ContinuousSplitPlanner.java  |   0
 .../hybrid/enumerator/ContinuousSplitPlannerImpl.java   |   0
 .../hybrid/enumerator/InitializationFinishedEvent.java  |   0
 .../enumerator/MergeOnReadIncrementalPlanner.java       |   0
 .../read/hybrid/enumerator/MergeOnReadPlannerImpl.java  |   0
 .../hybrid/enumerator/StaticArcticSourceEnumerator.java |   0
 .../flink/read/hybrid/reader/ArcticRecordEmitter.java   |   0
 .../read/hybrid/reader/ArcticRecordWithOffset.java      |   0
 .../flink/read/hybrid/reader/ArcticSourceReader.java    |   0
 .../flink/read/hybrid/reader/ArrayBatchRecords.java     |   0
 .../hybrid/reader/ArrayPoolDataIteratorBatcher.java     |   0
 .../flink/read/hybrid/reader/DataIteratorBatcher.java   |   0
 .../read/hybrid/reader/DataIteratorReaderFunction.java  |   0
 .../flink/read/hybrid/reader/HybridSplitReader.java     |   0
 .../amoro/flink/read/hybrid/reader/ReaderFunction.java  |   0
 .../flink/read/hybrid/reader/ReaderStartedEvent.java    |   0
 .../amoro/flink/read/hybrid/reader/RecordFactory.java   |   0
 .../amoro/flink/read/hybrid/reader/RecordPosition.java  |   0
 .../flink/read/hybrid/reader/RowDataReaderFunction.java |   0
 .../flink/read/hybrid/reader/RowDataRecordFactory.java  |   0
 .../amoro/flink/read/hybrid/split/ArcticSplit.java      |   0
 .../flink/read/hybrid/split/ArcticSplitSerializer.java  |   0
 .../amoro/flink/read/hybrid/split/ArcticSplitState.java |   0
 .../amoro/flink/read/hybrid/split/ChangelogSplit.java   |   0
 .../amoro/flink/read/hybrid/split/MergeOnReadSplit.java |   0
 .../amoro/flink/read/hybrid/split/SnapshotSplit.java    |   0
 .../flink/read/hybrid/split/SplitRequestEvent.java      |   0
 .../flink/read/hybrid/split/TemporalJoinSplits.java     |   0
 .../flink/read/internals/KafkaPartitionSplitReader.java |   0
 .../apache/amoro/flink/read/internals/KafkaSource.java  |   0
 .../flink/read/internals/KafkaSourceFetcherManager.java |   0
 .../amoro/flink/read/internals/KafkaSourceReader.java   |   0
 .../internals/metrics/KafkaConsumerMetricConstants.java |   0
 .../amoro/flink/read/source/ArcticScanContext.java      |   0
 .../amoro/flink/read/source/ChangeLogDataIterator.java  |   0
 .../apache/amoro/flink/read/source/DataIterator.java    |   0
 .../amoro/flink/read/source/FileScanTaskReader.java     |   0
 .../amoro/flink/read/source/FlinkArcticDataReader.java  |   0
 .../flink/read/source/FlinkArcticMORDataReader.java     |   0
 .../flink/read/source/MergeOnReadDataIterator.java      |   0
 .../amoro/flink/read/source/log/LogSourceHelper.java    |   0
 .../read/source/log/kafka/LogKafkaPartitionSplit.java   |   0
 .../source/log/kafka/LogKafkaPartitionSplitReader.java  |   0
 .../source/log/kafka/LogKafkaPartitionSplitState.java   |   0
 .../read/source/log/kafka/LogKafkaRecordEmitter.java    |   0
 .../flink/read/source/log/kafka/LogKafkaSource.java     |   0
 .../read/source/log/kafka/LogKafkaSourceBuilder.java    |   0
 .../read/source/log/kafka/LogKafkaSourceReader.java     |   0
 .../read/source/log/kafka/LogRecordWithRetractInfo.java |   0
 .../amoro/flink/shuffle/ReadShuffleRulePolicy.java      |   0
 .../flink/shuffle/RoundRobinShuffleRulePolicy.java      |   0
 .../org/apache/amoro/flink/shuffle/ShuffleHelper.java   |   0
 .../java/org/apache/amoro/flink/shuffle/ShuffleKey.java |   0
 .../apache/amoro/flink/shuffle/ShuffleRulePolicy.java   |   0
 .../amoro/flink/table/AmoroDynamicTableFactory.java     |   0
 .../org/apache/amoro/flink/table/ArcticDynamicSink.java |   0
 .../apache/amoro/flink/table/ArcticDynamicSource.java   |   0
 .../org/apache/amoro/flink/table/ArcticFileSource.java  |   0
 .../org/apache/amoro/flink/table/ArcticTableLoader.java |   0
 .../apache/amoro/flink/table/DynamicTableFactory.java   |   0
 .../java/org/apache/amoro/flink/table/FlinkSource.java  |   0
 .../amoro/flink/table/KafkaConnectorOptionsUtil.java    |   0
 .../org/apache/amoro/flink/table/LogDynamicSource.java  |   0
 .../flink/table/UnkeyedInputFormatOperatorFactory.java  |   0
 .../flink/table/UnkeyedInputFormatSourceFunction.java   |   0
 .../amoro/flink/table/descriptors/ArcticValidator.java  |   0
 .../java/org/apache/amoro/flink/util/ArcticUtils.java   |   0
 .../amoro/flink/util/CompatibleFlinkPropertyUtil.java   |   0
 .../java/org/apache/amoro/flink/util/DateTimeUtils.java |   0
 .../java/org/apache/amoro/flink/util/FilterUtil.java    |   0
 .../amoro/flink/util/FlinkClassReflectionUtil.java      |   0
 .../apache/amoro/flink/util/IcebergAndFlinkFilters.java |   0
 .../org/apache/amoro/flink/util/IcebergClassUtil.java   |   0
 .../java/org/apache/amoro/flink/util/LookupUtil.java    |   0
 .../java/org/apache/amoro/flink/util/Projection.java    |   0
 .../java/org/apache/amoro/flink/util/ProxyUtil.java     |   0
 .../org/apache/amoro/flink/util/ReflectionUtil.java     |   0
 .../org/apache/amoro/flink/util/ThreadLocalCache.java   |   0
 .../flink/write/AdaptHiveFlinkAppenderFactory.java      |   0
 .../org/apache/amoro/flink/write/ArcticFileWriter.java  |   0
 .../org/apache/amoro/flink/write/ArcticLogWriter.java   |   0
 .../flink/write/ArcticRowDataTaskWriterFactory.java     |   0
 .../java/org/apache/amoro/flink/write/ArcticWriter.java |   0
 .../amoro/flink/write/AutomaticDoubleWriteStatus.java   |   0
 .../apache/amoro/flink/write/AutomaticLogWriter.java    |   0
 .../amoro/flink/write/AutomaticWriteSpecification.java  |   0
 .../apache/amoro/flink/write/FlinkBaseTaskWriter.java   |   0
 .../apache/amoro/flink/write/FlinkChangeTaskWriter.java |   0
 .../java/org/apache/amoro/flink/write/FlinkSink.java    |   0
 .../amoro/flink/write/FlinkTaskWriterBuilder.java       |   0
 .../flink/write/hidden/AbstractHiddenLogWriter.java     |   0
 .../amoro/flink/write/hidden/ArcticLogPartitioner.java  |   0
 .../amoro/flink/write/hidden/GlobalFlipCommitter.java   |   0
 .../amoro/flink/write/hidden/HiddenLogWriter.java       |   0
 .../apache/amoro/flink/write/hidden/LogMsgFactory.java  |   0
 .../flink/write/hidden/kafka/HiddenKafkaFactory.java    |   0
 .../flink/write/hidden/kafka/HiddenKafkaProducer.java   |   0
 .../services/org.apache.flink.table.factories.Factory   |   0
 .../flink-common/src/main/resources/log4j.properties    |   0
 .../apache/amoro/flink/DynamicTableSourceTestBase.java  |   0
 .../java/org/apache/amoro/flink/FlinkTableTestBase.java |   0
 .../test/java/org/apache/amoro/flink/FlinkTestBase.java |   0
 .../org/apache/amoro/flink/TestFlinkSchemaUtil.java     |   0
 .../amoro/flink/catalog/FlinkAmoroCatalogITCase.java    |   0
 .../apache/amoro/flink/catalog/FlinkCatalogContext.java |   0
 .../amoro/flink/catalog/FlinkUnifiedCatalogITCase.java  |   0
 .../amoro/flink/catalog/TestFlinkUnifiedCatalogs.java   |   0
 .../apache/amoro/flink/catalog/TestMixedCatalog.java    |   0
 .../flink/catalog/TestMixedCatalogTablePartitions.java  |   0
 .../flink/kafka/testutils/KafkaConfigGenerate.java      |   0
 .../amoro/flink/kafka/testutils/KafkaContainerTest.java |   0
 .../apache/amoro/flink/kafka/testutils/KafkaUtil.java   |   0
 .../amoro/flink/kafka/testutils/SuccessException.java   |   0
 .../amoro/flink/lookup/ByteArraySetSerializerTest.java  |   0
 .../java/org/apache/amoro/flink/lookup/TestKVTable.java |   0
 .../filter/TestRowDataPredicateAllFieldTypes.java       |   0
 .../flink/lookup/filter/TestRowDataPredicateBase.java   |   0
 .../filter/TestRowDataPredicateExpressionVisitor.java   |   0
 .../org/apache/amoro/flink/read/TestArcticSource.java   |   0
 .../org/apache/amoro/flink/read/TestFlinkSource.java    |   0
 .../apache/amoro/flink/read/TestFlinkSplitPlanner.java  |   0
 .../flink/read/hidden/kafka/TestKafkaConsumer.java      |   0
 .../flink/read/hidden/kafka/TestKafkaSourceReader.java  |   0
 .../hidden/kafka/TestLogKafkaPartitionSplitReader.java  |   0
 .../read/hybrid/assigner/TestShuffleSplitAssigner.java  |   0
 .../read/hybrid/assigner/TestSplitAssignerAwaiting.java |   0
 .../read/hybrid/assigner/TestStaticSplitAssigner.java   |   0
 .../enumerator/TestArcticSourceEnumStateSerializer.java |   0
 .../hybrid/enumerator/TestArcticSourceEnumerator.java   |   0
 .../enumerator/TestContinuousSplitPlannerImpl.java      |   0
 .../enumerator/TestTemporalJoinSplitsThreadSafe.java    |   0
 .../read/hybrid/reader/MixedIncrementalLoaderTest.java  |   0
 .../read/hybrid/reader/TestRowDataReaderFunction.java   |   0
 .../read/hybrid/split/TestArcticSplitSerializer.java    |   0
 .../org/apache/amoro/flink/shuffle/TestLogRecordV1.java |   0
 .../flink/shuffle/TestRoundRobinShuffleRulePolicy.java  |   0
 .../amoro/flink/table/AmoroCatalogITCaseBase.java       |   0
 .../org/apache/amoro/flink/table/CatalogITCaseBase.java |   0
 .../java/org/apache/amoro/flink/table/LookupITCase.java |   0
 .../java/org/apache/amoro/flink/table/TestJoin.java     |   0
 .../java/org/apache/amoro/flink/table/TestKeyed.java    |   0
 .../apache/amoro/flink/table/TestLookupSecondary.java   |   0
 .../org/apache/amoro/flink/table/TestTableRefresh.java  |   0
 .../java/org/apache/amoro/flink/table/TestUnkeyed.java  |   0
 .../apache/amoro/flink/table/TestUnkeyedOverwrite.java  |   0
 .../org/apache/amoro/flink/table/TestWatermark.java     |   0
 .../org/apache/amoro/flink/util/ClassLoaderUtils.java   |   0
 .../test/java/org/apache/amoro/flink/util/DataUtil.java |   0
 .../apache/amoro/flink/util/MockEnvironmentArctic.java  |   0
 .../apache/amoro/flink/util/MockEnvironmentBuilder.java |   0
 .../flink/util/TestCompatibleFlinkPropertyUtil.java     |   0
 .../amoro/flink/util/TestGlobalAggregateManager.java    |   0
 .../flink/util/TestOneInputStreamOperatorIntern.java    |   0
 .../org/apache/amoro/flink/util/TestProjection.java     |   0
 .../test/java/org/apache/amoro/flink/util/TestUtil.java |   0
 .../amoro/flink/write/ArcticFileWriterITCase.java       |   0
 .../amoro/flink/write/FlinkTaskWriterBaseTest.java      |   0
 .../apache/amoro/flink/write/TestAdaptHiveWriter.java   |   0
 .../amoro/flink/write/TestArcticFileCommitter.java      |   0
 .../apache/amoro/flink/write/TestArcticFileWriter.java  |   0
 .../flink/write/TestAutomaticDoubleWriteStatus.java     |   0
 .../amoro/flink/write/TestAutomaticLogWriter.java       |   0
 .../org/apache/amoro/flink/write/TestFlinkSink.java     |   0
 .../amoro/flink/write/hidden/kafka/TestBaseLog.java     |   0
 .../write/hidden/kafka/TestHiddenKafkaProducer.java     |   0
 .../write/hidden/kafka/TestHiddenLogOperators.java      |   0
 .../services/org.apache.flink.table.factories.Factory   |   0
 .../flink-common/src/test/resources/log4j2-test.xml     |   0
 .../src/test/resources/log4j2.component.properties      |   0
 .../amoro-mixed-format-flink}/pom.xml                   |   0
 .../v1.15/flink-runtime/pom.xml                         |   0
 .../amoro-mixed-format-flink}/v1.15/flink/pom.xml       |   0
 .../v1.16/flink-runtime/pom.xml                         |   0
 .../amoro-mixed-format-flink}/v1.16/flink/pom.xml       |   0
 .../v1.17/flink-runtime/pom.xml                         |   0
 .../amoro-mixed-format-flink}/v1.17/flink/pom.xml       |   0
 .../amoro-mixed-format-hive}/pom.xml                    |   0
 .../org/apache/amoro/hive/ArcticHiveClientPool.java     |   0
 .../org/apache/amoro/hive/CachedHiveClientPool.java     |   0
 .../src/main/java/org/apache/amoro/hive/HMSClient.java  |   0
 .../main/java/org/apache/amoro/hive/HMSClientImpl.java  |   0
 .../main/java/org/apache/amoro/hive/HMSClientPool.java  |   0
 .../apache/amoro/hive/catalog/ArcticHiveCatalog.java    |   0
 .../org/apache/amoro/hive/catalog/MixedHiveTables.java  |   0
 .../exceptions/CannotAlterHiveLocationException.java    |   0
 .../io/reader/AbstractAdaptHiveKeyedDataReader.java     |   0
 .../io/reader/AbstractAdaptHiveUnkeyedDataReader.java   |   0
 .../hive/io/reader/AdaptHiveArcticDeleteFilter.java     |   0
 .../hive/io/reader/AdaptHiveGenericKeyedDataReader.java |   0
 .../io/reader/AdaptHiveGenericUnkeyedDataReader.java    |   0
 .../io/writer/AdaptHiveGenericTaskWriterBuilder.java    |   0
 .../hive/io/writer/AdaptHiveOperateToTableRelation.java |   0
 .../hive/io/writer/AdaptHiveOutputFileFactory.java      |   0
 .../amoro/hive/io/writer/OperateToTableRelation.java    |   0
 .../java/org/apache/amoro/hive/op/BaseSchemaUpdate.java |   0
 .../apache/amoro/hive/op/HiveOperationTransaction.java  |   0
 .../java/org/apache/amoro/hive/op/HiveSchemaUpdate.java |   0
 .../org/apache/amoro/hive/op/OverwriteHiveFiles.java    |   0
 .../org/apache/amoro/hive/op/ReplaceHivePartitions.java |   0
 .../java/org/apache/amoro/hive/op/RewriteHiveFiles.java |   0
 .../java/org/apache/amoro/hive/op/UpdateHiveFiles.java  |   0
 .../hive/optimizing/MixFormatOptimizingDataReader.java  |   0
 .../amoro/hive/optimizing/MixFormatRewriteExecutor.java |   0
 .../optimizing/MixFormatRewriteExecutorFactory.java     |   0
 .../org/apache/amoro/hive/table/HiveLocationKind.java   |   0
 .../org/apache/amoro/hive/table/KeyedHiveTable.java     |   0
 .../java/org/apache/amoro/hive/table/SupportHive.java   |   0
 .../org/apache/amoro/hive/table/UnkeyedHiveTable.java   |   0
 .../java/org/apache/amoro/hive/utils/CatalogUtil.java   |   0
 .../org/apache/amoro/hive/utils/ChangeFieldName.java    |   0
 .../amoro/hive/utils/CompatibleHivePropertyUtil.java    |   0
 .../org/apache/amoro/hive/utils/HiveCommitUtil.java     |   0
 .../apache/amoro/hive/utils/HiveMetaSynchronizer.java   |   0
 .../org/apache/amoro/hive/utils/HivePartitionUtil.java  |   0
 .../org/apache/amoro/hive/utils/HiveSchemaUtil.java     |   0
 .../java/org/apache/amoro/hive/utils/HiveTableUtil.java |   0
 .../java/org/apache/amoro/hive/utils/TableTypeUtil.java |   0
 .../main/java/org/apache/amoro/hive/utils/TimeUtil.java |   0
 .../apache/amoro/hive/utils/UpgradeHiveTableUtil.java   |   0
 .../optimizer/ppr/PartitionExpressionForMetastore.java  |   0
 .../authorization/AuthorizationPreEventListener.java    |   0
 .../main/java/org/apache/iceberg/IcebergSchemaUtil.java |   0
 .../iceberg/data/AdaptHiveGenericAppenderFactory.java   |   0
 .../data/parquet/AdaptHiveBaseParquetReaders.java       |   0
 .../data/parquet/AdaptHiveBaseParquetWriter.java        |   0
 .../data/parquet/AdaptHiveGenericParquetReaders.java    |   0
 .../data/parquet/AdaptHiveGenericParquetWriter.java     |   0
 .../iceberg/parquet/AdaptHiveApplyNameMapping.java      |   0
 .../apache/iceberg/parquet/AdaptHiveColumnWriter.java   |   0
 .../org/apache/iceberg/parquet/AdaptHiveParquet.java    |   0
 .../iceberg/parquet/AdaptHiveParquetConversions.java    |   0
 .../AdaptHiveParquetDictionaryRowGroupFilter.java       |   0
 .../parquet/AdaptHiveParquetMetricsRowGroupFilter.java  |   0
 .../apache/iceberg/parquet/AdaptHiveParquetReader.java  |   0
 .../iceberg/parquet/AdaptHiveParquetSchemaUtil.java     |   0
 .../apache/iceberg/parquet/AdaptHiveParquetUtil.java    |   0
 .../apache/iceberg/parquet/AdaptHiveParquetWriter.java  |   0
 .../iceberg/parquet/AdaptHivePrimitiveWriter.java       |   0
 .../org/apache/iceberg/parquet/AdaptHiveReadConf.java   |   0
 .../iceberg/parquet/AdaptHiveTypeToMessageType.java     |   0
 .../test/java/org/apache/amoro/hive/HMSMockServer.java  |   0
 .../org/apache/amoro/hive/MixedHiveTableTestBase.java   |   0
 .../src/test/java/org/apache/amoro/hive/TestHMS.java    |   0
 .../amoro/hive/catalog/HiveCatalogTestHelper.java       |   0
 .../apache/amoro/hive/catalog/HiveTableTestHelper.java  |   0
 .../amoro/hive/catalog/TestHiveCatalogLoader.java       |   0
 .../apache/amoro/hive/catalog/TestMixedHiveCatalog.java |   0
 .../hive/formats/IcebergHiveCatalogTestHelper.java      |   0
 .../hive/formats/MixedIcebergHiveCatalogTestHelper.java |   0
 .../amoro/hive/formats/PaimonHiveCatalogTestHelper.java |   0
 .../amoro/hive/formats/TestIcebergHiveAmoroCatalog.java |   0
 .../hive/formats/TestMixedIcebergHiveAmoroCatalog.java  |   0
 .../amoro/hive/formats/TestPaimonHiveAmoroCatalog.java  |   0
 .../org/apache/amoro/hive/io/HiveDataTestHelpers.java   |   0
 .../amoro/hive/io/TestHiveTableTrashManagers.java       |   0
 .../org/apache/amoro/hive/io/TestHiveTaskReader.java    |   0
 .../org/apache/amoro/hive/io/TestHiveTaskWriter.java    |   0
 .../org/apache/amoro/hive/io/TestImpalaParquet.java     |   0
 .../org/apache/amoro/hive/op/TestHiveSchemaUpdate.java  |   0
 .../org/apache/amoro/hive/op/TestOverwriteFiles.java    |   0
 .../java/org/apache/amoro/hive/op/TestRewriteFiles.java |   0
 .../org/apache/amoro/hive/op/TestRewritePartitions.java |   0
 .../java/org/apache/amoro/hive/op/TestSyncHiveMeta.java |   0
 .../amoro/hive/op/UpdateHiveFilesTestHelpers.java       |   0
 .../hive/utils/TestCompatibleHivePropertyUtil.java      |   0
 .../amoro/hive/utils/TestHiveMetaSynchronizer.java      |   0
 .../org/apache/amoro/hive/utils/TestHiveSchemaUtil.java |   0
 .../java/org/apache/amoro/hive/utils/TestTimeUtil.java  |   0
 .../amoro/hive/utils/TestUpgradeHiveTableUtil.java      |   0
 .../apache/iceberg/parquet/TestAdaptHiveReadConf.java   |   0
 .../src/test/resources/hive-schema-3.1.0.derby.sql      |   0
 .../src/test/resources/hive.parquet                     | Bin
 .../src/test/resources/log4j2.xml                       |   0
 .../src/test/resources/string_is_bytes.parquet          | Bin
 .../amoro-mixed-format-spark}/common/pom.xml            |   0
 .../java/org/apache/amoro/spark/SessionCatalogBase.java |   0
 .../java/org/apache/amoro/spark/SparkTableFormat.java   |   0
 .../org/apache/amoro/spark/SparkUnifiedCatalog.java     |   0
 .../amoro/spark/SparkUnifiedCatalogProperties.java      |   0
 .../apache/amoro/spark/SparkUnifiedSessionCatalog.java  |   0
 .../org/apache/amoro/spark/SupportAuthentication.java   |   0
 .../apache/amoro/spark/iceberg/IcebergSparkFormat.java  |   0
 .../org/apache/amoro/spark/mixed/ArcticDataSource.java  |   0
 .../apache/amoro/spark/mixed/MixedFormatSparkUtil.java  |   0
 .../apache/amoro/spark/mixed/MixedHiveDataSource.java   |   0
 .../apache/amoro/spark/mixed/MixedHiveSparkFormat.java  |   0
 .../amoro/spark/mixed/MixedIcebergDataSource.java       |   0
 .../amoro/spark/mixed/MixedIcebergSparkFormat.java      |   0
 .../amoro/spark/mixed/MixedSessionCatalogBase.java      |   0
 .../org/apache/amoro/spark/mixed/MixedSourceBase.java   |   0
 .../apache/amoro/spark/mixed/MixedSparkCatalogBase.java |   0
 .../apache/amoro/spark/mixed/MixedTableStoreType.java   |   0
 .../apache/amoro/spark/mixed/SparkSQLProperties.java    |   0
 .../apache/amoro/spark/paimon/PaimonSparkFormat.java    |   0
 .../java/org/apache/amoro/spark/util/SparkUtil.java     |   0
 .../services/org.apache.amoro.spark.SparkTableFormat    |   0
 .../org.apache.spark.sql.sources.DataSourceRegister     |   0
 .../org/apache/amoro/spark/test/MixedTableTestBase.java |   0
 .../java/org/apache/amoro/spark/test/SparkTestBase.java |   0
 .../org/apache/amoro/spark/test/SparkTestContext.java   |   0
 .../org/apache/amoro/spark/test/TestIdentifier.java     |   0
 .../spark/test/extensions/DefaultParameterContext.java  |   0
 .../spark/test/extensions/EachParameterResolver.java    |   0
 .../spark/test/extensions/EnableCatalogSelect.java      |   0
 .../test/extensions/EnableCatalogSelectExtension.java   |   0
 .../spark/test/unified/UnifiedCatalogTestSuites.java    |   0
 .../java/org/apache/amoro/spark/test/utils/Asserts.java |   0
 .../apache/amoro/spark/test/utils/DataComparator.java   |   0
 .../apache/amoro/spark/test/utils/ExpectResultUtil.java |   0
 .../apache/amoro/spark/test/utils/RecordGenerator.java  |   0
 .../amoro/spark/test/utils/ResourceInputFile.java       |   0
 .../apache/amoro/spark/test/utils/ScalaTestUtil.java    |   0
 .../org/apache/amoro/spark/test/utils/TableFiles.java   |   0
 .../org/apache/amoro/spark/test/utils/TestTable.java    |   0
 .../apache/amoro/spark/test/utils/TestTableUtil.java    |   0
 .../org/apache/amoro/spark/test/utils/TestTables.java   |   0
 .../amoro-mixed-format-spark}/pom.xml                   |   0
 .../v3.2/spark-runtime/pom.xml                          |   0
 .../amoro-mixed-format-spark}/v3.2/spark/pom.xml        |   0
 .../apache/amoro/spark/sql/parser/ArcticSqlCommand.g4   |   0
 .../apache/amoro/spark/sql/parser/ArcticSqlExtend.g4    |   0
 .../v3.2/spark/src/main/gen-antlr/.gitignore            |   0
 .../spark/sql/parser/ArcticSqlCommandBaseListener.java  |   0
 .../spark/sql/parser/ArcticSqlCommandBaseVisitor.java   |   0
 .../amoro/spark/sql/parser/ArcticSqlCommandLexer.java   |   0
 .../spark/sql/parser/ArcticSqlCommandListener.java      |   0
 .../amoro/spark/sql/parser/ArcticSqlCommandParser.java  |   0
 .../amoro/spark/sql/parser/ArcticSqlCommandVisitor.java |   0
 .../spark/sql/parser/ArcticSqlExtendBaseListener.java   |   0
 .../spark/sql/parser/ArcticSqlExtendBaseVisitor.java    |   0
 .../amoro/spark/sql/parser/ArcticSqlExtendLexer.java    |   0
 .../amoro/spark/sql/parser/ArcticSqlExtendListener.java |   0
 .../amoro/spark/sql/parser/ArcticSqlExtendParser.java   |   0
 .../amoro/spark/sql/parser/ArcticSqlExtendVisitor.java  |   0
 .../java/org/apache/amoro/spark/ArcticSparkCatalog.java |   0
 .../apache/amoro/spark/ArcticSparkSessionCatalog.java   |   0
 .../java/org/apache/amoro/spark/Spark32Adapter.java     |   0
 .../main/java/org/apache/amoro/spark/SparkAdapter.java  |   0
 .../java/org/apache/amoro/spark/SparkAdapterLoader.java |   0
 .../apache/amoro/spark/SparkInternalRowCastWrapper.java |   0
 .../org/apache/amoro/spark/SparkInternalRowWrapper.java |   0
 .../apache/amoro/spark/command/ArcticSparkCommand.java  |   0
 .../amoro/spark/command/MigrateToArcticCommand.java     |   0
 .../amoro/spark/io/ArcticSparkBaseTaskWriter.java       |   0
 .../amoro/spark/io/ArcticSparkChangeTaskWriter.java     |   0
 .../amoro/spark/io/InternalRowFileAppenderFactory.java  |   0
 .../java/org/apache/amoro/spark/io/TaskWriters.java     |   0
 .../apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java |   0
 .../amoro/spark/reader/ArcticSparkKeyedDataReader.java  |   0
 .../spark/reader/ArcticSparkUnkeyedDataReader.java      |   0
 .../apache/amoro/spark/reader/KeyedSparkBatchScan.java  |   0
 .../apache/amoro/spark/reader/SparkParquetReaders.java  |   0
 .../org/apache/amoro/spark/reader/SparkScanBuilder.java |   0
 .../amoro/spark/reader/UnkeyedSparkBatchScan.java       |   0
 .../sql/catalyst/parser/ArcticCommandAstParser.java     |   0
 .../sql/connector/expressions/FileIndexBucket.java      |   0
 .../amoro/spark/table/ArcticIcebergSparkTable.java      |   0
 .../amoro/spark/table/ArcticSparkChangeTable.java       |   0
 .../org/apache/amoro/spark/table/ArcticSparkTable.java  |   0
 .../amoro/spark/table/SupportsExtendIdentColumns.java   |   0
 .../amoro/spark/table/SupportsRowLevelOperator.java     |   0
 .../org/apache/amoro/spark/util/ArcticSparkUtils.java   |   0
 .../amoro/spark/util/DistributionAndOrderingUtil.java   |   0
 .../org/apache/amoro/spark/util/ExpressionHelper.java   |   0
 .../org/apache/amoro/spark/util/SortOrderToSpark.java   |   0
 .../main/java/org/apache/amoro/spark/util/Stats.java    |   0
 .../amoro/spark/writer/ArcticSparkWriteBuilder.java     |   0
 .../apache/amoro/spark/writer/KeyedSparkBatchWrite.java |   0
 .../org/apache/amoro/spark/writer/RowLevelWriter.java   |   0
 .../amoro/spark/writer/SimpleInternalRowDataWriter.java |   0
 .../amoro/spark/writer/SimpleRowLevelDataWriter.java    |   0
 .../amoro/spark/writer/UnkeyedSparkBatchWrite.java      |   0
 .../java/org/apache/amoro/spark/writer/WriteMode.java   |   0
 .../org/apache/amoro/spark/writer/WriteTaskCommit.java  |   0
 .../data/AdaptHiveParquetWithSparkSchemaVisitor.java    |   0
 .../spark/data/AdaptHiveSparkParquetWriters.java        |   0
 .../org/apache/amoro/spark/ArcticSparkExtensions.scala  |   0
 .../org/apache/amoro/spark/SupportSparkAdapter.scala    |   0
 .../apache/amoro/spark/sql/ArcticExtensionUtils.scala   |   0
 .../catalyst/analysis/QueryWithConstraintCheck.scala    |   0
 .../sql/catalyst/analysis/ResolveArcticCommand.scala    |   0
 .../ResolveMergeIntoArcticTableReferences.scala         |   0
 .../sql/catalyst/analysis/RewriteArcticCommand.scala    |   0
 .../catalyst/analysis/RewriteArcticMergeIntoTable.scala |   0
 .../spark/sql/catalyst/optimize/OptimizeWriteRule.scala |   0
 .../catalyst/optimize/RewriteAppendArcticTable.scala    |   0
 .../optimize/RewriteDeleteFromArcticTable.scala         |   0
 .../catalyst/optimize/RewriteUpdateArcticTable.scala    |   0
 .../spark/sql/catalyst/parser/ArcticParserUtils.scala   |   0
 .../sql/catalyst/parser/ArcticSqlExtensionsParser.scala |   0
 .../catalyst/plans/AlterArcticTableDropPartition.scala  |   0
 .../spark/sql/catalyst/plans/ArcticRowLevelWrite.scala  |   0
 .../spark/sql/catalyst/plans/MergeIntoArcticTable.scala |   0
 .../amoro/spark/sql/catalyst/plans/MergeRows.scala      |   0
 .../catalyst/plans/QueryWithConstraintCheckPlan.scala   |   0
 .../spark/sql/catalyst/plans/TruncateArcticTable.scala  |   0
 .../catalyst/plans/UnresolvedMergeIntoArcticTable.scala |   0
 .../amoro/spark/sql/catalyst/plans/logicals.scala       |   0
 .../amoro/spark/sql/catalyst/plans/statements.scala     |   0
 .../execution/AlterArcticTableDropPartitionExec.scala   |   0
 .../amoro/spark/sql/execution/ArcticCommandExec.scala   |   0
 .../spark/sql/execution/ArcticRowLevelWriteExec.scala   |   0
 .../spark/sql/execution/DescribeKeyedTableExec.scala    |   0
 .../spark/sql/execution/ExtendedArcticStrategy.scala    |   0
 .../amoro/spark/sql/execution/MergeRowsExec.scala       |   0
 .../sql/execution/QueryWithConstraintCheckExec.scala    |   0
 .../spark/sql/execution/TruncateArcticTableExec.scala   |   0
 .../amoro/spark/sql/utils/ArcticRewriteHelper.scala     |   0
 .../amoro/spark/sql/utils/ProjectingInternalRow.scala   |   0
 .../apache/amoro/spark/sql/utils/RowDeltaUtils.scala    |   0
 .../amoro/spark/sql/utils/WriteQueryProjections.scala   |   0
 .../org/apache/amoro/spark/sql/utils/expressions.scala  |   0
 .../spark/sql/amoro/catalyst/ArcticSpark32Helper.scala  |   0
 .../spark/sql/amoro/catalyst/ExpressionHelper.scala     |   0
 .../sql/amoro/parser/ArcticSqlExtendAstBuilder.scala    |   0
 .../spark/sql/amoro/parser/QueryParsingErrors.scala     |   0
 .../java/org/apache/amoro/spark/TestUnifiedCatalog.java |   0
 .../org/apache/amoro/spark/test/TestImpalaParquet.java  |   0
 .../test/suites/api/TestKeyedTableDataFrameAPI.java     |   0
 .../test/suites/api/TestUnKeyedTableDataFrameAPI.java   |   0
 .../spark/test/suites/catalog/TestSessionCatalog.java   |   0
 .../spark/test/suites/sql/TestAlterTableColumnSQL.java  |   0
 .../spark/test/suites/sql/TestArcticCommandSQL.java     |   0
 .../spark/test/suites/sql/TestArcticSessionCatalog.java |   0
 .../spark/test/suites/sql/TestCreateTableAsSelect.java  |   0
 .../spark/test/suites/sql/TestCreateTableLikeSQL.java   |   0
 .../amoro/spark/test/suites/sql/TestCreateTableSQL.java |   0
 .../amoro/spark/test/suites/sql/TestDeleteFromSQL.java  |   0
 .../apache/amoro/spark/test/suites/sql/TestDescSQL.java |   0
 .../spark/test/suites/sql/TestDropPartitionSQL.java     |   0
 .../amoro/spark/test/suites/sql/TestInsertIntoSQL.java  |   0
 .../spark/test/suites/sql/TestInsertOverwriteSQL.java   |   0
 .../amoro/spark/test/suites/sql/TestMergeIntoSQL.java   |   0
 .../amoro/spark/test/suites/sql/TestSelectSQL.java      |   0
 .../amoro/spark/test/suites/sql/TestTruncateSQL.java    |   0
 .../amoro/spark/test/suites/sql/TestUpdateSQL.java      |   0
 .../test/suites/ut/sql/parser/TestSqlExtendParser.java  |   0
 .../org/apache/amoro/spark/writer/TestMixedWriter.java  |   0
 .../v3.2/spark/src/test/resources/log4j2.properties     |   0
 .../v3.3/spark-runtime/pom.xml                          |   0
 .../amoro-mixed-format-spark}/v3.3/spark/pom.xml        |   0
 .../apache/amoro/spark/sql/parser/ArcticSqlCommand.g4   |   0
 .../apache/amoro/spark/sql/parser/ArcticSqlExtend.g4    |   0
 .../v3.3/spark/src/main/gen-antlr/.gitignore            |   0
 .../spark/sql/parser/ArcticSqlCommandBaseListener.java  |   0
 .../spark/sql/parser/ArcticSqlCommandBaseVisitor.java   |   0
 .../amoro/spark/sql/parser/ArcticSqlCommandLexer.java   |   0
 .../spark/sql/parser/ArcticSqlCommandListener.java      |   0
 .../amoro/spark/sql/parser/ArcticSqlCommandParser.java  |   0
 .../amoro/spark/sql/parser/ArcticSqlCommandVisitor.java |   0
 .../spark/sql/parser/ArcticSqlExtendBaseListener.java   |   0
 .../spark/sql/parser/ArcticSqlExtendBaseVisitor.java    |   0
 .../amoro/spark/sql/parser/ArcticSqlExtendLexer.java    |   0
 .../amoro/spark/sql/parser/ArcticSqlExtendListener.java |   0
 .../amoro/spark/sql/parser/ArcticSqlExtendParser.java   |   0
 .../amoro/spark/sql/parser/ArcticSqlExtendVisitor.java  |   0
 .../java/org/apache/amoro/spark/ArcticSparkCatalog.java |   0
 .../apache/amoro/spark/ArcticSparkSessionCatalog.java   |   0
 .../java/org/apache/amoro/spark/Spark33Adapter.java     |   0
 .../main/java/org/apache/amoro/spark/SparkAdapter.java  |   0
 .../java/org/apache/amoro/spark/SparkAdapterLoader.java |   0
 .../apache/amoro/spark/SparkInternalRowCastWrapper.java |   0
 .../org/apache/amoro/spark/SparkInternalRowWrapper.java |   0
 .../apache/amoro/spark/command/ArcticSparkCommand.java  |   0
 .../amoro/spark/command/MigrateToArcticCommand.java     |   0
 .../amoro/spark/io/ArcticSparkBaseTaskWriter.java       |   0
 .../amoro/spark/io/ArcticSparkChangeTaskWriter.java     |   0
 .../amoro/spark/io/InternalRowFileAppenderFactory.java  |   0
 .../java/org/apache/amoro/spark/io/TaskWriters.java     |   0
 .../apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java |   0
 .../amoro/spark/reader/ArcticSparkKeyedDataReader.java  |   0
 .../spark/reader/ArcticSparkUnkeyedDataReader.java      |   0
 .../apache/amoro/spark/reader/KeyedSparkBatchScan.java  |   0
 .../apache/amoro/spark/reader/SparkParquetReaders.java  |   0
 .../org/apache/amoro/spark/reader/SparkScanBuilder.java |   0
 .../amoro/spark/reader/UnkeyedSparkBatchScan.java       |   0
 .../sql/catalyst/parser/ArcticCommandAstParser.java     |   0
 .../sql/connector/expressions/FileIndexBucket.java      |   0
 .../amoro/spark/table/ArcticIcebergSparkTable.java      |   0
 .../amoro/spark/table/ArcticSparkChangeTable.java       |   0
 .../org/apache/amoro/spark/table/ArcticSparkTable.java  |   0
 .../amoro/spark/table/SupportsExtendIdentColumns.java   |   0
 .../amoro/spark/table/SupportsRowLevelOperator.java     |   0
 .../org/apache/amoro/spark/util/ArcticSparkUtils.java   |   0
 .../amoro/spark/util/DistributionAndOrderingUtil.java   |   0
 .../org/apache/amoro/spark/util/ExpressionHelper.java   |   0
 .../org/apache/amoro/spark/util/SortOrderToSpark.java   |   0
 .../main/java/org/apache/amoro/spark/util/Stats.java    |   0
 .../amoro/spark/writer/ArcticSparkWriteBuilder.java     |   0
 .../apache/amoro/spark/writer/KeyedSparkBatchWrite.java |   0
 .../org/apache/amoro/spark/writer/RowLevelWriter.java   |   0
 .../amoro/spark/writer/SimpleInternalRowDataWriter.java |   0
 .../amoro/spark/writer/SimpleRowLevelDataWriter.java    |   0
 .../amoro/spark/writer/UnkeyedSparkBatchWrite.java      |   0
 .../java/org/apache/amoro/spark/writer/WriteMode.java   |   0
 .../org/apache/amoro/spark/writer/WriteTaskCommit.java  |   0
 .../data/AdaptHiveParquetWithSparkSchemaVisitor.java    |   0
 .../spark/data/AdaptHiveSparkParquetWriters.java        |   0
 .../org/apache/amoro/spark/ArcticSparkExtensions.scala  |   0
 .../org/apache/amoro/spark/SupportSparkAdapter.scala    |   0
 .../apache/amoro/spark/sql/ArcticExtensionUtils.scala   |   0
 .../catalyst/analysis/QueryWithConstraintCheck.scala    |   0
 .../sql/catalyst/analysis/ResolveArcticCommand.scala    |   0
 .../ResolveMergeIntoArcticTableReferences.scala         |   0
 .../sql/catalyst/analysis/RewriteArcticCommand.scala    |   0
 .../catalyst/analysis/RewriteArcticMergeIntoTable.scala |   0
 .../spark/sql/catalyst/optimize/OptimizeWriteRule.scala |   0
 .../catalyst/optimize/RewriteAppendArcticTable.scala    |   0
 .../optimize/RewriteDeleteFromArcticTable.scala         |   0
 .../catalyst/optimize/RewriteUpdateArcticTable.scala    |   0
 .../spark/sql/catalyst/parser/ArcticParserUtils.scala   |   0
 .../sql/catalyst/parser/ArcticSqlExtensionsParser.scala |   0
 .../catalyst/plans/AlterArcticTableDropPartition.scala  |   0
 .../spark/sql/catalyst/plans/ArcticRowLevelWrite.scala  |   0
 .../spark/sql/catalyst/plans/MergeIntoArcticTable.scala |   0
 .../amoro/spark/sql/catalyst/plans/MergeRows.scala      |   0
 .../catalyst/plans/QueryWithConstraintCheckPlan.scala   |   0
 .../spark/sql/catalyst/plans/TruncateArcticTable.scala  |   0
 .../catalyst/plans/UnresolvedMergeIntoArcticTable.scala |   0
 .../amoro/spark/sql/catalyst/plans/logicals.scala       |   0
 .../amoro/spark/sql/catalyst/plans/statements.scala     |   0
 .../execution/AlterArcticTableDropPartitionExec.scala   |   0
 .../amoro/spark/sql/execution/ArcticCommandExec.scala   |   0
 .../spark/sql/execution/ArcticRowLevelWriteExec.scala   |   0
 .../spark/sql/execution/DescribeKeyedTableExec.scala    |   0
 .../spark/sql/execution/ExtendedArcticStrategy.scala    |   0
 .../amoro/spark/sql/execution/MergeRowsExec.scala       |   0
 .../sql/execution/QueryWithConstraintCheckExec.scala    |   0
 .../spark/sql/execution/TruncateArcticTableExec.scala   |   0
 .../amoro/spark/sql/utils/ArcticRewriteHelper.scala     |   0
 .../amoro/spark/sql/utils/ProjectingInternalRow.scala   |   0
 .../apache/amoro/spark/sql/utils/RowDeltaUtils.scala    |   0
 .../amoro/spark/sql/utils/WriteQueryProjections.scala   |   0
 .../org/apache/amoro/spark/sql/utils/expressions.scala  |   0
 .../spark/sql/amoro/catalyst/ArcticSpark33Helper.scala  |   0
 .../spark/sql/amoro/catalyst/AssignmentHelper.scala     |   0
 .../spark/sql/amoro/catalyst/ExpressionHelper.scala     |   0
 .../sql/amoro/parser/ArcticSqlExtendAstBuilder.scala    |   0
 .../spark/sql/amoro/parser/QueryParsingErrors.scala     |   0
 .../java/org/apache/amoro/spark/TestUnifiedCatalog.java |   0
 .../org/apache/amoro/spark/test/TestImpalaParquet.java  |   0
 .../test/suites/api/TestKeyedTableDataFrameAPI.java     |   0
 .../test/suites/api/TestUnKeyedTableDataFrameAPI.java   |   0
 .../spark/test/suites/catalog/TestSessionCatalog.java   |   0
 .../spark/test/suites/sql/TestAlterTableColumnSQL.java  |   0
 .../spark/test/suites/sql/TestArcticCommandSQL.java     |   0
 .../spark/test/suites/sql/TestArcticSessionCatalog.java |   0
 .../spark/test/suites/sql/TestCreateTableAsSelect.java  |   0
 .../spark/test/suites/sql/TestCreateTableLikeSQL.java   |   0
 .../amoro/spark/test/suites/sql/TestCreateTableSQL.java |   0
 .../amoro/spark/test/suites/sql/TestDeleteFromSQL.java  |   0
 .../apache/amoro/spark/test/suites/sql/TestDescSQL.java |   0
 .../spark/test/suites/sql/TestDropPartitionSQL.java     |   0
 .../amoro/spark/test/suites/sql/TestInsertIntoSQL.java  |   0
 .../spark/test/suites/sql/TestInsertOverwriteSQL.java   |   0
 .../amoro/spark/test/suites/sql/TestMergeIntoSQL.java   |   0
 .../amoro/spark/test/suites/sql/TestSelectSQL.java      |   0
 .../amoro/spark/test/suites/sql/TestTruncateSQL.java    |   0
 .../amoro/spark/test/suites/sql/TestUpdateSQL.java      |   0
 .../test/suites/ut/sql/parser/TestSqlExtendParser.java  |   0
 .../org/apache/amoro/spark/writer/TestMixedWriter.java  |   0
 .../v3.3/spark/src/test/resources/log4j2.properties     |   0
 .../amoro-mixed-format-trino}/assembly.xml              |   0
 .../amoro-mixed-format-trino}/pom.xml                   |   0
 .../io/trino/parquet/reader/ColumnReaderFactory.java    |   0
 .../io/trino/parquet/reader/TimestampColumnReader.java  |   0
 .../org/apache/amoro/trino/ArcticCatalogFactory.java    |   0
 .../amoro/trino/ArcticCatalogSupportTableSuffix.java    |   0
 .../main/java/org/apache/amoro/trino/ArcticConfig.java  |   0
 .../java/org/apache/amoro/trino/ArcticConnector.java    |   0
 .../org/apache/amoro/trino/ArcticConnectorFactory.java  |   0
 .../org/apache/amoro/trino/ArcticConnectorMetadata.java |   0
 .../apache/amoro/trino/ArcticConnectorSplitManager.java |   0
 .../java/org/apache/amoro/trino/ArcticErrorCode.java    |   0
 .../apache/amoro/trino/ArcticHadoopAuthentication.java  |   0
 .../apache/amoro/trino/ArcticHdfsAuthentication.java    |   0
 .../org/apache/amoro/trino/ArcticHdfsConfiguration.java |   0
 .../org/apache/amoro/trino/ArcticMetadataFactory.java   |   0
 .../main/java/org/apache/amoro/trino/ArcticModule.java  |   0
 .../apache/amoro/trino/ArcticPageSourceProvider.java    |   0
 .../main/java/org/apache/amoro/trino/ArcticPlugin.java  |   0
 .../org/apache/amoro/trino/ArcticSessionProperties.java |   0
 .../apache/amoro/trino/ArcticTransactionManager.java    |   0
 .../apache/amoro/trino/DefaultArcticCatalogFactory.java |   0
 .../java/org/apache/amoro/trino/TableNameResolve.java   |   0
 .../apache/amoro/trino/delete/DummyFileScanTask.java    |   0
 .../org/apache/amoro/trino/delete/TrinoDeleteFile.java  |   0
 .../java/org/apache/amoro/trino/delete/TrinoRow.java    |   0
 .../amoro/trino/keyed/KeyedConnectorMetadata.java       |   0
 .../amoro/trino/keyed/KeyedConnectorPageSource.java     |   0
 .../apache/amoro/trino/keyed/KeyedConnectorSplit.java   |   0
 .../amoro/trino/keyed/KeyedConnectorSplitManager.java   |   0
 .../org/apache/amoro/trino/keyed/KeyedDeleteFilter.java |   0
 .../amoro/trino/keyed/KeyedPageSourceProvider.java      |   0
 .../org/apache/amoro/trino/keyed/KeyedTableHandle.java  |   0
 .../trino/unkeyed/AdaptHiveIcebergTableHandle.java      |   0
 .../apache/amoro/trino/unkeyed/ArcticTrinoCatalog.java  |   0
 .../amoro/trino/unkeyed/ArcticTrinoCatalogFactory.java  |   0
 .../org/apache/amoro/trino/unkeyed/IcebergMetadata.java |   0
 .../apache/amoro/trino/unkeyed/IcebergPageSource.java   |   0
 .../amoro/trino/unkeyed/IcebergPageSourceProvider.java  |   0
 .../org/apache/amoro/trino/unkeyed/IcebergSplit.java    |   0
 .../apache/amoro/trino/unkeyed/IcebergSplitManager.java |   0
 .../apache/amoro/trino/unkeyed/IcebergSplitSource.java  |   0
 .../apache/amoro/trino/unkeyed/TrinoDeleteFilter.java   |   0
 .../java/org/apache/amoro/trino/util/MetricUtil.java    |   0
 .../apache/amoro/trino/util/ObjectSerializerUtil.java   |   0
 .../hadoop/hive/metastore/HiveMetaStoreClient.java      |   0
 .../main/java/org/apache/hadoop/util/VersionInfo.java   |   0
 .../format/converter/ParquetMetadataConverterUtil.java  |   0
 .../main/java/org/apache/parquet/io/ColumnIOUtil.java   |   0
 .../resources/META-INF/services/io.trino.spi.Plugin     |   0
 .../apache/amoro/trino/iceberg/ArcticQueryRunner.java   |   0
 .../amoro/trino/iceberg/ArcticQueryRunnerForClient.java |   0
 .../apache/amoro/trino/iceberg/BaseConnectorTest.java   |   0
 .../apache/amoro/trino/iceberg/SchemaInitializer.java   |   0
 .../amoro/trino/iceberg/TestArcticCatalogFactory.java   |   0
 .../amoro/trino/iceberg/TestArcticConnectorFactory.java |   0
 .../apache/amoro/trino/iceberg/TestArcticPlugin.java    |   0
 .../org/apache/amoro/trino/iceberg/TestArcticTable.java |   0
 .../trino/iceberg/TestBaseArcticConnectorTest.java      |   0
 .../amoro/trino/iceberg/TestBasicArcticCatalog.java     |   0
 .../trino/iceberg/TestOnServerArcticConnectorTest.java  |   0
 .../org/apache/amoro/trino/iceberg/TestUnionModule.java |   0
 .../org/apache/amoro/trino/mixed/ArcticQueryRunner.java |   0
 .../org/apache/amoro/trino/mixed/HiveTestRecords.java   |   0
 .../apache/amoro/trino/mixed/TableTestBaseForTrino.java |   0
 .../trino/mixed/TableTestBaseWithInitDataForTrino.java  |   0
 .../amoro/trino/mixed/TestBaseArcticPrimaryTable.java   |   0
 .../org/apache/amoro/trino/mixed/TestHiveTable.java     |   0
 .../amoro/trino/mixed/TestHiveTableBaseForTrino.java    |   0
 {mixed-format => amoro-mixed-format}/pom.xml            |   8 ++++----
 pom.xml                                                 |   6 +++---
 1615 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/core-hadoop2-ci.yml b/.github/workflows/core-hadoop2-ci.yml
index a7aa72df8..494388765 100644
--- a/.github/workflows/core-hadoop2-ci.yml
+++ b/.github/workflows/core-hadoop2-ci.yml
@@ -18,11 +18,11 @@ on:
       - "master"
       - "0.**"
     paths:
-      - "ams/**"
-      - "core/**"
-      - "mixed-format/flink/**"
-      - "mixed-format/hive/**"
-      - "mixed-format/spark/**"
+      - "amoro-ams/**"
+      - "amoro-core/**"
+      - "amoro-mixed-format/amoro-mixed-format-flink/**"
+      - "amoro-mixed-format/amoro-mixed-format-hive/**"
+      - "amoro-mixed-format/amoro-mixed-format-spark/**"
       - "pom.xml"
       - "tools/maven/**"
 
@@ -43,7 +43,7 @@ jobs:
         run: mvn validate
 
       - name: Build all module with Maven
-        run: mvn clean install -pl '!mixed-format/trino' -Djacoco.flink.skip=true -B -ntp -Dhadoop=v2
+        run: mvn clean install -pl '!amoro-mixed-format/amoro-mixed-format-trino' -Djacoco.flink.skip=true -B -ntp -Dhadoop=v2
 
       - name: Code coverage
         uses: codecov/codecov-action@v3
diff --git a/.github/workflows/core-hadoop3-ci.yml b/.github/workflows/core-hadoop3-ci.yml
index 0a5858f70..cbf55f589 100644
--- a/.github/workflows/core-hadoop3-ci.yml
+++ b/.github/workflows/core-hadoop3-ci.yml
@@ -18,11 +18,11 @@ on:
       - "master"
       - "0.**"
     paths:
-      - "ams/**"
-      - "core/**"
-      - "mixed-format/flink/**"
-      - "mixed-format/hive/**"
-      - "mixed-format/spark/**"
+      - "amoro-ams/**"
+      - "amoro-core/**"
+      - "amoro-mixed-format/amoro-mixed-format-flink/**"
+      - "amoro-mixed-format/amoro-mixed-format-hive/**"
+      - "amoro-mixed-format/amoro-mixed-format-spark/**"
       - "pom.xml"
       - "tools/maven/**"
 
@@ -43,7 +43,7 @@ jobs:
         run: mvn validate
 
       - name: Build all module with Maven
-        run: mvn clean install -pl '!mixed-format/trino' -Djacoco.flink.skip=true -B -ntp
+        run: mvn clean install -pl '!amoro-mixed-format/amoro-mixed-format-trino' -Djacoco.flink.skip=true -B -ntp
 
       - name: Code coverage
         uses: codecov/codecov-action@v3
diff --git a/.github/workflows/trino-ci.yml b/.github/workflows/trino-ci.yml
index a59e93779..4d799b2be 100644
--- a/.github/workflows/trino-ci.yml
+++ b/.github/workflows/trino-ci.yml
@@ -18,10 +18,10 @@ on:
       - "master"
       - "0.**"
     paths:
-      - "ams/**"
-      - "core/**"
-      - "mixed-format/hive/**"
-      - "mixed-format/trino/**"
+      - "amoro-ams/**"
+      - "amoro-core/**"
+      - "amoro-mixed-format/amoro-mixed-format-hive/**"
+      - "amoro-mixed-format/amoro-mixed-format-trino/**"
       - "pom.xml"
       - "tools/maven/**"
 
@@ -41,10 +41,10 @@ jobs:
         run: mvn validate -P trino-spotless
 
       - name: Install dependency with Maven
-        run: mvn clean install -DskipTests -pl 'ams/api,core,mixed-format/hive' -Dhadoop=v2 -am -B -P trino-spotless
+        run: mvn clean install -DskipTests -pl 'amoro-ams/amoro-ams-api,amoro-core,amoro-mixed-format/amoro-mixed-format-hive' -Dhadoop=v2 -am -B -P trino-spotless
 
       - name: Build with Maven
-        run: mvn clean test -pl 'mixed-format/trino' -B -ntp -Dhadoop=v2 -P trino-spotless
+        run: mvn clean test -pl 'amoro-mixed-format/amoro-mixed-format-trino' -B -ntp -Dhadoop=v2 -P trino-spotless
 
       - name: Code coverage
         uses: codecov/codecov-action@v3
diff --git a/.gitignore b/.gitignore
index ce72cea7a..f16100928 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,8 +68,8 @@ conf/
 *.tgz
 
 # dashboard static resources
-ams/dashboard/src/main/resources/static/
-ams/dashboard/node/
+amoro-ams/amoro-ams-dashboard/src/main/resources/static/
+amoro-ams/amoro-ams-dashboard/node/
 
-!ams/dist/src/main/arctic-bin/bin/
-!ams/dist/src/main/arctic-bin/conf/
\ No newline at end of file
+!amoro-ams/dist/src/main/arctic-bin/bin/
+!amoro-ams/dist/src/main/arctic-bin/conf/
\ No newline at end of file
diff --git a/ams/api/pom.xml b/amoro-ams/amoro-ams-api/pom.xml
similarity index 100%
rename from ams/api/pom.xml
rename to amoro-ams/amoro-ams-api/pom.xml
diff --git a/ams/api/src/main/java/org/apache/amoro/api/Action.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/Action.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/Action.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/Action.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/ActivePlugin.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/ActivePlugin.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/ActivePlugin.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/ActivePlugin.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/AmoroPlugin.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/AmoroPlugin.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/AmoroPlugin.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/AmoroPlugin.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/OptimizerProperties.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/OptimizerProperties.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/OptimizerProperties.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/OptimizerProperties.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/ServerTableIdentifier.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/ServerTableIdentifier.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/ServerTableIdentifier.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/ServerTableIdentifier.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/StateField.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/StateField.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/StateField.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/StateField.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/TableRuntime.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/TableRuntime.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/TableRuntime.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/TableRuntime.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/config/ConfigHelpers.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/ConfigHelpers.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/config/ConfigHelpers.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/ConfigHelpers.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/config/ConfigOption.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/ConfigOption.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/config/ConfigOption.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/ConfigOption.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/config/ConfigOptions.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/ConfigOptions.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/config/ConfigOptions.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/ConfigOptions.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/config/Configurations.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/Configurations.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/config/Configurations.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/Configurations.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/config/DataExpirationConfig.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/DataExpirationConfig.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/config/DataExpirationConfig.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/DataExpirationConfig.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/config/OptimizingConfig.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/OptimizingConfig.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/config/OptimizingConfig.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/OptimizingConfig.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/config/StructuredOptionsSplitter.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/StructuredOptionsSplitter.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/config/StructuredOptionsSplitter.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/StructuredOptionsSplitter.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/config/TableConfiguration.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/TableConfiguration.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/config/TableConfiguration.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/TableConfiguration.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/config/TagConfiguration.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/TagConfiguration.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/config/TagConfiguration.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/TagConfiguration.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/events/Event.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/events/Event.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/events/Event.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/events/Event.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/events/EventListener.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/events/EventListener.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/events/EventListener.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/events/EventListener.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/events/EventType.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/events/EventType.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/events/EventType.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/events/EventType.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/events/IcebergReportEvent.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/events/IcebergReportEvent.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/events/IcebergReportEvent.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/events/IcebergReportEvent.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/events/TableEvent.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/events/TableEvent.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/events/TableEvent.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/events/TableEvent.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/metrics/Counter.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/Counter.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/metrics/Counter.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/Counter.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/metrics/Gauge.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/Gauge.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/metrics/Gauge.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/Gauge.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/metrics/Metric.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/Metric.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/metrics/Metric.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/Metric.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/metrics/MetricDefine.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/MetricDefine.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/metrics/MetricDefine.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/MetricDefine.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/metrics/MetricDefines.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/MetricDefines.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/metrics/MetricDefines.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/MetricDefines.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/metrics/MetricKey.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/MetricKey.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/metrics/MetricKey.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/MetricKey.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/metrics/MetricRegisterListener.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/MetricRegisterListener.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/metrics/MetricRegisterListener.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/MetricRegisterListener.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/metrics/MetricReporter.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/MetricReporter.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/metrics/MetricReporter.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/MetricReporter.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/metrics/MetricSet.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/MetricSet.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/metrics/MetricSet.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/MetricSet.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/metrics/MetricType.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/MetricType.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/metrics/MetricType.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/metrics/MetricType.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/process/AmoroProcess.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/AmoroProcess.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/process/AmoroProcess.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/AmoroProcess.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/process/OptimizingStage.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/OptimizingStage.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/process/OptimizingStage.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/OptimizingStage.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/process/OptimizingState.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/OptimizingState.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/process/OptimizingState.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/OptimizingState.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/process/PendingInput.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/PendingInput.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/process/PendingInput.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/PendingInput.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/process/ProcessFactory.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/ProcessFactory.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/process/ProcessFactory.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/ProcessFactory.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/process/ProcessState.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/ProcessState.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/process/ProcessState.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/ProcessState.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/process/ProcessStatus.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/ProcessStatus.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/process/ProcessStatus.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/ProcessStatus.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/process/SimpleFuture.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/SimpleFuture.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/process/SimpleFuture.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/SimpleFuture.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/process/TableProcess.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/TableProcess.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/process/TableProcess.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/TableProcess.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/process/TableProcessState.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/TableProcessState.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/process/TableProcessState.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/process/TableProcessState.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/resource/Resource.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/resource/Resource.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/resource/Resource.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/resource/Resource.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/resource/ResourceContainer.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/resource/ResourceContainer.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/resource/ResourceContainer.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/resource/ResourceContainer.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/resource/ResourceGroup.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/resource/ResourceGroup.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/resource/ResourceGroup.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/resource/ResourceGroup.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/resource/ResourceManager.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/resource/ResourceManager.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/resource/ResourceManager.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/resource/ResourceManager.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/resource/ResourceStatus.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/resource/ResourceStatus.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/resource/ResourceStatus.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/resource/ResourceStatus.java
diff --git a/ams/api/src/main/java/org/apache/amoro/api/resource/ResourceType.java b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/resource/ResourceType.java
similarity index 100%
rename from ams/api/src/main/java/org/apache/amoro/api/resource/ResourceType.java
rename to amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/resource/ResourceType.java
diff --git a/ams/api/src/test/java/org/apache/amoro/api/MockZookeeperServer.java b/amoro-ams/amoro-ams-api/src/test/java/org/apache/amoro/api/MockZookeeperServer.java
similarity index 100%
rename from ams/api/src/test/java/org/apache/amoro/api/MockZookeeperServer.java
rename to amoro-ams/amoro-ams-api/src/test/java/org/apache/amoro/api/MockZookeeperServer.java
diff --git a/ams/api/src/test/java/org/apache/amoro/api/metrics/MetricDefineTest.java b/amoro-ams/amoro-ams-api/src/test/java/org/apache/amoro/api/metrics/MetricDefineTest.java
similarity index 100%
rename from ams/api/src/test/java/org/apache/amoro/api/metrics/MetricDefineTest.java
rename to amoro-ams/amoro-ams-api/src/test/java/org/apache/amoro/api/metrics/MetricDefineTest.java
diff --git a/ams/api/src/test/java/org/apache/amoro/api/metrics/TestMetricDefine.java b/amoro-ams/amoro-ams-api/src/test/java/org/apache/amoro/api/metrics/TestMetricDefine.java
similarity index 100%
rename from ams/api/src/test/java/org/apache/amoro/api/metrics/TestMetricDefine.java
rename to amoro-ams/amoro-ams-api/src/test/java/org/apache/amoro/api/metrics/TestMetricDefine.java
diff --git a/ams/api/src/test/java/org/apache/amoro/api/metrics/TestMetricKey.java b/amoro-ams/amoro-ams-api/src/test/java/org/apache/amoro/api/metrics/TestMetricKey.java
similarity index 100%
rename from ams/api/src/test/java/org/apache/amoro/api/metrics/TestMetricKey.java
rename to amoro-ams/amoro-ams-api/src/test/java/org/apache/amoro/api/metrics/TestMetricKey.java
diff --git a/ams/dashboard/.browserslistrc b/amoro-ams/amoro-ams-dashboard/.browserslistrc
similarity index 100%
rename from ams/dashboard/.browserslistrc
rename to amoro-ams/amoro-ams-dashboard/.browserslistrc
diff --git a/ams/dashboard/.editorconfig b/amoro-ams/amoro-ams-dashboard/.editorconfig
similarity index 100%
rename from ams/dashboard/.editorconfig
rename to amoro-ams/amoro-ams-dashboard/.editorconfig
diff --git a/ams/dashboard/.gitignore b/amoro-ams/amoro-ams-dashboard/.gitignore
similarity index 100%
rename from ams/dashboard/.gitignore
rename to amoro-ams/amoro-ams-dashboard/.gitignore
diff --git a/ams/dashboard/.vscode/extensions.json b/amoro-ams/amoro-ams-dashboard/.vscode/extensions.json
similarity index 100%
rename from ams/dashboard/.vscode/extensions.json
rename to amoro-ams/amoro-ams-dashboard/.vscode/extensions.json
diff --git a/ams/dashboard/README.md b/amoro-ams/amoro-ams-dashboard/README.md
similarity index 100%
rename from ams/dashboard/README.md
rename to amoro-ams/amoro-ams-dashboard/README.md
diff --git a/ams/dashboard/commitlint.config.js b/amoro-ams/amoro-ams-dashboard/commitlint.config.js
similarity index 100%
rename from ams/dashboard/commitlint.config.js
rename to amoro-ams/amoro-ams-dashboard/commitlint.config.js
diff --git a/ams/dashboard/eslint.config.js b/amoro-ams/amoro-ams-dashboard/eslint.config.js
similarity index 100%
rename from ams/dashboard/eslint.config.js
rename to amoro-ams/amoro-ams-dashboard/eslint.config.js
diff --git a/ams/dashboard/index.html b/amoro-ams/amoro-ams-dashboard/index.html
similarity index 100%
rename from ams/dashboard/index.html
rename to amoro-ams/amoro-ams-dashboard/index.html
diff --git a/ams/dashboard/license.node.js b/amoro-ams/amoro-ams-dashboard/license.node.js
similarity index 100%
rename from ams/dashboard/license.node.js
rename to amoro-ams/amoro-ams-dashboard/license.node.js
diff --git a/ams/dashboard/mock/index.js b/amoro-ams/amoro-ams-dashboard/mock/index.js
similarity index 100%
rename from ams/dashboard/mock/index.js
rename to amoro-ams/amoro-ams-dashboard/mock/index.js
diff --git a/ams/dashboard/mock/modules/catalogs.js b/amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js
similarity index 100%
rename from ams/dashboard/mock/modules/catalogs.js
rename to amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js
diff --git a/ams/dashboard/mock/modules/common.js b/amoro-ams/amoro-ams-dashboard/mock/modules/common.js
similarity index 100%
rename from ams/dashboard/mock/modules/common.js
rename to amoro-ams/amoro-ams-dashboard/mock/modules/common.js
diff --git a/ams/dashboard/mock/modules/database.js b/amoro-ams/amoro-ams-dashboard/mock/modules/database.js
similarity index 100%
rename from ams/dashboard/mock/modules/database.js
rename to amoro-ams/amoro-ams-dashboard/mock/modules/database.js
diff --git a/ams/dashboard/mock/modules/db.js b/amoro-ams/amoro-ams-dashboard/mock/modules/db.js
similarity index 100%
rename from ams/dashboard/mock/modules/db.js
rename to amoro-ams/amoro-ams-dashboard/mock/modules/db.js
diff --git a/ams/dashboard/mock/modules/optimize.js b/amoro-ams/amoro-ams-dashboard/mock/modules/optimize.js
similarity index 100%
rename from ams/dashboard/mock/modules/optimize.js
rename to amoro-ams/amoro-ams-dashboard/mock/modules/optimize.js
diff --git a/ams/dashboard/mock/modules/overview.js b/amoro-ams/amoro-ams-dashboard/mock/modules/overview.js
similarity index 100%
rename from ams/dashboard/mock/modules/overview.js
rename to amoro-ams/amoro-ams-dashboard/mock/modules/overview.js
diff --git a/ams/dashboard/mock/modules/settings.js b/amoro-ams/amoro-ams-dashboard/mock/modules/settings.js
similarity index 100%
rename from ams/dashboard/mock/modules/settings.js
rename to amoro-ams/amoro-ams-dashboard/mock/modules/settings.js
diff --git a/ams/dashboard/mock/modules/table.js b/amoro-ams/amoro-ams-dashboard/mock/modules/table.js
similarity index 100%
rename from ams/dashboard/mock/modules/table.js
rename to amoro-ams/amoro-ams-dashboard/mock/modules/table.js
diff --git a/ams/dashboard/mock/modules/terminal.js b/amoro-ams/amoro-ams-dashboard/mock/modules/terminal.js
similarity index 100%
rename from ams/dashboard/mock/modules/terminal.js
rename to amoro-ams/amoro-ams-dashboard/mock/modules/terminal.js
diff --git a/ams/dashboard/package.json b/amoro-ams/amoro-ams-dashboard/package.json
similarity index 100%
rename from ams/dashboard/package.json
rename to amoro-ams/amoro-ams-dashboard/package.json
diff --git a/ams/dashboard/pnpm-lock.yaml b/amoro-ams/amoro-ams-dashboard/pnpm-lock.yaml
similarity index 100%
rename from ams/dashboard/pnpm-lock.yaml
rename to amoro-ams/amoro-ams-dashboard/pnpm-lock.yaml
diff --git a/ams/dashboard/pom.xml b/amoro-ams/amoro-ams-dashboard/pom.xml
similarity index 100%
rename from ams/dashboard/pom.xml
rename to amoro-ams/amoro-ams-dashboard/pom.xml
diff --git a/ams/dashboard/public/favicon-bak.ico b/amoro-ams/amoro-ams-dashboard/public/favicon-bak.ico
similarity index 100%
rename from ams/dashboard/public/favicon-bak.ico
rename to amoro-ams/amoro-ams-dashboard/public/favicon-bak.ico
diff --git a/ams/dashboard/public/favicon.ico b/amoro-ams/amoro-ams-dashboard/public/favicon.ico
similarity index 100%
rename from ams/dashboard/public/favicon.ico
rename to amoro-ams/amoro-ams-dashboard/public/favicon.ico
diff --git a/ams/dashboard/src/.gitkeep b/amoro-ams/amoro-ams-dashboard/src/.gitkeep
similarity index 100%
rename from ams/dashboard/src/.gitkeep
rename to amoro-ams/amoro-ams-dashboard/src/.gitkeep
diff --git a/ams/dashboard/src/App.vue b/amoro-ams/amoro-ams-dashboard/src/App.vue
similarity index 100%
rename from ams/dashboard/src/App.vue
rename to amoro-ams/amoro-ams-dashboard/src/App.vue
diff --git a/ams/dashboard/src/assets/icons/index.ts b/amoro-ams/amoro-ams-dashboard/src/assets/icons/index.ts
similarity index 100%
rename from ams/dashboard/src/assets/icons/index.ts
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/index.ts
diff --git a/ams/dashboard/src/assets/icons/svg/amoro.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/amoro.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/amoro.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/amoro.svg
diff --git a/ams/dashboard/src/assets/icons/svg/arctic.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/arctic.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/arctic.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/arctic.svg
diff --git a/ams/dashboard/src/assets/icons/svg/branch.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/branch.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/branch.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/branch.svg
diff --git a/ams/dashboard/src/assets/icons/svg/catalogs.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/catalogs.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/catalogs.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/catalogs.svg
diff --git a/ams/dashboard/src/assets/icons/svg/database.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/database.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/database.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/database.svg
diff --git a/ams/dashboard/src/assets/icons/svg/format.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/format.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/format.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/format.svg
diff --git a/ams/dashboard/src/assets/icons/svg/hive.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/hive.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/hive.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/hive.svg
diff --git a/ams/dashboard/src/assets/icons/svg/iceberg.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/iceberg.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/iceberg.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/iceberg.svg
diff --git a/ams/dashboard/src/assets/icons/svg/optimizers.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/optimizers.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/optimizers.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/optimizers.svg
diff --git a/ams/dashboard/src/assets/icons/svg/optimizing.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/optimizing.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/optimizing.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/optimizing.svg
diff --git a/ams/dashboard/src/assets/icons/svg/overview.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/overview.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/overview.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/overview.svg
diff --git a/ams/dashboard/src/assets/icons/svg/paimon.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/paimon.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/paimon.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/paimon.svg
diff --git a/ams/dashboard/src/assets/icons/svg/settings.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/settings.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/settings.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/settings.svg
diff --git a/ams/dashboard/src/assets/icons/svg/slide.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/slide.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/slide.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/slide.svg
diff --git a/ams/dashboard/src/assets/icons/svg/sqldebug.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqldebug.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/sqldebug.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqldebug.svg
diff --git a/ams/dashboard/src/assets/icons/svg/sqlinit.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqlinit.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/sqlinit.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqlinit.svg
diff --git a/ams/dashboard/src/assets/icons/svg/sqlmax.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqlmax.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/sqlmax.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqlmax.svg
diff --git a/ams/dashboard/src/assets/icons/svg/sqlpause.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqlpause.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/sqlpause.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/sqlpause.svg
diff --git a/ams/dashboard/src/assets/icons/svg/tables.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/tables.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/tables.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/tables.svg
diff --git a/ams/dashboard/src/assets/icons/svg/tag.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/tag.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/tag.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/tag.svg
diff --git a/ams/dashboard/src/assets/icons/svg/terminal.svg b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/terminal.svg
similarity index 100%
rename from ams/dashboard/src/assets/icons/svg/terminal.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/terminal.svg
diff --git a/ams/dashboard/src/assets/images/Catalog-Service.png b/amoro-ams/amoro-ams-dashboard/src/assets/images/Catalog-Service.png
similarity index 100%
rename from ams/dashboard/src/assets/images/Catalog-Service.png
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/Catalog-Service.png
diff --git a/ams/dashboard/src/assets/images/Infrastructure-Idependent.png b/amoro-ams/amoro-ams-dashboard/src/assets/images/Infrastructure-Idependent.png
similarity index 100%
rename from ams/dashboard/src/assets/images/Infrastructure-Idependent.png
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/Infrastructure-Idependent.png
diff --git a/ams/dashboard/src/assets/images/Management-tools.png b/amoro-ams/amoro-ams-dashboard/src/assets/images/Management-tools.png
similarity index 100%
rename from ams/dashboard/src/assets/images/Management-tools.png
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/Management-tools.png
diff --git a/ams/dashboard/src/assets/images/Multiple-Formats.png b/amoro-ams/amoro-ams-dashboard/src/assets/images/Multiple-Formats.png
similarity index 100%
rename from ams/dashboard/src/assets/images/Multiple-Formats.png
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/Multiple-Formats.png
diff --git a/ams/dashboard/src/assets/images/Rich-Plugins.png b/amoro-ams/amoro-ams-dashboard/src/assets/images/Rich-Plugins.png
similarity index 100%
rename from ams/dashboard/src/assets/images/Rich-Plugins.png
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/Rich-Plugins.png
diff --git a/ams/dashboard/src/assets/images/Self-managed.png b/amoro-ams/amoro-ams-dashboard/src/assets/images/Self-managed.png
similarity index 100%
rename from ams/dashboard/src/assets/images/Self-managed.png
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/Self-managed.png
diff --git a/ams/dashboard/src/assets/images/arctic-dashboard.svg b/amoro-ams/amoro-ams-dashboard/src/assets/images/arctic-dashboard.svg
similarity index 100%
rename from ams/dashboard/src/assets/images/arctic-dashboard.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/arctic-dashboard.svg
diff --git a/ams/dashboard/src/assets/images/arctic-dashboard1.svg b/amoro-ams/amoro-ams-dashboard/src/assets/images/arctic-dashboard1.svg
similarity index 100%
rename from ams/dashboard/src/assets/images/arctic-dashboard1.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/arctic-dashboard1.svg
diff --git a/ams/dashboard/src/assets/images/arctic-introduce.png b/amoro-ams/amoro-ams-dashboard/src/assets/images/arctic-introduce.png
similarity index 100%
rename from ams/dashboard/src/assets/images/arctic-introduce.png
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/arctic-introduce.png
diff --git a/ams/dashboard/src/assets/images/home-content.png b/amoro-ams/amoro-ams-dashboard/src/assets/images/home-content.png
similarity index 100%
rename from ams/dashboard/src/assets/images/home-content.png
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/home-content.png
diff --git a/ams/dashboard/src/assets/images/introduce_arctic.png b/amoro-ams/amoro-ams-dashboard/src/assets/images/introduce_arctic.png
similarity index 100%
rename from ams/dashboard/src/assets/images/introduce_arctic.png
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/introduce_arctic.png
diff --git a/ams/dashboard/src/assets/images/item-icon.png b/amoro-ams/amoro-ams-dashboard/src/assets/images/item-icon.png
similarity index 100%
rename from ams/dashboard/src/assets/images/item-icon.png
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/item-icon.png
diff --git a/ams/dashboard/src/assets/images/logo-all1.svg b/amoro-ams/amoro-ams-dashboard/src/assets/images/logo-all1.svg
similarity index 100%
rename from ams/dashboard/src/assets/images/logo-all1.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/logo-all1.svg
diff --git a/ams/dashboard/src/assets/images/logo.svg b/amoro-ams/amoro-ams-dashboard/src/assets/images/logo.svg
similarity index 100%
rename from ams/dashboard/src/assets/images/logo.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/logo.svg
diff --git a/ams/dashboard/src/assets/images/logo1.svg b/amoro-ams/amoro-ams-dashboard/src/assets/images/logo1.svg
similarity index 100%
rename from ams/dashboard/src/assets/images/logo1.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/logo1.svg
diff --git a/ams/dashboard/src/assets/images/logo2.svg b/amoro-ams/amoro-ams-dashboard/src/assets/images/logo2.svg
similarity index 100%
rename from ams/dashboard/src/assets/images/logo2.svg
rename to amoro-ams/amoro-ams-dashboard/src/assets/images/logo2.svg
diff --git a/ams/dashboard/src/components/Layout.vue b/amoro-ams/amoro-ams-dashboard/src/components/Layout.vue
similarity index 100%
rename from ams/dashboard/src/components/Layout.vue
rename to amoro-ams/amoro-ams-dashboard/src/components/Layout.vue
diff --git a/ams/dashboard/src/components/Sidebar.vue b/amoro-ams/amoro-ams-dashboard/src/components/Sidebar.vue
similarity index 100%
rename from ams/dashboard/src/components/Sidebar.vue
rename to amoro-ams/amoro-ams-dashboard/src/components/Sidebar.vue
diff --git a/ams/dashboard/src/components/Topbar.vue b/amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue
similarity index 100%
rename from ams/dashboard/src/components/Topbar.vue
rename to amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue
diff --git a/ams/dashboard/src/components/VirtualRecycleScroller.vue b/amoro-ams/amoro-ams-dashboard/src/components/VirtualRecycleScroller.vue
similarity index 100%
rename from ams/dashboard/src/components/VirtualRecycleScroller.vue
rename to amoro-ams/amoro-ams-dashboard/src/components/VirtualRecycleScroller.vue
diff --git a/ams/dashboard/src/components/ant-design/index.ts b/amoro-ams/amoro-ams-dashboard/src/components/ant-design/index.ts
similarity index 100%
rename from ams/dashboard/src/components/ant-design/index.ts
rename to amoro-ams/amoro-ams-dashboard/src/components/ant-design/index.ts
diff --git a/ams/dashboard/src/components/echarts/Chart.vue b/amoro-ams/amoro-ams-dashboard/src/components/echarts/Chart.vue
similarity index 100%
rename from ams/dashboard/src/components/echarts/Chart.vue
rename to amoro-ams/amoro-ams-dashboard/src/components/echarts/Chart.vue
diff --git a/ams/dashboard/src/components/echarts/index.ts b/amoro-ams/amoro-ams-dashboard/src/components/echarts/index.ts
similarity index 100%
rename from ams/dashboard/src/components/echarts/index.ts
rename to amoro-ams/amoro-ams-dashboard/src/components/echarts/index.ts
diff --git a/ams/dashboard/src/components/loading/index.ts b/amoro-ams/amoro-ams-dashboard/src/components/loading/index.ts
similarity index 100%
rename from ams/dashboard/src/components/loading/index.ts
rename to amoro-ams/amoro-ams-dashboard/src/components/loading/index.ts
diff --git a/ams/dashboard/src/components/loading/loading.vue b/amoro-ams/amoro-ams-dashboard/src/components/loading/loading.vue
similarity index 100%
rename from ams/dashboard/src/components/loading/loading.vue
rename to amoro-ams/amoro-ams-dashboard/src/components/loading/loading.vue
diff --git a/ams/dashboard/src/components/register.ts b/amoro-ams/amoro-ams-dashboard/src/components/register.ts
similarity index 100%
rename from ams/dashboard/src/components/register.ts
rename to amoro-ams/amoro-ams-dashboard/src/components/register.ts
diff --git a/ams/dashboard/src/components/sql-editor/editor-config.ts b/amoro-ams/amoro-ams-dashboard/src/components/sql-editor/editor-config.ts
similarity index 100%
rename from ams/dashboard/src/components/sql-editor/editor-config.ts
rename to amoro-ams/amoro-ams-dashboard/src/components/sql-editor/editor-config.ts
diff --git a/ams/dashboard/src/components/sql-editor/index.vue b/amoro-ams/amoro-ams-dashboard/src/components/sql-editor/index.vue
similarity index 100%
rename from ams/dashboard/src/components/sql-editor/index.vue
rename to amoro-ams/amoro-ams-dashboard/src/components/sql-editor/index.vue
diff --git a/ams/dashboard/src/components/svg-icon.vue b/amoro-ams/amoro-ams-dashboard/src/components/svg-icon.vue
similarity index 100%
rename from ams/dashboard/src/components/svg-icon.vue
rename to amoro-ams/amoro-ams-dashboard/src/components/svg-icon.vue
diff --git a/ams/dashboard/src/components/tables-sub-menu/CreateDB.vue b/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/CreateDB.vue
similarity index 100%
rename from ams/dashboard/src/components/tables-sub-menu/CreateDB.vue
rename to amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/CreateDB.vue
diff --git a/ams/dashboard/src/components/tables-sub-menu/TablesMenu.vue b/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/TablesMenu.vue
similarity index 100%
rename from ams/dashboard/src/components/tables-sub-menu/TablesMenu.vue
rename to amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/TablesMenu.vue
diff --git a/ams/dashboard/src/hooks/usePagination.ts b/amoro-ams/amoro-ams-dashboard/src/hooks/usePagination.ts
similarity index 100%
rename from ams/dashboard/src/hooks/usePagination.ts
rename to amoro-ams/amoro-ams-dashboard/src/hooks/usePagination.ts
diff --git a/ams/dashboard/src/hooks/usePlaceholder.ts b/amoro-ams/amoro-ams-dashboard/src/hooks/usePlaceholder.ts
similarity index 100%
rename from ams/dashboard/src/hooks/usePlaceholder.ts
rename to amoro-ams/amoro-ams-dashboard/src/hooks/usePlaceholder.ts
diff --git a/ams/dashboard/src/language/datetimeFormats.ts b/amoro-ams/amoro-ams-dashboard/src/language/datetimeFormats.ts
similarity index 100%
rename from ams/dashboard/src/language/datetimeFormats.ts
rename to amoro-ams/amoro-ams-dashboard/src/language/datetimeFormats.ts
diff --git a/ams/dashboard/src/language/en.ts b/amoro-ams/amoro-ams-dashboard/src/language/en.ts
similarity index 100%
rename from ams/dashboard/src/language/en.ts
rename to amoro-ams/amoro-ams-dashboard/src/language/en.ts
diff --git a/ams/dashboard/src/language/i18n.ts b/amoro-ams/amoro-ams-dashboard/src/language/i18n.ts
similarity index 100%
rename from ams/dashboard/src/language/i18n.ts
rename to amoro-ams/amoro-ams-dashboard/src/language/i18n.ts
diff --git a/ams/dashboard/src/language/index.ts b/amoro-ams/amoro-ams-dashboard/src/language/index.ts
similarity index 100%
rename from ams/dashboard/src/language/index.ts
rename to amoro-ams/amoro-ams-dashboard/src/language/index.ts
diff --git a/ams/dashboard/src/language/zh.ts b/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
similarity index 100%
rename from ams/dashboard/src/language/zh.ts
rename to amoro-ams/amoro-ams-dashboard/src/language/zh.ts
diff --git a/ams/dashboard/src/main.ts b/amoro-ams/amoro-ams-dashboard/src/main.ts
similarity index 100%
rename from ams/dashboard/src/main.ts
rename to amoro-ams/amoro-ams-dashboard/src/main.ts
diff --git a/ams/dashboard/src/router/index.ts b/amoro-ams/amoro-ams-dashboard/src/router/index.ts
similarity index 100%
rename from ams/dashboard/src/router/index.ts
rename to amoro-ams/amoro-ams-dashboard/src/router/index.ts
diff --git a/ams/dashboard/src/services/global.service.ts b/amoro-ams/amoro-ams-dashboard/src/services/global.service.ts
similarity index 100%
rename from ams/dashboard/src/services/global.service.ts
rename to amoro-ams/amoro-ams-dashboard/src/services/global.service.ts
diff --git a/ams/dashboard/src/services/login.service.ts b/amoro-ams/amoro-ams-dashboard/src/services/login.service.ts
similarity index 100%
rename from ams/dashboard/src/services/login.service.ts
rename to amoro-ams/amoro-ams-dashboard/src/services/login.service.ts
diff --git a/ams/dashboard/src/services/optimize.service.ts b/amoro-ams/amoro-ams-dashboard/src/services/optimize.service.ts
similarity index 100%
rename from ams/dashboard/src/services/optimize.service.ts
rename to amoro-ams/amoro-ams-dashboard/src/services/optimize.service.ts
diff --git a/ams/dashboard/src/services/setting.services.ts b/amoro-ams/amoro-ams-dashboard/src/services/setting.services.ts
similarity index 100%
rename from ams/dashboard/src/services/setting.services.ts
rename to amoro-ams/amoro-ams-dashboard/src/services/setting.services.ts
diff --git a/ams/dashboard/src/services/table.service.ts b/amoro-ams/amoro-ams-dashboard/src/services/table.service.ts
similarity index 100%
rename from ams/dashboard/src/services/table.service.ts
rename to amoro-ams/amoro-ams-dashboard/src/services/table.service.ts
diff --git a/ams/dashboard/src/services/terminal.service.ts b/amoro-ams/amoro-ams-dashboard/src/services/terminal.service.ts
similarity index 100%
rename from ams/dashboard/src/services/terminal.service.ts
rename to amoro-ams/amoro-ams-dashboard/src/services/terminal.service.ts
diff --git a/ams/dashboard/src/shims-vue.d.ts b/amoro-ams/amoro-ams-dashboard/src/shims-vue.d.ts
similarity index 100%
rename from ams/dashboard/src/shims-vue.d.ts
rename to amoro-ams/amoro-ams-dashboard/src/shims-vue.d.ts
diff --git a/ams/dashboard/src/store/index.ts b/amoro-ams/amoro-ams-dashboard/src/store/index.ts
similarity index 100%
rename from ams/dashboard/src/store/index.ts
rename to amoro-ams/amoro-ams-dashboard/src/store/index.ts
diff --git a/ams/dashboard/src/styles/ant-design.less b/amoro-ams/amoro-ams-dashboard/src/styles/ant-design.less
similarity index 100%
rename from ams/dashboard/src/styles/ant-design.less
rename to amoro-ams/amoro-ams-dashboard/src/styles/ant-design.less
diff --git a/ams/dashboard/src/styles/global.less b/amoro-ams/amoro-ams-dashboard/src/styles/global.less
similarity index 100%
rename from ams/dashboard/src/styles/global.less
rename to amoro-ams/amoro-ams-dashboard/src/styles/global.less
diff --git a/ams/dashboard/src/styles/index.less b/amoro-ams/amoro-ams-dashboard/src/styles/index.less
similarity index 100%
rename from ams/dashboard/src/styles/index.less
rename to amoro-ams/amoro-ams-dashboard/src/styles/index.less
diff --git a/ams/dashboard/src/styles/reset.less b/amoro-ams/amoro-ams-dashboard/src/styles/reset.less
similarity index 100%
rename from ams/dashboard/src/styles/reset.less
rename to amoro-ams/amoro-ams-dashboard/src/styles/reset.less
diff --git a/ams/dashboard/src/types/common.type.ts b/amoro-ams/amoro-ams-dashboard/src/types/common.type.ts
similarity index 100%
rename from ams/dashboard/src/types/common.type.ts
rename to amoro-ams/amoro-ams-dashboard/src/types/common.type.ts
diff --git a/ams/dashboard/src/utils/chart.ts b/amoro-ams/amoro-ams-dashboard/src/utils/chart.ts
similarity index 100%
rename from ams/dashboard/src/utils/chart.ts
rename to amoro-ams/amoro-ams-dashboard/src/utils/chart.ts
diff --git a/ams/dashboard/src/utils/editor.ts b/amoro-ams/amoro-ams-dashboard/src/utils/editor.ts
similarity index 100%
rename from ams/dashboard/src/utils/editor.ts
rename to amoro-ams/amoro-ams-dashboard/src/utils/editor.ts
diff --git a/ams/dashboard/src/utils/index.ts b/amoro-ams/amoro-ams-dashboard/src/utils/index.ts
similarity index 100%
rename from ams/dashboard/src/utils/index.ts
rename to amoro-ams/amoro-ams-dashboard/src/utils/index.ts
diff --git a/ams/dashboard/src/utils/request.ts b/amoro-ams/amoro-ams-dashboard/src/utils/request.ts
similarity index 100%
rename from ams/dashboard/src/utils/request.ts
rename to amoro-ams/amoro-ams-dashboard/src/utils/request.ts
diff --git a/ams/dashboard/src/utils/sql.ts b/amoro-ams/amoro-ams-dashboard/src/utils/sql.ts
similarity index 100%
rename from ams/dashboard/src/utils/sql.ts
rename to amoro-ams/amoro-ams-dashboard/src/utils/sql.ts
diff --git a/ams/dashboard/src/views/404.vue b/amoro-ams/amoro-ams-dashboard/src/views/404.vue
similarity index 100%
rename from ams/dashboard/src/views/404.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/404.vue
diff --git a/ams/dashboard/src/views/Home.vue b/amoro-ams/amoro-ams-dashboard/src/views/Home.vue
similarity index 100%
rename from ams/dashboard/src/views/Home.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/Home.vue
diff --git a/ams/dashboard/src/views/catalogs/Detail.vue b/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue
similarity index 100%
rename from ams/dashboard/src/views/catalogs/Detail.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue
diff --git a/ams/dashboard/src/views/catalogs/Properties.vue b/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Properties.vue
similarity index 100%
rename from ams/dashboard/src/views/catalogs/Properties.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/catalogs/Properties.vue
diff --git a/ams/dashboard/src/views/catalogs/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/catalogs/index.vue
similarity index 100%
rename from ams/dashboard/src/views/catalogs/index.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/catalogs/index.vue
diff --git a/ams/dashboard/src/views/hive-details/components/Details.vue b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Details.vue
similarity index 100%
rename from ams/dashboard/src/views/hive-details/components/Details.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Details.vue
diff --git a/ams/dashboard/src/views/hive-details/components/ErrorMsg.vue b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue
similarity index 100%
rename from ams/dashboard/src/views/hive-details/components/ErrorMsg.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue
diff --git a/ams/dashboard/src/views/hive-details/components/Field.vue b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Field.vue
similarity index 100%
rename from ams/dashboard/src/views/hive-details/components/Field.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Field.vue
diff --git a/ams/dashboard/src/views/hive-details/components/Partition.vue b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Partition.vue
similarity index 100%
rename from ams/dashboard/src/views/hive-details/components/Partition.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Partition.vue
diff --git a/ams/dashboard/src/views/hive-details/components/Properties.vue b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Properties.vue
similarity index 100%
rename from ams/dashboard/src/views/hive-details/components/Properties.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/Properties.vue
diff --git a/ams/dashboard/src/views/hive-details/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/index.vue
similarity index 100%
rename from ams/dashboard/src/views/hive-details/index.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/hive-details/index.vue
diff --git a/ams/dashboard/src/views/hive-details/upgrade.vue b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/upgrade.vue
similarity index 100%
rename from ams/dashboard/src/views/hive-details/upgrade.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/hive-details/upgrade.vue
diff --git a/ams/dashboard/src/views/introduce/index-bakl.vue b/amoro-ams/amoro-ams-dashboard/src/views/introduce/index-bakl.vue
similarity index 100%
rename from ams/dashboard/src/views/introduce/index-bakl.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/introduce/index-bakl.vue
diff --git a/ams/dashboard/src/views/introduce/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/introduce/index.vue
similarity index 100%
rename from ams/dashboard/src/views/introduce/index.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/introduce/index.vue
diff --git a/ams/dashboard/src/views/login/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/login/index.vue
similarity index 100%
rename from ams/dashboard/src/views/login/index.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/login/index.vue
diff --git a/ams/dashboard/src/views/optimize/components/List.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue
similarity index 100%
rename from ams/dashboard/src/views/optimize/components/List.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue
diff --git a/ams/dashboard/src/views/optimize/components/ScaleOut.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
similarity index 100%
rename from ams/dashboard/src/views/optimize/components/ScaleOut.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
diff --git a/ams/dashboard/src/views/optimize/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue
similarity index 100%
rename from ams/dashboard/src/views/optimize/index.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue
diff --git a/ams/dashboard/src/views/resource/components/GroupModal.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
similarity index 100%
rename from ams/dashboard/src/views/resource/components/GroupModal.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
diff --git a/ams/dashboard/src/views/resource/components/List.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue
similarity index 100%
rename from ams/dashboard/src/views/resource/components/List.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue
diff --git a/ams/dashboard/src/views/resource/components/ScaleOut.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/ScaleOut.vue
similarity index 100%
rename from ams/dashboard/src/views/resource/components/ScaleOut.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/resource/components/ScaleOut.vue
diff --git a/ams/dashboard/src/views/resource/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/index.vue
similarity index 100%
rename from ams/dashboard/src/views/resource/index.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/resource/index.vue
diff --git a/ams/dashboard/src/views/settings/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/settings/index.vue
similarity index 100%
rename from ams/dashboard/src/views/settings/index.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/settings/index.vue
diff --git a/ams/dashboard/src/views/tables/components/Details.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Details.vue
similarity index 100%
rename from ams/dashboard/src/views/tables/components/Details.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/tables/components/Details.vue
diff --git a/ams/dashboard/src/views/tables/components/Files.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Files.vue
similarity index 100%
rename from ams/dashboard/src/views/tables/components/Files.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/tables/components/Files.vue
diff --git a/ams/dashboard/src/views/tables/components/Operations.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue
similarity index 100%
rename from ams/dashboard/src/views/tables/components/Operations.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue
diff --git a/ams/dashboard/src/views/tables/components/Optimizing.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue
similarity index 100%
rename from ams/dashboard/src/views/tables/components/Optimizing.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue
diff --git a/ams/dashboard/src/views/tables/components/Selector.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Selector.vue
similarity index 100%
rename from ams/dashboard/src/views/tables/components/Selector.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/tables/components/Selector.vue
diff --git a/ams/dashboard/src/views/tables/components/Snapshots.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Snapshots.vue
similarity index 100%
rename from ams/dashboard/src/views/tables/components/Snapshots.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/tables/components/Snapshots.vue
diff --git a/ams/dashboard/src/views/tables/create.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/create.vue
similarity index 100%
rename from ams/dashboard/src/views/tables/create.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/tables/create.vue
diff --git a/ams/dashboard/src/views/tables/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
similarity index 100%
rename from ams/dashboard/src/views/tables/index.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
diff --git a/ams/dashboard/src/views/terminal/components/sql-log.vue b/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-log.vue
similarity index 100%
rename from ams/dashboard/src/views/terminal/components/sql-log.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-log.vue
diff --git a/ams/dashboard/src/views/terminal/components/sql-result.vue b/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
similarity index 100%
rename from ams/dashboard/src/views/terminal/components/sql-result.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
diff --git a/ams/dashboard/src/views/terminal/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/terminal/index.vue
similarity index 100%
rename from ams/dashboard/src/views/terminal/index.vue
rename to amoro-ams/amoro-ams-dashboard/src/views/terminal/index.vue
diff --git a/ams/dashboard/src/vite-env.d.ts b/amoro-ams/amoro-ams-dashboard/src/vite-env.d.ts
similarity index 100%
rename from ams/dashboard/src/vite-env.d.ts
rename to amoro-ams/amoro-ams-dashboard/src/vite-env.d.ts
diff --git a/ams/dashboard/tsconfig.json b/amoro-ams/amoro-ams-dashboard/tsconfig.json
similarity index 100%
rename from ams/dashboard/tsconfig.json
rename to amoro-ams/amoro-ams-dashboard/tsconfig.json
diff --git a/ams/dashboard/tsconfig.node.json b/amoro-ams/amoro-ams-dashboard/tsconfig.node.json
similarity index 100%
rename from ams/dashboard/tsconfig.node.json
rename to amoro-ams/amoro-ams-dashboard/tsconfig.node.json
diff --git a/ams/dashboard/vite.config.ts b/amoro-ams/amoro-ams-dashboard/vite.config.ts
similarity index 100%
rename from ams/dashboard/vite.config.ts
rename to amoro-ams/amoro-ams-dashboard/vite.config.ts
diff --git a/ams/metric-reporter/pom.xml b/amoro-ams/amoro-ams-metric-reporter/pom.xml
similarity index 100%
rename from ams/metric-reporter/pom.xml
rename to amoro-ams/amoro-ams-metric-reporter/pom.xml
diff --git a/ams/metric-reporter/prometheus-reporter/pom.xml b/amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/pom.xml
similarity index 100%
rename from ams/metric-reporter/prometheus-reporter/pom.xml
rename to amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/pom.xml
diff --git a/ams/metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/MetricCollector.java b/amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/MetricCollector.java
similarity index 100%
rename from ams/metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/MetricCollector.java
rename to amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/MetricCollector.java
diff --git a/ams/metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/PrometheusExporterMetricReporter.java b/amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/PrometheusExporterMetricReporter.java
similarity index 100%
rename from ams/metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/PrometheusExporterMetricReporter.java
rename to amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/PrometheusExporterMetricReporter.java
diff --git a/ams/optimizer/common/pom.xml b/amoro-ams/amoro-ams-optimizer/common/pom.xml
similarity index 100%
rename from ams/optimizer/common/pom.xml
rename to amoro-ams/amoro-ams-optimizer/common/pom.xml
diff --git a/ams/optimizer/common/src/main/java/org/apache/amoro/optimizer/common/AbstractOptimizerOperator.java b/amoro-ams/amoro-ams-optimizer/common/src/main/java/org/apache/amoro/optimizer/common/AbstractOptimizerOperator.java
similarity index 100%
rename from ams/optimizer/common/src/main/java/org/apache/amoro/optimizer/common/AbstractOptimizerOperator.java
rename to amoro-ams/amoro-ams-optimizer/common/src/main/java/org/apache/amoro/optimizer/common/AbstractOptimizerOperator.java
diff --git a/ams/optimizer/common/src/main/java/org/apache/amoro/optimizer/common/Optimizer.java b/amoro-ams/amoro-ams-optimizer/common/src/main/java/org/apache/amoro/optimizer/common/Optimizer.java
similarity index 100%
rename from ams/optimizer/common/src/main/java/org/apache/amoro/optimizer/common/Optimizer.java
rename to amoro-ams/amoro-ams-optimizer/common/src/main/java/org/apache/amoro/optimizer/common/Optimizer.java
diff --git a/ams/optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerConfig.java b/amoro-ams/amoro-ams-optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerConfig.java
similarity index 100%
rename from ams/optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerConfig.java
rename to amoro-ams/amoro-ams-optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerConfig.java
diff --git a/ams/optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java b/amoro-ams/amoro-ams-optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
similarity index 100%
rename from ams/optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
rename to amoro-ams/amoro-ams-optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
diff --git a/ams/optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerToucher.java b/amoro-ams/amoro-ams-optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerToucher.java
similarity index 100%
rename from ams/optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerToucher.java
rename to amoro-ams/amoro-ams-optimizer/common/src/main/java/org/apache/amoro/optimizer/common/OptimizerToucher.java
diff --git a/ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestBase.java b/amoro-ams/amoro-ams-optimizer/common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestBase.java
similarity index 100%
rename from ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestBase.java
rename to amoro-ams/amoro-ams-optimizer/common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestBase.java
diff --git a/ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestHelpers.java b/amoro-ams/amoro-ams-optimizer/common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestHelpers.java
similarity index 100%
rename from ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestHelpers.java
rename to amoro-ams/amoro-ams-optimizer/common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestHelpers.java
diff --git a/ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizer.java b/amoro-ams/amoro-ams-optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizer.java
similarity index 100%
rename from ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizer.java
rename to amoro-ams/amoro-ams-optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizer.java
diff --git a/ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerConfig.java b/amoro-ams/amoro-ams-optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerConfig.java
similarity index 100%
rename from ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerConfig.java
rename to amoro-ams/amoro-ams-optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerConfig.java
diff --git a/ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerExecutor.java b/amoro-ams/amoro-ams-optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerExecutor.java
similarity index 100%
rename from ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerExecutor.java
rename to amoro-ams/amoro-ams-optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerExecutor.java
diff --git a/ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerToucher.java b/amoro-ams/amoro-ams-optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerToucher.java
similarity index 100%
rename from ams/optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerToucher.java
rename to amoro-ams/amoro-ams-optimizer/common/src/test/java/org/apache/amoro/optimizer/common/TestOptimizerToucher.java
diff --git a/ams/optimizer/flink-optimizer/pom.xml b/amoro-ams/amoro-ams-optimizer/flink-optimizer/pom.xml
similarity index 100%
rename from ams/optimizer/flink-optimizer/pom.xml
rename to amoro-ams/amoro-ams-optimizer/flink-optimizer/pom.xml
diff --git a/ams/optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkExecutor.java b/amoro-ams/amoro-ams-optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkExecutor.java
similarity index 100%
rename from ams/optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkExecutor.java
rename to amoro-ams/amoro-ams-optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkExecutor.java
diff --git a/ams/optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizer.java b/amoro-ams/amoro-ams-optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizer.java
similarity index 100%
rename from ams/optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizer.java
rename to amoro-ams/amoro-ams-optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizer.java
diff --git a/ams/optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java b/amoro-ams/amoro-ams-optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java
similarity index 100%
rename from ams/optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java
rename to amoro-ams/amoro-ams-optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java
diff --git a/ams/optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkToucher.java b/amoro-ams/amoro-ams-optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkToucher.java
similarity index 100%
rename from ams/optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkToucher.java
rename to amoro-ams/amoro-ams-optimizer/flink-optimizer/src/main/java/org/apache/amoro/optimizer/flink/FlinkToucher.java
diff --git a/ams/optimizer/pom.xml b/amoro-ams/amoro-ams-optimizer/pom.xml
similarity index 100%
rename from ams/optimizer/pom.xml
rename to amoro-ams/amoro-ams-optimizer/pom.xml
diff --git a/ams/optimizer/spark-optimizer/pom.xml b/amoro-ams/amoro-ams-optimizer/spark-optimizer/pom.xml
similarity index 100%
rename from ams/optimizer/spark-optimizer/pom.xml
rename to amoro-ams/amoro-ams-optimizer/spark-optimizer/pom.xml
diff --git a/ams/optimizer/spark-optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizer.java b/amoro-ams/amoro-ams-optimizer/spark-optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizer.java
similarity index 100%
rename from ams/optimizer/spark-optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizer.java
rename to amoro-ams/amoro-ams-optimizer/spark-optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizer.java
diff --git a/ams/optimizer/spark-optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java b/amoro-ams/amoro-ams-optimizer/spark-optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
similarity index 100%
rename from ams/optimizer/spark-optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
rename to amoro-ams/amoro-ams-optimizer/spark-optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
diff --git a/ams/optimizer/spark-optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizingTaskFunction.java b/amoro-ams/amoro-ams-optimizer/spark-optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizingTaskFunction.java
similarity index 100%
rename from ams/optimizer/spark-optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizingTaskFunction.java
rename to amoro-ams/amoro-ams-optimizer/spark-optimizer/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizingTaskFunction.java
diff --git a/ams/optimizer/standalone-optimizer/pom.xml b/amoro-ams/amoro-ams-optimizer/standalone-optimizer/pom.xml
similarity index 100%
rename from ams/optimizer/standalone-optimizer/pom.xml
rename to amoro-ams/amoro-ams-optimizer/standalone-optimizer/pom.xml
diff --git a/ams/optimizer/standalone-optimizer/src/main/java/org/apache/amoro/optimizer/standalone/StandaloneOptimizer.java b/amoro-ams/amoro-ams-optimizer/standalone-optimizer/src/main/java/org/apache/amoro/optimizer/standalone/StandaloneOptimizer.java
similarity index 100%
rename from ams/optimizer/standalone-optimizer/src/main/java/org/apache/amoro/optimizer/standalone/StandaloneOptimizer.java
rename to amoro-ams/amoro-ams-optimizer/standalone-optimizer/src/main/java/org/apache/amoro/optimizer/standalone/StandaloneOptimizer.java
diff --git a/ams/server/pom.xml b/amoro-ams/amoro-ams-server/pom.xml
similarity index 100%
rename from ams/server/pom.xml
rename to amoro-ams/amoro-ams-server/pom.xml
diff --git a/ams/server/src/main/java/org/apache/amoro/server/ArcticManagementConf.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/ArcticManagementConf.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/ArcticManagementConf.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/ArcticManagementConf.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/ArcticManagementConfValidator.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/ArcticManagementConfValidator.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/ArcticManagementConfValidator.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/ArcticManagementConfValidator.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/ArcticServiceConstants.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/ArcticServiceConstants.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/ArcticServiceConstants.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/ArcticServiceConstants.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/ArcticServiceContainer.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/ArcticServiceContainer.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/ArcticServiceContainer.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/ArcticServiceContainer.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/Environments.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/Environments.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/Environments.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/Environments.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/HighAvailabilityContainer.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/HighAvailabilityContainer.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/HighAvailabilityContainer.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/HighAvailabilityContainer.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/RestCatalogService.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/RestCatalogService.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/RestCatalogService.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/RestCatalogService.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/TableManagementService.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/TableManagementService.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/TableManagementService.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/TableManagementService.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/catalog/CatalogBuilder.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogBuilder.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/catalog/CatalogBuilder.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogBuilder.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/catalog/CatalogService.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogService.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/catalog/CatalogService.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogService.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/catalog/CatalogType.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogType.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/catalog/CatalogType.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/CatalogType.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ExternalCatalog.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalCatalog.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalIcebergCatalogImpl.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/catalog/InternalMixedCatalogImpl.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalMixedCatalogImpl.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/catalog/InternalMixedCatalogImpl.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/InternalMixedCatalogImpl.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/MixedHiveCatalogImpl.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/catalog/ServerCatalog.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/APITokenManager.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/APITokenManager.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/APITokenManager.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/APITokenManager.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/FormatTableDescriptor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/FormatTableDescriptor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/FormatTableDescriptor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/FormatTableDescriptor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/PaimonTableDescriptor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/PaimonTableDescriptor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/PaimonTableDescriptor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/PaimonTableDescriptor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/PlatformFileManager.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/PlatformFileManager.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/PlatformFileManager.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/PlatformFileManager.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/ServerTableDescriptor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/ServerTableDescriptor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/ServerTableDescriptor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/ServerTableDescriptor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/ServerTableProperties.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/ServerTableProperties.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/ServerTableProperties.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/ServerTableProperties.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/DDLReverser.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/DDLReverser.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/DDLReverser.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/DDLReverser.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTableMetaExtract.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTableMetaExtract.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTableMetaExtract.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTableMetaExtract.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/MetadataChangeHandler.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/MetadataChangeHandler.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/MetadataChangeHandler.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/MetadataChangeHandler.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/PaimonTableMetaExtract.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/PaimonTableMetaExtract.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/PaimonTableMetaExtract.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/PaimonTableMetaExtract.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/PaimonTypeToSparkType.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/PaimonTypeToSparkType.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/PaimonTypeToSparkType.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/PaimonTypeToSparkType.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/SparkMetadataChangeHandler.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/SparkMetadataChangeHandler.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/SparkMetadataChangeHandler.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/SparkMetadataChangeHandler.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/TableMetaExtract.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/TableMetaExtract.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/TableMetaExtract.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/component/reverser/TableMetaExtract.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/HealthCheckController.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/HealthCheckController.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/HealthCheckController.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/HealthCheckController.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/LoginController.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/LoginController.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/LoginController.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/LoginController.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/PlatformFileInfoController.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/PlatformFileInfoController.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/PlatformFileInfoController.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/PlatformFileInfoController.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/TerminalController.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TerminalController.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/TerminalController.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TerminalController.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/AMSColumnInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/AMSColumnInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/AMSColumnInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/AMSColumnInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/AMSPartitionField.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/AMSPartitionField.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/AMSPartitionField.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/AMSPartitionField.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/AmoroSnapshotsOfTable.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/AmoroSnapshotsOfTable.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/AmoroSnapshotsOfTable.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/AmoroSnapshotsOfTable.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/ApiTokens.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/ApiTokens.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/ApiTokens.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/ApiTokens.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogRegisterInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogRegisterInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogRegisterInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogRegisterInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogSettingInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogSettingInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogSettingInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/CatalogSettingInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/DDLInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/DDLInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/DDLInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/DDLInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/FilesStatistics.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/FilesStatistics.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/FilesStatistics.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/FilesStatistics.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/HiveTableInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/HiveTableInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/HiveTableInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/HiveTableInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/KafkaClusterSimpleInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/KafkaClusterSimpleInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/KafkaClusterSimpleInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/KafkaClusterSimpleInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/LatestSessionInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/LatestSessionInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/LatestSessionInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/LatestSessionInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/LogInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/LogInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/LogInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/LogInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/OperationType.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OperationType.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/OperationType.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OperationType.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerInstanceInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerInstanceInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerInstanceInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerInstanceInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerResourceInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerResourceInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerResourceInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizerResourceInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizingProcessInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizingProcessInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizingProcessInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizingProcessInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizingTaskInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizingTaskInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizingTaskInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/OptimizingTaskInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/PartitionBaseInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/PartitionBaseInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/PartitionBaseInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/PartitionBaseInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/PartitionFileBaseInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/PartitionFileBaseInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/PartitionFileBaseInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/PartitionFileBaseInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/PlatformFileInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/PlatformFileInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/PlatformFileInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/PlatformFileInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/ServerTableMeta.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/ServerTableMeta.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/ServerTableMeta.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/ServerTableMeta.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/SessionInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SessionInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/SessionInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SessionInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/SnapshotInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SnapshotInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/SnapshotInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SnapshotInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/SqlExample.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlExample.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/SqlExample.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlExample.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/SqlResult.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlResult.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/SqlResult.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlResult.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/SqlStatus.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlStatus.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/SqlStatus.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/SqlStatus.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/TableBasicInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableBasicInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/TableBasicInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableBasicInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/TableMeta.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableMeta.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/TableMeta.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableMeta.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/TableOperation.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableOperation.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/TableOperation.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableOperation.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/TableOptimizingInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableOptimizingInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/TableOptimizingInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableOptimizingInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/TableStatistics.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableStatistics.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/TableStatistics.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TableStatistics.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/TagOrBranchInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TagOrBranchInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/TagOrBranchInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/TagOrBranchInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeHiveMeta.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeHiveMeta.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeHiveMeta.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeHiveMeta.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeRunningInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeRunningInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeRunningInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeRunningInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeStatus.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeStatus.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeStatus.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/UpgradeStatus.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/model/VersionInfo.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/VersionInfo.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/model/VersionInfo.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/model/VersionInfo.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/response/ErrorResponse.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/ErrorResponse.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/response/ErrorResponse.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/ErrorResponse.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/response/OkResponse.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/OkResponse.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/response/OkResponse.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/OkResponse.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/response/PageResult.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/PageResult.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/response/PageResult.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/PageResult.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/response/Response.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/Response.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/response/Response.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/response/Response.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/AmsUtil.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/AmsUtil.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/AmsUtil.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/AmsUtil.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/CommonUtil.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/CommonUtil.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/CommonUtil.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/CommonUtil.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/DesensitizationUtil.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/DesensitizationUtil.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/DesensitizationUtil.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/DesensitizationUtil.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/FilesStatisticsBuilder.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/FilesStatisticsBuilder.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/FilesStatisticsBuilder.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/FilesStatisticsBuilder.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/OptimizingUtil.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/OptimizingUtil.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/OptimizingUtil.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/OptimizingUtil.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/PropertiesUtil.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/PropertiesUtil.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/PropertiesUtil.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/PropertiesUtil.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/TableStatCollector.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/TableStatCollector.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/dashboard/utils/TableStatCollector.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/TableStatCollector.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/events/LoggingEventListener.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/events/LoggingEventListener.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/events/LoggingEventListener.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/events/LoggingEventListener.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/AlreadyExistsException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/AlreadyExistsException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/AlreadyExistsException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/AlreadyExistsException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/ArcticRuntimeException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/ArcticRuntimeException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/ArcticRuntimeException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/ArcticRuntimeException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/BlockerConflictException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/BlockerConflictException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/BlockerConflictException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/BlockerConflictException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/ForbiddenException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/ForbiddenException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/ForbiddenException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/ForbiddenException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/IllegalMetadataException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/IllegalMetadataException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/IllegalMetadataException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/IllegalMetadataException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/IllegalTaskStateException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/IllegalTaskStateException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/IllegalTaskStateException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/IllegalTaskStateException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/LoadingPluginException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/LoadingPluginException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/LoadingPluginException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/LoadingPluginException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/ObjectNotExistsException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/ObjectNotExistsException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/ObjectNotExistsException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/ObjectNotExistsException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/OptimizingClosedException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/OptimizingClosedException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/OptimizingClosedException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/OptimizingClosedException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/OptimizingCommitException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/OptimizingCommitException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/OptimizingCommitException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/OptimizingCommitException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/PersistenceException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PersistenceException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/PersistenceException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PersistenceException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/PluginAuthException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PluginAuthException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/PluginAuthException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PluginAuthException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/PluginRetryAuthException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PluginRetryAuthException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/PluginRetryAuthException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/PluginRetryAuthException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/TaskNotFoundException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/TaskNotFoundException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/TaskNotFoundException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/TaskNotFoundException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/TaskRuntimeException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/TaskRuntimeException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/TaskRuntimeException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/TaskRuntimeException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/exception/UndefinedException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/UndefinedException.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/exception/UndefinedException.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/UndefinedException.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/manager/AbstractPluginManager.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/AbstractPluginManager.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/manager/AbstractPluginManager.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/AbstractPluginManager.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/manager/AbstractResourceContainer.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/AbstractResourceContainer.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/manager/AbstractResourceContainer.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/AbstractResourceContainer.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/manager/ClassLoaderContext.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/ClassLoaderContext.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/manager/ClassLoaderContext.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/ClassLoaderContext.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/manager/EventsManager.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/EventsManager.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/manager/EventsManager.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/EventsManager.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/manager/ExecUtil.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/ExecUtil.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/manager/ExecUtil.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/ExecUtil.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/manager/FlinkOptimizerContainer.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/FlinkOptimizerContainer.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/manager/FlinkOptimizerContainer.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/FlinkOptimizerContainer.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/manager/LocalOptimizerContainer.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/LocalOptimizerContainer.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/manager/LocalOptimizerContainer.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/LocalOptimizerContainer.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/manager/MetricManager.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/MetricManager.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/manager/MetricManager.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/MetricManager.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/manager/PluginConfiguration.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/PluginConfiguration.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/manager/PluginConfiguration.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/PluginConfiguration.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/manager/PluginManager.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/PluginManager.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/manager/PluginManager.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/PluginManager.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/metrics/MetricRegistry.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/metrics/MetricRegistry.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/metrics/MetricRegistry.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/metrics/MetricRegistry.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/MetricsSummary.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/MetricsSummary.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/MetricsSummary.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/MetricsSummary.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/OptimizerGroupMetrics.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizerGroupMetrics.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/OptimizerGroupMetrics.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizerGroupMetrics.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcess.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcess.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcess.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcess.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcessMeta.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcessMeta.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcessMeta.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingProcessMeta.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/OptimizingQueue.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingQueue.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/OptimizingQueue.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingQueue.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/OptimizingStatus.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingStatus.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/OptimizingStatus.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingStatus.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/OptimizingTaskMeta.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingTaskMeta.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/OptimizingTaskMeta.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingTaskMeta.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/OptimizingType.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingType.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/OptimizingType.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/OptimizingType.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/SchedulingPolicy.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/SchedulingPolicy.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/SchedulingPolicy.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/SchedulingPolicy.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/TaskRuntime.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/TaskRuntime.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/TaskRuntime.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/TaskRuntime.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/maintainer/AutoCreateIcebergTagAction.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/AutoCreateIcebergTagAction.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/maintainer/AutoCreateIcebergTagAction.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/AutoCreateIcebergTagAction.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/maintainer/IcebergTableMaintainer.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/IcebergTableMaintainer.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/maintainer/IcebergTableMaintainer.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/IcebergTableMaintainer.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/maintainer/MixedTableMaintainer.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/MixedTableMaintainer.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/maintainer/MixedTableMaintainer.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/MixedTableMaintainer.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/maintainer/TableMaintainer.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/TableMaintainer.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/maintainer/TableMaintainer.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/maintainer/TableMaintainer.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/AbstractPartitionPlan.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/AbstractPartitionPlan.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/AbstractPartitionPlan.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/AbstractPartitionPlan.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/IcebergPartitionPlan.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/IcebergPartitionPlan.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/IcebergPartitionPlan.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/IcebergPartitionPlan.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedHivePartitionPlan.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedHivePartitionPlan.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedHivePartitionPlan.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedHivePartitionPlan.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedIcebergPartitionPlan.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedIcebergPartitionPlan.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedIcebergPartitionPlan.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/MixedIcebergPartitionPlan.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingEvaluator.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingEvaluator.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingEvaluator.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingEvaluator.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingPlanner.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingPlanner.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingPlanner.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/OptimizingPlanner.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/PartitionEvaluator.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/PartitionEvaluator.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/PartitionEvaluator.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/PartitionEvaluator.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/TaskDescriptor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/TaskDescriptor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/plan/TaskDescriptor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/TaskDescriptor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/scan/IcebergTableFileScanHelper.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/IcebergTableFileScanHelper.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/scan/IcebergTableFileScanHelper.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/IcebergTableFileScanHelper.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/scan/KeyedTableFileScanHelper.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/KeyedTableFileScanHelper.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/scan/KeyedTableFileScanHelper.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/KeyedTableFileScanHelper.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelper.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelper.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelper.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelper.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/optimizing/scan/UnkeyedTableFileScanHelper.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/UnkeyedTableFileScanHelper.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/optimizing/scan/UnkeyedTableFileScanHelper.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/scan/UnkeyedTableFileScanHelper.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/NestedSqlSession.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/NestedSqlSession.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/NestedSqlSession.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/NestedSqlSession.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/PersistentBase.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/PersistentBase.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/PersistentBase.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/PersistentBase.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/SqlSessionFactoryProvider.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/SqlSessionFactoryProvider.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/SqlSessionFactoryProvider.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/SqlSessionFactoryProvider.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/StatedPersistentBase.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/StatedPersistentBase.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/StatedPersistentBase.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/StatedPersistentBase.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/converter/JsonObjectConverter.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/JsonObjectConverter.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/converter/JsonObjectConverter.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/JsonObjectConverter.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/converter/List2StringConverter.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/List2StringConverter.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/converter/List2StringConverter.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/List2StringConverter.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/converter/Long2TsConverter.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Long2TsConverter.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/converter/Long2TsConverter.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Long2TsConverter.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/converter/Map2StringConverter.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Map2StringConverter.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/converter/Map2StringConverter.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Map2StringConverter.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/converter/MapLong2StringConverter.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/MapLong2StringConverter.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/converter/MapLong2StringConverter.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/MapLong2StringConverter.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/converter/Object2ByteArrayConvert.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Object2ByteArrayConvert.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/converter/Object2ByteArrayConvert.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/converter/Object2ByteArrayConvert.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/ApiTokensMapper.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/ApiTokensMapper.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/ApiTokensMapper.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/ApiTokensMapper.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/CatalogMetaMapper.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/CatalogMetaMapper.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/CatalogMetaMapper.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/CatalogMetaMapper.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizerMapper.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizerMapper.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizerMapper.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizerMapper.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/PlatformFileMapper.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/PlatformFileMapper.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/PlatformFileMapper.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/PlatformFileMapper.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/ResourceMapper.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/ResourceMapper.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/ResourceMapper.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/ResourceMapper.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/TableBlockerMapper.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/TableBlockerMapper.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/TableBlockerMapper.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/TableBlockerMapper.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/resource/ContainerMetadata.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/ContainerMetadata.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/resource/ContainerMetadata.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/ContainerMetadata.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/resource/OptimizerInstance.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerInstance.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/resource/OptimizerInstance.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerInstance.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/resource/OptimizerManager.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerManager.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/resource/OptimizerManager.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerManager.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/resource/OptimizerThread.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerThread.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/resource/OptimizerThread.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/OptimizerThread.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/resource/QuotaProvider.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/QuotaProvider.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/resource/QuotaProvider.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/QuotaProvider.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/resource/ResourceContainers.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/ResourceContainers.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/resource/ResourceContainers.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/resource/ResourceContainers.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/BasicTableSnapshot.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/BasicTableSnapshot.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/BasicTableSnapshot.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/BasicTableSnapshot.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/DefaultTableService.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/KeyedTableSnapshot.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/KeyedTableSnapshot.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/KeyedTableSnapshot.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/KeyedTableSnapshot.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/RuntimeHandlerChain.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/RuntimeHandlerChain.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/RuntimeHandlerChain.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/RuntimeHandlerChain.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/TableManager.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableManager.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/TableManager.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableManager.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/TableMetadata.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableMetadata.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/TableMetadata.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableMetadata.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/TableMetrics.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableMetrics.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/TableMetrics.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableMetrics.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/TableRuntime.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntime.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/TableRuntime.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntime.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/TableRuntimeHandler.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntimeHandler.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/TableRuntimeHandler.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntimeHandler.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/TableRuntimeMeta.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntimeMeta.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/TableRuntimeMeta.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableRuntimeMeta.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/TableService.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableService.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/TableService.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableService.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/TableSnapshot.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableSnapshot.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/TableSnapshot.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/TableSnapshot.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/blocker/TableBlocker.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/blocker/TableBlocker.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/blocker/TableBlocker.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/blocker/TableBlocker.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/executor/AsyncTableExecutors.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/AsyncTableExecutors.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/executor/AsyncTableExecutors.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/AsyncTableExecutors.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/BaseTableExecutor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/executor/BlockerExpiringExecutor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/BlockerExpiringExecutor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/executor/BlockerExpiringExecutor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/BlockerExpiringExecutor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/executor/DataExpiringExecutor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/DataExpiringExecutor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/executor/DataExpiringExecutor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/DataExpiringExecutor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/executor/HiveCommitSyncExecutor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/HiveCommitSyncExecutor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/executor/HiveCommitSyncExecutor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/HiveCommitSyncExecutor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/executor/OptimizingCommitExecutor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OptimizingCommitExecutor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/executor/OptimizingCommitExecutor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OptimizingCommitExecutor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/executor/OptimizingExpiringExecutor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OptimizingExpiringExecutor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/executor/OptimizingExpiringExecutor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OptimizingExpiringExecutor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/executor/OrphanFilesCleaningExecutor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OrphanFilesCleaningExecutor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/executor/OrphanFilesCleaningExecutor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/OrphanFilesCleaningExecutor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/executor/SnapshotsExpiringExecutor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/SnapshotsExpiringExecutor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/executor/SnapshotsExpiringExecutor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/SnapshotsExpiringExecutor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/executor/TagsAutoCreatingExecutor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TagsAutoCreatingExecutor.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/executor/TagsAutoCreatingExecutor.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TagsAutoCreatingExecutor.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/internal/IcebergInternalTableOperations.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/IcebergInternalTableOperations.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/internal/IcebergInternalTableOperations.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/IcebergInternalTableOperations.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergCreator.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergCreator.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergCreator.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergCreator.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergHandler.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergHandler.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergHandler.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalIcebergHandler.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergCreator.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergCreator.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergCreator.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergCreator.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergHandler.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergHandler.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergHandler.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalMixedIcebergHandler.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/internal/InternalTableConstants.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableConstants.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/internal/InternalTableConstants.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableConstants.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/internal/InternalTableCreator.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableCreator.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/internal/InternalTableCreator.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableCreator.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/internal/InternalTableHandler.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableHandler.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/internal/InternalTableHandler.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/InternalTableHandler.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/table/internal/MixedIcebergInternalTableStoreOperations.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/MixedIcebergInternalTableStoreOperations.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/table/internal/MixedIcebergInternalTableStoreOperations.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/internal/MixedIcebergInternalTableStoreOperations.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/terminal/ExecutionResult.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/ExecutionResult.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/terminal/ExecutionResult.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/ExecutionResult.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/terminal/ExecutionStatus.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/ExecutionStatus.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/terminal/ExecutionStatus.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/ExecutionStatus.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/terminal/JDBCResultSet.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/JDBCResultSet.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/terminal/JDBCResultSet.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/JDBCResultSet.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/terminal/SimpleResultSet.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/SimpleResultSet.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/terminal/SimpleResultSet.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/SimpleResultSet.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/terminal/SparkContextUtil.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/SparkContextUtil.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/terminal/SparkContextUtil.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/SparkContextUtil.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/terminal/StatementResult.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/StatementResult.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/terminal/StatementResult.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/StatementResult.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/terminal/TerminalManager.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalManager.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/terminal/TerminalManager.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalManager.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/terminal/TerminalSession.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSession.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/terminal/TerminalSession.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSession.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionContext.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionContext.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionContext.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionContext.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionFactory.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionFactory.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionFactory.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/TerminalSessionFactory.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiSession.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiSession.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiSession.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiSession.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiTerminalSessionFactory.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiTerminalSessionFactory.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiTerminalSessionFactory.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/kyuubi/KyuubiTerminalSessionFactory.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/terminal/local/LocalTerminalSession.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalTerminalSession.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/terminal/local/LocalTerminalSession.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalTerminalSession.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/utils/CompressUtil.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/CompressUtil.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/utils/CompressUtil.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/CompressUtil.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/utils/FlinkClientUtil.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/FlinkClientUtil.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/utils/FlinkClientUtil.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/FlinkClientUtil.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/utils/HiveLocationUtil.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/HiveLocationUtil.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/utils/HiveLocationUtil.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/HiveLocationUtil.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/utils/IcebergTableUtil.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/IcebergTableUtil.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/utils/IcebergTableUtil.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/IcebergTableUtil.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/utils/InternalTableUtil.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/InternalTableUtil.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/utils/InternalTableUtil.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/InternalTableUtil.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/utils/PreconditionUtils.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/PreconditionUtils.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/utils/PreconditionUtils.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/PreconditionUtils.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/utils/StructuredOptionsSplitter.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/StructuredOptionsSplitter.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/utils/StructuredOptionsSplitter.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/StructuredOptionsSplitter.java
diff --git a/ams/server/src/main/java/org/apache/amoro/server/utils/ThriftServiceProxy.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/ThriftServiceProxy.java
similarity index 100%
rename from ams/server/src/main/java/org/apache/amoro/server/utils/ThriftServiceProxy.java
rename to amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/utils/ThriftServiceProxy.java
diff --git a/ams/server/src/main/resources/META-INF/services/org.apache.amoro.api.events.EventListener b/amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.api.events.EventListener
similarity index 100%
rename from ams/server/src/main/resources/META-INF/services/org.apache.amoro.api.events.EventListener
rename to amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.api.events.EventListener
diff --git a/ams/server/src/main/resources/META-INF/services/org.apache.amoro.api.resource.ResourceContainer b/amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.api.resource.ResourceContainer
similarity index 100%
rename from ams/server/src/main/resources/META-INF/services/org.apache.amoro.api.resource.ResourceContainer
rename to amoro-ams/amoro-ams-server/src/main/resources/META-INF/services/org.apache.amoro.api.resource.ResourceContainer
diff --git a/ams/server/src/main/resources/derby/ams-derby-init.sql b/amoro-ams/amoro-ams-server/src/main/resources/derby/ams-derby-init.sql
similarity index 100%
rename from ams/server/src/main/resources/derby/ams-derby-init.sql
rename to amoro-ams/amoro-ams-server/src/main/resources/derby/ams-derby-init.sql
diff --git a/ams/server/src/main/resources/log4j2.xml b/amoro-ams/amoro-ams-server/src/main/resources/log4j2.xml
similarity index 100%
rename from ams/server/src/main/resources/log4j2.xml
rename to amoro-ams/amoro-ams-server/src/main/resources/log4j2.xml
diff --git a/ams/server/src/main/resources/mysql/ams-mysql-init.sql b/amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql
similarity index 100%
rename from ams/server/src/main/resources/mysql/ams-mysql-init.sql
rename to amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql
diff --git a/ams/server/src/main/resources/mysql/update.sql b/amoro-ams/amoro-ams-server/src/main/resources/mysql/update.sql
similarity index 100%
rename from ams/server/src/main/resources/mysql/update.sql
rename to amoro-ams/amoro-ams-server/src/main/resources/mysql/update.sql
diff --git a/ams/server/src/main/resources/mysql/upgrade-0.3.0-to-0.3.1.sql b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.0-to-0.3.1.sql
similarity index 100%
rename from ams/server/src/main/resources/mysql/upgrade-0.3.0-to-0.3.1.sql
rename to amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.0-to-0.3.1.sql
diff --git a/ams/server/src/main/resources/mysql/upgrade-0.3.1-to-0.3.2.sql b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.1-to-0.3.2.sql
similarity index 100%
rename from ams/server/src/main/resources/mysql/upgrade-0.3.1-to-0.3.2.sql
rename to amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.1-to-0.3.2.sql
diff --git a/ams/server/src/main/resources/mysql/upgrade-0.3.2-to-0.4.0.sql b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.2-to-0.4.0.sql
similarity index 100%
rename from ams/server/src/main/resources/mysql/upgrade-0.3.2-to-0.4.0.sql
rename to amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.3.2-to-0.4.0.sql
diff --git a/ams/server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql
similarity index 100%
rename from ams/server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql
rename to amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql
diff --git a/ams/server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql
similarity index 100%
rename from ams/server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql
rename to amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql
diff --git a/ams/server/src/main/resources/mysql/upgrade-0.5.0-to-0.5.1.sql b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.5.0-to-0.5.1.sql
similarity index 100%
rename from ams/server/src/main/resources/mysql/upgrade-0.5.0-to-0.5.1.sql
rename to amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.5.0-to-0.5.1.sql
diff --git a/ams/server/src/main/resources/mysql/upgrade-0.5.1-to-0.6.0.sql b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.5.1-to-0.6.0.sql
similarity index 100%
rename from ams/server/src/main/resources/mysql/upgrade-0.5.1-to-0.6.0.sql
rename to amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.5.1-to-0.6.0.sql
diff --git a/ams/server/src/main/resources/postgres/ams-postgres-init.sql b/amoro-ams/amoro-ams-server/src/main/resources/postgres/ams-postgres-init.sql
similarity index 100%
rename from ams/server/src/main/resources/postgres/ams-postgres-init.sql
rename to amoro-ams/amoro-ams-server/src/main/resources/postgres/ams-postgres-init.sql
diff --git a/ams/server/src/main/resources/postgres/update.sql b/amoro-ams/amoro-ams-server/src/main/resources/postgres/update.sql
similarity index 100%
rename from ams/server/src/main/resources/postgres/update.sql
rename to amoro-ams/amoro-ams-server/src/main/resources/postgres/update.sql
diff --git a/ams/server/src/main/resources/postgres/upgrade-0.5.1-to-0.6.0.sql b/amoro-ams/amoro-ams-server/src/main/resources/postgres/upgrade-0.5.1-to-0.6.0.sql
similarity index 100%
rename from ams/server/src/main/resources/postgres/upgrade-0.5.1-to-0.6.0.sql
rename to amoro-ams/amoro-ams-server/src/main/resources/postgres/upgrade-0.5.1-to-0.6.0.sql
diff --git a/ams/server/src/test/java/org/apache/amoro/server/AmsEnvironment.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/AmsEnvironment.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/AmsEnvironment.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/AmsEnvironment.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/RestCatalogServiceTestBase.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/TestArcticManagementConfValidator.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestArcticManagementConfValidator.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/TestArcticManagementConfValidator.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestArcticManagementConfValidator.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalIcebergCatalogService.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/TestInternalMixedCatalogService.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalMixedCatalogService.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/TestInternalMixedCatalogService.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/TestInternalMixedCatalogService.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/catalog/TableCatalogTestBase.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TableCatalogTestBase.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/catalog/TableCatalogTestBase.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TableCatalogTestBase.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/catalog/TestServerCatalog.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/dashboard/TestIcebergServerTableDescriptor.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/TestIcebergServerTableDescriptor.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/dashboard/TestIcebergServerTableDescriptor.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/TestIcebergServerTableDescriptor.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/dashboard/TestPaimonServerTableDescriptor.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/TestPaimonServerTableDescriptor.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/dashboard/TestPaimonServerTableDescriptor.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/TestPaimonServerTableDescriptor.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/dashboard/TestServerTableDescriptor.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/TestServerTableDescriptor.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/dashboard/TestServerTableDescriptor.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/TestServerTableDescriptor.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/dashboard/utils/TestParamSignatureCalculator.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/utils/TestParamSignatureCalculator.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/dashboard/utils/TestParamSignatureCalculator.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/utils/TestParamSignatureCalculator.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/dashboard/utils/TestPropertiesUtil.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/utils/TestPropertiesUtil.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/dashboard/utils/TestPropertiesUtil.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/dashboard/utils/TestPropertiesUtil.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/manager/TestAbstractPluginManager.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestAbstractPluginManager.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/manager/TestAbstractPluginManager.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestAbstractPluginManager.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/manager/TestFlinkOptimizerContainer.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestFlinkOptimizerContainer.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/manager/TestFlinkOptimizerContainer.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestFlinkOptimizerContainer.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/manager/TestSparkOptimizerContainer.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestSparkOptimizerContainer.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/manager/TestSparkOptimizerContainer.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/manager/TestSparkOptimizerContainer.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/metrics/MockedMetricReporter.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/metrics/MockedMetricReporter.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/metrics/MockedMetricReporter.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/metrics/MockedMetricReporter.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/metrics/TestMetricRegistry.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/metrics/TestMetricRegistry.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/metrics/TestMetricRegistry.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/metrics/TestMetricRegistry.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/AbstractOptimizingTest.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/AbstractOptimizingTest.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/AbstractOptimizingTest.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/AbstractOptimizingTest.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/OptimizingTestHelpers.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/OptimizingTestHelpers.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/OptimizingTestHelpers.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/OptimizingTestHelpers.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestIcebergHadoopOptimizing.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/TestMixedHiveOptimizing.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestMixedHiveOptimizing.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/TestMixedHiveOptimizing.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestMixedHiveOptimizing.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/TestMixedIcebergOptimizing.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestMixedIcebergOptimizing.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/TestMixedIcebergOptimizing.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestMixedIcebergOptimizing.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingIntegration.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingIntegration.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingIntegration.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingIntegration.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingQueue.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingQueue.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingQueue.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/TestOptimizingQueue.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/commit/TestMixIcebergCommit.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/commit/TestMixIcebergCommit.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/commit/TestMixIcebergCommit.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/commit/TestMixIcebergCommit.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/commit/TestUnKeyedTableCommit.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/commit/TestUnKeyedTableCommit.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/commit/TestUnKeyedTableCommit.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/commit/TestUnKeyedTableCommit.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/CompleteOptimizingFlow.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/CompleteOptimizingFlow.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/CompleteOptimizingFlow.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/CompleteOptimizingFlow.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/DataReader.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/DataReader.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/DataReader.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/DataReader.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/RandomRecordGenerator.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/RandomRecordGenerator.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/RandomRecordGenerator.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/RandomRecordGenerator.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/TestUnKeyedContinuousOptimizing.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractHiveChecker.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractHiveChecker.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractHiveChecker.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractHiveChecker.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractSceneCountChecker.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractSceneCountChecker.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractSceneCountChecker.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/AbstractSceneCountChecker.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/DataConcurrencyChecker.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/DataConcurrencyChecker.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/DataConcurrencyChecker.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/DataConcurrencyChecker.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingMove2HiveChecker.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingMove2HiveChecker.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingMove2HiveChecker.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingMove2HiveChecker.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingWrite2HiveChecker.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingWrite2HiveChecker.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingWrite2HiveChecker.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/FullOptimizingWrite2HiveChecker.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MajorOptimizingChecker.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MajorOptimizingChecker.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MajorOptimizingChecker.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MajorOptimizingChecker.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MinorOptimizingCheck.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MinorOptimizingCheck.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MinorOptimizingCheck.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/MinorOptimizingCheck.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/OptimizingCountChecker.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/OptimizingCountChecker.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/OptimizingCountChecker.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/checker/OptimizingCountChecker.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/view/AbstractTableDataView.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/AbstractTableDataView.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/view/AbstractTableDataView.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/AbstractTableDataView.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/view/KeyedTableDataView.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/KeyedTableDataView.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/view/KeyedTableDataView.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/KeyedTableDataView.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/view/MatchResult.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/MatchResult.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/view/MatchResult.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/MatchResult.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/view/TableDataView.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/TableDataView.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/view/TableDataView.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/TableDataView.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/view/UnKeyedTableDataView.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/UnKeyedTableDataView.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/flow/view/UnKeyedTableDataView.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/flow/view/UnKeyedTableDataView.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestAutoCreateIcebergTagAction.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpire.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpire.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpire.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpire.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireHive.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireHive.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireHive.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireHive.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileClean.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileClean.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileClean.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileClean.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanHive.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanHive.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanHive.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanHive.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestOrphanFileCleanIceberg.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpire.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpire.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpire.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpire.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireHive.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireHive.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireHive.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireHive.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireIceberg.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireIceberg.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireIceberg.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestSnapshotExpireIceberg.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/MixedTablePlanTestBase.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/MixedTablePlanTestBase.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/MixedTablePlanTestBase.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/MixedTablePlanTestBase.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveKeyedPartitionPlan.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveKeyedPartitionPlan.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveKeyedPartitionPlan.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveKeyedPartitionPlan.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveOptimizingEvaluator.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveOptimizingEvaluator.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveOptimizingEvaluator.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveOptimizingEvaluator.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestHiveUnkeyedPartitionPlan.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestIcebergPartitionPlan.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestIcebergPartitionPlan.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestIcebergPartitionPlan.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestIcebergPartitionPlan.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestKeyedPartitionPlan.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestKeyedPartitionPlan.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestKeyedPartitionPlan.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestKeyedPartitionPlan.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingEvaluator.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingEvaluator.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingEvaluator.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingEvaluator.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingPlanner.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingPlanner.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingPlanner.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestOptimizingPlanner.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestUnkeyedPartitionPlan.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestUnkeyedPartitionPlan.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/plan/TestUnkeyedPartitionPlan.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/plan/TestUnkeyedPartitionPlan.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelperTestBase.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelperTestBase.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelperTestBase.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TableFileScanHelperTestBase.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveKeyedTableFileScanHelper.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestHiveUnkeyedTableFileScanHelper.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/scan/TestIcebergTableFileScanHelper.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestIcebergTableFileScanHelper.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/scan/TestIcebergTableFileScanHelper.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestIcebergTableFileScanHelper.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/scan/TestKeyedTableFileScanHelper.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestKeyedTableFileScanHelper.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/scan/TestKeyedTableFileScanHelper.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestKeyedTableFileScanHelper.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/optimizing/scan/TestUnkeyedTableFileScanHelper.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/persistence/TestNestedSqlSession.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestNestedSqlSession.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/persistence/TestNestedSqlSession.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestNestedSqlSession.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/persistence/TestPersistentBase.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestPersistentBase.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/persistence/TestPersistentBase.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestPersistentBase.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/persistence/TestStatedPersistentBase.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestStatedPersistentBase.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/persistence/TestStatedPersistentBase.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/TestStatedPersistentBase.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/persistence/mapper/MySQLTestBase.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/mapper/MySQLTestBase.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/persistence/mapper/MySQLTestBase.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/persistence/mapper/MySQLTestBase.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/table/AMSTableTestBase.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/AMSTableTestBase.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/table/AMSTableTestBase.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/AMSTableTestBase.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/table/DerbyPersistence.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/DerbyPersistence.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/table/DerbyPersistence.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/DerbyPersistence.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/table/TableServiceTestBase.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TableServiceTestBase.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/table/TableServiceTestBase.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TableServiceTestBase.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/table/TestCatalogService.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestCatalogService.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/table/TestCatalogService.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestCatalogService.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/table/TestDatabaseService.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestDatabaseService.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/table/TestDatabaseService.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestDatabaseService.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeHandler.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableRuntimeManager.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/table/TestTableService.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableService.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/table/TestTableService.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/TestTableService.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/table/executor/ExecutorTestBase.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/executor/ExecutorTestBase.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/table/executor/ExecutorTestBase.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/executor/ExecutorTestBase.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/table/executor/TestBlockerExpiringExecutor.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/executor/TestBlockerExpiringExecutor.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/table/executor/TestBlockerExpiringExecutor.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/table/executor/TestBlockerExpiringExecutor.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/util/TestCompressUtil.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestCompressUtil.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/util/TestCompressUtil.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestCompressUtil.java
diff --git a/ams/server/src/test/java/org/apache/amoro/server/util/TestConfigurationUtil.java b/amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestConfigurationUtil.java
similarity index 100%
rename from ams/server/src/test/java/org/apache/amoro/server/util/TestConfigurationUtil.java
rename to amoro-ams/amoro-ams-server/src/test/java/org/apache/amoro/server/util/TestConfigurationUtil.java
diff --git a/ams/server/src/test/resources/META-INF/services/org.apache.amoro.api.metrics.MetricReporter b/amoro-ams/amoro-ams-server/src/test/resources/META-INF/services/org.apache.amoro.api.metrics.MetricReporter
similarity index 100%
rename from ams/server/src/test/resources/META-INF/services/org.apache.amoro.api.metrics.MetricReporter
rename to amoro-ams/amoro-ams-server/src/test/resources/META-INF/services/org.apache.amoro.api.metrics.MetricReporter
diff --git a/ams/server/src/test/resources/META-INF/services/org.apache.amoro.server.manager.TestAbstractPluginManager$TestPlugin b/amoro-ams/amoro-ams-server/src/test/resources/META-INF/services/org.apache.amoro.server.manager.TestAbstractPluginManager$TestPlugin
similarity index 100%
rename from ams/server/src/test/resources/META-INF/services/org.apache.amoro.server.manager.TestAbstractPluginManager$TestPlugin
rename to amoro-ams/amoro-ams-server/src/test/resources/META-INF/services/org.apache.amoro.server.manager.TestAbstractPluginManager$TestPlugin
diff --git a/ams/server/src/test/resources/log4j2.xml b/amoro-ams/amoro-ams-server/src/test/resources/log4j2.xml
similarity index 100%
rename from ams/server/src/test/resources/log4j2.xml
rename to amoro-ams/amoro-ams-server/src/test/resources/log4j2.xml
diff --git a/ams/server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/amoro-ams/amoro-ams-server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
similarity index 100%
rename from ams/server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
rename to amoro-ams/amoro-ams-server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/ams/dist/pom.xml b/amoro-ams/dist/pom.xml
similarity index 100%
rename from ams/dist/pom.xml
rename to amoro-ams/dist/pom.xml
diff --git a/ams/dist/src/main/arctic-bin/bin/ams.sh b/amoro-ams/dist/src/main/arctic-bin/bin/ams.sh
similarity index 100%
rename from ams/dist/src/main/arctic-bin/bin/ams.sh
rename to amoro-ams/dist/src/main/arctic-bin/bin/ams.sh
diff --git a/ams/dist/src/main/arctic-bin/bin/load-config.sh b/amoro-ams/dist/src/main/arctic-bin/bin/load-config.sh
similarity index 100%
rename from ams/dist/src/main/arctic-bin/bin/load-config.sh
rename to amoro-ams/dist/src/main/arctic-bin/bin/load-config.sh
diff --git a/ams/dist/src/main/arctic-bin/bin/optimizer.sh b/amoro-ams/dist/src/main/arctic-bin/bin/optimizer.sh
similarity index 100%
rename from ams/dist/src/main/arctic-bin/bin/optimizer.sh
rename to amoro-ams/dist/src/main/arctic-bin/bin/optimizer.sh
diff --git a/ams/dist/src/main/arctic-bin/conf/config.yaml b/amoro-ams/dist/src/main/arctic-bin/conf/config.yaml
similarity index 100%
rename from ams/dist/src/main/arctic-bin/conf/config.yaml
rename to amoro-ams/dist/src/main/arctic-bin/conf/config.yaml
diff --git a/ams/dist/src/main/arctic-bin/conf/jvm.properties b/amoro-ams/dist/src/main/arctic-bin/conf/jvm.properties
similarity index 100%
rename from ams/dist/src/main/arctic-bin/conf/jvm.properties
rename to amoro-ams/dist/src/main/arctic-bin/conf/jvm.properties
diff --git a/ams/dist/src/main/arctic-bin/conf/log4j2.xml b/amoro-ams/dist/src/main/arctic-bin/conf/log4j2.xml
similarity index 100%
rename from ams/dist/src/main/arctic-bin/conf/log4j2.xml
rename to amoro-ams/dist/src/main/arctic-bin/conf/log4j2.xml
diff --git a/ams/dist/src/main/arctic-bin/conf/optimize/log4j2.xml b/amoro-ams/dist/src/main/arctic-bin/conf/optimize/log4j2.xml
similarity index 100%
rename from ams/dist/src/main/arctic-bin/conf/optimize/log4j2.xml
rename to amoro-ams/dist/src/main/arctic-bin/conf/optimize/log4j2.xml
diff --git a/ams/dist/src/main/arctic-bin/conf/plugins/event-listeners.yaml b/amoro-ams/dist/src/main/arctic-bin/conf/plugins/event-listeners.yaml
similarity index 100%
rename from ams/dist/src/main/arctic-bin/conf/plugins/event-listeners.yaml
rename to amoro-ams/dist/src/main/arctic-bin/conf/plugins/event-listeners.yaml
diff --git a/ams/dist/src/main/arctic-bin/conf/plugins/metric-reporters.yaml b/amoro-ams/dist/src/main/arctic-bin/conf/plugins/metric-reporters.yaml
similarity index 100%
rename from ams/dist/src/main/arctic-bin/conf/plugins/metric-reporters.yaml
rename to amoro-ams/dist/src/main/arctic-bin/conf/plugins/metric-reporters.yaml
diff --git a/ams/dist/src/main/assemblies/bin.xml b/amoro-ams/dist/src/main/assemblies/bin.xml
similarity index 80%
rename from ams/dist/src/main/assemblies/bin.xml
rename to amoro-ams/dist/src/main/assemblies/bin.xml
index 174ee435a..b3cdddaa2 100644
--- a/ams/dist/src/main/assemblies/bin.xml
+++ b/amoro-ams/dist/src/main/assemblies/bin.xml
@@ -30,7 +30,7 @@
     <files>
         <file>
             <source>
-                ../optimizer/flink-optimizer/target/flink-optimizer-${project.version}-jar-with-dependencies.jar
+                ../amoro-ams-optimizer/flink-optimizer/target/flink-optimizer-${project.version}-jar-with-dependencies.jar
             </source>
             <outputDirectory>plugin/optimizer/flink</outputDirectory>
             <destName>optimizer-job.jar</destName>
@@ -38,7 +38,7 @@
         </file>
         <file>
             <source>
-                ../optimizer/spark-optimizer/target/spark-optimizer-${project.version}-jar-with-dependencies.jar
+                ../amoro-ams-optimizer/spark-optimizer/target/spark-optimizer-${project.version}-jar-with-dependencies.jar
             </source>
             <outputDirectory>plugin/optimizer/spark</outputDirectory>
             <destName>optimizer-job.jar</destName>
@@ -46,14 +46,14 @@
         </file>
         <file>
             <source>
-                ../metric-reporter/prometheus-reporter/target/prometheus-reporter-${project.version}-jar-with-dependencies.jar
+                ../amoro-ams-metric-reporter/prometheus-reporter/target/prometheus-reporter-${project.version}-jar-with-dependencies.jar
             </source>
             <outputDirectory>plugin/metrics-reporter</outputDirectory>
             <destName>prometheus-reporter.jar</destName>
             <fileMode>0644</fileMode>
         </file>
         <file>
-            <source>../server/target/amoro-ams-server-${project.version}.jar</source>
+            <source>../amoro-ams-server/target/amoro-ams-server-${project.version}.jar</source>
             <outputDirectory>lib/</outputDirectory>
             <destName>amoro-ams-server-${project.version}.jar</destName>
             <fileMode>0644</fileMode>
@@ -77,22 +77,22 @@
             <fileMode>0644</fileMode>
         </fileSet>
         <fileSet>
-            <directory>../server/src/main/resources/mysql</directory>
+            <directory>../amoro-ams-server/src/main/resources/mysql</directory>
             <outputDirectory>conf/mysql</outputDirectory>
             <fileMode>0644</fileMode>
         </fileSet>
         <fileSet>
-            <directory>../server/src/main/resources/postgres</directory>
+            <directory>../amoro-ams-server/src/main/resources/postgres</directory>
             <outputDirectory>conf/postgres</outputDirectory>
             <fileMode>0644</fileMode>
         </fileSet>
         <fileSet>
-            <directory>../server/src/main/resources/derby</directory>
+            <directory>../amoro-ams-server/src/main/resources/derby</directory>
             <outputDirectory>conf/derby</outputDirectory>
             <fileMode>0644</fileMode>
         </fileSet>
         <fileSet>
-            <directory>../server/target/amoro-ams-server-dependency/lib</directory>
+            <directory>../amoro-ams-server/target/amoro-ams-server-dependency/lib</directory>
             <outputDirectory>lib/</outputDirectory>
             <fileMode>0644</fileMode>
         </fileSet>
diff --git a/ams/pom.xml b/amoro-ams/pom.xml
similarity index 87%
rename from ams/pom.xml
rename to amoro-ams/pom.xml
index 93f57a22e..67284492c 100644
--- a/ams/pom.xml
+++ b/amoro-ams/pom.xml
@@ -33,12 +33,12 @@
     <url>https://amoro.apache.org</url>
 
     <modules>
-        <module>api</module>
-        <module>server</module>
-        <module>dashboard</module>
-        <module>optimizer</module>
+        <module>amoro-ams-api</module>
+        <module>amoro-ams-server</module>
+        <module>amoro-ams-dashboard</module>
+        <module>amoro-ams-optimizer</module>
+        <module>amoro-ams-metric-reporter</module>
         <module>dist</module>
-        <module>metric-reporter</module>
     </modules>
 
 </project>
diff --git a/core/pom.xml b/amoro-core/pom.xml
similarity index 100%
rename from core/pom.xml
rename to amoro-core/pom.xml
diff --git a/core/src/main/gen-java/org/apache/amoro/api/AlreadyExistsException.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/AlreadyExistsException.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/AlreadyExistsException.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/AlreadyExistsException.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/ArcticException.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/ArcticException.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/ArcticException.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/ArcticException.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/ArcticTableMetastore.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/ArcticTableMetastore.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/ArcticTableMetastore.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/ArcticTableMetastore.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/BlockableOperation.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/BlockableOperation.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/BlockableOperation.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/BlockableOperation.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/Blocker.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/Blocker.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/Blocker.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/Blocker.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/CatalogMeta.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/CatalogMeta.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/CatalogMeta.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/CatalogMeta.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/ColumnInfo.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/ColumnInfo.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/ColumnInfo.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/ColumnInfo.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/CommitMetaProducer.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/CommitMetaProducer.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/CommitMetaProducer.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/CommitMetaProducer.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/DataFile.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/DataFile.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/DataFile.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/DataFile.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/InvalidObjectException.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/InvalidObjectException.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/InvalidObjectException.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/InvalidObjectException.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/MetaException.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/MetaException.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/MetaException.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/MetaException.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/NoSuchObjectException.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/NoSuchObjectException.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/NoSuchObjectException.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/NoSuchObjectException.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/NotSupportedException.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/NotSupportedException.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/NotSupportedException.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/NotSupportedException.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/OperationConflictException.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/OperationConflictException.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/OperationConflictException.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/OperationConflictException.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/OptimizerRegisterInfo.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/OptimizerRegisterInfo.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/OptimizerRegisterInfo.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/OptimizerRegisterInfo.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/OptimizingService.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/OptimizingService.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/OptimizingService.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/OptimizingService.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/OptimizingTask.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/OptimizingTask.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/OptimizingTask.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/OptimizingTask.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/OptimizingTaskId.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/OptimizingTaskId.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/OptimizingTaskId.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/OptimizingTaskId.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/OptimizingTaskResult.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/OptimizingTaskResult.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/OptimizingTaskResult.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/OptimizingTaskResult.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/PartitionFieldData.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/PartitionFieldData.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/PartitionFieldData.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/PartitionFieldData.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/PrimaryKeySpec.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/PrimaryKeySpec.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/PrimaryKeySpec.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/PrimaryKeySpec.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/Schema.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/Schema.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/Schema.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/Schema.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/SchemaUpdateMeta.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/SchemaUpdateMeta.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/SchemaUpdateMeta.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/SchemaUpdateMeta.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/TableChange.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/TableChange.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/TableChange.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/TableChange.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/TableCommitMeta.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/TableCommitMeta.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/TableCommitMeta.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/TableCommitMeta.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/TableIdentifier.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/TableIdentifier.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/TableIdentifier.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/TableIdentifier.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/TableMeta.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/TableMeta.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/TableMeta.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/TableMeta.java
diff --git a/core/src/main/gen-java/org/apache/amoro/api/UpdateColumn.java b/amoro-core/src/main/gen-java/org/apache/amoro/api/UpdateColumn.java
similarity index 100%
rename from core/src/main/gen-java/org/apache/amoro/api/UpdateColumn.java
rename to amoro-core/src/main/gen-java/org/apache/amoro/api/UpdateColumn.java
diff --git a/core/src/main/java/org/apache/amoro/AlreadyExistsException.java b/amoro-core/src/main/java/org/apache/amoro/AlreadyExistsException.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/AlreadyExistsException.java
rename to amoro-core/src/main/java/org/apache/amoro/AlreadyExistsException.java
diff --git a/core/src/main/java/org/apache/amoro/AmoroCatalog.java b/amoro-core/src/main/java/org/apache/amoro/AmoroCatalog.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/AmoroCatalog.java
rename to amoro-core/src/main/java/org/apache/amoro/AmoroCatalog.java
diff --git a/core/src/main/java/org/apache/amoro/AmoroTable.java b/amoro-core/src/main/java/org/apache/amoro/AmoroTable.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/AmoroTable.java
rename to amoro-core/src/main/java/org/apache/amoro/AmoroTable.java
diff --git a/core/src/main/java/org/apache/amoro/AmsClient.java b/amoro-core/src/main/java/org/apache/amoro/AmsClient.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/AmsClient.java
rename to amoro-core/src/main/java/org/apache/amoro/AmsClient.java
diff --git a/core/src/main/java/org/apache/amoro/ArcticIOException.java b/amoro-core/src/main/java/org/apache/amoro/ArcticIOException.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/ArcticIOException.java
rename to amoro-core/src/main/java/org/apache/amoro/ArcticIOException.java
diff --git a/core/src/main/java/org/apache/amoro/CommonUnifiedCatalog.java b/amoro-core/src/main/java/org/apache/amoro/CommonUnifiedCatalog.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/CommonUnifiedCatalog.java
rename to amoro-core/src/main/java/org/apache/amoro/CommonUnifiedCatalog.java
diff --git a/core/src/main/java/org/apache/amoro/Constants.java b/amoro-core/src/main/java/org/apache/amoro/Constants.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/Constants.java
rename to amoro-core/src/main/java/org/apache/amoro/Constants.java
diff --git a/core/src/main/java/org/apache/amoro/DatabaseNotEmptyException.java b/amoro-core/src/main/java/org/apache/amoro/DatabaseNotEmptyException.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/DatabaseNotEmptyException.java
rename to amoro-core/src/main/java/org/apache/amoro/DatabaseNotEmptyException.java
diff --git a/core/src/main/java/org/apache/amoro/ErrorCodes.java b/amoro-core/src/main/java/org/apache/amoro/ErrorCodes.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/ErrorCodes.java
rename to amoro-core/src/main/java/org/apache/amoro/ErrorCodes.java
diff --git a/core/src/main/java/org/apache/amoro/FormatCatalog.java b/amoro-core/src/main/java/org/apache/amoro/FormatCatalog.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/FormatCatalog.java
rename to amoro-core/src/main/java/org/apache/amoro/FormatCatalog.java
diff --git a/core/src/main/java/org/apache/amoro/FormatCatalogFactory.java b/amoro-core/src/main/java/org/apache/amoro/FormatCatalogFactory.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/FormatCatalogFactory.java
rename to amoro-core/src/main/java/org/apache/amoro/FormatCatalogFactory.java
diff --git a/core/src/main/java/org/apache/amoro/IcebergFileEntry.java b/amoro-core/src/main/java/org/apache/amoro/IcebergFileEntry.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/IcebergFileEntry.java
rename to amoro-core/src/main/java/org/apache/amoro/IcebergFileEntry.java
diff --git a/core/src/main/java/org/apache/amoro/NoSuchDatabaseException.java b/amoro-core/src/main/java/org/apache/amoro/NoSuchDatabaseException.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/NoSuchDatabaseException.java
rename to amoro-core/src/main/java/org/apache/amoro/NoSuchDatabaseException.java
diff --git a/core/src/main/java/org/apache/amoro/NoSuchTableException.java b/amoro-core/src/main/java/org/apache/amoro/NoSuchTableException.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/NoSuchTableException.java
rename to amoro-core/src/main/java/org/apache/amoro/NoSuchTableException.java
diff --git a/core/src/main/java/org/apache/amoro/PooledAmsClient.java b/amoro-core/src/main/java/org/apache/amoro/PooledAmsClient.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/PooledAmsClient.java
rename to amoro-core/src/main/java/org/apache/amoro/PooledAmsClient.java
diff --git a/core/src/main/java/org/apache/amoro/TableFormat.java b/amoro-core/src/main/java/org/apache/amoro/TableFormat.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/TableFormat.java
rename to amoro-core/src/main/java/org/apache/amoro/TableFormat.java
diff --git a/core/src/main/java/org/apache/amoro/TableIDWithFormat.java b/amoro-core/src/main/java/org/apache/amoro/TableIDWithFormat.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/TableIDWithFormat.java
rename to amoro-core/src/main/java/org/apache/amoro/TableIDWithFormat.java
diff --git a/core/src/main/java/org/apache/amoro/TableSnapshot.java b/amoro-core/src/main/java/org/apache/amoro/TableSnapshot.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/TableSnapshot.java
rename to amoro-core/src/main/java/org/apache/amoro/TableSnapshot.java
diff --git a/core/src/main/java/org/apache/amoro/UnifiedCatalog.java b/amoro-core/src/main/java/org/apache/amoro/UnifiedCatalog.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/UnifiedCatalog.java
rename to amoro-core/src/main/java/org/apache/amoro/UnifiedCatalog.java
diff --git a/core/src/main/java/org/apache/amoro/UnifiedCatalogLoader.java b/amoro-core/src/main/java/org/apache/amoro/UnifiedCatalogLoader.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/UnifiedCatalogLoader.java
rename to amoro-core/src/main/java/org/apache/amoro/UnifiedCatalogLoader.java
diff --git a/core/src/main/java/org/apache/amoro/catalog/ArcticCatalog.java b/amoro-core/src/main/java/org/apache/amoro/catalog/ArcticCatalog.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/catalog/ArcticCatalog.java
rename to amoro-core/src/main/java/org/apache/amoro/catalog/ArcticCatalog.java
diff --git a/core/src/main/java/org/apache/amoro/catalog/BasicArcticCatalog.java b/amoro-core/src/main/java/org/apache/amoro/catalog/BasicArcticCatalog.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/catalog/BasicArcticCatalog.java
rename to amoro-core/src/main/java/org/apache/amoro/catalog/BasicArcticCatalog.java
diff --git a/core/src/main/java/org/apache/amoro/catalog/CatalogLoader.java b/amoro-core/src/main/java/org/apache/amoro/catalog/CatalogLoader.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/catalog/CatalogLoader.java
rename to amoro-core/src/main/java/org/apache/amoro/catalog/CatalogLoader.java
diff --git a/core/src/main/java/org/apache/amoro/catalog/MixedTables.java b/amoro-core/src/main/java/org/apache/amoro/catalog/MixedTables.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/catalog/MixedTables.java
rename to amoro-core/src/main/java/org/apache/amoro/catalog/MixedTables.java
diff --git a/core/src/main/java/org/apache/amoro/client/AmsClientPools.java b/amoro-core/src/main/java/org/apache/amoro/client/AmsClientPools.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/AmsClientPools.java
rename to amoro-core/src/main/java/org/apache/amoro/client/AmsClientPools.java
diff --git a/core/src/main/java/org/apache/amoro/client/AmsServerInfo.java b/amoro-core/src/main/java/org/apache/amoro/client/AmsServerInfo.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/AmsServerInfo.java
rename to amoro-core/src/main/java/org/apache/amoro/client/AmsServerInfo.java
diff --git a/core/src/main/java/org/apache/amoro/client/ArcticThriftUrl.java b/amoro-core/src/main/java/org/apache/amoro/client/ArcticThriftUrl.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/ArcticThriftUrl.java
rename to amoro-core/src/main/java/org/apache/amoro/client/ArcticThriftUrl.java
diff --git a/core/src/main/java/org/apache/amoro/client/ArcticZookeeperFactory.java b/amoro-core/src/main/java/org/apache/amoro/client/ArcticZookeeperFactory.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/ArcticZookeeperFactory.java
rename to amoro-core/src/main/java/org/apache/amoro/client/ArcticZookeeperFactory.java
diff --git a/core/src/main/java/org/apache/amoro/client/ConnectionFailException.java b/amoro-core/src/main/java/org/apache/amoro/client/ConnectionFailException.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/ConnectionFailException.java
rename to amoro-core/src/main/java/org/apache/amoro/client/ConnectionFailException.java
diff --git a/core/src/main/java/org/apache/amoro/client/NoBackendServiceException.java b/amoro-core/src/main/java/org/apache/amoro/client/NoBackendServiceException.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/NoBackendServiceException.java
rename to amoro-core/src/main/java/org/apache/amoro/client/NoBackendServiceException.java
diff --git a/core/src/main/java/org/apache/amoro/client/OptimizingClientPools.java b/amoro-core/src/main/java/org/apache/amoro/client/OptimizingClientPools.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/OptimizingClientPools.java
rename to amoro-core/src/main/java/org/apache/amoro/client/OptimizingClientPools.java
diff --git a/core/src/main/java/org/apache/amoro/client/PoolConfig.java b/amoro-core/src/main/java/org/apache/amoro/client/PoolConfig.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/PoolConfig.java
rename to amoro-core/src/main/java/org/apache/amoro/client/PoolConfig.java
diff --git a/core/src/main/java/org/apache/amoro/client/ServiceInfo.java b/amoro-core/src/main/java/org/apache/amoro/client/ServiceInfo.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/ServiceInfo.java
rename to amoro-core/src/main/java/org/apache/amoro/client/ServiceInfo.java
diff --git a/core/src/main/java/org/apache/amoro/client/ThriftClient.java b/amoro-core/src/main/java/org/apache/amoro/client/ThriftClient.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/ThriftClient.java
rename to amoro-core/src/main/java/org/apache/amoro/client/ThriftClient.java
diff --git a/core/src/main/java/org/apache/amoro/client/ThriftClientFactory.java b/amoro-core/src/main/java/org/apache/amoro/client/ThriftClientFactory.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/ThriftClientFactory.java
rename to amoro-core/src/main/java/org/apache/amoro/client/ThriftClientFactory.java
diff --git a/core/src/main/java/org/apache/amoro/client/ThriftClientPool.java b/amoro-core/src/main/java/org/apache/amoro/client/ThriftClientPool.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/ThriftClientPool.java
rename to amoro-core/src/main/java/org/apache/amoro/client/ThriftClientPool.java
diff --git a/core/src/main/java/org/apache/amoro/client/ThriftException.java b/amoro-core/src/main/java/org/apache/amoro/client/ThriftException.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/ThriftException.java
rename to amoro-core/src/main/java/org/apache/amoro/client/ThriftException.java
diff --git a/core/src/main/java/org/apache/amoro/client/ThriftPingFactory.java b/amoro-core/src/main/java/org/apache/amoro/client/ThriftPingFactory.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/ThriftPingFactory.java
rename to amoro-core/src/main/java/org/apache/amoro/client/ThriftPingFactory.java
diff --git a/core/src/main/java/org/apache/amoro/client/ThriftUtil.java b/amoro-core/src/main/java/org/apache/amoro/client/ThriftUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/ThriftUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/client/ThriftUtil.java
diff --git a/core/src/main/java/org/apache/amoro/client/ZookeeperService.java b/amoro-core/src/main/java/org/apache/amoro/client/ZookeeperService.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/client/ZookeeperService.java
rename to amoro-core/src/main/java/org/apache/amoro/client/ZookeeperService.java
diff --git a/core/src/main/java/org/apache/amoro/data/ChangeAction.java b/amoro-core/src/main/java/org/apache/amoro/data/ChangeAction.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/data/ChangeAction.java
rename to amoro-core/src/main/java/org/apache/amoro/data/ChangeAction.java
diff --git a/core/src/main/java/org/apache/amoro/data/ChangedLsn.java b/amoro-core/src/main/java/org/apache/amoro/data/ChangedLsn.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/data/ChangedLsn.java
rename to amoro-core/src/main/java/org/apache/amoro/data/ChangedLsn.java
diff --git a/core/src/main/java/org/apache/amoro/data/DataFileType.java b/amoro-core/src/main/java/org/apache/amoro/data/DataFileType.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/data/DataFileType.java
rename to amoro-core/src/main/java/org/apache/amoro/data/DataFileType.java
diff --git a/core/src/main/java/org/apache/amoro/data/DataTreeNode.java b/amoro-core/src/main/java/org/apache/amoro/data/DataTreeNode.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/data/DataTreeNode.java
rename to amoro-core/src/main/java/org/apache/amoro/data/DataTreeNode.java
diff --git a/core/src/main/java/org/apache/amoro/data/DefaultKeyedFile.java b/amoro-core/src/main/java/org/apache/amoro/data/DefaultKeyedFile.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/data/DefaultKeyedFile.java
rename to amoro-core/src/main/java/org/apache/amoro/data/DefaultKeyedFile.java
diff --git a/core/src/main/java/org/apache/amoro/data/FileNameRules.java b/amoro-core/src/main/java/org/apache/amoro/data/FileNameRules.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/data/FileNameRules.java
rename to amoro-core/src/main/java/org/apache/amoro/data/FileNameRules.java
diff --git a/core/src/main/java/org/apache/amoro/data/PrimaryKeyData.java b/amoro-core/src/main/java/org/apache/amoro/data/PrimaryKeyData.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/data/PrimaryKeyData.java
rename to amoro-core/src/main/java/org/apache/amoro/data/PrimaryKeyData.java
diff --git a/core/src/main/java/org/apache/amoro/data/PrimaryKeyedFile.java b/amoro-core/src/main/java/org/apache/amoro/data/PrimaryKeyedFile.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/data/PrimaryKeyedFile.java
rename to amoro-core/src/main/java/org/apache/amoro/data/PrimaryKeyedFile.java
diff --git a/core/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalog.java b/amoro-core/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalog.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalog.java
rename to amoro-core/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalog.java
diff --git a/core/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalogFactory.java b/amoro-core/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalogFactory.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalogFactory.java
rename to amoro-core/src/main/java/org/apache/amoro/formats/iceberg/IcebergCatalogFactory.java
diff --git a/core/src/main/java/org/apache/amoro/formats/iceberg/IcebergSnapshot.java b/amoro-core/src/main/java/org/apache/amoro/formats/iceberg/IcebergSnapshot.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/formats/iceberg/IcebergSnapshot.java
rename to amoro-core/src/main/java/org/apache/amoro/formats/iceberg/IcebergSnapshot.java
diff --git a/core/src/main/java/org/apache/amoro/formats/iceberg/IcebergTable.java b/amoro-core/src/main/java/org/apache/amoro/formats/iceberg/IcebergTable.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/formats/iceberg/IcebergTable.java
rename to amoro-core/src/main/java/org/apache/amoro/formats/iceberg/IcebergTable.java
diff --git a/core/src/main/java/org/apache/amoro/formats/mixed/MixedCatalog.java b/amoro-core/src/main/java/org/apache/amoro/formats/mixed/MixedCatalog.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/formats/mixed/MixedCatalog.java
rename to amoro-core/src/main/java/org/apache/amoro/formats/mixed/MixedCatalog.java
diff --git a/core/src/main/java/org/apache/amoro/formats/mixed/MixedHiveCatalogFactory.java b/amoro-core/src/main/java/org/apache/amoro/formats/mixed/MixedHiveCatalogFactory.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/formats/mixed/MixedHiveCatalogFactory.java
rename to amoro-core/src/main/java/org/apache/amoro/formats/mixed/MixedHiveCatalogFactory.java
diff --git a/core/src/main/java/org/apache/amoro/formats/mixed/MixedIcebergCatalogFactory.java b/amoro-core/src/main/java/org/apache/amoro/formats/mixed/MixedIcebergCatalogFactory.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/formats/mixed/MixedIcebergCatalogFactory.java
rename to amoro-core/src/main/java/org/apache/amoro/formats/mixed/MixedIcebergCatalogFactory.java
diff --git a/core/src/main/java/org/apache/amoro/formats/mixed/MixedSnapshot.java b/amoro-core/src/main/java/org/apache/amoro/formats/mixed/MixedSnapshot.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/formats/mixed/MixedSnapshot.java
rename to amoro-core/src/main/java/org/apache/amoro/formats/mixed/MixedSnapshot.java
diff --git a/core/src/main/java/org/apache/amoro/formats/mixed/MixedTable.java b/amoro-core/src/main/java/org/apache/amoro/formats/mixed/MixedTable.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/formats/mixed/MixedTable.java
rename to amoro-core/src/main/java/org/apache/amoro/formats/mixed/MixedTable.java
diff --git a/core/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalog.java b/amoro-core/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalog.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalog.java
rename to amoro-core/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalog.java
diff --git a/core/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalogFactory.java b/amoro-core/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalogFactory.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalogFactory.java
rename to amoro-core/src/main/java/org/apache/amoro/formats/paimon/PaimonCatalogFactory.java
diff --git a/core/src/main/java/org/apache/amoro/formats/paimon/PaimonSnapshot.java b/amoro-core/src/main/java/org/apache/amoro/formats/paimon/PaimonSnapshot.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/formats/paimon/PaimonSnapshot.java
rename to amoro-core/src/main/java/org/apache/amoro/formats/paimon/PaimonSnapshot.java
diff --git a/core/src/main/java/org/apache/amoro/formats/paimon/PaimonTable.java b/amoro-core/src/main/java/org/apache/amoro/formats/paimon/PaimonTable.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/formats/paimon/PaimonTable.java
rename to amoro-core/src/main/java/org/apache/amoro/formats/paimon/PaimonTable.java
diff --git a/core/src/main/java/org/apache/amoro/io/ArcticFileIO.java b/amoro-core/src/main/java/org/apache/amoro/io/ArcticFileIO.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/ArcticFileIO.java
rename to amoro-core/src/main/java/org/apache/amoro/io/ArcticFileIO.java
diff --git a/core/src/main/java/org/apache/amoro/io/ArcticFileIOAdapter.java b/amoro-core/src/main/java/org/apache/amoro/io/ArcticFileIOAdapter.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/ArcticFileIOAdapter.java
rename to amoro-core/src/main/java/org/apache/amoro/io/ArcticFileIOAdapter.java
diff --git a/core/src/main/java/org/apache/amoro/io/ArcticFileIOs.java b/amoro-core/src/main/java/org/apache/amoro/io/ArcticFileIOs.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/ArcticFileIOs.java
rename to amoro-core/src/main/java/org/apache/amoro/io/ArcticFileIOs.java
diff --git a/core/src/main/java/org/apache/amoro/io/ArcticHadoopFileIO.java b/amoro-core/src/main/java/org/apache/amoro/io/ArcticHadoopFileIO.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/ArcticHadoopFileIO.java
rename to amoro-core/src/main/java/org/apache/amoro/io/ArcticHadoopFileIO.java
diff --git a/core/src/main/java/org/apache/amoro/io/BasicTableTrashManager.java b/amoro-core/src/main/java/org/apache/amoro/io/BasicTableTrashManager.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/BasicTableTrashManager.java
rename to amoro-core/src/main/java/org/apache/amoro/io/BasicTableTrashManager.java
diff --git a/core/src/main/java/org/apache/amoro/io/CloseableIterableWrapper.java b/amoro-core/src/main/java/org/apache/amoro/io/CloseableIterableWrapper.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/CloseableIterableWrapper.java
rename to amoro-core/src/main/java/org/apache/amoro/io/CloseableIterableWrapper.java
diff --git a/core/src/main/java/org/apache/amoro/io/CloseableIteratorWrapper.java b/amoro-core/src/main/java/org/apache/amoro/io/CloseableIteratorWrapper.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/CloseableIteratorWrapper.java
rename to amoro-core/src/main/java/org/apache/amoro/io/CloseableIteratorWrapper.java
diff --git a/core/src/main/java/org/apache/amoro/io/CloseablePredicate.java b/amoro-core/src/main/java/org/apache/amoro/io/CloseablePredicate.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/CloseablePredicate.java
rename to amoro-core/src/main/java/org/apache/amoro/io/CloseablePredicate.java
diff --git a/core/src/main/java/org/apache/amoro/io/PathInfo.java b/amoro-core/src/main/java/org/apache/amoro/io/PathInfo.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/PathInfo.java
rename to amoro-core/src/main/java/org/apache/amoro/io/PathInfo.java
diff --git a/core/src/main/java/org/apache/amoro/io/RecoverableHadoopFileIO.java b/amoro-core/src/main/java/org/apache/amoro/io/RecoverableHadoopFileIO.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/RecoverableHadoopFileIO.java
rename to amoro-core/src/main/java/org/apache/amoro/io/RecoverableHadoopFileIO.java
diff --git a/core/src/main/java/org/apache/amoro/io/SupportFileRecycleOperations.java b/amoro-core/src/main/java/org/apache/amoro/io/SupportFileRecycleOperations.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/SupportFileRecycleOperations.java
rename to amoro-core/src/main/java/org/apache/amoro/io/SupportFileRecycleOperations.java
diff --git a/core/src/main/java/org/apache/amoro/io/SupportsFileSystemOperations.java b/amoro-core/src/main/java/org/apache/amoro/io/SupportsFileSystemOperations.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/SupportsFileSystemOperations.java
rename to amoro-core/src/main/java/org/apache/amoro/io/SupportsFileSystemOperations.java
diff --git a/core/src/main/java/org/apache/amoro/io/TableTrashManager.java b/amoro-core/src/main/java/org/apache/amoro/io/TableTrashManager.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/TableTrashManager.java
rename to amoro-core/src/main/java/org/apache/amoro/io/TableTrashManager.java
diff --git a/core/src/main/java/org/apache/amoro/io/TableTrashManagers.java b/amoro-core/src/main/java/org/apache/amoro/io/TableTrashManagers.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/TableTrashManagers.java
rename to amoro-core/src/main/java/org/apache/amoro/io/TableTrashManagers.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/AbstractKeyedDataReader.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/AbstractKeyedDataReader.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/AbstractKeyedDataReader.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/AbstractKeyedDataReader.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/AbstractUnkeyedDataReader.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/AbstractUnkeyedDataReader.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/AbstractUnkeyedDataReader.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/AbstractUnkeyedDataReader.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/ArcticDeleteFilter.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/ArcticDeleteFilter.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/ArcticDeleteFilter.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/ArcticDeleteFilter.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/BaseIcebergPosDeleteReader.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/BaseIcebergPosDeleteReader.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/BaseIcebergPosDeleteReader.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/BaseIcebergPosDeleteReader.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/CombinedDeleteFilter.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/CombinedDeleteFilter.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/CombinedDeleteFilter.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/CombinedDeleteFilter.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/DataReaderCommon.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/DataReaderCommon.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/DataReaderCommon.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/DataReaderCommon.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/DeleteFilter.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/DeleteFilter.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/DeleteFilter.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/DeleteFilter.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/Deletes.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/Deletes.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/Deletes.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/Deletes.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/GenericCombinedIcebergDataReader.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/GenericCombinedIcebergDataReader.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/GenericCombinedIcebergDataReader.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/GenericCombinedIcebergDataReader.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/GenericKeyedDataReader.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/GenericKeyedDataReader.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/GenericKeyedDataReader.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/GenericKeyedDataReader.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/GenericUnkeyedDataReader.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/GenericUnkeyedDataReader.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/GenericUnkeyedDataReader.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/GenericUnkeyedDataReader.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/ParallelIcebergGenerics.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/ParallelIcebergGenerics.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/ParallelIcebergGenerics.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/ParallelIcebergGenerics.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/ParallelTableScanIterable.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/ParallelTableScanIterable.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/ParallelTableScanIterable.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/ParallelTableScanIterable.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/StructForDelete.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/StructForDelete.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/StructForDelete.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/StructForDelete.java
diff --git a/core/src/main/java/org/apache/amoro/io/reader/StructLikeFunnel.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/StructLikeFunnel.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/reader/StructLikeFunnel.java
rename to amoro-core/src/main/java/org/apache/amoro/io/reader/StructLikeFunnel.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/ArcticTreeNodePosDeleteWriter.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/ArcticTreeNodePosDeleteWriter.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/ArcticTreeNodePosDeleteWriter.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/ArcticTreeNodePosDeleteWriter.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/BaseTaskWriter.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/BaseTaskWriter.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/BaseTaskWriter.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/BaseTaskWriter.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/ChangeTaskWriter.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/ChangeTaskWriter.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/ChangeTaskWriter.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/ChangeTaskWriter.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/CommonOutputFileFactory.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/CommonOutputFileFactory.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/CommonOutputFileFactory.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/CommonOutputFileFactory.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/GenericBaseTaskWriter.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/GenericBaseTaskWriter.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/GenericBaseTaskWriter.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/GenericBaseTaskWriter.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/GenericChangeTaskWriter.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/GenericChangeTaskWriter.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/GenericChangeTaskWriter.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/GenericChangeTaskWriter.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/GenericIcebergPartitionedFanoutWriter.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/GenericIcebergPartitionedFanoutWriter.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/GenericIcebergPartitionedFanoutWriter.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/GenericIcebergPartitionedFanoutWriter.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/GenericTaskWriters.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/GenericTaskWriters.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/GenericTaskWriters.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/GenericTaskWriters.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/IcebergFanoutPosDeleteWriter.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/IcebergFanoutPosDeleteWriter.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/IcebergFanoutPosDeleteWriter.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/IcebergFanoutPosDeleteWriter.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/OutputFileFactory.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/OutputFileFactory.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/OutputFileFactory.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/OutputFileFactory.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/RecordWithAction.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/RecordWithAction.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/RecordWithAction.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/RecordWithAction.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/SetTreeNode.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/SetTreeNode.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/SetTreeNode.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/SetTreeNode.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/SortedPosDeleteWriter.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/SortedPosDeleteWriter.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/SortedPosDeleteWriter.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/SortedPosDeleteWriter.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/TaskWriterBuilder.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/TaskWriterBuilder.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/TaskWriterBuilder.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/TaskWriterBuilder.java
diff --git a/core/src/main/java/org/apache/amoro/io/writer/TaskWriterKey.java b/amoro-core/src/main/java/org/apache/amoro/io/writer/TaskWriterKey.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/io/writer/TaskWriterKey.java
rename to amoro-core/src/main/java/org/apache/amoro/io/writer/TaskWriterKey.java
diff --git a/core/src/main/java/org/apache/amoro/log/Bytes.java b/amoro-core/src/main/java/org/apache/amoro/log/Bytes.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/log/Bytes.java
rename to amoro-core/src/main/java/org/apache/amoro/log/Bytes.java
diff --git a/core/src/main/java/org/apache/amoro/log/Converter.java b/amoro-core/src/main/java/org/apache/amoro/log/Converter.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/log/Converter.java
rename to amoro-core/src/main/java/org/apache/amoro/log/Converter.java
diff --git a/core/src/main/java/org/apache/amoro/log/FormatVersion.java b/amoro-core/src/main/java/org/apache/amoro/log/FormatVersion.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/log/FormatVersion.java
rename to amoro-core/src/main/java/org/apache/amoro/log/FormatVersion.java
diff --git a/core/src/main/java/org/apache/amoro/log/JsonToLogDataConverters.java b/amoro-core/src/main/java/org/apache/amoro/log/JsonToLogDataConverters.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/log/JsonToLogDataConverters.java
rename to amoro-core/src/main/java/org/apache/amoro/log/JsonToLogDataConverters.java
diff --git a/core/src/main/java/org/apache/amoro/log/LogData.java b/amoro-core/src/main/java/org/apache/amoro/log/LogData.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/log/LogData.java
rename to amoro-core/src/main/java/org/apache/amoro/log/LogData.java
diff --git a/core/src/main/java/org/apache/amoro/log/LogDataJsonDeserialization.java b/amoro-core/src/main/java/org/apache/amoro/log/LogDataJsonDeserialization.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/log/LogDataJsonDeserialization.java
rename to amoro-core/src/main/java/org/apache/amoro/log/LogDataJsonDeserialization.java
diff --git a/core/src/main/java/org/apache/amoro/log/LogDataJsonSerialization.java b/amoro-core/src/main/java/org/apache/amoro/log/LogDataJsonSerialization.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/log/LogDataJsonSerialization.java
rename to amoro-core/src/main/java/org/apache/amoro/log/LogDataJsonSerialization.java
diff --git a/core/src/main/java/org/apache/amoro/log/LogDataToJsonConverters.java b/amoro-core/src/main/java/org/apache/amoro/log/LogDataToJsonConverters.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/log/LogDataToJsonConverters.java
rename to amoro-core/src/main/java/org/apache/amoro/log/LogDataToJsonConverters.java
diff --git a/core/src/main/java/org/apache/amoro/log/MessageBytes.java b/amoro-core/src/main/java/org/apache/amoro/log/MessageBytes.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/log/MessageBytes.java
rename to amoro-core/src/main/java/org/apache/amoro/log/MessageBytes.java
diff --git a/core/src/main/java/org/apache/amoro/log/TimeFormats.java b/amoro-core/src/main/java/org/apache/amoro/log/TimeFormats.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/log/TimeFormats.java
rename to amoro-core/src/main/java/org/apache/amoro/log/TimeFormats.java
diff --git a/core/src/main/java/org/apache/amoro/log/data/LogArrayData.java b/amoro-core/src/main/java/org/apache/amoro/log/data/LogArrayData.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/log/data/LogArrayData.java
rename to amoro-core/src/main/java/org/apache/amoro/log/data/LogArrayData.java
diff --git a/core/src/main/java/org/apache/amoro/log/data/LogMapData.java b/amoro-core/src/main/java/org/apache/amoro/log/data/LogMapData.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/log/data/LogMapData.java
rename to amoro-core/src/main/java/org/apache/amoro/log/data/LogMapData.java
diff --git a/core/src/main/java/org/apache/amoro/mixed/BasicMixedIcebergCatalog.java b/amoro-core/src/main/java/org/apache/amoro/mixed/BasicMixedIcebergCatalog.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/mixed/BasicMixedIcebergCatalog.java
rename to amoro-core/src/main/java/org/apache/amoro/mixed/BasicMixedIcebergCatalog.java
diff --git a/core/src/main/java/org/apache/amoro/mixed/InternalMixedIcebergCatalog.java b/amoro-core/src/main/java/org/apache/amoro/mixed/InternalMixedIcebergCatalog.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/mixed/InternalMixedIcebergCatalog.java
rename to amoro-core/src/main/java/org/apache/amoro/mixed/InternalMixedIcebergCatalog.java
diff --git a/core/src/main/java/org/apache/amoro/mixed/MixedTables.java b/amoro-core/src/main/java/org/apache/amoro/mixed/MixedTables.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/mixed/MixedTables.java
rename to amoro-core/src/main/java/org/apache/amoro/mixed/MixedTables.java
diff --git a/core/src/main/java/org/apache/amoro/op/ArcticAppendFiles.java b/amoro-core/src/main/java/org/apache/amoro/op/ArcticAppendFiles.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/ArcticAppendFiles.java
rename to amoro-core/src/main/java/org/apache/amoro/op/ArcticAppendFiles.java
diff --git a/core/src/main/java/org/apache/amoro/op/ArcticDeleteFiles.java b/amoro-core/src/main/java/org/apache/amoro/op/ArcticDeleteFiles.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/ArcticDeleteFiles.java
rename to amoro-core/src/main/java/org/apache/amoro/op/ArcticDeleteFiles.java
diff --git a/core/src/main/java/org/apache/amoro/op/ArcticHadoopTableOperations.java b/amoro-core/src/main/java/org/apache/amoro/op/ArcticHadoopTableOperations.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/ArcticHadoopTableOperations.java
rename to amoro-core/src/main/java/org/apache/amoro/op/ArcticHadoopTableOperations.java
diff --git a/core/src/main/java/org/apache/amoro/op/ArcticOverwriteFiles.java b/amoro-core/src/main/java/org/apache/amoro/op/ArcticOverwriteFiles.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/ArcticOverwriteFiles.java
rename to amoro-core/src/main/java/org/apache/amoro/op/ArcticOverwriteFiles.java
diff --git a/core/src/main/java/org/apache/amoro/op/ArcticReplacePartitions.java b/amoro-core/src/main/java/org/apache/amoro/op/ArcticReplacePartitions.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/ArcticReplacePartitions.java
rename to amoro-core/src/main/java/org/apache/amoro/op/ArcticReplacePartitions.java
diff --git a/core/src/main/java/org/apache/amoro/op/ArcticRewriteFiles.java b/amoro-core/src/main/java/org/apache/amoro/op/ArcticRewriteFiles.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/ArcticRewriteFiles.java
rename to amoro-core/src/main/java/org/apache/amoro/op/ArcticRewriteFiles.java
diff --git a/core/src/main/java/org/apache/amoro/op/ArcticRowDelta.java b/amoro-core/src/main/java/org/apache/amoro/op/ArcticRowDelta.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/ArcticRowDelta.java
rename to amoro-core/src/main/java/org/apache/amoro/op/ArcticRowDelta.java
diff --git a/core/src/main/java/org/apache/amoro/op/ArcticTableOperations.java b/amoro-core/src/main/java/org/apache/amoro/op/ArcticTableOperations.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/ArcticTableOperations.java
rename to amoro-core/src/main/java/org/apache/amoro/op/ArcticTableOperations.java
diff --git a/core/src/main/java/org/apache/amoro/op/ArcticTransaction.java b/amoro-core/src/main/java/org/apache/amoro/op/ArcticTransaction.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/ArcticTransaction.java
rename to amoro-core/src/main/java/org/apache/amoro/op/ArcticTransaction.java
diff --git a/core/src/main/java/org/apache/amoro/op/ArcticUpdate.java b/amoro-core/src/main/java/org/apache/amoro/op/ArcticUpdate.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/ArcticUpdate.java
rename to amoro-core/src/main/java/org/apache/amoro/op/ArcticUpdate.java
diff --git a/core/src/main/java/org/apache/amoro/op/CreateTableTransaction.java b/amoro-core/src/main/java/org/apache/amoro/op/CreateTableTransaction.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/CreateTableTransaction.java
rename to amoro-core/src/main/java/org/apache/amoro/op/CreateTableTransaction.java
diff --git a/core/src/main/java/org/apache/amoro/op/KeyedPartitionRewrite.java b/amoro-core/src/main/java/org/apache/amoro/op/KeyedPartitionRewrite.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/KeyedPartitionRewrite.java
rename to amoro-core/src/main/java/org/apache/amoro/op/KeyedPartitionRewrite.java
diff --git a/core/src/main/java/org/apache/amoro/op/KeyedSchemaUpdate.java b/amoro-core/src/main/java/org/apache/amoro/op/KeyedSchemaUpdate.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/KeyedSchemaUpdate.java
rename to amoro-core/src/main/java/org/apache/amoro/op/KeyedSchemaUpdate.java
diff --git a/core/src/main/java/org/apache/amoro/op/OverwriteBaseFiles.java b/amoro-core/src/main/java/org/apache/amoro/op/OverwriteBaseFiles.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/OverwriteBaseFiles.java
rename to amoro-core/src/main/java/org/apache/amoro/op/OverwriteBaseFiles.java
diff --git a/core/src/main/java/org/apache/amoro/op/PartitionPropertiesUpdate.java b/amoro-core/src/main/java/org/apache/amoro/op/PartitionPropertiesUpdate.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/PartitionPropertiesUpdate.java
rename to amoro-core/src/main/java/org/apache/amoro/op/PartitionPropertiesUpdate.java
diff --git a/core/src/main/java/org/apache/amoro/op/PartitionTransactionOperation.java b/amoro-core/src/main/java/org/apache/amoro/op/PartitionTransactionOperation.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/PartitionTransactionOperation.java
rename to amoro-core/src/main/java/org/apache/amoro/op/PartitionTransactionOperation.java
diff --git a/core/src/main/java/org/apache/amoro/op/RewritePartitions.java b/amoro-core/src/main/java/org/apache/amoro/op/RewritePartitions.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/RewritePartitions.java
rename to amoro-core/src/main/java/org/apache/amoro/op/RewritePartitions.java
diff --git a/core/src/main/java/org/apache/amoro/op/SnapshotSummary.java b/amoro-core/src/main/java/org/apache/amoro/op/SnapshotSummary.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/SnapshotSummary.java
rename to amoro-core/src/main/java/org/apache/amoro/op/SnapshotSummary.java
diff --git a/core/src/main/java/org/apache/amoro/op/UpdateKeyedTableProperties.java b/amoro-core/src/main/java/org/apache/amoro/op/UpdateKeyedTableProperties.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/UpdateKeyedTableProperties.java
rename to amoro-core/src/main/java/org/apache/amoro/op/UpdateKeyedTableProperties.java
diff --git a/core/src/main/java/org/apache/amoro/op/UpdatePartitionProperties.java b/amoro-core/src/main/java/org/apache/amoro/op/UpdatePartitionProperties.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/op/UpdatePartitionProperties.java
rename to amoro-core/src/main/java/org/apache/amoro/op/UpdatePartitionProperties.java
diff --git a/core/src/main/java/org/apache/amoro/optimizing/AbstractRewriteFilesExecutor.java b/amoro-core/src/main/java/org/apache/amoro/optimizing/AbstractRewriteFilesExecutor.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/optimizing/AbstractRewriteFilesExecutor.java
rename to amoro-core/src/main/java/org/apache/amoro/optimizing/AbstractRewriteFilesExecutor.java
diff --git a/core/src/main/java/org/apache/amoro/optimizing/BaseArcticOptimizingDataReader.java b/amoro-core/src/main/java/org/apache/amoro/optimizing/BaseArcticOptimizingDataReader.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/optimizing/BaseArcticOptimizingDataReader.java
rename to amoro-core/src/main/java/org/apache/amoro/optimizing/BaseArcticOptimizingDataReader.java
diff --git a/core/src/main/java/org/apache/amoro/optimizing/BaseOptimizingInput.java b/amoro-core/src/main/java/org/apache/amoro/optimizing/BaseOptimizingInput.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/optimizing/BaseOptimizingInput.java
rename to amoro-core/src/main/java/org/apache/amoro/optimizing/BaseOptimizingInput.java
diff --git a/core/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutor.java b/amoro-core/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutor.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutor.java
rename to amoro-core/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutor.java
diff --git a/core/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutorFactory.java b/amoro-core/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutorFactory.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutorFactory.java
rename to amoro-core/src/main/java/org/apache/amoro/optimizing/IcebergRewriteExecutorFactory.java
diff --git a/core/src/main/java/org/apache/amoro/optimizing/OptimizingCommitterFactory.java b/amoro-core/src/main/java/org/apache/amoro/optimizing/OptimizingCommitterFactory.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/optimizing/OptimizingCommitterFactory.java
rename to amoro-core/src/main/java/org/apache/amoro/optimizing/OptimizingCommitterFactory.java
diff --git a/core/src/main/java/org/apache/amoro/optimizing/OptimizingDataReader.java b/amoro-core/src/main/java/org/apache/amoro/optimizing/OptimizingDataReader.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/optimizing/OptimizingDataReader.java
rename to amoro-core/src/main/java/org/apache/amoro/optimizing/OptimizingDataReader.java
diff --git a/core/src/main/java/org/apache/amoro/optimizing/OptimizingExecutor.java b/amoro-core/src/main/java/org/apache/amoro/optimizing/OptimizingExecutor.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/optimizing/OptimizingExecutor.java
rename to amoro-core/src/main/java/org/apache/amoro/optimizing/OptimizingExecutor.java
diff --git a/core/src/main/java/org/apache/amoro/optimizing/OptimizingExecutorFactory.java b/amoro-core/src/main/java/org/apache/amoro/optimizing/OptimizingExecutorFactory.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/optimizing/OptimizingExecutorFactory.java
rename to amoro-core/src/main/java/org/apache/amoro/optimizing/OptimizingExecutorFactory.java
diff --git a/core/src/main/java/org/apache/amoro/optimizing/OptimizingInputProperties.java b/amoro-core/src/main/java/org/apache/amoro/optimizing/OptimizingInputProperties.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/optimizing/OptimizingInputProperties.java
rename to amoro-core/src/main/java/org/apache/amoro/optimizing/OptimizingInputProperties.java
diff --git a/core/src/main/java/org/apache/amoro/optimizing/OptimizingTaskSummary.java b/amoro-core/src/main/java/org/apache/amoro/optimizing/OptimizingTaskSummary.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/optimizing/OptimizingTaskSummary.java
rename to amoro-core/src/main/java/org/apache/amoro/optimizing/OptimizingTaskSummary.java
diff --git a/core/src/main/java/org/apache/amoro/optimizing/RewriteFilesInput.java b/amoro-core/src/main/java/org/apache/amoro/optimizing/RewriteFilesInput.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/optimizing/RewriteFilesInput.java
rename to amoro-core/src/main/java/org/apache/amoro/optimizing/RewriteFilesInput.java
diff --git a/core/src/main/java/org/apache/amoro/optimizing/RewriteFilesOutput.java b/amoro-core/src/main/java/org/apache/amoro/optimizing/RewriteFilesOutput.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/optimizing/RewriteFilesOutput.java
rename to amoro-core/src/main/java/org/apache/amoro/optimizing/RewriteFilesOutput.java
diff --git a/core/src/main/java/org/apache/amoro/optimizing/TableOptimizing.java b/amoro-core/src/main/java/org/apache/amoro/optimizing/TableOptimizing.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/optimizing/TableOptimizing.java
rename to amoro-core/src/main/java/org/apache/amoro/optimizing/TableOptimizing.java
diff --git a/core/src/main/java/org/apache/amoro/properties/AmsHAProperties.java b/amoro-core/src/main/java/org/apache/amoro/properties/AmsHAProperties.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/properties/AmsHAProperties.java
rename to amoro-core/src/main/java/org/apache/amoro/properties/AmsHAProperties.java
diff --git a/core/src/main/java/org/apache/amoro/properties/CatalogMetaProperties.java b/amoro-core/src/main/java/org/apache/amoro/properties/CatalogMetaProperties.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/properties/CatalogMetaProperties.java
rename to amoro-core/src/main/java/org/apache/amoro/properties/CatalogMetaProperties.java
diff --git a/core/src/main/java/org/apache/amoro/properties/HiveTableProperties.java b/amoro-core/src/main/java/org/apache/amoro/properties/HiveTableProperties.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/properties/HiveTableProperties.java
rename to amoro-core/src/main/java/org/apache/amoro/properties/HiveTableProperties.java
diff --git a/core/src/main/java/org/apache/amoro/properties/MetaTableProperties.java b/amoro-core/src/main/java/org/apache/amoro/properties/MetaTableProperties.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/properties/MetaTableProperties.java
rename to amoro-core/src/main/java/org/apache/amoro/properties/MetaTableProperties.java
diff --git a/core/src/main/java/org/apache/amoro/scan/ArcticFileScanTask.java b/amoro-core/src/main/java/org/apache/amoro/scan/ArcticFileScanTask.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/scan/ArcticFileScanTask.java
rename to amoro-core/src/main/java/org/apache/amoro/scan/ArcticFileScanTask.java
diff --git a/core/src/main/java/org/apache/amoro/scan/BaseCombinedScanTask.java b/amoro-core/src/main/java/org/apache/amoro/scan/BaseCombinedScanTask.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/scan/BaseCombinedScanTask.java
rename to amoro-core/src/main/java/org/apache/amoro/scan/BaseCombinedScanTask.java
diff --git a/core/src/main/java/org/apache/amoro/scan/BasicArcticFileScanTask.java b/amoro-core/src/main/java/org/apache/amoro/scan/BasicArcticFileScanTask.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/scan/BasicArcticFileScanTask.java
rename to amoro-core/src/main/java/org/apache/amoro/scan/BasicArcticFileScanTask.java
diff --git a/core/src/main/java/org/apache/amoro/scan/BasicKeyedTableScan.java b/amoro-core/src/main/java/org/apache/amoro/scan/BasicKeyedTableScan.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/scan/BasicKeyedTableScan.java
rename to amoro-core/src/main/java/org/apache/amoro/scan/BasicKeyedTableScan.java
diff --git a/core/src/main/java/org/apache/amoro/scan/ChangeTableIncrementalScan.java b/amoro-core/src/main/java/org/apache/amoro/scan/ChangeTableIncrementalScan.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/scan/ChangeTableIncrementalScan.java
rename to amoro-core/src/main/java/org/apache/amoro/scan/ChangeTableIncrementalScan.java
diff --git a/core/src/main/java/org/apache/amoro/scan/CombinedIcebergScanTask.java b/amoro-core/src/main/java/org/apache/amoro/scan/CombinedIcebergScanTask.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/scan/CombinedIcebergScanTask.java
rename to amoro-core/src/main/java/org/apache/amoro/scan/CombinedIcebergScanTask.java
diff --git a/core/src/main/java/org/apache/amoro/scan/CombinedScanTask.java b/amoro-core/src/main/java/org/apache/amoro/scan/CombinedScanTask.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/scan/CombinedScanTask.java
rename to amoro-core/src/main/java/org/apache/amoro/scan/CombinedScanTask.java
diff --git a/core/src/main/java/org/apache/amoro/scan/KeyedTableScan.java b/amoro-core/src/main/java/org/apache/amoro/scan/KeyedTableScan.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/scan/KeyedTableScan.java
rename to amoro-core/src/main/java/org/apache/amoro/scan/KeyedTableScan.java
diff --git a/core/src/main/java/org/apache/amoro/scan/KeyedTableScanTask.java b/amoro-core/src/main/java/org/apache/amoro/scan/KeyedTableScanTask.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/scan/KeyedTableScanTask.java
rename to amoro-core/src/main/java/org/apache/amoro/scan/KeyedTableScanTask.java
diff --git a/core/src/main/java/org/apache/amoro/scan/NodeFileScanTask.java b/amoro-core/src/main/java/org/apache/amoro/scan/NodeFileScanTask.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/scan/NodeFileScanTask.java
rename to amoro-core/src/main/java/org/apache/amoro/scan/NodeFileScanTask.java
diff --git a/core/src/main/java/org/apache/amoro/scan/TableEntriesScan.java b/amoro-core/src/main/java/org/apache/amoro/scan/TableEntriesScan.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/scan/TableEntriesScan.java
rename to amoro-core/src/main/java/org/apache/amoro/scan/TableEntriesScan.java
diff --git a/core/src/main/java/org/apache/amoro/scan/expressions/BasicPartitionEvaluator.java b/amoro-core/src/main/java/org/apache/amoro/scan/expressions/BasicPartitionEvaluator.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/scan/expressions/BasicPartitionEvaluator.java
rename to amoro-core/src/main/java/org/apache/amoro/scan/expressions/BasicPartitionEvaluator.java
diff --git a/core/src/main/java/org/apache/amoro/scan/expressions/RewriteNot.java b/amoro-core/src/main/java/org/apache/amoro/scan/expressions/RewriteNot.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/scan/expressions/RewriteNot.java
rename to amoro-core/src/main/java/org/apache/amoro/scan/expressions/RewriteNot.java
diff --git a/core/src/main/java/org/apache/amoro/table/ArcticTable.java b/amoro-core/src/main/java/org/apache/amoro/table/ArcticTable.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/ArcticTable.java
rename to amoro-core/src/main/java/org/apache/amoro/table/ArcticTable.java
diff --git a/core/src/main/java/org/apache/amoro/table/BaseLocationKind.java b/amoro-core/src/main/java/org/apache/amoro/table/BaseLocationKind.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/BaseLocationKind.java
rename to amoro-core/src/main/java/org/apache/amoro/table/BaseLocationKind.java
diff --git a/core/src/main/java/org/apache/amoro/table/BaseTable.java b/amoro-core/src/main/java/org/apache/amoro/table/BaseTable.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/BaseTable.java
rename to amoro-core/src/main/java/org/apache/amoro/table/BaseTable.java
diff --git a/core/src/main/java/org/apache/amoro/table/BasicKeyedTable.java b/amoro-core/src/main/java/org/apache/amoro/table/BasicKeyedTable.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/BasicKeyedTable.java
rename to amoro-core/src/main/java/org/apache/amoro/table/BasicKeyedTable.java
diff --git a/core/src/main/java/org/apache/amoro/table/BasicTableBuilder.java b/amoro-core/src/main/java/org/apache/amoro/table/BasicTableBuilder.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/BasicTableBuilder.java
rename to amoro-core/src/main/java/org/apache/amoro/table/BasicTableBuilder.java
diff --git a/core/src/main/java/org/apache/amoro/table/BasicUnkeyedTable.java b/amoro-core/src/main/java/org/apache/amoro/table/BasicUnkeyedTable.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/BasicUnkeyedTable.java
rename to amoro-core/src/main/java/org/apache/amoro/table/BasicUnkeyedTable.java
diff --git a/core/src/main/java/org/apache/amoro/table/ChangeLocationKind.java b/amoro-core/src/main/java/org/apache/amoro/table/ChangeLocationKind.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/ChangeLocationKind.java
rename to amoro-core/src/main/java/org/apache/amoro/table/ChangeLocationKind.java
diff --git a/core/src/main/java/org/apache/amoro/table/ChangeTable.java b/amoro-core/src/main/java/org/apache/amoro/table/ChangeTable.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/ChangeTable.java
rename to amoro-core/src/main/java/org/apache/amoro/table/ChangeTable.java
diff --git a/core/src/main/java/org/apache/amoro/table/DistributionHashMode.java b/amoro-core/src/main/java/org/apache/amoro/table/DistributionHashMode.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/DistributionHashMode.java
rename to amoro-core/src/main/java/org/apache/amoro/table/DistributionHashMode.java
diff --git a/core/src/main/java/org/apache/amoro/table/KeyedTable.java b/amoro-core/src/main/java/org/apache/amoro/table/KeyedTable.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/KeyedTable.java
rename to amoro-core/src/main/java/org/apache/amoro/table/KeyedTable.java
diff --git a/core/src/main/java/org/apache/amoro/table/LocationKind.java b/amoro-core/src/main/java/org/apache/amoro/table/LocationKind.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/LocationKind.java
rename to amoro-core/src/main/java/org/apache/amoro/table/LocationKind.java
diff --git a/core/src/main/java/org/apache/amoro/table/MetadataColumns.java b/amoro-core/src/main/java/org/apache/amoro/table/MetadataColumns.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/MetadataColumns.java
rename to amoro-core/src/main/java/org/apache/amoro/table/MetadataColumns.java
diff --git a/core/src/main/java/org/apache/amoro/table/PrimaryKeySpec.java b/amoro-core/src/main/java/org/apache/amoro/table/PrimaryKeySpec.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/PrimaryKeySpec.java
rename to amoro-core/src/main/java/org/apache/amoro/table/PrimaryKeySpec.java
diff --git a/core/src/main/java/org/apache/amoro/table/TableBuilder.java b/amoro-core/src/main/java/org/apache/amoro/table/TableBuilder.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/TableBuilder.java
rename to amoro-core/src/main/java/org/apache/amoro/table/TableBuilder.java
diff --git a/core/src/main/java/org/apache/amoro/table/TableIdentifier.java b/amoro-core/src/main/java/org/apache/amoro/table/TableIdentifier.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/TableIdentifier.java
rename to amoro-core/src/main/java/org/apache/amoro/table/TableIdentifier.java
diff --git a/core/src/main/java/org/apache/amoro/table/TableMetaStore.java b/amoro-core/src/main/java/org/apache/amoro/table/TableMetaStore.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/TableMetaStore.java
rename to amoro-core/src/main/java/org/apache/amoro/table/TableMetaStore.java
diff --git a/core/src/main/java/org/apache/amoro/table/TableProperties.java b/amoro-core/src/main/java/org/apache/amoro/table/TableProperties.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/TableProperties.java
rename to amoro-core/src/main/java/org/apache/amoro/table/TableProperties.java
diff --git a/core/src/main/java/org/apache/amoro/table/UnkeyedTable.java b/amoro-core/src/main/java/org/apache/amoro/table/UnkeyedTable.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/UnkeyedTable.java
rename to amoro-core/src/main/java/org/apache/amoro/table/UnkeyedTable.java
diff --git a/core/src/main/java/org/apache/amoro/table/WatermarkGenerator.java b/amoro-core/src/main/java/org/apache/amoro/table/WatermarkGenerator.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/WatermarkGenerator.java
rename to amoro-core/src/main/java/org/apache/amoro/table/WatermarkGenerator.java
diff --git a/core/src/main/java/org/apache/amoro/table/WriteOperationKind.java b/amoro-core/src/main/java/org/apache/amoro/table/WriteOperationKind.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/WriteOperationKind.java
rename to amoro-core/src/main/java/org/apache/amoro/table/WriteOperationKind.java
diff --git a/core/src/main/java/org/apache/amoro/table/blocker/BasicTableBlockerManager.java b/amoro-core/src/main/java/org/apache/amoro/table/blocker/BasicTableBlockerManager.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/blocker/BasicTableBlockerManager.java
rename to amoro-core/src/main/java/org/apache/amoro/table/blocker/BasicTableBlockerManager.java
diff --git a/core/src/main/java/org/apache/amoro/table/blocker/Blocker.java b/amoro-core/src/main/java/org/apache/amoro/table/blocker/Blocker.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/blocker/Blocker.java
rename to amoro-core/src/main/java/org/apache/amoro/table/blocker/Blocker.java
diff --git a/core/src/main/java/org/apache/amoro/table/blocker/RenewableBlocker.java b/amoro-core/src/main/java/org/apache/amoro/table/blocker/RenewableBlocker.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/blocker/RenewableBlocker.java
rename to amoro-core/src/main/java/org/apache/amoro/table/blocker/RenewableBlocker.java
diff --git a/core/src/main/java/org/apache/amoro/table/blocker/TableBlockerManager.java b/amoro-core/src/main/java/org/apache/amoro/table/blocker/TableBlockerManager.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/table/blocker/TableBlockerManager.java
rename to amoro-core/src/main/java/org/apache/amoro/table/blocker/TableBlockerManager.java
diff --git a/core/src/main/java/org/apache/amoro/utils/ArcticCatalogUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/ArcticCatalogUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/ArcticCatalogUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/ArcticCatalogUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/ArcticDataFiles.java b/amoro-core/src/main/java/org/apache/amoro/utils/ArcticDataFiles.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/ArcticDataFiles.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/ArcticDataFiles.java
diff --git a/core/src/main/java/org/apache/amoro/utils/ArcticTableUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/ArcticTableUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/ArcticTableUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/ArcticTableUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/CompatiblePropertyUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/CompatiblePropertyUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/CompatiblePropertyUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/CompatiblePropertyUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/ConfigurationFileUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/ConfigurationFileUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/ConfigurationFileUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/ConfigurationFileUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/ContentFiles.java b/amoro-core/src/main/java/org/apache/amoro/utils/ContentFiles.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/ContentFiles.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/ContentFiles.java
diff --git a/core/src/main/java/org/apache/amoro/utils/ConvertStructUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/ConvertStructUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/ConvertStructUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/ConvertStructUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/ExceptionUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/ExceptionUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/ExceptionUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/ExceptionUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/ExpressionUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/ExpressionUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/ExpressionUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/ExpressionUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/FileScanTaskUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/FileScanTaskUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/FileScanTaskUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/FileScanTaskUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/FlipUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/FlipUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/FlipUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/FlipUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/IcebergInMemoryLockManager.java b/amoro-core/src/main/java/org/apache/amoro/utils/IcebergInMemoryLockManager.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/IcebergInMemoryLockManager.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/IcebergInMemoryLockManager.java
diff --git a/core/src/main/java/org/apache/amoro/utils/IdGenerator.java b/amoro-core/src/main/java/org/apache/amoro/utils/IdGenerator.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/IdGenerator.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/IdGenerator.java
diff --git a/core/src/main/java/org/apache/amoro/utils/JacksonUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/JacksonUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/JacksonUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/JacksonUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/LocalFileUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/LocalFileUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/LocalFileUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/LocalFileUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/ManifestEntryFields.java b/amoro-core/src/main/java/org/apache/amoro/utils/ManifestEntryFields.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/ManifestEntryFields.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/ManifestEntryFields.java
diff --git a/core/src/main/java/org/apache/amoro/utils/NodeFilter.java b/amoro-core/src/main/java/org/apache/amoro/utils/NodeFilter.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/NodeFilter.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/NodeFilter.java
diff --git a/core/src/main/java/org/apache/amoro/utils/SchemaUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/SchemaUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/SchemaUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/SchemaUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/SerializationUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/SerializationUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/SerializationUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/SerializationUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/StatisticsFileUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/StatisticsFileUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/StatisticsFileUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/StatisticsFileUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/StructLikeSet.java b/amoro-core/src/main/java/org/apache/amoro/utils/StructLikeSet.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/StructLikeSet.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/StructLikeSet.java
diff --git a/core/src/main/java/org/apache/amoro/utils/TableFileUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/TableFileUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/TableFileUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/TableFileUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/TablePropertyUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/TablePropertyUtil.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/TablePropertyUtil.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/TablePropertyUtil.java
diff --git a/core/src/main/java/org/apache/amoro/utils/map/DefaultSizeEstimator.java b/amoro-core/src/main/java/org/apache/amoro/utils/map/DefaultSizeEstimator.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/map/DefaultSizeEstimator.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/map/DefaultSizeEstimator.java
diff --git a/core/src/main/java/org/apache/amoro/utils/map/RocksDBBackend.java b/amoro-core/src/main/java/org/apache/amoro/utils/map/RocksDBBackend.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/map/RocksDBBackend.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/map/RocksDBBackend.java
diff --git a/core/src/main/java/org/apache/amoro/utils/map/SimpleMap.java b/amoro-core/src/main/java/org/apache/amoro/utils/map/SimpleMap.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/map/SimpleMap.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/map/SimpleMap.java
diff --git a/core/src/main/java/org/apache/amoro/utils/map/SimpleSpillableMap.java b/amoro-core/src/main/java/org/apache/amoro/utils/map/SimpleSpillableMap.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/map/SimpleSpillableMap.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/map/SimpleSpillableMap.java
diff --git a/core/src/main/java/org/apache/amoro/utils/map/SizeEstimator.java b/amoro-core/src/main/java/org/apache/amoro/utils/map/SizeEstimator.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/map/SizeEstimator.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/map/SizeEstimator.java
diff --git a/core/src/main/java/org/apache/amoro/utils/map/StructLikeBaseMap.java b/amoro-core/src/main/java/org/apache/amoro/utils/map/StructLikeBaseMap.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/map/StructLikeBaseMap.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/map/StructLikeBaseMap.java
diff --git a/core/src/main/java/org/apache/amoro/utils/map/StructLikeCollections.java b/amoro-core/src/main/java/org/apache/amoro/utils/map/StructLikeCollections.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/map/StructLikeCollections.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/map/StructLikeCollections.java
diff --git a/core/src/main/java/org/apache/amoro/utils/map/StructLikeMemoryMap.java b/amoro-core/src/main/java/org/apache/amoro/utils/map/StructLikeMemoryMap.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/map/StructLikeMemoryMap.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/map/StructLikeMemoryMap.java
diff --git a/core/src/main/java/org/apache/amoro/utils/map/StructLikeSpillableMap.java b/amoro-core/src/main/java/org/apache/amoro/utils/map/StructLikeSpillableMap.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/map/StructLikeSpillableMap.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/map/StructLikeSpillableMap.java
diff --git a/core/src/main/java/org/apache/amoro/utils/map/StructLikeWrapperSizeEstimator.java b/amoro-core/src/main/java/org/apache/amoro/utils/map/StructLikeWrapperSizeEstimator.java
similarity index 100%
rename from core/src/main/java/org/apache/amoro/utils/map/StructLikeWrapperSizeEstimator.java
rename to amoro-core/src/main/java/org/apache/amoro/utils/map/StructLikeWrapperSizeEstimator.java
diff --git a/core/src/main/java/org/apache/iceberg/IcebergFindFiles.java b/amoro-core/src/main/java/org/apache/iceberg/IcebergFindFiles.java
similarity index 100%
rename from core/src/main/java/org/apache/iceberg/IcebergFindFiles.java
rename to amoro-core/src/main/java/org/apache/iceberg/IcebergFindFiles.java
diff --git a/core/src/main/java/org/apache/iceberg/MixedChangeTableScan.java b/amoro-core/src/main/java/org/apache/iceberg/MixedChangeTableScan.java
similarity index 100%
rename from core/src/main/java/org/apache/iceberg/MixedChangeTableScan.java
rename to amoro-core/src/main/java/org/apache/iceberg/MixedChangeTableScan.java
diff --git a/core/src/main/java/org/apache/iceberg/data/PublicGenericReader.java b/amoro-core/src/main/java/org/apache/iceberg/data/PublicGenericReader.java
similarity index 100%
rename from core/src/main/java/org/apache/iceberg/data/PublicGenericReader.java
rename to amoro-core/src/main/java/org/apache/iceberg/data/PublicGenericReader.java
diff --git a/core/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory b/amoro-core/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory
similarity index 100%
rename from core/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory
rename to amoro-core/src/main/resources/META-INF/services/org.apache.amoro.FormatCatalogFactory
diff --git a/core/src/main/thrift/arctic_commons.thrift b/amoro-core/src/main/thrift/arctic_commons.thrift
similarity index 100%
rename from core/src/main/thrift/arctic_commons.thrift
rename to amoro-core/src/main/thrift/arctic_commons.thrift
diff --git a/core/src/main/thrift/arctic_optimizing_service.thrift b/amoro-core/src/main/thrift/arctic_optimizing_service.thrift
similarity index 100%
rename from core/src/main/thrift/arctic_optimizing_service.thrift
rename to amoro-core/src/main/thrift/arctic_optimizing_service.thrift
diff --git a/core/src/main/thrift/arctic_table_metastore.thrift b/amoro-core/src/main/thrift/arctic_table_metastore.thrift
similarity index 100%
rename from core/src/main/thrift/arctic_table_metastore.thrift
rename to amoro-core/src/main/thrift/arctic_table_metastore.thrift
diff --git a/core/src/test/java/org/apache/amoro/BasicTableTestHelper.java b/amoro-core/src/test/java/org/apache/amoro/BasicTableTestHelper.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/BasicTableTestHelper.java
rename to amoro-core/src/test/java/org/apache/amoro/BasicTableTestHelper.java
diff --git a/core/src/test/java/org/apache/amoro/DataFileTestHelpers.java b/amoro-core/src/test/java/org/apache/amoro/DataFileTestHelpers.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/DataFileTestHelpers.java
rename to amoro-core/src/test/java/org/apache/amoro/DataFileTestHelpers.java
diff --git a/core/src/test/java/org/apache/amoro/MockArcticMetastoreServer.java b/amoro-core/src/test/java/org/apache/amoro/MockArcticMetastoreServer.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/MockArcticMetastoreServer.java
rename to amoro-core/src/test/java/org/apache/amoro/MockArcticMetastoreServer.java
diff --git a/core/src/test/java/org/apache/amoro/SingletonResourceUtil.java b/amoro-core/src/test/java/org/apache/amoro/SingletonResourceUtil.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/SingletonResourceUtil.java
rename to amoro-core/src/test/java/org/apache/amoro/SingletonResourceUtil.java
diff --git a/core/src/test/java/org/apache/amoro/TableTestHelper.java b/amoro-core/src/test/java/org/apache/amoro/TableTestHelper.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/TableTestHelper.java
rename to amoro-core/src/test/java/org/apache/amoro/TableTestHelper.java
diff --git a/core/src/test/java/org/apache/amoro/TestAms.java b/amoro-core/src/test/java/org/apache/amoro/TestAms.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/TestAms.java
rename to amoro-core/src/test/java/org/apache/amoro/TestAms.java
diff --git a/core/src/test/java/org/apache/amoro/TestTreeNode.java b/amoro-core/src/test/java/org/apache/amoro/TestTreeNode.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/TestTreeNode.java
rename to amoro-core/src/test/java/org/apache/amoro/TestTreeNode.java
diff --git a/core/src/test/java/org/apache/amoro/TestUnifiedCatalog.java b/amoro-core/src/test/java/org/apache/amoro/TestUnifiedCatalog.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/TestUnifiedCatalog.java
rename to amoro-core/src/test/java/org/apache/amoro/TestUnifiedCatalog.java
diff --git a/core/src/test/java/org/apache/amoro/TestedCatalogs.java b/amoro-core/src/test/java/org/apache/amoro/TestedCatalogs.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/TestedCatalogs.java
rename to amoro-core/src/test/java/org/apache/amoro/TestedCatalogs.java
diff --git a/core/src/test/java/org/apache/amoro/catalog/BasicCatalogTestHelper.java b/amoro-core/src/test/java/org/apache/amoro/catalog/BasicCatalogTestHelper.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/catalog/BasicCatalogTestHelper.java
rename to amoro-core/src/test/java/org/apache/amoro/catalog/BasicCatalogTestHelper.java
diff --git a/core/src/test/java/org/apache/amoro/catalog/CatalogTestBase.java b/amoro-core/src/test/java/org/apache/amoro/catalog/CatalogTestBase.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/catalog/CatalogTestBase.java
rename to amoro-core/src/test/java/org/apache/amoro/catalog/CatalogTestBase.java
diff --git a/core/src/test/java/org/apache/amoro/catalog/CatalogTestHelper.java b/amoro-core/src/test/java/org/apache/amoro/catalog/CatalogTestHelper.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/catalog/CatalogTestHelper.java
rename to amoro-core/src/test/java/org/apache/amoro/catalog/CatalogTestHelper.java
diff --git a/core/src/test/java/org/apache/amoro/catalog/CatalogTestHelpers.java b/amoro-core/src/test/java/org/apache/amoro/catalog/CatalogTestHelpers.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/catalog/CatalogTestHelpers.java
rename to amoro-core/src/test/java/org/apache/amoro/catalog/CatalogTestHelpers.java
diff --git a/core/src/test/java/org/apache/amoro/catalog/TableTestBase.java b/amoro-core/src/test/java/org/apache/amoro/catalog/TableTestBase.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/catalog/TableTestBase.java
rename to amoro-core/src/test/java/org/apache/amoro/catalog/TableTestBase.java
diff --git a/core/src/test/java/org/apache/amoro/catalog/TestCatalogLoader.java b/amoro-core/src/test/java/org/apache/amoro/catalog/TestCatalogLoader.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/catalog/TestCatalogLoader.java
rename to amoro-core/src/test/java/org/apache/amoro/catalog/TestCatalogLoader.java
diff --git a/core/src/test/java/org/apache/amoro/catalog/TestMixedCatalog.java b/amoro-core/src/test/java/org/apache/amoro/catalog/TestMixedCatalog.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/catalog/TestMixedCatalog.java
rename to amoro-core/src/test/java/org/apache/amoro/catalog/TestMixedCatalog.java
diff --git a/core/src/test/java/org/apache/amoro/data/TestDefaultKeyedFile.java b/amoro-core/src/test/java/org/apache/amoro/data/TestDefaultKeyedFile.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/data/TestDefaultKeyedFile.java
rename to amoro-core/src/test/java/org/apache/amoro/data/TestDefaultKeyedFile.java
diff --git a/core/src/test/java/org/apache/amoro/data/TestUpsertPushDown.java b/amoro-core/src/test/java/org/apache/amoro/data/TestUpsertPushDown.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/data/TestUpsertPushDown.java
rename to amoro-core/src/test/java/org/apache/amoro/data/TestUpsertPushDown.java
diff --git a/core/src/test/java/org/apache/amoro/formats/AbstractFormatCatalogTestHelper.java b/amoro-core/src/test/java/org/apache/amoro/formats/AbstractFormatCatalogTestHelper.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/formats/AbstractFormatCatalogTestHelper.java
rename to amoro-core/src/test/java/org/apache/amoro/formats/AbstractFormatCatalogTestHelper.java
diff --git a/core/src/test/java/org/apache/amoro/formats/AmoroCatalogTestBase.java b/amoro-core/src/test/java/org/apache/amoro/formats/AmoroCatalogTestBase.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/formats/AmoroCatalogTestBase.java
rename to amoro-core/src/test/java/org/apache/amoro/formats/AmoroCatalogTestBase.java
diff --git a/core/src/test/java/org/apache/amoro/formats/AmoroCatalogTestHelper.java b/amoro-core/src/test/java/org/apache/amoro/formats/AmoroCatalogTestHelper.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/formats/AmoroCatalogTestHelper.java
rename to amoro-core/src/test/java/org/apache/amoro/formats/AmoroCatalogTestHelper.java
diff --git a/core/src/test/java/org/apache/amoro/formats/IcebergHadoopCatalogTestHelper.java b/amoro-core/src/test/java/org/apache/amoro/formats/IcebergHadoopCatalogTestHelper.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/formats/IcebergHadoopCatalogTestHelper.java
rename to amoro-core/src/test/java/org/apache/amoro/formats/IcebergHadoopCatalogTestHelper.java
diff --git a/core/src/test/java/org/apache/amoro/formats/MixedIcebergHadoopCatalogTestHelper.java b/amoro-core/src/test/java/org/apache/amoro/formats/MixedIcebergHadoopCatalogTestHelper.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/formats/MixedIcebergHadoopCatalogTestHelper.java
rename to amoro-core/src/test/java/org/apache/amoro/formats/MixedIcebergHadoopCatalogTestHelper.java
diff --git a/core/src/test/java/org/apache/amoro/formats/PaimonHadoopCatalogTestHelper.java b/amoro-core/src/test/java/org/apache/amoro/formats/PaimonHadoopCatalogTestHelper.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/formats/PaimonHadoopCatalogTestHelper.java
rename to amoro-core/src/test/java/org/apache/amoro/formats/PaimonHadoopCatalogTestHelper.java
diff --git a/core/src/test/java/org/apache/amoro/formats/TestAmoroCatalogBase.java b/amoro-core/src/test/java/org/apache/amoro/formats/TestAmoroCatalogBase.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/formats/TestAmoroCatalogBase.java
rename to amoro-core/src/test/java/org/apache/amoro/formats/TestAmoroCatalogBase.java
diff --git a/core/src/test/java/org/apache/amoro/formats/TestIcebergAmoroCatalog.java b/amoro-core/src/test/java/org/apache/amoro/formats/TestIcebergAmoroCatalog.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/formats/TestIcebergAmoroCatalog.java
rename to amoro-core/src/test/java/org/apache/amoro/formats/TestIcebergAmoroCatalog.java
diff --git a/core/src/test/java/org/apache/amoro/formats/TestMixedIcebergFormatCatalog.java b/amoro-core/src/test/java/org/apache/amoro/formats/TestMixedIcebergFormatCatalog.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/formats/TestMixedIcebergFormatCatalog.java
rename to amoro-core/src/test/java/org/apache/amoro/formats/TestMixedIcebergFormatCatalog.java
diff --git a/core/src/test/java/org/apache/amoro/formats/TestPaimonAmoroCatalog.java b/amoro-core/src/test/java/org/apache/amoro/formats/TestPaimonAmoroCatalog.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/formats/TestPaimonAmoroCatalog.java
rename to amoro-core/src/test/java/org/apache/amoro/formats/TestPaimonAmoroCatalog.java
diff --git a/core/src/test/java/org/apache/amoro/io/IcebergDataTestHelpers.java b/amoro-core/src/test/java/org/apache/amoro/io/IcebergDataTestHelpers.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/io/IcebergDataTestHelpers.java
rename to amoro-core/src/test/java/org/apache/amoro/io/IcebergDataTestHelpers.java
diff --git a/core/src/test/java/org/apache/amoro/io/MixedDataTestHelpers.java b/amoro-core/src/test/java/org/apache/amoro/io/MixedDataTestHelpers.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/io/MixedDataTestHelpers.java
rename to amoro-core/src/test/java/org/apache/amoro/io/MixedDataTestHelpers.java
diff --git a/core/src/test/java/org/apache/amoro/io/TableDataTestBase.java b/amoro-core/src/test/java/org/apache/amoro/io/TableDataTestBase.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/io/TableDataTestBase.java
rename to amoro-core/src/test/java/org/apache/amoro/io/TableDataTestBase.java
diff --git a/core/src/test/java/org/apache/amoro/io/TestArcticTreeNodePosDeleteWriter.java b/amoro-core/src/test/java/org/apache/amoro/io/TestArcticTreeNodePosDeleteWriter.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/io/TestArcticTreeNodePosDeleteWriter.java
rename to amoro-core/src/test/java/org/apache/amoro/io/TestArcticTreeNodePosDeleteWriter.java
diff --git a/core/src/test/java/org/apache/amoro/io/TestBasicTableTrashManager.java b/amoro-core/src/test/java/org/apache/amoro/io/TestBasicTableTrashManager.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/io/TestBasicTableTrashManager.java
rename to amoro-core/src/test/java/org/apache/amoro/io/TestBasicTableTrashManager.java
diff --git a/core/src/test/java/org/apache/amoro/io/TestFileNameGenerator.java b/amoro-core/src/test/java/org/apache/amoro/io/TestFileNameGenerator.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/io/TestFileNameGenerator.java
rename to amoro-core/src/test/java/org/apache/amoro/io/TestFileNameGenerator.java
diff --git a/core/src/test/java/org/apache/amoro/io/TestIcebergCombinedReader.java b/amoro-core/src/test/java/org/apache/amoro/io/TestIcebergCombinedReader.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/io/TestIcebergCombinedReader.java
rename to amoro-core/src/test/java/org/apache/amoro/io/TestIcebergCombinedReader.java
diff --git a/core/src/test/java/org/apache/amoro/io/TestIcebergCombinedReaderVariousTypes.java b/amoro-core/src/test/java/org/apache/amoro/io/TestIcebergCombinedReaderVariousTypes.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/io/TestIcebergCombinedReaderVariousTypes.java
rename to amoro-core/src/test/java/org/apache/amoro/io/TestIcebergCombinedReaderVariousTypes.java
diff --git a/core/src/test/java/org/apache/amoro/io/TestIcebergFanoutPosDeleteWriter.java b/amoro-core/src/test/java/org/apache/amoro/io/TestIcebergFanoutPosDeleteWriter.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/io/TestIcebergFanoutPosDeleteWriter.java
rename to amoro-core/src/test/java/org/apache/amoro/io/TestIcebergFanoutPosDeleteWriter.java
diff --git a/core/src/test/java/org/apache/amoro/io/TestRecoverableArcticFileIO.java b/amoro-core/src/test/java/org/apache/amoro/io/TestRecoverableArcticFileIO.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/io/TestRecoverableArcticFileIO.java
rename to amoro-core/src/test/java/org/apache/amoro/io/TestRecoverableArcticFileIO.java
diff --git a/core/src/test/java/org/apache/amoro/io/TestTableTrashManagers.java b/amoro-core/src/test/java/org/apache/amoro/io/TestTableTrashManagers.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/io/TestTableTrashManagers.java
rename to amoro-core/src/test/java/org/apache/amoro/io/TestTableTrashManagers.java
diff --git a/core/src/test/java/org/apache/amoro/io/TestTaskReader.java b/amoro-core/src/test/java/org/apache/amoro/io/TestTaskReader.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/io/TestTaskReader.java
rename to amoro-core/src/test/java/org/apache/amoro/io/TestTaskReader.java
diff --git a/core/src/test/java/org/apache/amoro/io/TestTaskWriter.java b/amoro-core/src/test/java/org/apache/amoro/io/TestTaskWriter.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/io/TestTaskWriter.java
rename to amoro-core/src/test/java/org/apache/amoro/io/TestTaskWriter.java
diff --git a/core/src/test/java/org/apache/amoro/listener/ArcticRunListener.java b/amoro-core/src/test/java/org/apache/amoro/listener/ArcticRunListener.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/listener/ArcticRunListener.java
rename to amoro-core/src/test/java/org/apache/amoro/listener/ArcticRunListener.java
diff --git a/core/src/test/java/org/apache/amoro/log/FormatTestBase.java b/amoro-core/src/test/java/org/apache/amoro/log/FormatTestBase.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/log/FormatTestBase.java
rename to amoro-core/src/test/java/org/apache/amoro/log/FormatTestBase.java
diff --git a/core/src/test/java/org/apache/amoro/log/TestLogDataJsonSerialization.java b/amoro-core/src/test/java/org/apache/amoro/log/TestLogDataJsonSerialization.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/log/TestLogDataJsonSerialization.java
rename to amoro-core/src/test/java/org/apache/amoro/log/TestLogDataJsonSerialization.java
diff --git a/core/src/test/java/org/apache/amoro/op/TestOverwriteBaseFile.java b/amoro-core/src/test/java/org/apache/amoro/op/TestOverwriteBaseFile.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/op/TestOverwriteBaseFile.java
rename to amoro-core/src/test/java/org/apache/amoro/op/TestOverwriteBaseFile.java
diff --git a/core/src/test/java/org/apache/amoro/op/TestRewritePartitions.java b/amoro-core/src/test/java/org/apache/amoro/op/TestRewritePartitions.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/op/TestRewritePartitions.java
rename to amoro-core/src/test/java/org/apache/amoro/op/TestRewritePartitions.java
diff --git a/core/src/test/java/org/apache/amoro/op/TestUpdatePartitionProperties.java b/amoro-core/src/test/java/org/apache/amoro/op/TestUpdatePartitionProperties.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/op/TestUpdatePartitionProperties.java
rename to amoro-core/src/test/java/org/apache/amoro/op/TestUpdatePartitionProperties.java
diff --git a/core/src/test/java/org/apache/amoro/op/TestUpdateTable.java b/amoro-core/src/test/java/org/apache/amoro/op/TestUpdateTable.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/op/TestUpdateTable.java
rename to amoro-core/src/test/java/org/apache/amoro/op/TestUpdateTable.java
diff --git a/core/src/test/java/org/apache/amoro/optimizing/IcebergRewriteExecutorTest.java b/amoro-core/src/test/java/org/apache/amoro/optimizing/IcebergRewriteExecutorTest.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/optimizing/IcebergRewriteExecutorTest.java
rename to amoro-core/src/test/java/org/apache/amoro/optimizing/IcebergRewriteExecutorTest.java
diff --git a/core/src/test/java/org/apache/amoro/scan/TestBaseCombinedScanTask.java b/amoro-core/src/test/java/org/apache/amoro/scan/TestBaseCombinedScanTask.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/scan/TestBaseCombinedScanTask.java
rename to amoro-core/src/test/java/org/apache/amoro/scan/TestBaseCombinedScanTask.java
diff --git a/core/src/test/java/org/apache/amoro/scan/TestKeyedTableScan.java b/amoro-core/src/test/java/org/apache/amoro/scan/TestKeyedTableScan.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/scan/TestKeyedTableScan.java
rename to amoro-core/src/test/java/org/apache/amoro/scan/TestKeyedTableScan.java
diff --git a/core/src/test/java/org/apache/amoro/scan/TestMixedChangeTableScan.java b/amoro-core/src/test/java/org/apache/amoro/scan/TestMixedChangeTableScan.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/scan/TestMixedChangeTableScan.java
rename to amoro-core/src/test/java/org/apache/amoro/scan/TestMixedChangeTableScan.java
diff --git a/core/src/test/java/org/apache/amoro/scan/TestScanSplitTask.java b/amoro-core/src/test/java/org/apache/amoro/scan/TestScanSplitTask.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/scan/TestScanSplitTask.java
rename to amoro-core/src/test/java/org/apache/amoro/scan/TestScanSplitTask.java
diff --git a/core/src/test/java/org/apache/amoro/scan/TestTableEntriesScan.java b/amoro-core/src/test/java/org/apache/amoro/scan/TestTableEntriesScan.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/scan/TestTableEntriesScan.java
rename to amoro-core/src/test/java/org/apache/amoro/scan/TestTableEntriesScan.java
diff --git a/core/src/test/java/org/apache/amoro/table/blocker/TestBasicTableBlockerManager.java b/amoro-core/src/test/java/org/apache/amoro/table/blocker/TestBasicTableBlockerManager.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/table/blocker/TestBasicTableBlockerManager.java
rename to amoro-core/src/test/java/org/apache/amoro/table/blocker/TestBasicTableBlockerManager.java
diff --git a/core/src/test/java/org/apache/amoro/trace/TestTableTracer.java b/amoro-core/src/test/java/org/apache/amoro/trace/TestTableTracer.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/trace/TestTableTracer.java
rename to amoro-core/src/test/java/org/apache/amoro/trace/TestTableTracer.java
diff --git a/core/src/test/java/org/apache/amoro/trace/TestTableWatermark.java b/amoro-core/src/test/java/org/apache/amoro/trace/TestTableWatermark.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/trace/TestTableWatermark.java
rename to amoro-core/src/test/java/org/apache/amoro/trace/TestTableWatermark.java
diff --git a/core/src/test/java/org/apache/amoro/utils/JacksonUtilTest.java b/amoro-core/src/test/java/org/apache/amoro/utils/JacksonUtilTest.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/JacksonUtilTest.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/JacksonUtilTest.java
diff --git a/core/src/test/java/org/apache/amoro/utils/TestArcticCatalogUtil.java b/amoro-core/src/test/java/org/apache/amoro/utils/TestArcticCatalogUtil.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/TestArcticCatalogUtil.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/TestArcticCatalogUtil.java
diff --git a/core/src/test/java/org/apache/amoro/utils/TestArcticDataFiles.java b/amoro-core/src/test/java/org/apache/amoro/utils/TestArcticDataFiles.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/TestArcticDataFiles.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/TestArcticDataFiles.java
diff --git a/core/src/test/java/org/apache/amoro/utils/TestCompatiblePropertyUtil.java b/amoro-core/src/test/java/org/apache/amoro/utils/TestCompatiblePropertyUtil.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/TestCompatiblePropertyUtil.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/TestCompatiblePropertyUtil.java
diff --git a/core/src/test/java/org/apache/amoro/utils/TestFileUtil.java b/amoro-core/src/test/java/org/apache/amoro/utils/TestFileUtil.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/TestFileUtil.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/TestFileUtil.java
diff --git a/core/src/test/java/org/apache/amoro/utils/TestKeyedExpressionUtil.java b/amoro-core/src/test/java/org/apache/amoro/utils/TestKeyedExpressionUtil.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/TestKeyedExpressionUtil.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/TestKeyedExpressionUtil.java
diff --git a/core/src/test/java/org/apache/amoro/utils/TestStatisticsFileUtil.java b/amoro-core/src/test/java/org/apache/amoro/utils/TestStatisticsFileUtil.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/TestStatisticsFileUtil.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/TestStatisticsFileUtil.java
diff --git a/core/src/test/java/org/apache/amoro/utils/TestTablePropertyUtil.java b/amoro-core/src/test/java/org/apache/amoro/utils/TestTablePropertyUtil.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/TestTablePropertyUtil.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/TestTablePropertyUtil.java
diff --git a/core/src/test/java/org/apache/amoro/utils/TestUnkeyedExpressionUtil.java b/amoro-core/src/test/java/org/apache/amoro/utils/TestUnkeyedExpressionUtil.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/TestUnkeyedExpressionUtil.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/TestUnkeyedExpressionUtil.java
diff --git a/core/src/test/java/org/apache/amoro/utils/TestWatermarkGenerator.java b/amoro-core/src/test/java/org/apache/amoro/utils/TestWatermarkGenerator.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/TestWatermarkGenerator.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/TestWatermarkGenerator.java
diff --git a/core/src/test/java/org/apache/amoro/utils/map/TestRocksDBBackend.java b/amoro-core/src/test/java/org/apache/amoro/utils/map/TestRocksDBBackend.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/map/TestRocksDBBackend.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/map/TestRocksDBBackend.java
diff --git a/core/src/test/java/org/apache/amoro/utils/map/TestSimpleSpillableMap.java b/amoro-core/src/test/java/org/apache/amoro/utils/map/TestSimpleSpillableMap.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/map/TestSimpleSpillableMap.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/map/TestSimpleSpillableMap.java
diff --git a/core/src/test/java/org/apache/amoro/utils/map/TestSimpleSpilledMap.java b/amoro-core/src/test/java/org/apache/amoro/utils/map/TestSimpleSpilledMap.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/map/TestSimpleSpilledMap.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/map/TestSimpleSpilledMap.java
diff --git a/core/src/test/java/org/apache/amoro/utils/map/TestStructLikeMap.java b/amoro-core/src/test/java/org/apache/amoro/utils/map/TestStructLikeMap.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/map/TestStructLikeMap.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/map/TestStructLikeMap.java
diff --git a/core/src/test/java/org/apache/amoro/utils/map/TestStructLikeWrapperSizeEstimator.java b/amoro-core/src/test/java/org/apache/amoro/utils/map/TestStructLikeWrapperSizeEstimator.java
similarity index 100%
rename from core/src/test/java/org/apache/amoro/utils/map/TestStructLikeWrapperSizeEstimator.java
rename to amoro-core/src/test/java/org/apache/amoro/utils/map/TestStructLikeWrapperSizeEstimator.java
diff --git a/core/src/test/java/org/apache/iceberg/TestIcebergFindFiles.java b/amoro-core/src/test/java/org/apache/iceberg/TestIcebergFindFiles.java
similarity index 100%
rename from core/src/test/java/org/apache/iceberg/TestIcebergFindFiles.java
rename to amoro-core/src/test/java/org/apache/iceberg/TestIcebergFindFiles.java
diff --git a/core/src/test/resources/log4j2.xml b/amoro-core/src/test/resources/log4j2.xml
similarity index 100%
rename from core/src/test/resources/log4j2.xml
rename to amoro-core/src/test/resources/log4j2.xml
diff --git a/mixed-format/flink/flink-common-format/pom.xml b/amoro-mixed-format/amoro-mixed-format-flink/flink-common-format/pom.xml
similarity index 100%
rename from mixed-format/flink/flink-common-format/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common-format/pom.xml
diff --git a/mixed-format/flink/flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/LogRecordV1.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/LogRecordV1.java
similarity index 100%
rename from mixed-format/flink/flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/LogRecordV1.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/LogRecordV1.java
diff --git a/mixed-format/flink/flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/RowKindUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/RowKindUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/RowKindUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common-format/src/main/java/org/apache/amoro/flink/shuffle/RowKindUtil.java
diff --git a/mixed-format/flink/flink-common-iceberg-bridge/pom.xml b/amoro-mixed-format/amoro-mixed-format-flink/flink-common-iceberg-bridge/pom.xml
similarity index 100%
rename from mixed-format/flink/flink-common-iceberg-bridge/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common-iceberg-bridge/pom.xml
diff --git a/mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java
similarity index 100%
rename from mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetReaders.java
diff --git a/mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java
similarity index 100%
rename from mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveFlinkParquetWriters.java
diff --git a/mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java
similarity index 100%
rename from mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/data/AdaptHiveParquetWithFlinkSchemaVisitor.java
diff --git a/mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java
similarity index 100%
rename from mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java
diff --git a/mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java
similarity index 100%
rename from mixed-format/flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common-iceberg-bridge/src/main/java/org/apache/iceberg/flink/source/ScanContext.java
diff --git a/mixed-format/flink/flink-common/pom.xml b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/pom.xml
similarity index 100%
rename from mixed-format/flink/flink-common/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/pom.xml
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/FlinkSchemaUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/FlinkSchemaUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/FlinkSchemaUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/FlinkSchemaUtil.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/InternalCatalogBuilder.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/InternalCatalogBuilder.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/InternalCatalogBuilder.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/InternalCatalogBuilder.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalog.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/MixedCatalog.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/MixedCatalog.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/MixedCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/MixedCatalog.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/CatalogFactoryOptions.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/CatalogFactoryOptions.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/CatalogFactoryOptions.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/CatalogFactoryOptions.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/FlinkUnifiedCatalogFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/FlinkUnifiedCatalogFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/FlinkUnifiedCatalogFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/FlinkUnifiedCatalogFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/iceberg/IcebergFlinkCatalogFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/iceberg/IcebergFlinkCatalogFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/iceberg/IcebergFlinkCatalogFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/iceberg/IcebergFlinkCatalogFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedCatalogFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedCatalogFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedCatalogFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedCatalogFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedHiveCatalogFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedHiveCatalogFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedHiveCatalogFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedHiveCatalogFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedIcebergCatalogFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedIcebergCatalogFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedIcebergCatalogFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/mixed/MixedIcebergCatalogFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/paimon/PaimonFlinkCatalogFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/paimon/PaimonFlinkCatalogFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/paimon/PaimonFlinkCatalogFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/catalog/factories/paimon/PaimonFlinkCatalogFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/FlinkTablePropertiesInvocationHandler.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/FlinkTablePropertiesInvocationHandler.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/FlinkTablePropertiesInvocationHandler.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/FlinkTablePropertiesInvocationHandler.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInterceptor.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInterceptor.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInterceptor.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInterceptor.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInvocationHandler.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInvocationHandler.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInvocationHandler.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/KerberosInvocationHandler.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/ProxyFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/ProxyFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/ProxyFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/interceptor/ProxyFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/ArcticRowDataLookupFunction.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/ArcticRowDataLookupFunction.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/ArcticRowDataLookupFunction.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/ArcticRowDataLookupFunction.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/BasicLookupFunction.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/BasicLookupFunction.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/BasicLookupFunction.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/BasicLookupFunction.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/BinaryRowDataSerializerWrapper.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/BinaryRowDataSerializerWrapper.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/BinaryRowDataSerializerWrapper.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/BinaryRowDataSerializerWrapper.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArraySetSerializer.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArraySetSerializer.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArraySetSerializer.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArraySetSerializer.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArrayWrapper.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArrayWrapper.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArrayWrapper.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/ByteArrayWrapper.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTable.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTable.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTable.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTable.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTableFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTableFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTableFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/KVTableFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/KeyRowData.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/KeyRowData.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/KeyRowData.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/KeyRowData.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupMetrics.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupMetrics.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupMetrics.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupMetrics.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupOptions.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupOptions.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupOptions.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupOptions.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupRecord.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupRecord.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupRecord.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/LookupRecord.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBCacheState.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBCacheState.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBCacheState.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBCacheState.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBRecordState.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBRecordState.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBRecordState.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBRecordState.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetSpilledState.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetSpilledState.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetSpilledState.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetSpilledState.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetState.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetState.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetState.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetState.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RowDataStateFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RowDataStateFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RowDataStateFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/RowDataStateFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/SecondaryIndexTable.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/SecondaryIndexTable.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/SecondaryIndexTable.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/SecondaryIndexTable.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/TableFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/TableFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/TableFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/TableFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/UniqueIndexTable.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/UniqueIndexTable.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/UniqueIndexTable.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/UniqueIndexTable.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicate.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicate.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicate.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicate.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicateExpressionVisitor.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicateExpressionVisitor.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicateExpressionVisitor.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/lookup/filter/RowDataPredicateExpressionVisitor.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/metric/MetricConstant.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/metric/MetricConstant.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/metric/MetricConstant.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/metric/MetricConstant.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/metric/MetricsGenerator.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/metric/MetricsGenerator.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/metric/MetricsGenerator.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/metric/MetricsGenerator.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/planner/calcite/FlinkTypeSystem.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/planner/calcite/FlinkTypeSystem.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/planner/calcite/FlinkTypeSystem.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/planner/calcite/FlinkTypeSystem.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/AdaptHiveFlinkParquetReaders.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/AdaptHiveFlinkParquetReaders.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/AdaptHiveFlinkParquetReaders.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/AdaptHiveFlinkParquetReaders.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/ArcticSource.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/ArcticSource.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/ArcticSource.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/ArcticSource.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/FlinkSplitPlanner.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/FlinkSplitPlanner.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/FlinkSplitPlanner.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/FlinkSplitPlanner.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/MixedIncrementalLoader.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/MixedIncrementalLoader.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/MixedIncrementalLoader.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/MixedIncrementalLoader.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/PartitionAndNodeGroup.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/PartitionAndNodeGroup.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/PartitionAndNodeGroup.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/PartitionAndNodeGroup.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/ShuffleSplitAssigner.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/ShuffleSplitAssigner.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/ShuffleSplitAssigner.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/ShuffleSplitAssigner.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/Split.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/Split.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/Split.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/Split.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/SplitAssigner.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/SplitAssigner.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/SplitAssigner.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/SplitAssigner.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/StaticSplitAssigner.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/StaticSplitAssigner.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/StaticSplitAssigner.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/assigner/StaticSplitAssigner.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/AbstractArcticEnumerator.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/AbstractArcticEnumerator.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/AbstractArcticEnumerator.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/AbstractArcticEnumerator.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticEnumeratorOffset.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticEnumeratorOffset.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticEnumeratorOffset.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticEnumeratorOffset.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticEnumeratorOffsetSerializer.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticEnumeratorOffsetSerializer.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticEnumeratorOffsetSerializer.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticEnumeratorOffsetSerializer.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticSourceEnumState.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticSourceEnumState.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticSourceEnumState.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticSourceEnumState.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticSourceEnumStateSerializer.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticSourceEnumStateSerializer.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticSourceEnumStateSerializer.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticSourceEnumStateSerializer.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticSourceEnumerator.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticSourceEnumerator.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticSourceEnumerator.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ArcticSourceEnumerator.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousEnumerationResult.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlanner.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/ContinuousSplitPlannerImpl.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/InitializationFinishedEvent.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/InitializationFinishedEvent.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/InitializationFinishedEvent.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/InitializationFinishedEvent.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadIncrementalPlanner.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/MergeOnReadPlannerImpl.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/StaticArcticSourceEnumerator.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/StaticArcticSourceEnumerator.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/StaticArcticSourceEnumerator.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/enumerator/StaticArcticSourceEnumerator.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArcticRecordEmitter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArcticRecordEmitter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArcticRecordEmitter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArcticRecordEmitter.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArcticRecordWithOffset.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArcticRecordWithOffset.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArcticRecordWithOffset.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArcticRecordWithOffset.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArcticSourceReader.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArcticSourceReader.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArcticSourceReader.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArcticSourceReader.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayBatchRecords.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayBatchRecords.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayBatchRecords.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayBatchRecords.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ArrayPoolDataIteratorBatcher.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorBatcher.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorBatcher.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorBatcher.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorBatcher.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorReaderFunction.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorReaderFunction.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorReaderFunction.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/DataIteratorReaderFunction.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/HybridSplitReader.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/HybridSplitReader.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/HybridSplitReader.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/HybridSplitReader.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderFunction.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderFunction.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderFunction.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderFunction.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderStartedEvent.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderStartedEvent.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderStartedEvent.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/ReaderStartedEvent.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordPosition.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordPosition.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordPosition.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RecordPosition.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataReaderFunction.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataReaderFunction.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataReaderFunction.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataReaderFunction.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataRecordFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataRecordFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataRecordFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/reader/RowDataRecordFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ArcticSplit.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ArcticSplit.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ArcticSplit.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ArcticSplit.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ArcticSplitSerializer.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ArcticSplitSerializer.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ArcticSplitSerializer.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ArcticSplitSerializer.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ArcticSplitState.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ArcticSplitState.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ArcticSplitState.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ArcticSplitState.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ChangelogSplit.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ChangelogSplit.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ChangelogSplit.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/ChangelogSplit.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MergeOnReadSplit.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MergeOnReadSplit.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MergeOnReadSplit.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/MergeOnReadSplit.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SnapshotSplit.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SnapshotSplit.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SnapshotSplit.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SnapshotSplit.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SplitRequestEvent.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SplitRequestEvent.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SplitRequestEvent.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/SplitRequestEvent.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/TemporalJoinSplits.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/TemporalJoinSplits.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/TemporalJoinSplits.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/hybrid/split/TemporalJoinSplits.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaPartitionSplitReader.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaPartitionSplitReader.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaPartitionSplitReader.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaPartitionSplitReader.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSource.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSource.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSource.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSource.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceFetcherManager.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceFetcherManager.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceFetcherManager.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceFetcherManager.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceReader.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceReader.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceReader.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSourceReader.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/metrics/KafkaConsumerMetricConstants.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/metrics/KafkaConsumerMetricConstants.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/metrics/KafkaConsumerMetricConstants.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/internals/metrics/KafkaConsumerMetricConstants.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/ArcticScanContext.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/ArcticScanContext.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/ArcticScanContext.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/ArcticScanContext.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/ChangeLogDataIterator.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/ChangeLogDataIterator.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/ChangeLogDataIterator.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/ChangeLogDataIterator.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/DataIterator.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/DataIterator.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/DataIterator.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/DataIterator.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/FileScanTaskReader.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/FileScanTaskReader.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/FileScanTaskReader.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/FileScanTaskReader.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkArcticDataReader.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkArcticDataReader.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkArcticDataReader.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkArcticDataReader.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkArcticMORDataReader.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkArcticMORDataReader.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkArcticMORDataReader.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/FlinkArcticMORDataReader.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/MergeOnReadDataIterator.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/MergeOnReadDataIterator.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/MergeOnReadDataIterator.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/MergeOnReadDataIterator.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/LogSourceHelper.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/LogSourceHelper.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/LogSourceHelper.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/LogSourceHelper.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplit.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplit.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplit.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplit.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitReader.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaPartitionSplitState.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaRecordEmitter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaRecordEmitter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaRecordEmitter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaRecordEmitter.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSource.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSource.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSource.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSource.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceBuilder.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceBuilder.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceBuilder.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceBuilder.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceReader.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceReader.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceReader.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogKafkaSourceReader.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogRecordWithRetractInfo.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogRecordWithRetractInfo.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogRecordWithRetractInfo.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/read/source/log/kafka/LogRecordWithRetractInfo.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ReadShuffleRulePolicy.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ReadShuffleRulePolicy.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ReadShuffleRulePolicy.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ReadShuffleRulePolicy.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/RoundRobinShuffleRulePolicy.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/RoundRobinShuffleRulePolicy.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/RoundRobinShuffleRulePolicy.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/RoundRobinShuffleRulePolicy.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleHelper.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleHelper.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleHelper.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleHelper.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleKey.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleKey.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleKey.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleKey.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleRulePolicy.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleRulePolicy.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleRulePolicy.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/shuffle/ShuffleRulePolicy.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/AmoroDynamicTableFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/AmoroDynamicTableFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/AmoroDynamicTableFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/AmoroDynamicTableFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticDynamicSink.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticDynamicSink.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticDynamicSink.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticDynamicSink.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticDynamicSource.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticDynamicSource.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticDynamicSource.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticDynamicSource.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticFileSource.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticFileSource.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticFileSource.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticFileSource.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticTableLoader.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticTableLoader.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticTableLoader.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/ArcticTableLoader.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/DynamicTableFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/DynamicTableFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/DynamicTableFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/DynamicTableFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/FlinkSource.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/FlinkSource.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/FlinkSource.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/FlinkSource.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/KafkaConnectorOptionsUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/KafkaConnectorOptionsUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/KafkaConnectorOptionsUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/KafkaConnectorOptionsUtil.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/LogDynamicSource.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/LogDynamicSource.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/LogDynamicSource.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/LogDynamicSource.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatOperatorFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatOperatorFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatOperatorFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatOperatorFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatSourceFunction.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatSourceFunction.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatSourceFunction.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/UnkeyedInputFormatSourceFunction.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/descriptors/ArcticValidator.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/descriptors/ArcticValidator.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/table/descriptors/ArcticValidator.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/table/descriptors/ArcticValidator.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/ArcticUtils.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/ArcticUtils.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/ArcticUtils.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/ArcticUtils.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/CompatibleFlinkPropertyUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/CompatibleFlinkPropertyUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/CompatibleFlinkPropertyUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/CompatibleFlinkPropertyUtil.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/DateTimeUtils.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/DateTimeUtils.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/DateTimeUtils.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/DateTimeUtils.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/FilterUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/FilterUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/FilterUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/FilterUtil.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/FlinkClassReflectionUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/FlinkClassReflectionUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/FlinkClassReflectionUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/FlinkClassReflectionUtil.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/IcebergAndFlinkFilters.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/IcebergAndFlinkFilters.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/IcebergAndFlinkFilters.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/IcebergAndFlinkFilters.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/IcebergClassUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/IcebergClassUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/IcebergClassUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/IcebergClassUtil.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/LookupUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/LookupUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/LookupUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/LookupUtil.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/Projection.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/Projection.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/Projection.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/Projection.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/ProxyUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/ProxyUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/ProxyUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/ProxyUtil.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/ReflectionUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/ReflectionUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/ReflectionUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/ReflectionUtil.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/ThreadLocalCache.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/ThreadLocalCache.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/util/ThreadLocalCache.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/util/ThreadLocalCache.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/AdaptHiveFlinkAppenderFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/AdaptHiveFlinkAppenderFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/AdaptHiveFlinkAppenderFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/AdaptHiveFlinkAppenderFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticFileWriter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticFileWriter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticFileWriter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticFileWriter.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticLogWriter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticLogWriter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticLogWriter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticLogWriter.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticRowDataTaskWriterFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticRowDataTaskWriterFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticRowDataTaskWriterFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticRowDataTaskWriterFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticWriter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticWriter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticWriter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/ArcticWriter.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticDoubleWriteStatus.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticDoubleWriteStatus.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticDoubleWriteStatus.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticDoubleWriteStatus.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticLogWriter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticLogWriter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticLogWriter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticLogWriter.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticWriteSpecification.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticWriteSpecification.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticWriteSpecification.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/AutomaticWriteSpecification.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkBaseTaskWriter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkBaseTaskWriter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkBaseTaskWriter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkBaseTaskWriter.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkChangeTaskWriter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkChangeTaskWriter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkChangeTaskWriter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkChangeTaskWriter.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkSink.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkSink.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkSink.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkSink.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkTaskWriterBuilder.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkTaskWriterBuilder.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkTaskWriterBuilder.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/FlinkTaskWriterBuilder.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/AbstractHiddenLogWriter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/AbstractHiddenLogWriter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/AbstractHiddenLogWriter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/AbstractHiddenLogWriter.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/ArcticLogPartitioner.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/ArcticLogPartitioner.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/ArcticLogPartitioner.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/ArcticLogPartitioner.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/GlobalFlipCommitter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/GlobalFlipCommitter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/GlobalFlipCommitter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/GlobalFlipCommitter.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/HiddenLogWriter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/HiddenLogWriter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/HiddenLogWriter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/HiddenLogWriter.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/LogMsgFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/LogMsgFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/LogMsgFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/LogMsgFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaFactory.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaFactory.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaFactory.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaFactory.java
diff --git a/mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaProducer.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaProducer.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaProducer.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/java/org/apache/amoro/flink/write/hidden/kafka/HiddenKafkaProducer.java
diff --git a/mixed-format/flink/flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
diff --git a/mixed-format/flink/flink-common/src/main/resources/log4j.properties b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/resources/log4j.properties
similarity index 100%
rename from mixed-format/flink/flink-common/src/main/resources/log4j.properties
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/main/resources/log4j.properties
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/DynamicTableSourceTestBase.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/DynamicTableSourceTestBase.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/DynamicTableSourceTestBase.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/DynamicTableSourceTestBase.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/FlinkTableTestBase.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/FlinkTableTestBase.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/FlinkTableTestBase.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/FlinkTableTestBase.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/FlinkTestBase.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/FlinkTestBase.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/FlinkTestBase.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/FlinkTestBase.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/TestFlinkSchemaUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/TestFlinkSchemaUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/TestFlinkSchemaUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/TestFlinkSchemaUtil.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkAmoroCatalogITCase.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkAmoroCatalogITCase.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkAmoroCatalogITCase.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkAmoroCatalogITCase.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkCatalogContext.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkCatalogContext.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkCatalogContext.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkCatalogContext.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalogITCase.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalogITCase.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalogITCase.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/FlinkUnifiedCatalogITCase.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/TestFlinkUnifiedCatalogs.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/TestFlinkUnifiedCatalogs.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/TestFlinkUnifiedCatalogs.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/TestFlinkUnifiedCatalogs.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalog.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalog.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalog.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalogTablePartitions.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalogTablePartitions.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalogTablePartitions.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/catalog/TestMixedCatalogTablePartitions.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaConfigGenerate.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaConfigGenerate.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaConfigGenerate.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaConfigGenerate.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaContainerTest.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaContainerTest.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaContainerTest.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaContainerTest.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/KafkaUtil.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/SuccessException.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/SuccessException.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/SuccessException.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/kafka/testutils/SuccessException.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/ByteArraySetSerializerTest.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/ByteArraySetSerializerTest.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/ByteArraySetSerializerTest.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/ByteArraySetSerializerTest.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/TestKVTable.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/TestKVTable.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/TestKVTable.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/TestKVTable.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateAllFieldTypes.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateBase.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateBase.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateBase.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateBase.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/lookup/filter/TestRowDataPredicateExpressionVisitor.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/TestArcticSource.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/TestArcticSource.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/TestArcticSource.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/TestArcticSource.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSource.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSource.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSource.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSource.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSplitPlanner.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSplitPlanner.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSplitPlanner.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/TestFlinkSplitPlanner.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaConsumer.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaConsumer.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaConsumer.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaConsumer.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaSourceReader.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaSourceReader.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaSourceReader.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestKafkaSourceReader.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hidden/kafka/TestLogKafkaPartitionSplitReader.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestShuffleSplitAssigner.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestSplitAssignerAwaiting.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestStaticSplitAssigner.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestStaticSplitAssigner.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestStaticSplitAssigner.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/assigner/TestStaticSplitAssigner.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestArcticSourceEnumStateSerializer.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestArcticSourceEnumStateSerializer.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestArcticSourceEnumStateSerializer.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestArcticSourceEnumStateSerializer.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestArcticSourceEnumerator.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestContinuousSplitPlannerImpl.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/enumerator/TestTemporalJoinSplitsThreadSafe.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/MixedIncrementalLoaderTest.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/TestRowDataReaderFunction.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/TestRowDataReaderFunction.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/TestRowDataReaderFunction.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/TestRowDataReaderFunction.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/split/TestArcticSplitSerializer.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/split/TestArcticSplitSerializer.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/split/TestArcticSplitSerializer.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/split/TestArcticSplitSerializer.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestLogRecordV1.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestLogRecordV1.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestLogRecordV1.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestLogRecordV1.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestRoundRobinShuffleRulePolicy.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestRoundRobinShuffleRulePolicy.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestRoundRobinShuffleRulePolicy.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/shuffle/TestRoundRobinShuffleRulePolicy.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/AmoroCatalogITCaseBase.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/AmoroCatalogITCaseBase.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/AmoroCatalogITCaseBase.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/AmoroCatalogITCaseBase.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/CatalogITCaseBase.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/CatalogITCaseBase.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/CatalogITCaseBase.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/CatalogITCaseBase.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/LookupITCase.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/LookupITCase.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/LookupITCase.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/LookupITCase.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestJoin.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestJoin.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestJoin.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestJoin.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestKeyed.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestKeyed.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestKeyed.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestKeyed.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestLookupSecondary.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestLookupSecondary.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestLookupSecondary.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestLookupSecondary.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestTableRefresh.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestTableRefresh.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestTableRefresh.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestTableRefresh.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyed.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyed.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyed.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyed.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyedOverwrite.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyedOverwrite.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyedOverwrite.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestUnkeyedOverwrite.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestWatermark.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestWatermark.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestWatermark.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/table/TestWatermark.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/ClassLoaderUtils.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/ClassLoaderUtils.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/ClassLoaderUtils.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/ClassLoaderUtils.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/DataUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/DataUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/DataUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/DataUtil.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/MockEnvironmentArctic.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/MockEnvironmentArctic.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/MockEnvironmentArctic.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/MockEnvironmentArctic.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/MockEnvironmentBuilder.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/MockEnvironmentBuilder.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/MockEnvironmentBuilder.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/MockEnvironmentBuilder.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestCompatibleFlinkPropertyUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestCompatibleFlinkPropertyUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestCompatibleFlinkPropertyUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestCompatibleFlinkPropertyUtil.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestGlobalAggregateManager.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestGlobalAggregateManager.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestGlobalAggregateManager.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestGlobalAggregateManager.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestOneInputStreamOperatorIntern.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestOneInputStreamOperatorIntern.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestOneInputStreamOperatorIntern.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestOneInputStreamOperatorIntern.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestProjection.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestProjection.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestProjection.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestProjection.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestUtil.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestUtil.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestUtil.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/util/TestUtil.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/ArcticFileWriterITCase.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/ArcticFileWriterITCase.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/ArcticFileWriterITCase.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/ArcticFileWriterITCase.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/FlinkTaskWriterBaseTest.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/FlinkTaskWriterBaseTest.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/FlinkTaskWriterBaseTest.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/FlinkTaskWriterBaseTest.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestAdaptHiveWriter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestAdaptHiveWriter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestAdaptHiveWriter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestAdaptHiveWriter.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestArcticFileCommitter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestArcticFileCommitter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestArcticFileCommitter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestArcticFileCommitter.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestArcticFileWriter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestArcticFileWriter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestArcticFileWriter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestArcticFileWriter.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticDoubleWriteStatus.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticDoubleWriteStatus.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticDoubleWriteStatus.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticDoubleWriteStatus.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticLogWriter.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticLogWriter.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticLogWriter.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestAutomaticLogWriter.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestFlinkSink.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestFlinkSink.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestFlinkSink.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/TestFlinkSink.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestBaseLog.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestBaseLog.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestBaseLog.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestBaseLog.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenKafkaProducer.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenKafkaProducer.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenKafkaProducer.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenKafkaProducer.java
diff --git a/mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenLogOperators.java b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenLogOperators.java
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenLogOperators.java
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/java/org/apache/amoro/flink/write/hidden/kafka/TestHiddenLogOperators.java
diff --git a/mixed-format/flink/flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory
diff --git a/mixed-format/flink/flink-common/src/test/resources/log4j2-test.xml b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/resources/log4j2-test.xml
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/resources/log4j2-test.xml
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/resources/log4j2-test.xml
diff --git a/mixed-format/flink/flink-common/src/test/resources/log4j2.component.properties b/amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/resources/log4j2.component.properties
similarity index 100%
rename from mixed-format/flink/flink-common/src/test/resources/log4j2.component.properties
rename to amoro-mixed-format/amoro-mixed-format-flink/flink-common/src/test/resources/log4j2.component.properties
diff --git a/mixed-format/flink/pom.xml b/amoro-mixed-format/amoro-mixed-format-flink/pom.xml
similarity index 100%
rename from mixed-format/flink/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-flink/pom.xml
diff --git a/mixed-format/flink/v1.15/flink-runtime/pom.xml b/amoro-mixed-format/amoro-mixed-format-flink/v1.15/flink-runtime/pom.xml
similarity index 100%
rename from mixed-format/flink/v1.15/flink-runtime/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-flink/v1.15/flink-runtime/pom.xml
diff --git a/mixed-format/flink/v1.15/flink/pom.xml b/amoro-mixed-format/amoro-mixed-format-flink/v1.15/flink/pom.xml
similarity index 100%
rename from mixed-format/flink/v1.15/flink/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-flink/v1.15/flink/pom.xml
diff --git a/mixed-format/flink/v1.16/flink-runtime/pom.xml b/amoro-mixed-format/amoro-mixed-format-flink/v1.16/flink-runtime/pom.xml
similarity index 100%
rename from mixed-format/flink/v1.16/flink-runtime/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-flink/v1.16/flink-runtime/pom.xml
diff --git a/mixed-format/flink/v1.16/flink/pom.xml b/amoro-mixed-format/amoro-mixed-format-flink/v1.16/flink/pom.xml
similarity index 100%
rename from mixed-format/flink/v1.16/flink/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-flink/v1.16/flink/pom.xml
diff --git a/mixed-format/flink/v1.17/flink-runtime/pom.xml b/amoro-mixed-format/amoro-mixed-format-flink/v1.17/flink-runtime/pom.xml
similarity index 100%
rename from mixed-format/flink/v1.17/flink-runtime/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-flink/v1.17/flink-runtime/pom.xml
diff --git a/mixed-format/flink/v1.17/flink/pom.xml b/amoro-mixed-format/amoro-mixed-format-flink/v1.17/flink/pom.xml
similarity index 100%
rename from mixed-format/flink/v1.17/flink/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-flink/v1.17/flink/pom.xml
diff --git a/mixed-format/hive/pom.xml b/amoro-mixed-format/amoro-mixed-format-hive/pom.xml
similarity index 100%
rename from mixed-format/hive/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-hive/pom.xml
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/ArcticHiveClientPool.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/ArcticHiveClientPool.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/ArcticHiveClientPool.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/ArcticHiveClientPool.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/CachedHiveClientPool.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/CachedHiveClientPool.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/CachedHiveClientPool.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/CachedHiveClientPool.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/HMSClient.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/HMSClient.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/HMSClient.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/HMSClient.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/HMSClientImpl.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/HMSClientImpl.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/HMSClientImpl.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/HMSClientImpl.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/HMSClientPool.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/HMSClientPool.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/HMSClientPool.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/HMSClientPool.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/catalog/ArcticHiveCatalog.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/catalog/ArcticHiveCatalog.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/catalog/ArcticHiveCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/catalog/ArcticHiveCatalog.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/catalog/MixedHiveTables.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/catalog/MixedHiveTables.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/catalog/MixedHiveTables.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/catalog/MixedHiveTables.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/exceptions/CannotAlterHiveLocationException.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/exceptions/CannotAlterHiveLocationException.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/exceptions/CannotAlterHiveLocationException.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/exceptions/CannotAlterHiveLocationException.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveKeyedDataReader.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AbstractAdaptHiveUnkeyedDataReader.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveArcticDeleteFilter.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveArcticDeleteFilter.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveArcticDeleteFilter.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveArcticDeleteFilter.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericKeyedDataReader.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericKeyedDataReader.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericKeyedDataReader.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericKeyedDataReader.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/reader/AdaptHiveGenericUnkeyedDataReader.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveGenericTaskWriterBuilder.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOperateToTableRelation.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOperateToTableRelation.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOperateToTableRelation.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOperateToTableRelation.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOutputFileFactory.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOutputFileFactory.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOutputFileFactory.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/AdaptHiveOutputFileFactory.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/io/writer/OperateToTableRelation.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/OperateToTableRelation.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/io/writer/OperateToTableRelation.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/io/writer/OperateToTableRelation.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/op/BaseSchemaUpdate.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/BaseSchemaUpdate.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/op/BaseSchemaUpdate.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/BaseSchemaUpdate.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/op/HiveOperationTransaction.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/HiveOperationTransaction.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/op/HiveOperationTransaction.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/HiveOperationTransaction.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/op/HiveSchemaUpdate.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/HiveSchemaUpdate.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/op/HiveSchemaUpdate.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/HiveSchemaUpdate.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/op/OverwriteHiveFiles.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/OverwriteHiveFiles.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/op/OverwriteHiveFiles.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/OverwriteHiveFiles.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/op/ReplaceHivePartitions.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/ReplaceHivePartitions.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/op/ReplaceHivePartitions.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/ReplaceHivePartitions.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/op/RewriteHiveFiles.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/RewriteHiveFiles.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/op/RewriteHiveFiles.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/RewriteHiveFiles.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/op/UpdateHiveFiles.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/UpdateHiveFiles.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/op/UpdateHiveFiles.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/op/UpdateHiveFiles.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatOptimizingDataReader.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatOptimizingDataReader.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatOptimizingDataReader.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatOptimizingDataReader.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutor.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutor.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutor.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutor.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutorFactory.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutorFactory.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutorFactory.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/optimizing/MixFormatRewriteExecutorFactory.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/table/HiveLocationKind.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/HiveLocationKind.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/table/HiveLocationKind.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/HiveLocationKind.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/table/KeyedHiveTable.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/KeyedHiveTable.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/table/KeyedHiveTable.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/KeyedHiveTable.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/table/SupportHive.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/SupportHive.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/table/SupportHive.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/SupportHive.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/table/UnkeyedHiveTable.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/UnkeyedHiveTable.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/table/UnkeyedHiveTable.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/table/UnkeyedHiveTable.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/CatalogUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/CatalogUtil.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/CatalogUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/CatalogUtil.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/ChangeFieldName.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/ChangeFieldName.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/ChangeFieldName.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/ChangeFieldName.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/CompatibleHivePropertyUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/CompatibleHivePropertyUtil.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/CompatibleHivePropertyUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/CompatibleHivePropertyUtil.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/HiveCommitUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveCommitUtil.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/HiveCommitUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveCommitUtil.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/HiveMetaSynchronizer.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveMetaSynchronizer.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/HiveMetaSynchronizer.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveMetaSynchronizer.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/HivePartitionUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HivePartitionUtil.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/HivePartitionUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HivePartitionUtil.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/HiveSchemaUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveSchemaUtil.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/HiveSchemaUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveSchemaUtil.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/HiveTableUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveTableUtil.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/HiveTableUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/HiveTableUtil.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/TableTypeUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/TableTypeUtil.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/TableTypeUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/TableTypeUtil.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/TimeUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/TimeUtil.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/TimeUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/TimeUtil.java
diff --git a/mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/UpgradeHiveTableUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/UpgradeHiveTableUtil.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/amoro/hive/utils/UpgradeHiveTableUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/amoro/hive/utils/UpgradeHiveTableUtil.java
diff --git a/mixed-format/hive/src/main/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionExpressionForMetastore.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionExpressionForMetastore.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionExpressionForMetastore.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionExpressionForMetastore.java
diff --git a/mixed-format/hive/src/main/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationPreEventListener.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationPreEventListener.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationPreEventListener.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationPreEventListener.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/IcebergSchemaUtil.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/AdaptHiveGenericAppenderFactory.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetReaders.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveBaseParquetWriter.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetReaders.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/data/parquet/AdaptHiveGenericParquetWriter.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveApplyNameMapping.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveColumnWriter.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquet.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetConversions.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetDictionaryRowGroupFilter.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetMetricsRowGroupFilter.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetReader.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetSchemaUtil.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetUtil.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveParquetWriter.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHivePrimitiveWriter.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveReadConf.java
diff --git a/mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java b/amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java
similarity index 100%
rename from mixed-format/hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/main/java/org/apache/iceberg/parquet/AdaptHiveTypeToMessageType.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/HMSMockServer.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/HMSMockServer.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/HMSMockServer.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/HMSMockServer.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/MixedHiveTableTestBase.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/MixedHiveTableTestBase.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/MixedHiveTableTestBase.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/MixedHiveTableTestBase.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/TestHMS.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/TestHMS.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/TestHMS.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/TestHMS.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/catalog/HiveCatalogTestHelper.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/HiveCatalogTestHelper.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/catalog/HiveCatalogTestHelper.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/HiveCatalogTestHelper.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/catalog/HiveTableTestHelper.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/HiveTableTestHelper.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/catalog/HiveTableTestHelper.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/HiveTableTestHelper.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/catalog/TestHiveCatalogLoader.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/TestHiveCatalogLoader.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/catalog/TestHiveCatalogLoader.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/TestHiveCatalogLoader.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/catalog/TestMixedHiveCatalog.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/TestMixedHiveCatalog.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/catalog/TestMixedHiveCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/catalog/TestMixedHiveCatalog.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/formats/IcebergHiveCatalogTestHelper.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/IcebergHiveCatalogTestHelper.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/formats/IcebergHiveCatalogTestHelper.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/IcebergHiveCatalogTestHelper.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/formats/MixedIcebergHiveCatalogTestHelper.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/MixedIcebergHiveCatalogTestHelper.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/formats/MixedIcebergHiveCatalogTestHelper.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/MixedIcebergHiveCatalogTestHelper.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/formats/PaimonHiveCatalogTestHelper.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/PaimonHiveCatalogTestHelper.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/formats/PaimonHiveCatalogTestHelper.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/PaimonHiveCatalogTestHelper.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/formats/TestIcebergHiveAmoroCatalog.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/TestIcebergHiveAmoroCatalog.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/formats/TestIcebergHiveAmoroCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/TestIcebergHiveAmoroCatalog.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/formats/TestMixedIcebergHiveAmoroCatalog.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/TestMixedIcebergHiveAmoroCatalog.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/formats/TestMixedIcebergHiveAmoroCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/TestMixedIcebergHiveAmoroCatalog.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/formats/TestPaimonHiveAmoroCatalog.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/TestPaimonHiveAmoroCatalog.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/formats/TestPaimonHiveAmoroCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/formats/TestPaimonHiveAmoroCatalog.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/io/HiveDataTestHelpers.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/HiveDataTestHelpers.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/io/HiveDataTestHelpers.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/HiveDataTestHelpers.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/io/TestHiveTableTrashManagers.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTableTrashManagers.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/io/TestHiveTableTrashManagers.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTableTrashManagers.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskReader.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskReader.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskReader.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskReader.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskWriter.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskWriter.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskWriter.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestHiveTaskWriter.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/io/TestImpalaParquet.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestImpalaParquet.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/io/TestImpalaParquet.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/io/TestImpalaParquet.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/op/TestHiveSchemaUpdate.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestHiveSchemaUpdate.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/op/TestHiveSchemaUpdate.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestHiveSchemaUpdate.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/op/TestOverwriteFiles.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestOverwriteFiles.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/op/TestOverwriteFiles.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestOverwriteFiles.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/op/TestRewriteFiles.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestRewriteFiles.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/op/TestRewriteFiles.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestRewriteFiles.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/op/TestRewritePartitions.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestRewritePartitions.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/op/TestRewritePartitions.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestRewritePartitions.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/op/TestSyncHiveMeta.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestSyncHiveMeta.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/op/TestSyncHiveMeta.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/TestSyncHiveMeta.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/op/UpdateHiveFilesTestHelpers.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/UpdateHiveFilesTestHelpers.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/op/UpdateHiveFilesTestHelpers.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/op/UpdateHiveFilesTestHelpers.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/utils/TestCompatibleHivePropertyUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestCompatibleHivePropertyUtil.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/utils/TestCompatibleHivePropertyUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestCompatibleHivePropertyUtil.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/utils/TestHiveMetaSynchronizer.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestHiveMetaSynchronizer.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/utils/TestHiveMetaSynchronizer.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestHiveMetaSynchronizer.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/utils/TestHiveSchemaUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestHiveSchemaUtil.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/utils/TestHiveSchemaUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestHiveSchemaUtil.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/utils/TestTimeUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestTimeUtil.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/utils/TestTimeUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestTimeUtil.java
diff --git a/mixed-format/hive/src/test/java/org/apache/amoro/hive/utils/TestUpgradeHiveTableUtil.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestUpgradeHiveTableUtil.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/amoro/hive/utils/TestUpgradeHiveTableUtil.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/amoro/hive/utils/TestUpgradeHiveTableUtil.java
diff --git a/mixed-format/hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java b/amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java
similarity index 100%
rename from mixed-format/hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/java/org/apache/iceberg/parquet/TestAdaptHiveReadConf.java
diff --git a/mixed-format/hive/src/test/resources/hive-schema-3.1.0.derby.sql b/amoro-mixed-format/amoro-mixed-format-hive/src/test/resources/hive-schema-3.1.0.derby.sql
similarity index 100%
rename from mixed-format/hive/src/test/resources/hive-schema-3.1.0.derby.sql
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/resources/hive-schema-3.1.0.derby.sql
diff --git a/mixed-format/hive/src/test/resources/hive.parquet b/amoro-mixed-format/amoro-mixed-format-hive/src/test/resources/hive.parquet
similarity index 100%
rename from mixed-format/hive/src/test/resources/hive.parquet
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/resources/hive.parquet
diff --git a/mixed-format/hive/src/test/resources/log4j2.xml b/amoro-mixed-format/amoro-mixed-format-hive/src/test/resources/log4j2.xml
similarity index 100%
rename from mixed-format/hive/src/test/resources/log4j2.xml
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/resources/log4j2.xml
diff --git a/mixed-format/hive/src/test/resources/string_is_bytes.parquet b/amoro-mixed-format/amoro-mixed-format-hive/src/test/resources/string_is_bytes.parquet
similarity index 100%
rename from mixed-format/hive/src/test/resources/string_is_bytes.parquet
rename to amoro-mixed-format/amoro-mixed-format-hive/src/test/resources/string_is_bytes.parquet
diff --git a/mixed-format/spark/common/pom.xml b/amoro-mixed-format/amoro-mixed-format-spark/common/pom.xml
similarity index 100%
rename from mixed-format/spark/common/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-spark/common/pom.xml
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/SessionCatalogBase.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/SessionCatalogBase.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/SessionCatalogBase.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/SessionCatalogBase.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/SparkTableFormat.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/SparkTableFormat.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/SparkTableFormat.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/SparkTableFormat.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalog.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogProperties.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogProperties.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogProperties.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/SparkUnifiedCatalogProperties.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/SparkUnifiedSessionCatalog.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/SupportAuthentication.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/SupportAuthentication.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/SupportAuthentication.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/SupportAuthentication.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/iceberg/IcebergSparkFormat.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/iceberg/IcebergSparkFormat.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/iceberg/IcebergSparkFormat.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/iceberg/IcebergSparkFormat.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/ArcticDataSource.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/ArcticDataSource.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/ArcticDataSource.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/ArcticDataSource.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedFormatSparkUtil.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedFormatSparkUtil.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedFormatSparkUtil.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedFormatSparkUtil.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveDataSource.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveDataSource.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveDataSource.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveDataSource.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveSparkFormat.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveSparkFormat.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveSparkFormat.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedHiveSparkFormat.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergDataSource.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergDataSource.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergDataSource.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergDataSource.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergSparkFormat.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergSparkFormat.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergSparkFormat.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedIcebergSparkFormat.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedSessionCatalogBase.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedSessionCatalogBase.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedSessionCatalogBase.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedSessionCatalogBase.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedSourceBase.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedSourceBase.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedSourceBase.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedSourceBase.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedSparkCatalogBase.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedSparkCatalogBase.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedSparkCatalogBase.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedSparkCatalogBase.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedTableStoreType.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedTableStoreType.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedTableStoreType.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/MixedTableStoreType.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/SparkSQLProperties.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/SparkSQLProperties.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/mixed/SparkSQLProperties.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/mixed/SparkSQLProperties.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/paimon/PaimonSparkFormat.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/paimon/PaimonSparkFormat.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/paimon/PaimonSparkFormat.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/paimon/PaimonSparkFormat.java
diff --git a/mixed-format/spark/common/src/main/java/org/apache/amoro/spark/util/SparkUtil.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/util/SparkUtil.java
similarity index 100%
rename from mixed-format/spark/common/src/main/java/org/apache/amoro/spark/util/SparkUtil.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/java/org/apache/amoro/spark/util/SparkUtil.java
diff --git a/mixed-format/spark/common/src/main/resources/META-INF/services/org.apache.amoro.spark.SparkTableFormat b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/resources/META-INF/services/org.apache.amoro.spark.SparkTableFormat
similarity index 100%
rename from mixed-format/spark/common/src/main/resources/META-INF/services/org.apache.amoro.spark.SparkTableFormat
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/resources/META-INF/services/org.apache.amoro.spark.SparkTableFormat
diff --git a/mixed-format/spark/common/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister b/amoro-mixed-format/amoro-mixed-format-spark/common/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
similarity index 100%
rename from mixed-format/spark/common/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/MixedTableTestBase.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/MixedTableTestBase.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/MixedTableTestBase.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/MixedTableTestBase.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/SparkTestBase.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/SparkTestBase.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/SparkTestBase.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/SparkTestBase.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/SparkTestContext.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/SparkTestContext.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/SparkTestContext.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/SparkTestContext.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/TestIdentifier.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/TestIdentifier.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/TestIdentifier.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/TestIdentifier.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/extensions/DefaultParameterContext.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/extensions/DefaultParameterContext.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/extensions/DefaultParameterContext.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/extensions/DefaultParameterContext.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/extensions/EachParameterResolver.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/extensions/EachParameterResolver.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/extensions/EachParameterResolver.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/extensions/EachParameterResolver.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelect.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelect.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelect.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelect.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelectExtension.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelectExtension.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelectExtension.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/extensions/EnableCatalogSelectExtension.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/unified/UnifiedCatalogTestSuites.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/unified/UnifiedCatalogTestSuites.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/unified/UnifiedCatalogTestSuites.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/unified/UnifiedCatalogTestSuites.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/Asserts.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/Asserts.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/Asserts.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/Asserts.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/DataComparator.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/DataComparator.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/DataComparator.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/DataComparator.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/ExpectResultUtil.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/ExpectResultUtil.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/ExpectResultUtil.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/ExpectResultUtil.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/RecordGenerator.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/RecordGenerator.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/RecordGenerator.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/RecordGenerator.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/ResourceInputFile.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/ResourceInputFile.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/ResourceInputFile.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/ResourceInputFile.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/ScalaTestUtil.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/ScalaTestUtil.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/ScalaTestUtil.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/ScalaTestUtil.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/TableFiles.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/TableFiles.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/TableFiles.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/TableFiles.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/TestTable.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/TestTable.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/TestTable.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/TestTable.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/TestTableUtil.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/TestTableUtil.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/TestTableUtil.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/TestTableUtil.java
diff --git a/mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/TestTables.java b/amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/TestTables.java
similarity index 100%
rename from mixed-format/spark/common/src/test/java/org/apache/amoro/spark/test/utils/TestTables.java
rename to amoro-mixed-format/amoro-mixed-format-spark/common/src/test/java/org/apache/amoro/spark/test/utils/TestTables.java
diff --git a/mixed-format/spark/pom.xml b/amoro-mixed-format/amoro-mixed-format-spark/pom.xml
similarity index 100%
rename from mixed-format/spark/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-spark/pom.xml
diff --git a/mixed-format/spark/v3.2/spark-runtime/pom.xml b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark-runtime/pom.xml
similarity index 100%
rename from mixed-format/spark/v3.2/spark-runtime/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark-runtime/pom.xml
diff --git a/mixed-format/spark/v3.2/spark/pom.xml b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/pom.xml
similarity index 100%
rename from mixed-format/spark/v3.2/spark/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/pom.xml
diff --git a/mixed-format/spark/v3.2/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlCommand.g4 b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlCommand.g4
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlCommand.g4
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlCommand.g4
diff --git a/mixed-format/spark/v3.2/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlExtend.g4 b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlExtend.g4
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlExtend.g4
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlExtend.g4
diff --git a/mixed-format/spark/v3.2/spark/src/main/gen-antlr/.gitignore b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/.gitignore
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/gen-antlr/.gitignore
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/.gitignore
diff --git a/mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseListener.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseListener.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseListener.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseListener.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseVisitor.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseVisitor.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseVisitor.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseVisitor.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandLexer.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandLexer.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandLexer.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandLexer.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandListener.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandListener.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandListener.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandListener.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandParser.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandParser.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandParser.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandParser.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandVisitor.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandVisitor.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandVisitor.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandVisitor.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseListener.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseListener.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseListener.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseListener.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseVisitor.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseVisitor.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseVisitor.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseVisitor.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendLexer.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendLexer.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendLexer.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendLexer.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendListener.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendListener.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendListener.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendListener.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendParser.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendParser.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendParser.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendParser.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendVisitor.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendVisitor.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendVisitor.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendVisitor.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/ArcticSparkCatalog.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/ArcticSparkCatalog.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/ArcticSparkCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/ArcticSparkCatalog.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/ArcticSparkSessionCatalog.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/ArcticSparkSessionCatalog.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/ArcticSparkSessionCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/ArcticSparkSessionCatalog.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/Spark32Adapter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/Spark32Adapter.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/Spark32Adapter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/Spark32Adapter.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkAdapter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkAdapter.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkAdapter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkAdapter.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/command/ArcticSparkCommand.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/command/ArcticSparkCommand.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/command/ArcticSparkCommand.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/command/ArcticSparkCommand.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/command/MigrateToArcticCommand.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/command/MigrateToArcticCommand.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/command/MigrateToArcticCommand.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/command/MigrateToArcticCommand.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkBaseTaskWriter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkBaseTaskWriter.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkBaseTaskWriter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkBaseTaskWriter.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkChangeTaskWriter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkChangeTaskWriter.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkChangeTaskWriter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkChangeTaskWriter.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/TaskWriters.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/TaskWriters.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/TaskWriters.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/TaskWriters.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkKeyedDataReader.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkKeyedDataReader.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkKeyedDataReader.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkKeyedDataReader.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkUnkeyedDataReader.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkUnkeyedDataReader.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkUnkeyedDataReader.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkUnkeyedDataReader.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/sql/catalyst/parser/ArcticCommandAstParser.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/sql/catalyst/parser/ArcticCommandAstParser.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/sql/catalyst/parser/ArcticCommandAstParser.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/sql/catalyst/parser/ArcticCommandAstParser.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/ArcticIcebergSparkTable.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/ArcticIcebergSparkTable.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/ArcticIcebergSparkTable.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/ArcticIcebergSparkTable.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkChangeTable.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkChangeTable.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkChangeTable.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkChangeTable.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkTable.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkTable.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkTable.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkTable.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/ArcticSparkUtils.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/ArcticSparkUtils.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/ArcticSparkUtils.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/ArcticSparkUtils.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/Stats.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/Stats.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/Stats.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/util/Stats.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/ArcticSparkWriteBuilder.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/ArcticSparkWriteBuilder.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/ArcticSparkWriteBuilder.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/ArcticSparkWriteBuilder.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/WriteMode.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/WriteMode.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/WriteMode.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/WriteMode.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/ArcticSparkExtensions.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/ArcticSparkExtensions.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/ArcticSparkExtensions.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/ArcticSparkExtensions.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/ArcticExtensionUtils.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/ArcticExtensionUtils.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/ArcticExtensionUtils.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/ArcticExtensionUtils.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveArcticCommand.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveArcticCommand.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveArcticCommand.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveArcticCommand.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticCommand.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticCommand.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticCommand.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticCommand.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticParserUtils.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticParserUtils.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticParserUtils.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticParserUtils.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoArcticTable.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoArcticTable.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoArcticTable.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoArcticTable.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateArcticTable.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateArcticTable.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateArcticTable.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateArcticTable.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/AlterArcticTableDropPartitionExec.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/AlterArcticTableDropPartitionExec.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/AlterArcticTableDropPartitionExec.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/AlterArcticTableDropPartitionExec.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticCommandExec.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticCommandExec.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticCommandExec.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticCommandExec.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticRowLevelWriteExec.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticRowLevelWriteExec.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticRowLevelWriteExec.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticRowLevelWriteExec.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedArcticStrategy.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedArcticStrategy.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedArcticStrategy.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedArcticStrategy.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateArcticTableExec.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateArcticTableExec.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateArcticTableExec.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateArcticTableExec.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ArcticRewriteHelper.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ArcticRewriteHelper.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ArcticRewriteHelper.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ArcticRewriteHelper.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ArcticSpark32Helper.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ArcticSpark32Helper.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ArcticSpark32Helper.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ArcticSpark32Helper.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/parser/ArcticSqlExtendAstBuilder.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/parser/ArcticSqlExtendAstBuilder.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/parser/ArcticSqlExtendAstBuilder.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/parser/ArcticSqlExtendAstBuilder.scala
diff --git a/mixed-format/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticCommandSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticCommandSQL.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticCommandSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticCommandSQL.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticSessionCatalog.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticSessionCatalog.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticSessionCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticSessionCatalog.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java
diff --git a/mixed-format/spark/v3.2/spark/src/test/resources/log4j2.properties b/amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/resources/log4j2.properties
similarity index 100%
rename from mixed-format/spark/v3.2/spark/src/test/resources/log4j2.properties
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.2/spark/src/test/resources/log4j2.properties
diff --git a/mixed-format/spark/v3.3/spark-runtime/pom.xml b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark-runtime/pom.xml
similarity index 100%
rename from mixed-format/spark/v3.3/spark-runtime/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark-runtime/pom.xml
diff --git a/mixed-format/spark/v3.3/spark/pom.xml b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/pom.xml
similarity index 100%
rename from mixed-format/spark/v3.3/spark/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/pom.xml
diff --git a/mixed-format/spark/v3.3/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlCommand.g4 b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlCommand.g4
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlCommand.g4
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlCommand.g4
diff --git a/mixed-format/spark/v3.3/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlExtend.g4 b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlExtend.g4
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlExtend.g4
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/antlr4/org/apache/amoro/spark/sql/parser/ArcticSqlExtend.g4
diff --git a/mixed-format/spark/v3.3/spark/src/main/gen-antlr/.gitignore b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/.gitignore
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/gen-antlr/.gitignore
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/.gitignore
diff --git a/mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseListener.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseListener.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseListener.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseListener.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseVisitor.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseVisitor.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseVisitor.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandBaseVisitor.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandLexer.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandLexer.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandLexer.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandLexer.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandListener.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandListener.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandListener.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandListener.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandParser.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandParser.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandParser.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandParser.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandVisitor.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandVisitor.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandVisitor.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlCommandVisitor.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseListener.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseListener.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseListener.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseListener.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseVisitor.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseVisitor.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseVisitor.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendBaseVisitor.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendLexer.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendLexer.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendLexer.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendLexer.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendListener.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendListener.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendListener.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendListener.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendParser.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendParser.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendParser.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendParser.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendVisitor.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendVisitor.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendVisitor.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/gen-antlr/org/apache/amoro/spark/sql/parser/ArcticSqlExtendVisitor.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/ArcticSparkCatalog.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/ArcticSparkCatalog.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/ArcticSparkCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/ArcticSparkCatalog.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/ArcticSparkSessionCatalog.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/ArcticSparkSessionCatalog.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/ArcticSparkSessionCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/ArcticSparkSessionCatalog.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/Spark33Adapter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/Spark33Adapter.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/Spark33Adapter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/Spark33Adapter.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkAdapter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkAdapter.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkAdapter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkAdapter.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkAdapterLoader.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/SparkInternalRowWrapper.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/command/ArcticSparkCommand.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/command/ArcticSparkCommand.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/command/ArcticSparkCommand.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/command/ArcticSparkCommand.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/command/MigrateToArcticCommand.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/command/MigrateToArcticCommand.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/command/MigrateToArcticCommand.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/command/MigrateToArcticCommand.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkBaseTaskWriter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkBaseTaskWriter.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkBaseTaskWriter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkBaseTaskWriter.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkChangeTaskWriter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkChangeTaskWriter.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkChangeTaskWriter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/ArcticSparkChangeTaskWriter.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/InternalRowFileAppenderFactory.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/TaskWriters.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/TaskWriters.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/TaskWriters.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/TaskWriters.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/io/UnkeyedUpsertSparkWriter.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkKeyedDataReader.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkKeyedDataReader.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkKeyedDataReader.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkKeyedDataReader.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkUnkeyedDataReader.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkUnkeyedDataReader.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkUnkeyedDataReader.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/ArcticSparkUnkeyedDataReader.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/SparkParquetReaders.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/SparkScanBuilder.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/sql/catalyst/parser/ArcticCommandAstParser.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/sql/catalyst/parser/ArcticCommandAstParser.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/sql/catalyst/parser/ArcticCommandAstParser.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/sql/catalyst/parser/ArcticCommandAstParser.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/sql/connector/expressions/FileIndexBucket.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/ArcticIcebergSparkTable.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/ArcticIcebergSparkTable.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/ArcticIcebergSparkTable.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/ArcticIcebergSparkTable.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkChangeTable.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkChangeTable.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkChangeTable.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkChangeTable.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkTable.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkTable.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkTable.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkTable.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/SupportsExtendIdentColumns.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/SupportsRowLevelOperator.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/ArcticSparkUtils.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/ArcticSparkUtils.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/ArcticSparkUtils.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/ArcticSparkUtils.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/DistributionAndOrderingUtil.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/ExpressionHelper.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/SortOrderToSpark.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/Stats.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/Stats.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/Stats.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/util/Stats.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/ArcticSparkWriteBuilder.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/ArcticSparkWriteBuilder.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/ArcticSparkWriteBuilder.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/ArcticSparkWriteBuilder.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/KeyedSparkBatchWrite.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/RowLevelWriter.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/SimpleInternalRowDataWriter.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/SimpleRowLevelDataWriter.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/UnkeyedSparkBatchWrite.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/WriteMode.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/WriteMode.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/WriteMode.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/WriteMode.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/amoro/spark/writer/WriteTaskCommit.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveParquetWithSparkSchemaVisitor.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/data/AdaptHiveSparkParquetWriters.java
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/ArcticSparkExtensions.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/ArcticSparkExtensions.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/ArcticSparkExtensions.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/ArcticSparkExtensions.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/SupportSparkAdapter.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/ArcticExtensionUtils.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/ArcticExtensionUtils.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/ArcticExtensionUtils.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/ArcticExtensionUtils.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/QueryWithConstraintCheck.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveArcticCommand.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveArcticCommand.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveArcticCommand.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveArcticCommand.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/ResolveMergeIntoArcticTableReferences.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticCommand.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticCommand.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticCommand.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticCommand.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/analysis/RewriteArcticMergeIntoTable.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/OptimizeWriteRule.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteAppendArcticTable.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteDeleteFromArcticTable.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/optimize/RewriteUpdateArcticTable.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticParserUtils.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticParserUtils.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticParserUtils.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticParserUtils.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/parser/ArcticSqlExtensionsParser.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/AlterArcticTableDropPartition.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/ArcticRowLevelWrite.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoArcticTable.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoArcticTable.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoArcticTable.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeIntoArcticTable.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/MergeRows.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/QueryWithConstraintCheckPlan.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateArcticTable.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateArcticTable.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateArcticTable.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/TruncateArcticTable.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/UnresolvedMergeIntoArcticTable.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/logicals.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/catalyst/plans/statements.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/AlterArcticTableDropPartitionExec.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/AlterArcticTableDropPartitionExec.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/AlterArcticTableDropPartitionExec.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/AlterArcticTableDropPartitionExec.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticCommandExec.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticCommandExec.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticCommandExec.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticCommandExec.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticRowLevelWriteExec.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticRowLevelWriteExec.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticRowLevelWriteExec.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ArcticRowLevelWriteExec.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/DescribeKeyedTableExec.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedArcticStrategy.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedArcticStrategy.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedArcticStrategy.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/ExtendedArcticStrategy.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/MergeRowsExec.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/QueryWithConstraintCheckExec.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateArcticTableExec.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateArcticTableExec.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateArcticTableExec.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/execution/TruncateArcticTableExec.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ArcticRewriteHelper.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ArcticRewriteHelper.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ArcticRewriteHelper.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ArcticRewriteHelper.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/ProjectingInternalRow.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/RowDeltaUtils.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/WriteQueryProjections.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/amoro/spark/sql/utils/expressions.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ArcticSpark33Helper.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ArcticSpark33Helper.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ArcticSpark33Helper.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ArcticSpark33Helper.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/AssignmentHelper.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/AssignmentHelper.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/AssignmentHelper.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/AssignmentHelper.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/catalyst/ExpressionHelper.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/parser/ArcticSqlExtendAstBuilder.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/parser/ArcticSqlExtendAstBuilder.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/parser/ArcticSqlExtendAstBuilder.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/parser/ArcticSqlExtendAstBuilder.scala
diff --git a/mixed-format/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/main/scala/org/apache/spark/sql/amoro/parser/QueryParsingErrors.scala
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/TestUnifiedCatalog.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/TestImpalaParquet.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestKeyedTableDataFrameAPI.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/api/TestUnKeyedTableDataFrameAPI.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/catalog/TestSessionCatalog.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestAlterTableColumnSQL.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticCommandSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticCommandSQL.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticCommandSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticCommandSQL.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticSessionCatalog.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticSessionCatalog.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticSessionCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestArcticSessionCatalog.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableAsSelect.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableLikeSQL.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestCreateTableSQL.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDeleteFromSQL.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDescSQL.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestDropPartitionSQL.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertIntoSQL.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestInsertOverwriteSQL.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestMergeIntoSQL.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestSelectSQL.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestTruncateSQL.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/sql/TestUpdateSQL.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/test/suites/ut/sql/parser/TestSqlExtendParser.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/java/org/apache/amoro/spark/writer/TestMixedWriter.java
diff --git a/mixed-format/spark/v3.3/spark/src/test/resources/log4j2.properties b/amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/resources/log4j2.properties
similarity index 100%
rename from mixed-format/spark/v3.3/spark/src/test/resources/log4j2.properties
rename to amoro-mixed-format/amoro-mixed-format-spark/v3.3/spark/src/test/resources/log4j2.properties
diff --git a/mixed-format/trino/assembly.xml b/amoro-mixed-format/amoro-mixed-format-trino/assembly.xml
similarity index 100%
rename from mixed-format/trino/assembly.xml
rename to amoro-mixed-format/amoro-mixed-format-trino/assembly.xml
diff --git a/mixed-format/trino/pom.xml b/amoro-mixed-format/amoro-mixed-format-trino/pom.xml
similarity index 100%
rename from mixed-format/trino/pom.xml
rename to amoro-mixed-format/amoro-mixed-format-trino/pom.xml
diff --git a/mixed-format/trino/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java
similarity index 100%
rename from mixed-format/trino/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/io/trino/parquet/reader/ColumnReaderFactory.java
diff --git a/mixed-format/trino/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java
similarity index 100%
rename from mixed-format/trino/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/io/trino/parquet/reader/TimestampColumnReader.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticCatalogFactory.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticCatalogFactory.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticCatalogFactory.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticCatalogFactory.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticCatalogSupportTableSuffix.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticCatalogSupportTableSuffix.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticCatalogSupportTableSuffix.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticCatalogSupportTableSuffix.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticConfig.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticConfig.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticConfig.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticConfig.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticConnector.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticConnector.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticConnector.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticConnector.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticConnectorFactory.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticConnectorFactory.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticConnectorFactory.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticConnectorFactory.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticConnectorMetadata.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticConnectorMetadata.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticConnectorMetadata.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticConnectorMetadata.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticConnectorSplitManager.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticConnectorSplitManager.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticConnectorSplitManager.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticConnectorSplitManager.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticErrorCode.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticErrorCode.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticErrorCode.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticErrorCode.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticHadoopAuthentication.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticHadoopAuthentication.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticHadoopAuthentication.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticHadoopAuthentication.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticHdfsAuthentication.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticHdfsAuthentication.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticHdfsAuthentication.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticHdfsAuthentication.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticHdfsConfiguration.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticHdfsConfiguration.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticHdfsConfiguration.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticHdfsConfiguration.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticMetadataFactory.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticMetadataFactory.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticMetadataFactory.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticMetadataFactory.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticModule.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticModule.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticModule.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticModule.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticPageSourceProvider.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticPageSourceProvider.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticPageSourceProvider.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticPageSourceProvider.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticPlugin.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticPlugin.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticPlugin.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticPlugin.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticSessionProperties.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticSessionProperties.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticSessionProperties.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticSessionProperties.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticTransactionManager.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticTransactionManager.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/ArcticTransactionManager.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/ArcticTransactionManager.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/DefaultArcticCatalogFactory.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/DefaultArcticCatalogFactory.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/DefaultArcticCatalogFactory.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/DefaultArcticCatalogFactory.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/TableNameResolve.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/TableNameResolve.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/TableNameResolve.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/TableNameResolve.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/delete/DummyFileScanTask.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/delete/DummyFileScanTask.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/delete/DummyFileScanTask.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/delete/DummyFileScanTask.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/delete/TrinoDeleteFile.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/delete/TrinoDeleteFile.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/delete/TrinoDeleteFile.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/delete/TrinoDeleteFile.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/delete/TrinoRow.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/delete/TrinoRow.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/delete/TrinoRow.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/delete/TrinoRow.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorMetadata.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorMetadata.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorMetadata.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorMetadata.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorPageSource.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorPageSource.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorPageSource.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorPageSource.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplit.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplit.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplit.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplit.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplitManager.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplitManager.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplitManager.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplitManager.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/keyed/KeyedDeleteFilter.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedDeleteFilter.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/keyed/KeyedDeleteFilter.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedDeleteFilter.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/keyed/KeyedPageSourceProvider.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedPageSourceProvider.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/keyed/KeyedPageSourceProvider.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedPageSourceProvider.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/keyed/KeyedTableHandle.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedTableHandle.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/keyed/KeyedTableHandle.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedTableHandle.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/AdaptHiveIcebergTableHandle.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/AdaptHiveIcebergTableHandle.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/AdaptHiveIcebergTableHandle.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/AdaptHiveIcebergTableHandle.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/ArcticTrinoCatalog.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/ArcticTrinoCatalog.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/ArcticTrinoCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/ArcticTrinoCatalog.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/ArcticTrinoCatalogFactory.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/ArcticTrinoCatalogFactory.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/ArcticTrinoCatalogFactory.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/ArcticTrinoCatalogFactory.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergMetadata.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergMetadata.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergMetadata.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergMetadata.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSource.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSource.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSource.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSource.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSourceProvider.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSourceProvider.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSourceProvider.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergPageSourceProvider.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplit.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplit.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplit.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplit.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitManager.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitManager.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitManager.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitManager.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitSource.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitSource.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitSource.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/IcebergSplitSource.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/TrinoDeleteFilter.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/TrinoDeleteFilter.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/unkeyed/TrinoDeleteFilter.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/TrinoDeleteFilter.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/util/MetricUtil.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/util/MetricUtil.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/util/MetricUtil.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/util/MetricUtil.java
diff --git a/mixed-format/trino/src/main/java/org/apache/amoro/trino/util/ObjectSerializerUtil.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/util/ObjectSerializerUtil.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/amoro/trino/util/ObjectSerializerUtil.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/util/ObjectSerializerUtil.java
diff --git a/mixed-format/trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
diff --git a/mixed-format/trino/src/main/java/org/apache/hadoop/util/VersionInfo.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/hadoop/util/VersionInfo.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/hadoop/util/VersionInfo.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/hadoop/util/VersionInfo.java
diff --git a/mixed-format/trino/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java
diff --git a/mixed-format/trino/src/main/java/org/apache/parquet/io/ColumnIOUtil.java b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/parquet/io/ColumnIOUtil.java
similarity index 100%
rename from mixed-format/trino/src/main/java/org/apache/parquet/io/ColumnIOUtil.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/parquet/io/ColumnIOUtil.java
diff --git a/mixed-format/trino/src/main/resources/META-INF/services/io.trino.spi.Plugin b/amoro-mixed-format/amoro-mixed-format-trino/src/main/resources/META-INF/services/io.trino.spi.Plugin
similarity index 100%
rename from mixed-format/trino/src/main/resources/META-INF/services/io.trino.spi.Plugin
rename to amoro-mixed-format/amoro-mixed-format-trino/src/main/resources/META-INF/services/io.trino.spi.Plugin
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/ArcticQueryRunner.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/ArcticQueryRunner.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/ArcticQueryRunner.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/ArcticQueryRunner.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/ArcticQueryRunnerForClient.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/ArcticQueryRunnerForClient.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/ArcticQueryRunnerForClient.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/ArcticQueryRunnerForClient.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/BaseConnectorTest.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/BaseConnectorTest.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/BaseConnectorTest.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/BaseConnectorTest.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/SchemaInitializer.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/SchemaInitializer.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/SchemaInitializer.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/SchemaInitializer.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticCatalogFactory.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticCatalogFactory.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticCatalogFactory.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticCatalogFactory.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticConnectorFactory.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticConnectorFactory.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticConnectorFactory.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticConnectorFactory.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticPlugin.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticPlugin.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticPlugin.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticPlugin.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticTable.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticTable.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticTable.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestArcticTable.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestBaseArcticConnectorTest.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestBaseArcticConnectorTest.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestBaseArcticConnectorTest.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestBaseArcticConnectorTest.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestBasicArcticCatalog.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestBasicArcticCatalog.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestBasicArcticCatalog.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestBasicArcticCatalog.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestOnServerArcticConnectorTest.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestOnServerArcticConnectorTest.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestOnServerArcticConnectorTest.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestOnServerArcticConnectorTest.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestUnionModule.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestUnionModule.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/iceberg/TestUnionModule.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestUnionModule.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/mixed/ArcticQueryRunner.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/ArcticQueryRunner.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/mixed/ArcticQueryRunner.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/ArcticQueryRunner.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/mixed/HiveTestRecords.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/HiveTestRecords.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/mixed/HiveTestRecords.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/HiveTestRecords.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseForTrino.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseForTrino.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseForTrino.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseForTrino.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseWithInitDataForTrino.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseWithInitDataForTrino.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseWithInitDataForTrino.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TableTestBaseWithInitDataForTrino.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/mixed/TestBaseArcticPrimaryTable.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TestBaseArcticPrimaryTable.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/mixed/TestBaseArcticPrimaryTable.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TestBaseArcticPrimaryTable.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTable.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTable.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTable.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTable.java
diff --git a/mixed-format/trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTableBaseForTrino.java b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTableBaseForTrino.java
similarity index 100%
rename from mixed-format/trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTableBaseForTrino.java
rename to amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/mixed/TestHiveTableBaseForTrino.java
diff --git a/mixed-format/pom.xml b/amoro-mixed-format/pom.xml
similarity index 87%
rename from mixed-format/pom.xml
rename to amoro-mixed-format/pom.xml
index e1f498460..a7d5f6dc8 100644
--- a/mixed-format/pom.xml
+++ b/amoro-mixed-format/pom.xml
@@ -35,10 +35,10 @@
     <url>https://amoro.apache.org</url>
 
     <modules>
-        <module>flink</module>
-        <module>spark</module>
-        <module>hive</module>
-        <module>trino</module>
+        <module>amoro-mixed-format-flink</module>
+        <module>amoro-mixed-format-spark</module>
+        <module>amoro-mixed-format-hive</module>
+        <module>amoro-mixed-format-trino</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 650a30f3a..27b73d721 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,9 +39,9 @@
     </licenses>
 
     <modules>
-        <module>core</module>
-        <module>ams</module>
-        <module>mixed-format</module>
+        <module>amoro-core</module>
+        <module>amoro-ams</module>
+        <module>amoro-mixed-format</module>
     </modules>
 
     <scm>