You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/07/22 10:54:27 UTC

[incubator-iotdb] branch rename_iotdb_module created (now 30978e5)

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

qiaojialin pushed a change to branch rename_iotdb_module
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


      at 30978e5  rename iotdb module to iotdb-server

This branch includes the following new commits:

     new 30978e5  rename iotdb module to iotdb-server

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[incubator-iotdb] 01/01: rename iotdb module to iotdb-server

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch rename_iotdb_module
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 30978e503819afd47578fbb4a0bb42d67b980eba
Author: qiaojialin <64...@qq.com>
AuthorDate: Mon Jul 22 18:54:14 2019 +0800

    rename iotdb module to iotdb-server
---
 {iotdb => iotdb-server}/iotdb/conf/iotdb-engine.properties     | 10 +++++-----
 {iotdb => iotdb-server}/iotdb/conf/iotdb-env.bat               |  0
 {iotdb => iotdb-server}/iotdb/conf/iotdb-env.sh                |  0
 .../iotdb/conf/iotdb-sync-client.properties                    |  0
 {iotdb => iotdb-server}/iotdb/conf/logback-tool.xml            |  0
 {iotdb => iotdb-server}/iotdb/conf/logback.xml                 |  0
 {iotdb => iotdb-server}/iotdb/conf/tsfile-format.properties    |  0
 {iotdb => iotdb-server}/iotdb/sbin/start-server.bat            |  0
 {iotdb => iotdb-server}/iotdb/sbin/start-server.sh             |  0
 {iotdb => iotdb-server}/iotdb/sbin/stop-server.bat             |  0
 {iotdb => iotdb-server}/iotdb/sbin/stop-server.sh              |  0
 {iotdb => iotdb-server}/iotdb/tools/memory-tool.bat            |  0
 {iotdb => iotdb-server}/iotdb/tools/memory-tool.sh             |  0
 {iotdb => iotdb-server}/iotdb/tools/start-WalChecker.bat       |  0
 {iotdb => iotdb-server}/iotdb/tools/start-WalChecker.sh        |  0
 {iotdb => iotdb-server}/iotdb/tools/start-sync-client.bat      |  0
 {iotdb => iotdb-server}/iotdb/tools/start-sync-client.sh       |  0
 {iotdb => iotdb-server}/iotdb/tools/stop-sync-client.bat       |  0
 {iotdb => iotdb-server}/iotdb/tools/stop-sync-client.sh        |  0
 {iotdb => iotdb-server}/pom.xml                                |  4 ++--
 .../src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g    |  0
 .../src/main/antlr3/org/apache/iotdb/db/sql/parse/TSParser.g   |  0
 .../src/main/java/org/apache/iotdb/db/auth/AuthException.java  |  0
 .../main/java/org/apache/iotdb/db/auth/AuthorityChecker.java   |  0
 .../org/apache/iotdb/db/auth/authorizer/BasicAuthorizer.java   |  0
 .../java/org/apache/iotdb/db/auth/authorizer/IAuthorizer.java  |  0
 .../apache/iotdb/db/auth/authorizer/LocalFileAuthorizer.java   |  0
 .../java/org/apache/iotdb/db/auth/entity/PathPrivilege.java    |  0
 .../java/org/apache/iotdb/db/auth/entity/PrivilegeType.java    |  0
 .../src/main/java/org/apache/iotdb/db/auth/entity/Role.java    |  0
 .../src/main/java/org/apache/iotdb/db/auth/entity/User.java    |  0
 .../java/org/apache/iotdb/db/auth/role/BasicRoleManager.java   |  0
 .../main/java/org/apache/iotdb/db/auth/role/IRoleAccessor.java |  0
 .../main/java/org/apache/iotdb/db/auth/role/IRoleManager.java  |  0
 .../org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java   |  0
 .../org/apache/iotdb/db/auth/role/LocalFileRoleManager.java    |  0
 .../java/org/apache/iotdb/db/auth/user/BasicUserManager.java   |  0
 .../main/java/org/apache/iotdb/db/auth/user/IUserAccessor.java |  0
 .../main/java/org/apache/iotdb/db/auth/user/IUserManager.java  |  0
 .../org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java   |  0
 .../org/apache/iotdb/db/auth/user/LocalFileUserManager.java    |  0
 .../src/main/java/org/apache/iotdb/db/concurrent/HashLock.java |  0
 .../db/concurrent/IoTDBDefaultThreadExceptionHandler.java      |  0
 .../org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactory.java |  0
 .../java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java  |  0
 .../main/java/org/apache/iotdb/db/concurrent/ThreadName.java   |  0
 .../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java    |  0
 .../src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java  |  0
 .../main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java    |  0
 .../org/apache/iotdb/db/conf/adapter/CompressionRatio.java     |  0
 .../java/org/apache/iotdb/db/conf/adapter/IDynamicAdapter.java |  0
 .../iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java       |  0
 .../org/apache/iotdb/db/conf/directories/DirectoryManager.java |  0
 .../iotdb/db/conf/directories/strategy/DirectoryStrategy.java  |  0
 .../directories/strategy/MaxDiskUsableSpaceFirstStrategy.java  |  0
 .../strategy/MinFolderOccupiedSpaceFirstStrategy.java          |  0
 .../iotdb/db/conf/directories/strategy/SequenceStrategy.java   |  0
 .../iotdb/db/cost/statistic/ConcurrentCircularArray.java       |  0
 .../java/org/apache/iotdb/db/cost/statistic/Measurement.java   |  0
 .../org/apache/iotdb/db/cost/statistic/MeasurementMBean.java   |  0
 .../java/org/apache/iotdb/db/cost/statistic/Operation.java     |  0
 .../main/java/org/apache/iotdb/db/engine/StorageEngine.java    |  0
 .../org/apache/iotdb/db/engine/cache/DeviceMetaDataCache.java  |  0
 .../org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java  |  0
 .../org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java  |  0
 .../org/apache/iotdb/db/engine/memtable/AbstractMemTable.java  |  0
 .../org/apache/iotdb/db/engine/memtable/ChunkBufferPool.java   |  0
 .../java/org/apache/iotdb/db/engine/memtable/IMemTable.java    |  0
 .../org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java |  0
 .../apache/iotdb/db/engine/memtable/MemSeriesLazyMerger.java   |  0
 .../org/apache/iotdb/db/engine/memtable/MemTableFlushTask.java |  0
 .../apache/iotdb/db/engine/memtable/NotifyFlushMemTable.java   |  0
 .../org/apache/iotdb/db/engine/memtable/PrimitiveMemTable.java |  0
 .../iotdb/db/engine/memtable/TimeValuePairInMemTable.java      |  0
 .../apache/iotdb/db/engine/memtable/TimeValuePairSorter.java   |  0
 .../org/apache/iotdb/db/engine/memtable/WritableMemChunk.java  |  0
 .../java/org/apache/iotdb/db/engine/modification/Deletion.java |  0
 .../org/apache/iotdb/db/engine/modification/Modification.java  |  0
 .../apache/iotdb/db/engine/modification/ModificationFile.java  |  0
 .../engine/modification/io/LocalTextModificationAccessor.java  |  0
 .../iotdb/db/engine/modification/io/ModificationReader.java    |  0
 .../iotdb/db/engine/modification/io/ModificationWriter.java    |  0
 .../org/apache/iotdb/db/engine/modification/package-info.java  |  0
 .../java/org/apache/iotdb/db/engine/pool/FlushPoolManager.java |  0
 .../apache/iotdb/db/engine/pool/FlushSubTaskPoolManager.java   |  0
 .../apache/iotdb/db/engine/querycontext/QueryDataSource.java   |  0
 .../apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java  |  0
 .../org/apache/iotdb/db/engine/storagegroup/FlushManager.java  |  0
 .../iotdb/db/engine/storagegroup/StorageGroupProcessor.java    |  0
 .../apache/iotdb/db/engine/storagegroup/TsFileProcessor.java   |  0
 .../apache/iotdb/db/engine/storagegroup/TsFileResource.java    |  0
 .../iotdb/db/engine/version/SimpleFileVersionController.java   |  0
 .../iotdb/db/engine/version/SysTimeVersionController.java      |  0
 .../org/apache/iotdb/db/engine/version/VersionController.java  |  0
 .../java/org/apache/iotdb/db/exception/ArgsErrorException.java |  0
 .../org/apache/iotdb/db/exception/ConfigAdjusterException.java |  0
 .../apache/iotdb/db/exception/DeltaEngineRunningException.java |  0
 .../iotdb/db/exception/DiskSpaceInsufficientException.java     |  0
 .../org/apache/iotdb/db/exception/FlushRunTimeException.java   |  0
 .../org/apache/iotdb/db/exception/MetadataErrorException.java  |  0
 .../java/org/apache/iotdb/db/exception/PathErrorException.java |  0
 .../java/org/apache/iotdb/db/exception/ProcessorException.java |  0
 .../apache/iotdb/db/exception/QueryInBatchStmtException.java   |  0
 .../java/org/apache/iotdb/db/exception/StartupException.java   |  0
 .../org/apache/iotdb/db/exception/StorageEngineException.java  |  0
 .../iotdb/db/exception/StorageEngineFailureException.java      |  0
 .../iotdb/db/exception/StorageGroupProcessorException.java     |  0
 .../org/apache/iotdb/db/exception/SyncConnectionException.java |  0
 .../java/org/apache/iotdb/db/exception/SysCheckException.java  |  0
 .../apache/iotdb/db/exception/TsFileProcessorException.java    |  0
 .../iotdb/db/exception/UnSupportedFillTypeException.java       |  0
 .../iotdb/db/exception/qp/IllegalASTFormatException.java       |  0
 .../apache/iotdb/db/exception/qp/LogicalOperatorException.java |  0
 .../apache/iotdb/db/exception/qp/LogicalOptimizeException.java |  0
 .../apache/iotdb/db/exception/qp/QueryProcessorException.java  |  0
 .../src/main/java/org/apache/iotdb/db/metadata/MGraph.java     |  0
 .../src/main/java/org/apache/iotdb/db/metadata/MManager.java   |  0
 .../src/main/java/org/apache/iotdb/db/metadata/MNode.java      |  0
 .../src/main/java/org/apache/iotdb/db/metadata/MTree.java      |  0
 .../src/main/java/org/apache/iotdb/db/metadata/Metadata.java   |  0
 .../java/org/apache/iotdb/db/metadata/MetadataConstant.java    |  0
 .../org/apache/iotdb/db/metadata/MetadataOperationType.java    |  0
 .../src/main/java/org/apache/iotdb/db/metadata/PNode.java      |  0
 .../src/main/java/org/apache/iotdb/db/metadata/PTree.java      |  0
 .../src/main/java/org/apache/iotdb/db/monitor/IStatistic.java  |  0
 .../java/org/apache/iotdb/db/monitor/MonitorConstants.java     |  0
 .../src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java |  0
 .../java/org/apache/iotdb/db/monitor/collector/FileSize.java   |  0
 .../iotdb/db/monitor/collector/MemTableWriteTimeCost.java      |  0
 .../src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java   |  0
 .../java/org/apache/iotdb/db/qp/constant/DatetimeUtils.java    |  0
 .../main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java |  0
 .../java/org/apache/iotdb/db/qp/constant/TSParserConstant.java |  0
 .../apache/iotdb/db/qp/exception/DateTimeFormatException.java  |  0
 .../iotdb/db/qp/executor/AbstractQueryProcessExecutor.java     |  0
 .../org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java |  0
 .../org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java  |  0
 .../src/main/java/org/apache/iotdb/db/qp/logical/Operator.java |  0
 .../main/java/org/apache/iotdb/db/qp/logical/RootOperator.java |  0
 .../apache/iotdb/db/qp/logical/crud/BasicFunctionOperator.java |  0
 .../org/apache/iotdb/db/qp/logical/crud/BasicOperatorType.java |  0
 .../org/apache/iotdb/db/qp/logical/crud/DeleteOperator.java    |  0
 .../org/apache/iotdb/db/qp/logical/crud/FilterOperator.java    |  0
 .../java/org/apache/iotdb/db/qp/logical/crud/FromOperator.java |  0
 .../org/apache/iotdb/db/qp/logical/crud/FunctionOperator.java  |  0
 .../org/apache/iotdb/db/qp/logical/crud/InsertOperator.java    |  0
 .../org/apache/iotdb/db/qp/logical/crud/QueryOperator.java     |  0
 .../java/org/apache/iotdb/db/qp/logical/crud/SFWOperator.java  |  0
 .../org/apache/iotdb/db/qp/logical/crud/SelectOperator.java    |  0
 .../org/apache/iotdb/db/qp/logical/crud/UpdateOperator.java    |  0
 .../org/apache/iotdb/db/qp/logical/sys/AuthorOperator.java     |  0
 .../org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java   |  0
 .../org/apache/iotdb/db/qp/logical/sys/MetadataOperator.java   |  0
 .../org/apache/iotdb/db/qp/logical/sys/PropertyOperator.java   |  0
 .../java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java     |  0
 .../org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java  |  0
 .../java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java  |  0
 .../org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java    |  0
 .../java/org/apache/iotdb/db/qp/physical/crud/GroupByPlan.java |  0
 .../java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java  |  0
 .../java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java   |  0
 .../java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java  |  0
 .../java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java   |  0
 .../java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java |  0
 .../java/org/apache/iotdb/db/qp/physical/sys/MetadataPlan.java |  0
 .../java/org/apache/iotdb/db/qp/physical/sys/PropertyPlan.java |  0
 .../java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java |  0
 .../org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java     |  0
 .../iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java    |  0
 .../iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java     |  0
 .../iotdb/db/qp/strategy/optimizer/IFilterOptimizer.java       |  0
 .../iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java      |  0
 .../db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java   |  0
 .../iotdb/db/qp/strategy/optimizer/RemoveNotOptimizer.java     |  0
 .../org/apache/iotdb/db/query/aggregation/AggreResultData.java |  0
 .../apache/iotdb/db/query/aggregation/AggregateFunction.java   |  0
 .../apache/iotdb/db/query/aggregation/impl/CountAggrFunc.java  |  0
 .../apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java  |  0
 .../apache/iotdb/db/query/aggregation/impl/LastAggrFunc.java   |  0
 .../iotdb/db/query/aggregation/impl/MaxTimeAggrFunc.java       |  0
 .../iotdb/db/query/aggregation/impl/MaxValueAggrFunc.java      |  0
 .../apache/iotdb/db/query/aggregation/impl/MeanAggrFunc.java   |  0
 .../iotdb/db/query/aggregation/impl/MinTimeAggrFunc.java       |  0
 .../iotdb/db/query/aggregation/impl/MinValueAggrFunc.java      |  0
 .../apache/iotdb/db/query/aggregation/impl/SumAggrFunc.java    |  0
 .../java/org/apache/iotdb/db/query/context/QueryContext.java   |  0
 .../org/apache/iotdb/db/query/control/FileReaderManager.java   |  0
 .../java/org/apache/iotdb/db/query/control/JobFileManager.java |  0
 .../apache/iotdb/db/query/control/QueryResourceManager.java    |  0
 .../iotdb/db/query/dataset/AggreResultDataPointReader.java     |  0
 .../java/org/apache/iotdb/db/query/dataset/AuthDataSet.java    |  0
 .../iotdb/db/query/dataset/EngineDataSetWithValueFilter.java   |  0
 .../db/query/dataset/EngineDataSetWithoutValueFilter.java      |  0
 .../iotdb/db/query/dataset/groupby/GroupByEngineDataSet.java   |  0
 .../query/dataset/groupby/GroupByWithValueFilterDataSet.java   |  0
 .../dataset/groupby/GroupByWithoutValueFilterDataSet.java      |  0
 .../iotdb/db/query/executor/AggregateEngineExecutor.java       |  0
 .../org/apache/iotdb/db/query/executor/EngineExecutor.java     |  0
 .../org/apache/iotdb/db/query/executor/EngineQueryRouter.java  |  0
 .../org/apache/iotdb/db/query/executor/FillEngineExecutor.java |  0
 .../org/apache/iotdb/db/query/executor/IEngineQueryRouter.java |  0
 .../org/apache/iotdb/db/query/factory/AggreFuncFactory.java    |  0
 .../src/main/java/org/apache/iotdb/db/query/fill/IFill.java    |  0
 .../main/java/org/apache/iotdb/db/query/fill/LinearFill.java   |  0
 .../main/java/org/apache/iotdb/db/query/fill/PreviousFill.java |  0
 .../org/apache/iotdb/db/query/reader/IAggregateReader.java     |  0
 .../java/org/apache/iotdb/db/query/reader/IBatchReader.java    |  0
 .../java/org/apache/iotdb/db/query/reader/IPointReader.java    |  0
 .../org/apache/iotdb/db/query/reader/IReaderByTimestamp.java   |  0
 .../iotdb/db/query/reader/chunkRelated/DiskChunkReader.java    |  0
 .../query/reader/chunkRelated/DiskChunkReaderByTimestamp.java  |  0
 .../iotdb/db/query/reader/chunkRelated/MemChunkReader.java     |  0
 .../query/reader/chunkRelated/MemChunkReaderByTimestamp.java   |  0
 .../db/query/reader/fileRelated/FileSeriesReaderAdapter.java   |  0
 .../reader/fileRelated/FileSeriesReaderByTimestampAdapter.java |  0
 .../query/reader/fileRelated/UnSealedTsFileIterateReader.java  |  0
 .../reader/fileRelated/UnSealedTsFileReaderByTimestamp.java    |  0
 .../query/reader/resourceRelated/SeqResourceIterateReader.java |  0
 .../reader/resourceRelated/SeqResourceReaderByTimestamp.java   |  0
 .../query/reader/resourceRelated/UnseqResourceMergeReader.java |  0
 .../reader/resourceRelated/UnseqResourceReaderByTimestamp.java |  0
 .../db/query/reader/seriesRelated/SeriesReaderByTimestamp.java |  0
 .../reader/seriesRelated/SeriesReaderWithValueFilter.java      |  0
 .../reader/seriesRelated/SeriesReaderWithoutValueFilter.java   |  0
 .../apache/iotdb/db/query/reader/universal/IterateReader.java  |  0
 .../iotdb/db/query/reader/universal/PriorityMergeReader.java   |  0
 .../query/reader/universal/PriorityMergeReaderByTimestamp.java |  0
 .../iotdb/db/query/timegenerator/AbstractNodeConstructor.java  |  0
 .../apache/iotdb/db/query/timegenerator/EngineLeafNode.java    |  0
 .../iotdb/db/query/timegenerator/EngineNodeConstructor.java    |  0
 .../iotdb/db/query/timegenerator/EngineTimeGenerator.java      |  0
 .../src/main/java/org/apache/iotdb/db/rescon/MemTablePool.java |  0
 .../java/org/apache/iotdb/db/rescon/PrimitiveArrayPool.java    |  0
 .../main/java/org/apache/iotdb/db/rescon/TVListAllocator.java  |  0
 .../java/org/apache/iotdb/db/rescon/TVListAllocatorMBean.java  |  0
 .../src/main/java/org/apache/iotdb/db/rescon/package-info.java |  0
 .../src/main/java/org/apache/iotdb/db/service/IService.java    |  0
 .../src/main/java/org/apache/iotdb/db/service/IoTDB.java       |  0
 .../src/main/java/org/apache/iotdb/db/service/IoTDBMBean.java  |  0
 .../java/org/apache/iotdb/db/service/IoTDBShutdownHook.java    |  0
 .../src/main/java/org/apache/iotdb/db/service/JDBCService.java |  0
 .../org/apache/iotdb/db/service/JDBCServiceEventHandler.java   |  0
 .../java/org/apache/iotdb/db/service/JDBCServiceMBean.java     |  0
 .../src/main/java/org/apache/iotdb/db/service/JMXService.java  |  0
 .../src/main/java/org/apache/iotdb/db/service/Monitor.java     |  0
 .../main/java/org/apache/iotdb/db/service/MonitorMBean.java    |  0
 .../main/java/org/apache/iotdb/db/service/RegisterManager.java |  0
 .../src/main/java/org/apache/iotdb/db/service/ServiceType.java |  0
 .../main/java/org/apache/iotdb/db/service/StartupCheck.java    |  0
 .../main/java/org/apache/iotdb/db/service/StartupChecks.java   |  0
 .../main/java/org/apache/iotdb/db/service/TSServiceImpl.java   |  0
 .../src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java  |  0
 .../main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java  |  0
 .../src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java   |  0
 .../main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java |  0
 .../src/main/java/org/apache/iotdb/db/sql/parse/Node.java      |  0
 .../main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java   |  0
 .../main/java/org/apache/iotdb/db/sql/parse/ParseError.java    |  0
 .../java/org/apache/iotdb/db/sql/parse/ParseException.java     |  0
 .../main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java    |  0
 .../src/main/java/org/apache/iotdb/db/sync/conf/Constans.java  |  0
 .../java/org/apache/iotdb/db/sync/conf/SyncSenderConfig.java   |  0
 .../org/apache/iotdb/db/sync/conf/SyncSenderDescriptor.java    |  0
 .../org/apache/iotdb/db/sync/receiver/SyncServerManager.java   |  0
 .../org/apache/iotdb/db/sync/receiver/SyncServiceImpl.java     |  0
 .../java/org/apache/iotdb/db/sync/sender/SyncFileManager.java  |  0
 .../main/java/org/apache/iotdb/db/sync/sender/SyncSender.java  |  0
 .../java/org/apache/iotdb/db/sync/sender/SyncSenderImpl.java   |  0
 .../main/java/org/apache/iotdb/db/tools/MemEst/MemEstTool.java |  0
 .../java/org/apache/iotdb/db/tools/MemEst/MemEstToolCmd.java   |  0
 .../src/main/java/org/apache/iotdb/db/tools/WalChecker.java    |  0
 .../src/main/java/org/apache/iotdb/db/utils/AuthUtils.java     |  0
 .../src/main/java/org/apache/iotdb/db/utils/CommonUtils.java   |  0
 .../java/org/apache/iotdb/db/utils/CopyOnReadLinkedList.java   |  0
 .../src/main/java/org/apache/iotdb/db/utils/FilePathUtils.java |  0
 .../main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java   |  0
 .../src/main/java/org/apache/iotdb/db/utils/IOUtils.java       |  0
 .../src/main/java/org/apache/iotdb/db/utils/MathUtils.java     |  0
 .../src/main/java/org/apache/iotdb/db/utils/MemUtils.java      |  0
 .../main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java   |  0
 .../main/java/org/apache/iotdb/db/utils/QueryDataSetUtils.java |  0
 .../src/main/java/org/apache/iotdb/db/utils/QueryUtils.java    |  0
 .../main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java |  0
 .../src/main/java/org/apache/iotdb/db/utils/SyncUtils.java     |  0
 .../src/main/java/org/apache/iotdb/db/utils/TimeValuePair.java |  0
 .../java/org/apache/iotdb/db/utils/TimeValuePairUtils.java     |  0
 .../main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java   |  0
 .../org/apache/iotdb/db/utils/datastructure/BinaryTVList.java  |  0
 .../org/apache/iotdb/db/utils/datastructure/BooleanTVList.java |  0
 .../org/apache/iotdb/db/utils/datastructure/DoubleTVList.java  |  0
 .../org/apache/iotdb/db/utils/datastructure/FloatTVList.java   |  0
 .../org/apache/iotdb/db/utils/datastructure/IntTVList.java     |  0
 .../org/apache/iotdb/db/utils/datastructure/LongTVList.java    |  0
 .../java/org/apache/iotdb/db/utils/datastructure/TVList.java   |  0
 .../java/org/apache/iotdb/db/writelog/io/BatchLogReader.java   |  0
 .../main/java/org/apache/iotdb/db/writelog/io/ILogReader.java  |  0
 .../main/java/org/apache/iotdb/db/writelog/io/ILogWriter.java  |  0
 .../main/java/org/apache/iotdb/db/writelog/io/LogWriter.java   |  0
 .../org/apache/iotdb/db/writelog/io/MultiFileLogReader.java    |  0
 .../org/apache/iotdb/db/writelog/io/SingleFileLogReader.java   |  0
 .../iotdb/db/writelog/manager/MultiFileLogNodeManager.java     |  0
 .../apache/iotdb/db/writelog/manager/WriteLogNodeManager.java  |  0
 .../apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java   |  0
 .../java/org/apache/iotdb/db/writelog/node/WriteLogNode.java   |  0
 .../java/org/apache/iotdb/db/writelog/recover/LogReplayer.java |  0
 .../iotdb/db/writelog/recover/TsFileRecoverPerformer.java      |  0
 .../org/apache/iotdb/db/auth/LocalFIleRoleAccessorTest.java    |  0
 .../java/org/apache/iotdb/db/auth/LocalFileAuthorizerTest.java |  0
 .../org/apache/iotdb/db/auth/LocalFileRoleManagerTest.java     |  0
 .../org/apache/iotdb/db/auth/LocalFileUserAccessorTest.java    |  0
 .../org/apache/iotdb/db/auth/LocalFileUserManagerTest.java     |  0
 .../db/concurrent/IoTDBDefaultThreadExceptionHandlerTest.java  |  0
 .../apache/iotdb/db/concurrent/IoTDBThreadPoolFactoryTest.java |  0
 .../org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java |  0
 .../iotdb/db/conf/adapter/IoTDBConfigDynamicAdapterTest.java   |  0
 .../db/conf/directories/strategy/DirectoryStrategyTest.java    |  0
 .../apache/iotdb/db/cost/statistic/PerformanceStatTest.java    |  0
 .../java/org/apache/iotdb/db/engine/MetadataManagerHelper.java |  0
 .../apache/iotdb/db/engine/memtable/ChunkBufferPoolTest.java   |  0
 .../apache/iotdb/db/engine/memtable/MemTableFlushTaskTest.java |  0
 .../org/apache/iotdb/db/engine/memtable/MemTablePoolTest.java  |  0
 .../org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java |  0
 .../org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java |  0
 .../apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java |  0
 .../iotdb/db/engine/modification/DeletionFileNodeTest.java     |  0
 .../apache/iotdb/db/engine/modification/DeletionQueryTest.java |  0
 .../iotdb/db/engine/modification/ModificationFileTest.java     |  0
 .../modification/io/LocalTextModificationAccessorTest.java     |  0
 .../iotdb/db/engine/storagegroup/FileNodeManagerBenchmark.java |  0
 .../db/engine/storagegroup/StorageGroupProcessorTest.java      |  0
 .../iotdb/db/engine/storagegroup/TsFileProcessorTest.java      |  0
 .../db/engine/version/SimpleFileVersionControllerTest.java     |  0
 .../iotdb/db/engine/version/SysTimeVersionControllerTest.java  |  0
 .../test/java/org/apache/iotdb/db/integration/Constant.java    |  0
 .../test/java/org/apache/iotdb/db/integration/IOTDBFillIT.java |  0
 .../java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java   |  0
 .../org/apache/iotdb/db/integration/IoTDBAggregationIT.java    |  0
 .../iotdb/db/integration/IoTDBAggregationLargeDataIT.java      |  0
 .../iotdb/db/integration/IoTDBAggregationSmallDataIT.java      |  0
 .../org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java  |  0
 .../java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java  |  0
 .../java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java    |  0
 .../java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java  |  0
 .../iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java       |  0
 .../org/apache/iotdb/db/integration/IoTDBFloatPrecisionIT.java |  0
 .../apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java  |  0
 .../java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java |  0
 .../org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java    |  0
 .../org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java  |  0
 .../org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java    |  0
 .../org/apache/iotdb/db/integration/IoTDBPreparedStmtIT.java   |  0
 .../apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java  |  0
 .../org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java   |  0
 .../java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java  |  0
 .../java/org/apache/iotdb/db/integration/IoTDBVersionIT.java   |  0
 .../src/test/java/org/apache/iotdb/db/metadata/MGraphTest.java |  0
 .../org/apache/iotdb/db/metadata/MManagerAdvancedTest.java     |  0
 .../java/org/apache/iotdb/db/metadata/MManagerBasicTest.java   |  0
 .../java/org/apache/iotdb/db/metadata/MManagerImproveTest.java |  0
 .../src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java  |  0
 .../test/java/org/apache/iotdb/db/metadata/MetadataTest.java   |  0
 .../org/apache/iotdb/db/monitor/collector/FileSizeTest.java    |  0
 .../test/java/org/apache/iotdb/db/qp/QueryProcessorTest.java   |  0
 .../java/org/apache/iotdb/db/qp/bench/QueryParseBenchmark.java |  0
 .../org/apache/iotdb/db/qp/other/TSPlanContextAuthorTest.java  |  0
 .../apache/iotdb/db/qp/other/TSPlanContextPropertyTest.java    |  0
 .../java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java |  0
 .../java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java     |  0
 .../test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java    |  0
 .../java/org/apache/iotdb/db/qp/plan/TestConcatOptimizer.java  |  0
 .../org/apache/iotdb/db/qp/strategy/LogicalGeneratorTest.java  |  0
 .../java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java    |  0
 .../org/apache/iotdb/db/query/component/SimpleFileWriter.java  |  0
 .../apache/iotdb/db/query/control/FileReaderManagerTest.java   |  0
 .../iotdb/db/query/control/QueryResourceManagerTest.java       |  0
 .../db/query/dataset/EngineDataSetWithValueFilterTest.java     |  0
 .../iotdb/db/query/executor/GroupByEngineDataSetTest.java      |  0
 .../org/apache/iotdb/db/query/reader/ReaderTestHelper.java     |  0
 .../db/query/reader/fileRelated/UnSealedTsFileReaderTest.java  |  0
 .../db/query/reader/resourceRelated/SeqResourceReaderTest.java |  0
 .../query/reader/resourceRelated/UnseqResourceReaderTest.java  |  0
 .../iotdb/db/query/reader/seriesRelated/FakedIBatchPoint.java  |  0
 .../iotdb/db/query/reader/seriesRelated/FakedIPointReader.java |  0
 .../reader/seriesRelated/SeriesReaderWithValueFilterTest.java  |  0
 .../seriesRelated/SeriesReaderWithoutValueFilterTest.java      |  0
 .../query/reader/universal/FakedSeriesReaderByTimestamp.java   |  0
 .../reader/universal/PriorityMergeReaderByTimestampTest.java   |  0
 .../db/query/reader/universal/PriorityMergeReaderTest.java     |  0
 .../db/query/reader/universal/PriorityMergeReaderTest2.java    |  0
 .../src/test/java/org/apache/iotdb/db/script/EnvScriptIT.java  |  0
 .../org/apache/iotdb/db/sql/DatetimeQueryDataSetUtilsTest.java |  0
 .../src/test/java/org/apache/iotdb/db/sql/SQLParserTest.java   |  0
 .../apache/iotdb/db/sync/sender/MultipleClientSyncTest.java    |  0
 .../org/apache/iotdb/db/sync/sender/SingleClientSyncTest.java  |  0
 .../org/apache/iotdb/db/sync/sender/SyncFileManagerTest.java   |  0
 .../src/test/java/org/apache/iotdb/db/sync/test/RandomNum.java |  0
 .../java/org/apache/iotdb/db/sync/test/SyncTestClient1.java    |  0
 .../java/org/apache/iotdb/db/sync/test/SyncTestClient2.java    |  0
 .../java/org/apache/iotdb/db/sync/test/SyncTestClient3.java    |  0
 .../src/test/java/org/apache/iotdb/db/sync/test/Utils.java     |  0
 .../test/java/org/apache/iotdb/db/tools/WalCheckerTest.java    |  0
 .../test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java  |  0
 .../org/apache/iotdb/db/utils/MathQueryDataSetUtilsTest.java   |  0
 .../java/org/apache/iotdb/db/utils/OpenFileNumUtilTest.java    |  0
 .../apache/iotdb/db/utils/datastructure/LongTVListTest.java    |  0
 .../org/apache/iotdb/db/writelog/IoTDBLogFileSizeTest.java     |  0
 .../java/org/apache/iotdb/db/writelog/PerformanceTest.java     |  0
 .../org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java  |  0
 .../java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java    |  0
 .../org/apache/iotdb/db/writelog/io/LogWriterReaderTest.java   |  0
 .../apache/iotdb/db/writelog/io/MultiFileLogReaderTest.java    |  0
 .../org/apache/iotdb/db/writelog/recover/LogReplayerTest.java  |  0
 .../apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java |  0
 .../iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java      |  0
 {iotdb => iotdb-server}/src/test/resources/logback.xml         |  0
 {iotdb => iotdb-server}/src/test/resources/start-sync-test.sh  |  0
 {iotdb => iotdb-server}/src/test/resources/stop-sync-test.sh   |  0
 pom.xml                                                        |  2 +-
 418 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/iotdb/iotdb/conf/iotdb-engine.properties b/iotdb-server/iotdb/conf/iotdb-engine.properties
similarity index 100%
rename from iotdb/iotdb/conf/iotdb-engine.properties
rename to iotdb-server/iotdb/conf/iotdb-engine.properties
index 952b404..46e4c21 100644
--- a/iotdb/iotdb/conf/iotdb-engine.properties
+++ b/iotdb-server/iotdb/conf/iotdb-engine.properties
@@ -53,6 +53,11 @@ flush_wal_threshold=10000
 # Set this parameter to 0 may slow down the ingestion on slow disk.
 force_wal_period_in_ms=10
 
+# Size of log buffer in each log node(in byte).
+# If WAL is enabled and the size of a insert plan is smaller than this parameter, then the insert plan will be rejected by WAL
+# If it sets a value smaller than 0, use the default value 16777216
+wal_buffer_size=16777216
+
 ####################
 ### Directory Configuration
 ####################
@@ -125,11 +130,6 @@ merge_concurrent_threads=0
 # The amount of data read each time in batch (the number of data strips, that is, the number of different timestamps.)
 fetch_size=10000
 
-# Size of log buffer in each log node(in byte).
-# If WAL is enabled and the size of a insert plan is smaller than this parameter, then the insert plan will be rejected by WAL
-# If it sets a value smaller than 0, use the default value 16777216
-wal_buffer_size=16777216
-
 # time zone of server side
 # default value is +08:00
 # eg. +08:00, -01:00
diff --git a/iotdb/iotdb/conf/iotdb-env.bat b/iotdb-server/iotdb/conf/iotdb-env.bat
similarity index 100%
rename from iotdb/iotdb/conf/iotdb-env.bat
rename to iotdb-server/iotdb/conf/iotdb-env.bat
diff --git a/iotdb/iotdb/conf/iotdb-env.sh b/iotdb-server/iotdb/conf/iotdb-env.sh
similarity index 100%
rename from iotdb/iotdb/conf/iotdb-env.sh
rename to iotdb-server/iotdb/conf/iotdb-env.sh
diff --git a/iotdb/iotdb/conf/iotdb-sync-client.properties b/iotdb-server/iotdb/conf/iotdb-sync-client.properties
similarity index 100%
rename from iotdb/iotdb/conf/iotdb-sync-client.properties
rename to iotdb-server/iotdb/conf/iotdb-sync-client.properties
diff --git a/iotdb/iotdb/conf/logback-tool.xml b/iotdb-server/iotdb/conf/logback-tool.xml
similarity index 100%
rename from iotdb/iotdb/conf/logback-tool.xml
rename to iotdb-server/iotdb/conf/logback-tool.xml
diff --git a/iotdb/iotdb/conf/logback.xml b/iotdb-server/iotdb/conf/logback.xml
similarity index 100%
rename from iotdb/iotdb/conf/logback.xml
rename to iotdb-server/iotdb/conf/logback.xml
diff --git a/iotdb/iotdb/conf/tsfile-format.properties b/iotdb-server/iotdb/conf/tsfile-format.properties
similarity index 100%
rename from iotdb/iotdb/conf/tsfile-format.properties
rename to iotdb-server/iotdb/conf/tsfile-format.properties
diff --git a/iotdb/iotdb/sbin/start-server.bat b/iotdb-server/iotdb/sbin/start-server.bat
similarity index 100%
rename from iotdb/iotdb/sbin/start-server.bat
rename to iotdb-server/iotdb/sbin/start-server.bat
diff --git a/iotdb/iotdb/sbin/start-server.sh b/iotdb-server/iotdb/sbin/start-server.sh
similarity index 100%
rename from iotdb/iotdb/sbin/start-server.sh
rename to iotdb-server/iotdb/sbin/start-server.sh
diff --git a/iotdb/iotdb/sbin/stop-server.bat b/iotdb-server/iotdb/sbin/stop-server.bat
similarity index 100%
rename from iotdb/iotdb/sbin/stop-server.bat
rename to iotdb-server/iotdb/sbin/stop-server.bat
diff --git a/iotdb/iotdb/sbin/stop-server.sh b/iotdb-server/iotdb/sbin/stop-server.sh
similarity index 100%
rename from iotdb/iotdb/sbin/stop-server.sh
rename to iotdb-server/iotdb/sbin/stop-server.sh
diff --git a/iotdb/iotdb/tools/memory-tool.bat b/iotdb-server/iotdb/tools/memory-tool.bat
similarity index 100%
rename from iotdb/iotdb/tools/memory-tool.bat
rename to iotdb-server/iotdb/tools/memory-tool.bat
diff --git a/iotdb/iotdb/tools/memory-tool.sh b/iotdb-server/iotdb/tools/memory-tool.sh
similarity index 100%
rename from iotdb/iotdb/tools/memory-tool.sh
rename to iotdb-server/iotdb/tools/memory-tool.sh
diff --git a/iotdb/iotdb/tools/start-WalChecker.bat b/iotdb-server/iotdb/tools/start-WalChecker.bat
similarity index 100%
rename from iotdb/iotdb/tools/start-WalChecker.bat
rename to iotdb-server/iotdb/tools/start-WalChecker.bat
diff --git a/iotdb/iotdb/tools/start-WalChecker.sh b/iotdb-server/iotdb/tools/start-WalChecker.sh
similarity index 100%
rename from iotdb/iotdb/tools/start-WalChecker.sh
rename to iotdb-server/iotdb/tools/start-WalChecker.sh
diff --git a/iotdb/iotdb/tools/start-sync-client.bat b/iotdb-server/iotdb/tools/start-sync-client.bat
similarity index 100%
rename from iotdb/iotdb/tools/start-sync-client.bat
rename to iotdb-server/iotdb/tools/start-sync-client.bat
diff --git a/iotdb/iotdb/tools/start-sync-client.sh b/iotdb-server/iotdb/tools/start-sync-client.sh
similarity index 100%
rename from iotdb/iotdb/tools/start-sync-client.sh
rename to iotdb-server/iotdb/tools/start-sync-client.sh
diff --git a/iotdb/iotdb/tools/stop-sync-client.bat b/iotdb-server/iotdb/tools/stop-sync-client.bat
similarity index 100%
rename from iotdb/iotdb/tools/stop-sync-client.bat
rename to iotdb-server/iotdb/tools/stop-sync-client.bat
diff --git a/iotdb/iotdb/tools/stop-sync-client.sh b/iotdb-server/iotdb/tools/stop-sync-client.sh
similarity index 100%
rename from iotdb/iotdb/tools/stop-sync-client.sh
rename to iotdb-server/iotdb/tools/stop-sync-client.sh
diff --git a/iotdb/pom.xml b/iotdb-server/pom.xml
similarity index 99%
rename from iotdb/pom.xml
rename to iotdb-server/pom.xml
index 7a00458..3eca1e9 100644
--- a/iotdb/pom.xml
+++ b/iotdb-server/pom.xml
@@ -27,8 +27,8 @@
         <version>0.8.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>iotdb</artifactId>
-    <name>IoTDB</name>
+    <artifactId>iotdb-server</artifactId>
+    <name>IoTDB Server</name>
     <properties>
         <antlr3.version>3.5.2</antlr3.version>
         <common.lang3.version>3.8.1</common.lang3.version>
diff --git a/iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g b/iotdb-server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g
similarity index 100%
rename from iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g
rename to iotdb-server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g
diff --git a/iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSParser.g b/iotdb-server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSParser.g
similarity index 100%
rename from iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSParser.g
rename to iotdb-server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSParser.g
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/AuthException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/AuthException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/AuthException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/AuthException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/BasicAuthorizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/authorizer/BasicAuthorizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/BasicAuthorizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/authorizer/BasicAuthorizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/IAuthorizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/authorizer/IAuthorizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/IAuthorizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/authorizer/IAuthorizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PathPrivilege.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/PathPrivilege.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PathPrivilege.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/PathPrivilege.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PrivilegeType.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/PrivilegeType.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PrivilegeType.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/PrivilegeType.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/Role.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/Role.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/entity/Role.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/Role.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/User.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/User.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/entity/User.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/User.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleAccessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/IRoleAccessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleAccessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/IRoleAccessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/IRoleManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/IRoleManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserAccessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/IUserAccessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserAccessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/IUserAccessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/IUserManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/IUserManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java b/iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandler.java b/iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandler.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandler.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandler.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactory.java b/iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactory.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactory.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactory.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java b/iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java b/iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/IDynamicAdapter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/adapter/IDynamicAdapter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/IDynamicAdapter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/adapter/IDynamicAdapter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MaxDiskUsableSpaceFirstStrategy.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MaxDiskUsableSpaceFirstStrategy.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MaxDiskUsableSpaceFirstStrategy.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MaxDiskUsableSpaceFirstStrategy.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/ConcurrentCircularArray.java b/iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/ConcurrentCircularArray.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/ConcurrentCircularArray.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/ConcurrentCircularArray.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/Measurement.java b/iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/Measurement.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/Measurement.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/Measurement.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/MeasurementMBean.java b/iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/MeasurementMBean.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/MeasurementMBean.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/MeasurementMBean.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/Operation.java b/iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/Operation.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/Operation.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/Operation.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/DeviceMetaDataCache.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/cache/DeviceMetaDataCache.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/cache/DeviceMetaDataCache.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/cache/DeviceMetaDataCache.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPool.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPool.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPool.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPool.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemSeriesLazyMerger.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/MemSeriesLazyMerger.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemSeriesLazyMerger.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/MemSeriesLazyMerger.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTask.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTask.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTask.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTask.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/NotifyFlushMemTable.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/NotifyFlushMemTable.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/NotifyFlushMemTable.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/NotifyFlushMemTable.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTable.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTable.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTable.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTable.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairSorter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairSorter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairSorter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairSorter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/Deletion.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/Deletion.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/modification/Deletion.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/Deletion.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/Modification.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/Modification.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/modification/Modification.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/Modification.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/ModificationFile.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/ModificationFile.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/modification/ModificationFile.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/ModificationFile.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationWriter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationWriter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationWriter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationWriter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/package-info.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/package-info.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/modification/package-info.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/package-info.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/pool/FlushPoolManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/pool/FlushPoolManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/pool/FlushPoolManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/pool/FlushPoolManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/pool/FlushSubTaskPoolManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/pool/FlushSubTaskPoolManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/pool/FlushSubTaskPoolManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/pool/FlushSubTaskPoolManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/FlushManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/FlushManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/FlushManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/FlushManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/version/SimpleFileVersionController.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/version/SimpleFileVersionController.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/version/SimpleFileVersionController.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/version/SimpleFileVersionController.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/version/SysTimeVersionController.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/version/SysTimeVersionController.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/version/SysTimeVersionController.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/version/SysTimeVersionController.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/version/VersionController.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/version/VersionController.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/version/VersionController.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/version/VersionController.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/ArgsErrorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/ArgsErrorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/ArgsErrorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/ArgsErrorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/ConfigAdjusterException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/ConfigAdjusterException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/ConfigAdjusterException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/ConfigAdjusterException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/DeltaEngineRunningException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/DeltaEngineRunningException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/DeltaEngineRunningException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/DeltaEngineRunningException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/DiskSpaceInsufficientException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/DiskSpaceInsufficientException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/DiskSpaceInsufficientException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/DiskSpaceInsufficientException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/FlushRunTimeException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/FlushRunTimeException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/FlushRunTimeException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/FlushRunTimeException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/MetadataErrorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/MetadataErrorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/MetadataErrorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/MetadataErrorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/PathErrorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/PathErrorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/PathErrorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/PathErrorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/ProcessorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/ProcessorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/ProcessorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/ProcessorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/QueryInBatchStmtException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/QueryInBatchStmtException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/QueryInBatchStmtException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/QueryInBatchStmtException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/StartupException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/StartupException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/StartupException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/StartupException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/StorageEngineException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/StorageEngineException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/StorageEngineException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/StorageEngineException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/StorageEngineFailureException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/StorageEngineFailureException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/StorageEngineFailureException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/StorageEngineFailureException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/StorageGroupProcessorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/StorageGroupProcessorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/StorageGroupProcessorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/StorageGroupProcessorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/SyncConnectionException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/SyncConnectionException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/SyncConnectionException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/SyncConnectionException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/SysCheckException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/SysCheckException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/SysCheckException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/SysCheckException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/TsFileProcessorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/TsFileProcessorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/TsFileProcessorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/TsFileProcessorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/UnSupportedFillTypeException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/UnSupportedFillTypeException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/UnSupportedFillTypeException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/UnSupportedFillTypeException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/IllegalASTFormatException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/IllegalASTFormatException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/qp/IllegalASTFormatException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/IllegalASTFormatException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOperatorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOperatorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOperatorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOperatorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOptimizeException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOptimizeException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOptimizeException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOptimizeException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/QueryProcessorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/QueryProcessorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/qp/QueryProcessorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/QueryProcessorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MGraph.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MGraph.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/MGraph.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MGraph.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/MManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MNode.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MNode.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/MNode.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MNode.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MTree.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/MTree.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/Metadata.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/Metadata.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/Metadata.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/Metadata.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataOperationType.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MetadataOperationType.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataOperationType.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MetadataOperationType.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/PNode.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/PNode.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/PNode.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/PNode.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/PTree.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/PTree.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/PTree.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/PTree.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/monitor/IStatistic.java b/iotdb-server/src/main/java/org/apache/iotdb/db/monitor/IStatistic.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/monitor/IStatistic.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/monitor/IStatistic.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java b/iotdb-server/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java b/iotdb-server/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/MemTableWriteTimeCost.java b/iotdb-server/src/main/java/org/apache/iotdb/db/monitor/collector/MemTableWriteTimeCost.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/MemTableWriteTimeCost.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/monitor/collector/MemTableWriteTimeCost.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/DatetimeUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/constant/DatetimeUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/constant/DatetimeUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/constant/DatetimeUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/TSParserConstant.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/constant/TSParserConstant.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/constant/TSParserConstant.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/constant/TSParserConstant.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/exception/DateTimeFormatException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/exception/DateTimeFormatException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/exception/DateTimeFormatException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/exception/DateTimeFormatException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/RootOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/RootOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/RootOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/RootOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicFunctionOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicFunctionOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicFunctionOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicFunctionOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicOperatorType.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicOperatorType.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicOperatorType.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicOperatorType.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/DeleteOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/DeleteOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/DeleteOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/DeleteOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FilterOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FilterOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FilterOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FilterOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FromOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FromOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FromOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FromOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FunctionOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FunctionOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FunctionOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FunctionOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/InsertOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/InsertOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/InsertOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/InsertOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SFWOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/SFWOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SFWOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/SFWOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SelectOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/SelectOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SelectOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/SelectOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/UpdateOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/UpdateOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/UpdateOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/UpdateOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/AuthorOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/AuthorOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/AuthorOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/AuthorOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/MetadataOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/MetadataOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/MetadataOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/MetadataOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/PropertyOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/PropertyOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/PropertyOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/PropertyOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/MetadataPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MetadataPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/MetadataPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MetadataPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/PropertyPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/PropertyPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/PropertyPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/PropertyPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/IFilterOptimizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/IFilterOptimizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/IFilterOptimizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/IFilterOptimizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/RemoveNotOptimizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/RemoveNotOptimizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/RemoveNotOptimizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/RemoveNotOptimizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/AggreResultData.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/AggreResultData.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/AggreResultData.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/AggreResultData.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateFunction.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateFunction.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateFunction.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateFunction.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/CountAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/CountAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/CountAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/CountAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/LastAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/LastAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/LastAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/LastAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxTimeAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxTimeAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxTimeAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxTimeAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxValueAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxValueAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxValueAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxValueAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MeanAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MeanAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MeanAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MeanAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinTimeAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinTimeAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinTimeAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinTimeAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinValueAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinValueAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinValueAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinValueAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/control/JobFileManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/control/JobFileManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/control/JobFileManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/control/JobFileManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/AggreResultDataPointReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/AggreResultDataPointReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/AggreResultDataPointReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/AggreResultDataPointReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/AuthDataSet.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/AuthDataSet.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/AuthDataSet.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/AuthDataSet.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutValueFilter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutValueFilter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutValueFilter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutValueFilter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByEngineDataSet.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByEngineDataSet.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByEngineDataSet.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByEngineDataSet.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/FillEngineExecutor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/FillEngineExecutor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/executor/FillEngineExecutor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/FillEngineExecutor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/IEngineQueryRouter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/IEngineQueryRouter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/executor/IEngineQueryRouter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/IEngineQueryRouter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/fill/IFill.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/fill/IFill.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/fill/IFill.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/fill/IFill.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/fill/LinearFill.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/fill/LinearFill.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/fill/LinearFill.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/fill/LinearFill.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/fill/PreviousFill.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/fill/PreviousFill.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/fill/PreviousFill.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/fill/PreviousFill.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/IAggregateReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IAggregateReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/IAggregateReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IAggregateReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/IBatchReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IBatchReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/IBatchReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IBatchReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/IPointReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IPointReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/IPointReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IPointReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/IReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/IReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderAdapter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderAdapter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderAdapter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderAdapter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderByTimestampAdapter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderByTimestampAdapter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderByTimestampAdapter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderByTimestampAdapter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileIterateReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileIterateReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileIterateReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileIterateReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceIterateReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceIterateReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceIterateReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceIterateReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceMergeReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceMergeReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceMergeReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceMergeReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/universal/IterateReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/universal/IterateReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/universal/IterateReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/universal/IterateReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/AbstractNodeConstructor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/AbstractNodeConstructor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/AbstractNodeConstructor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/AbstractNodeConstructor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineLeafNode.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineLeafNode.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineLeafNode.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineLeafNode.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/rescon/MemTablePool.java b/iotdb-server/src/main/java/org/apache/iotdb/db/rescon/MemTablePool.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/rescon/MemTablePool.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/rescon/MemTablePool.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayPool.java b/iotdb-server/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayPool.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayPool.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayPool.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/rescon/TVListAllocator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/rescon/TVListAllocator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/rescon/TVListAllocator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/rescon/TVListAllocator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/rescon/TVListAllocatorMBean.java b/iotdb-server/src/main/java/org/apache/iotdb/db/rescon/TVListAllocatorMBean.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/rescon/TVListAllocatorMBean.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/rescon/TVListAllocatorMBean.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/rescon/package-info.java b/iotdb-server/src/main/java/org/apache/iotdb/db/rescon/package-info.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/rescon/package-info.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/rescon/package-info.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IService.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/IService.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/IService.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/IService.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBMBean.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/IoTDBMBean.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBMBean.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/IoTDBMBean.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/JDBCService.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/JDBCService.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceEventHandler.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/JDBCServiceEventHandler.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceEventHandler.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/JDBCServiceEventHandler.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceMBean.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/JDBCServiceMBean.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceMBean.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/JDBCServiceMBean.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/JMXService.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/JMXService.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/JMXService.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/JMXService.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/Monitor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/Monitor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/Monitor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/Monitor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/RegisterManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/RegisterManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/RegisterManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/RegisterManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/ServiceType.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/ServiceType.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/ServiceType.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/ServiceType.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/StartupCheck.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/StartupCheck.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/StartupCheck.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/StartupCheck.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/StartupChecks.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/StartupChecks.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/StartupChecks.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/StartupChecks.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/Node.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/Node.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/Node.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/Node.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/conf/Constans.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/conf/Constans.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/conf/Constans.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/conf/Constans.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderConfig.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderConfig.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderConfig.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderConfig.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderDescriptor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderDescriptor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderDescriptor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderDescriptor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServerManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServerManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServerManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServerManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServiceImpl.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServiceImpl.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServiceImpl.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServiceImpl.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/sender/SyncFileManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/sender/SyncFileManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/sender/SyncFileManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/sender/SyncFileManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/sender/SyncSender.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/sender/SyncSender.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/sender/SyncSender.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/sender/SyncSender.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/sender/SyncSenderImpl.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/sender/SyncSenderImpl.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/sender/SyncSenderImpl.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/sender/SyncSenderImpl.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstTool.java b/iotdb-server/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstTool.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstTool.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstTool.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstToolCmd.java b/iotdb-server/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstToolCmd.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstToolCmd.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstToolCmd.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/tools/WalChecker.java b/iotdb-server/src/main/java/org/apache/iotdb/db/tools/WalChecker.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/tools/WalChecker.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/tools/WalChecker.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/CopyOnReadLinkedList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/CopyOnReadLinkedList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/CopyOnReadLinkedList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/CopyOnReadLinkedList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/FilePathUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/FilePathUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/FilePathUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/FilePathUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/IOUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/IOUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/IOUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/IOUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/MathUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/MathUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/MathUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/MathUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/MemUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/MemUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/MemUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/MemUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/QueryDataSetUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/QueryDataSetUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/QueryDataSetUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/QueryDataSetUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/SyncUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/SyncUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/SyncUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/SyncUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePair.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/TimeValuePair.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePair.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/TimeValuePair.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePairUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/TimeValuePairUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePairUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/TimeValuePairUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/BatchLogReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/BatchLogReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/io/BatchLogReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/BatchLogReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/ILogReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/ILogReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogWriter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/ILogWriter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogWriter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/ILogWriter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/LogWriter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/LogWriter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/io/LogWriter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/LogWriter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/MultiFileLogReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/MultiFileLogReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/io/MultiFileLogReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/MultiFileLogReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/SingleFileLogReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/SingleFileLogReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/io/SingleFileLogReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/SingleFileLogReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/MultiFileLogNodeManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/manager/MultiFileLogNodeManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/MultiFileLogNodeManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/manager/MultiFileLogNodeManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/WriteLogNodeManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/manager/WriteLogNodeManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/WriteLogNodeManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/manager/WriteLogNodeManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/node/WriteLogNode.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/node/WriteLogNode.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/node/WriteLogNode.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/node/WriteLogNode.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/LogReplayer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/recover/LogReplayer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/LogReplayer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/recover/LogReplayer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFIleRoleAccessorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFIleRoleAccessorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFIleRoleAccessorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFIleRoleAccessorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileAuthorizerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileAuthorizerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileAuthorizerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileAuthorizerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileRoleManagerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileRoleManagerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileRoleManagerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileRoleManagerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserAccessorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileUserAccessorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserAccessorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileUserAccessorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserManagerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileUserManagerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserManagerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileUserManagerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandlerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandlerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandlerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandlerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactoryTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactoryTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactoryTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactoryTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapterTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapterTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapterTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapterTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategyTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategyTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategyTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategyTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/cost/statistic/PerformanceStatTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/cost/statistic/PerformanceStatTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/cost/statistic/PerformanceStatTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/cost/statistic/PerformanceStatTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPoolTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPoolTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPoolTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPoolTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTablePoolTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTablePoolTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTablePoolTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTablePoolTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/ModificationFileTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/ModificationFileTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/modification/ModificationFileTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/ModificationFileTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/storagegroup/FileNodeManagerBenchmark.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/storagegroup/FileNodeManagerBenchmark.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/storagegroup/FileNodeManagerBenchmark.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/storagegroup/FileNodeManagerBenchmark.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/version/SimpleFileVersionControllerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/version/SimpleFileVersionControllerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/version/SimpleFileVersionControllerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/version/SimpleFileVersionControllerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/version/SysTimeVersionControllerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/version/SysTimeVersionControllerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/version/SysTimeVersionControllerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/version/SysTimeVersionControllerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/Constant.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/Constant.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/Constant.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/Constant.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IOTDBFillIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IOTDBFillIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IOTDBFillIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IOTDBFillIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationSmallDataIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationSmallDataIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationSmallDataIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationSmallDataIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBFloatPrecisionIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBFloatPrecisionIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBFloatPrecisionIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBFloatPrecisionIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBPreparedStmtIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBPreparedStmtIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBPreparedStmtIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBPreparedStmtIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MGraphTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MGraphTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/metadata/MGraphTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MGraphTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MetadataTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MetadataTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/metadata/MetadataTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MetadataTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/monitor/collector/FileSizeTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/monitor/collector/FileSizeTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/monitor/collector/FileSizeTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/monitor/collector/FileSizeTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/QueryProcessorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/QueryProcessorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/QueryProcessorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/QueryProcessorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/bench/QueryParseBenchmark.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/bench/QueryParseBenchmark.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/bench/QueryParseBenchmark.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/bench/QueryParseBenchmark.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextAuthorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextAuthorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextAuthorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextAuthorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextPropertyTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextPropertyTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextPropertyTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextPropertyTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/TestConcatOptimizer.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/TestConcatOptimizer.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/plan/TestConcatOptimizer.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/TestConcatOptimizer.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/strategy/LogicalGeneratorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/strategy/LogicalGeneratorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/strategy/LogicalGeneratorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/strategy/LogicalGeneratorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/component/SimpleFileWriter.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/component/SimpleFileWriter.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/component/SimpleFileWriter.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/component/SimpleFileWriter.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/control/QueryResourceManagerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/control/QueryResourceManagerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/control/QueryResourceManagerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/control/QueryResourceManagerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilterTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilterTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilterTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilterTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIBatchPoint.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIBatchPoint.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIBatchPoint.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIBatchPoint.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIPointReader.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIPointReader.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIPointReader.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIPointReader.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilterTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilterTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilterTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilterTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilterTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilterTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilterTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilterTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/FakedSeriesReaderByTimestamp.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/FakedSeriesReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/FakedSeriesReaderByTimestamp.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/FakedSeriesReaderByTimestamp.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestampTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestampTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestampTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestampTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest2.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest2.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest2.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest2.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/script/EnvScriptIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/script/EnvScriptIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/script/EnvScriptIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/script/EnvScriptIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sql/DatetimeQueryDataSetUtilsTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sql/DatetimeQueryDataSetUtilsTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sql/DatetimeQueryDataSetUtilsTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sql/DatetimeQueryDataSetUtilsTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sql/SQLParserTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sql/SQLParserTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sql/SQLParserTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sql/SQLParserTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/sender/MultipleClientSyncTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/sender/MultipleClientSyncTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/sender/MultipleClientSyncTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/sender/MultipleClientSyncTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/sender/SingleClientSyncTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/sender/SingleClientSyncTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/sender/SingleClientSyncTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/sender/SingleClientSyncTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/sender/SyncFileManagerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/sender/SyncFileManagerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/sender/SyncFileManagerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/sender/SyncFileManagerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/test/RandomNum.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/RandomNum.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/test/RandomNum.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/RandomNum.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient1.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient1.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient1.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient1.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient2.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient2.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient2.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient2.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient3.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient3.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient3.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient3.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/test/Utils.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/Utils.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/test/Utils.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/Utils.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/tools/WalCheckerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/tools/WalCheckerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/tools/WalCheckerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/tools/WalCheckerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/iotdb-server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/utils/MathQueryDataSetUtilsTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/utils/MathQueryDataSetUtilsTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/utils/MathQueryDataSetUtilsTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/utils/MathQueryDataSetUtilsTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/utils/OpenFileNumUtilTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/utils/OpenFileNumUtilTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/utils/OpenFileNumUtilTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/utils/OpenFileNumUtilTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/utils/datastructure/LongTVListTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/utils/datastructure/LongTVListTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/utils/datastructure/LongTVListTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/utils/datastructure/LongTVListTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/IoTDBLogFileSizeTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/IoTDBLogFileSizeTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/IoTDBLogFileSizeTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/IoTDBLogFileSizeTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/io/LogWriterReaderTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/io/LogWriterReaderTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/io/LogWriterReaderTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/io/LogWriterReaderTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/io/MultiFileLogReaderTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/io/MultiFileLogReaderTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/io/MultiFileLogReaderTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/io/MultiFileLogReaderTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
diff --git a/iotdb/src/test/resources/logback.xml b/iotdb-server/src/test/resources/logback.xml
similarity index 100%
rename from iotdb/src/test/resources/logback.xml
rename to iotdb-server/src/test/resources/logback.xml
diff --git a/iotdb/src/test/resources/start-sync-test.sh b/iotdb-server/src/test/resources/start-sync-test.sh
similarity index 100%
rename from iotdb/src/test/resources/start-sync-test.sh
rename to iotdb-server/src/test/resources/start-sync-test.sh
diff --git a/iotdb/src/test/resources/stop-sync-test.sh b/iotdb-server/src/test/resources/stop-sync-test.sh
similarity index 100%
rename from iotdb/src/test/resources/stop-sync-test.sh
rename to iotdb-server/src/test/resources/stop-sync-test.sh
diff --git a/pom.xml b/pom.xml
index 2c0fe93..a7835f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
     <modules>
         <module>tsfile</module>
         <module>jdbc</module>
-        <module>iotdb</module>
+        <module>iotdb-server</module>
         <module>grafana</module>
         <module>service-rpc</module>
         <module>iotdb-cli</module>